diff --git a/cookbook/locale/ca/LC_MESSAGES/django.po b/cookbook/locale/ca/LC_MESSAGES/django.po
index 45ee88c6..1cb6b41a 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+0200\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/"
@@ -24,15 +24,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\cookbook\filters.py:23 .\cookbook\templates\base.html:98
-#: .\cookbook\templates\forms\edit_internal_recipe.html:269
+#: .\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\views\lists.py:67
+#: .\cookbook\templates\url_import.html:270
 msgid "Ingredients"
 msgstr "Ingredients"
 
-#: .\cookbook\forms.py:49
+#: .\cookbook\forms.py:50
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
@@ -40,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:51
+#: .\cookbook\forms.py:52
 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:53
+#: .\cookbook\forms.py:54
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
@@ -54,7 +53,7 @@ msgstr ""
 "Permet l'ús de fraccions de quantitats d'ingredients (p.ex.: converteix els "
 "decimals a fraccions automàticament)"
 
-#: .\cookbook\forms.py:56
+#: .\cookbook\forms.py:57
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
@@ -62,19 +61,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:58
+#: .\cookbook\forms.py:59
 msgid "Show recently viewed recipes on search page."
 msgstr "Mostra les receptes vistes recentment a la pàgina de cerca."
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:60
 msgid "Number of decimals to round ingredients."
 msgstr "Nombre de decimals dels ingredients."
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:61
 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:62
+#: .\cookbook\forms.py:63
 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 +86,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:65
+#: .\cookbook\forms.py:66
 msgid "Makes the navbar stick to the top of the page."
 msgstr ""
 
-#: .\cookbook\forms.py:81
+#: .\cookbook\forms.py:82
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
@@ -99,94 +98,91 @@ msgstr ""
 "Tots dos camps són opcionals. Si no se'n dóna cap, es mostrarà el nom "
 "d'usuari"
 
-#: .\cookbook\forms.py:102 .\cookbook\forms.py:331
-#: .\cookbook\templates\forms\edit_internal_recipe.html:49
+#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
 #: .\cookbook\templates\url_import.html:154
 msgid "Name"
 msgstr "Nom"
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:332
-#: .\cookbook\templates\base.html:108 .\cookbook\templates\base.html:169
-#: .\cookbook\templates\forms\edit_internal_recipe.html:85
+#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
 #: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573
+#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr "Paraules clau"
 
-#: .\cookbook\forms.py:104
+#: .\cookbook\forms.py:105
 msgid "Preparation time in minutes"
 msgstr "Temps de preparació en minuts"
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:106
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "Temps d'espera (cocció/fornejat) en minuts"
 
-#: .\cookbook\forms.py:106 .\cookbook\forms.py:333
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
 msgid "Path"
 msgstr "Ruta"
 
-#: .\cookbook\forms.py:107
+#: .\cookbook\forms.py:108
 msgid "Storage UID"
 msgstr "UID Emmagatzematge"
 
-#: .\cookbook\forms.py:133
+#: .\cookbook\forms.py:134
 msgid "Default"
 msgstr "Per defecte"
 
-#: .\cookbook\forms.py:144 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
 
-#: .\cookbook\forms.py:164
+#: .\cookbook\forms.py:165
 msgid "New Unit"
 msgstr "Nova Unitat"
 
-#: .\cookbook\forms.py:165
+#: .\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:170
+#: .\cookbook\forms.py:171
 msgid "Old Unit"
 msgstr "Unitat Antiga"
 
-#: .\cookbook\forms.py:171
+#: .\cookbook\forms.py:172
 msgid "Unit that should be replaced."
 msgstr "Unitat que s’hauria de substituir."
 
-#: .\cookbook\forms.py:187
+#: .\cookbook\forms.py:189
 msgid "New Food"
 msgstr "Menjar Nou"
 
-#: .\cookbook\forms.py:188
+#: .\cookbook\forms.py:190
 msgid "New food that other gets replaced by."
 msgstr "Nou menjar que altres substitueixen."
 
-#: .\cookbook\forms.py:193
+#: .\cookbook\forms.py:195
 msgid "Old Food"
 msgstr "Antic Menjar"
 
-#: .\cookbook\forms.py:194
+#: .\cookbook\forms.py:196
 msgid "Food that should be replaced."
 msgstr "Menjar que s’hauria de substituir."
 
-#: .\cookbook\forms.py:212
+#: .\cookbook\forms.py:214
 msgid "Add your comment: "
 msgstr "Afegir el teu comentari:"
 
-#: .\cookbook\forms.py:253
+#: .\cookbook\forms.py:256
 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:260
+#: .\cookbook\forms.py:263
 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:269
+#: .\cookbook\forms.py:272
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
@@ -194,26 +190,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:307
+#: .\cookbook\forms.py:310
 msgid "Search String"
 msgstr "Cerca Cadena"
 
-#: .\cookbook\forms.py:334
+#: .\cookbook\forms.py:337
 msgid "File ID"
 msgstr "ID d'Arxiu"
 
-#: .\cookbook\forms.py:370
+#: .\cookbook\forms.py:373
 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:383
+#: .\cookbook\forms.py:386
 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:384
-#: .\cookbook\templates\forms\edit_internal_recipe.html:427
+#: .\cookbook\forms.py:387
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
@@ -221,64 +216,140 @@ msgstr ""
 "Podeu utilitzar el marcador per donar format a aquest camp. Consulteu els <a "
 "href=\"/docs/markdown/\">documents aquí </a>"
 
-#: .\cookbook\forms.py:409
+#: .\cookbook\forms.py:412
 msgid "Maximum number of users for this space reached."
 msgstr ""
 
-#: .\cookbook\forms.py:415
+#: .\cookbook\forms.py:418
 msgid "Email address already taken!"
 msgstr ""
 
-#: .\cookbook\forms.py:423
+#: .\cookbook\forms.py:426
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
 msgstr ""
 
-#: .\cookbook\forms.py:438
+#: .\cookbook\forms.py:441
 msgid "Name already taken."
 msgstr ""
 
-#: .\cookbook\forms.py:449
+#: .\cookbook\forms.py:452
 msgid "Accept Terms and Privacy"
 msgstr ""
 
+#: .\cookbook\forms.py:487
+msgid ""
+"Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
+"full desciption of choices."
+msgstr ""
+
+#: .\cookbook\forms.py:488
+msgid ""
+"Use fuzzy matching on units, keywords and ingredients when editing and "
+"importing recipes."
+msgstr ""
+
+#: .\cookbook\forms.py:489
+msgid ""
+"Fields to search ignoring accents.  Selecting this option can improve or "
+"degrade search quality depending on language"
+msgstr ""
+
+#: .\cookbook\forms.py:490
+msgid ""
+"Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
+"'pie' and 'piece' and 'soapie')"
+msgstr ""
+
+#: .\cookbook\forms.py:491
+msgid ""
+"Fields to search for beginning of word matches. (e.g. searching for 'sa' "
+"will return 'salad' and 'sandwich')"
+msgstr ""
+
+#: .\cookbook\forms.py:492
+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
+msgid ""
+"Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
+"only function with fulltext fields."
+msgstr ""
+
+#: .\cookbook\forms.py:497
+#, fuzzy
+#| msgid "Search"
+msgid "Search Method"
+msgstr "Cerca"
+
+#: .\cookbook\forms.py:498
+msgid "Fuzzy Lookups"
+msgstr ""
+
+#: .\cookbook\forms.py:499
+msgid "Ignore Accent"
+msgstr ""
+
+#: .\cookbook\forms.py:500
+msgid "Partial Match"
+msgstr ""
+
+#: .\cookbook\forms.py:501
+msgid "Starts Wtih"
+msgstr ""
+
+#: .\cookbook\forms.py:502
+#, fuzzy
+#| msgid "Search"
+msgid "Fuzzy Search"
+msgstr "Cerca"
+
+#: .\cookbook\forms.py:503
+#, fuzzy
+#| msgid "Text"
+msgid "Full Text"
+msgstr "Text"
+
 #: .\cookbook\helper\AllAuthCustomAdapter.py:36
 msgid ""
 "In order to prevent spam, the requested email was not send. Please wait a "
 "few minutes and try again."
 msgstr ""
 
-#: .\cookbook\helper\permission_helper.py:138
-#: .\cookbook\helper\permission_helper.py:161 .\cookbook\views\views.py:151
+#: .\cookbook\helper\permission_helper.py:136
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
 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."
 
-#: .\cookbook\helper\permission_helper.py:142
-#: .\cookbook\helper\permission_helper.py:148
-#: .\cookbook\helper\permission_helper.py:173
-#: .\cookbook\helper\permission_helper.py:218
-#: .\cookbook\helper\permission_helper.py:232
-#: .\cookbook\helper\permission_helper.py:243
-#: .\cookbook\helper\permission_helper.py:254 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:162 .\cookbook\views\views.py:169
-#: .\cookbook\views\views.py:259
+#: .\cookbook\helper\permission_helper.py:140
+#: .\cookbook\helper\permission_helper.py:146
+#: .\cookbook\helper\permission_helper.py:171
+#: .\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
 msgid "You do not have the required permissions to view this page!"
 msgstr "No teniu els permisos necessaris per veure aquesta pàgina!"
 
-#: .\cookbook\helper\permission_helper.py:166
-#: .\cookbook\helper\permission_helper.py:189
-#: .\cookbook\helper\permission_helper.py:204
+#: .\cookbook\helper\permission_helper.py:164
+#: .\cookbook\helper\permission_helper.py:187
+#: .\cookbook\helper\permission_helper.py:202
 msgid "You cannot interact with this object as it is not owned by you!"
 msgstr ""
 "No pots interaccionar amb aquest objecte ja que no és de la teva propietat!"
 
-#: .\cookbook\helper\template_helper.py:60
-#: .\cookbook\helper\template_helper.py:62
+#: .\cookbook\helper\template_helper.py:61
+#: .\cookbook\helper\template_helper.py:63
 msgid "Could not parse template code."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:104
+#: .\cookbook\integration\integration.py:119
 #: .\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
@@ -287,27 +358,27 @@ msgstr ""
 #: .\cookbook\templates\url_import.html:123
 #: .\cookbook\templates\url_import.html:317
 #: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
-#: .\cookbook\views\edit.py:199
+#: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr "Importar"
 
-#: .\cookbook\integration\integration.py:185
+#: .\cookbook\integration\integration.py:200
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:188
+#: .\cookbook\integration\integration.py:203
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:192
+#: .\cookbook\integration\integration.py:208
 msgid "The following recipes were ignored because they already existed:"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:196
+#: .\cookbook\integration\integration.py:212
 #, fuzzy, python-format
 #| msgid "Imported new recipe!"
 msgid "Imported %s recipes."
@@ -330,7 +401,6 @@ msgid "Source"
 msgstr ""
 
 #: .\cookbook\integration\safron.py:23
-#: .\cookbook\templates\forms\edit_internal_recipe.html:79
 #: .\cookbook\templates\include\log_cooking.html:16
 #: .\cookbook\templates\url_import.html:224
 #: .\cookbook\templates\url_import.html:455
@@ -342,7 +412,6 @@ msgid "Waiting time"
 msgstr "Temps d'espera"
 
 #: .\cookbook\integration\safron.py:27
-#: .\cookbook\templates\forms\edit_internal_recipe.html:73
 msgid "Preparation Time"
 msgstr "Temps de preparació"
 
@@ -356,6 +425,22 @@ msgstr "Receptari"
 msgid "Section"
 msgstr "Secció"
 
+#: .\cookbook\management\commands\rebuildindex.py:14
+msgid "Rebuilds full text search index on Recipe"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:18
+msgid "Only Postgress databases use full text search, no index to rebuild"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:29
+msgid "Recipe index rebuild complete."
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:31
+msgid "Recipe index rebuild failed."
+msgstr ""
+
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:14
 msgid "Breakfast"
 msgstr "Esmorzar"
@@ -372,78 +457,91 @@ msgstr "Sopar"
 msgid "Other"
 msgstr "Un altre"
 
-#: .\cookbook\models.py:72
+#: .\cookbook\models.py:144
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr ""
 
-#: .\cookbook\models.py:123 .\cookbook\templates\search.html:7
+#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
 #: .\cookbook\templates\shopping_list.html:52
 msgid "Search"
 msgstr "Cerca"
 
-#: .\cookbook\models.py:124 .\cookbook\templates\base.html:92
+#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
 #: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:233 .\cookbook\views\new.py:201
+#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
 msgid "Meal-Plan"
 msgstr "Plans de Menjar"
 
-#: .\cookbook\models.py:125 .\cookbook\templates\base.html:89
+#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr "Receptes"
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Small"
 msgstr "Petit"
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Large"
 msgstr "Gran"
 
-#: .\cookbook\models.py:133 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:206 .\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:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:202
+#: .\cookbook\models.py:389
+msgid " is part of a recipe step and cannot be deleted"
+msgstr ""
+
+#: .\cookbook\models.py:429
 msgid "Text"
 msgstr "Text"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:203
+#: .\cookbook\models.py:429
 msgid "Time"
 msgstr "Temps"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:204
-#: .\cookbook\templates\forms\edit_internal_recipe.html:219
+#: .\cookbook\models.py:429
 #, fuzzy
 #| msgid "File ID"
 msgid "File"
 msgstr "ID d'Arxiu"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:205
-#: .\cookbook\templates\forms\edit_internal_recipe.html:241
+#: .\cookbook\models.py:429
 #: .\cookbook\templates\include\recipe_open_modal.html:7
 #: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:273 .\cookbook\views\new.py:52
+#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr "Recepta"
 
-#: .\cookbook\serializer.py:109
+#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+msgid "Simple"
+msgstr ""
+
+#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+msgid "Phrase"
+msgstr ""
+
+#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+msgid "Web"
+msgstr ""
+
+#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+msgid "Raw"
+msgstr ""
+
+#: .\cookbook\serializer.py:112
 msgid "File uploads are not enabled for this Space."
 msgstr ""
 
-#: .\cookbook\serializer.py:117
+#: .\cookbook\serializer.py:125
 msgid "You have reached your file upload limit."
 msgstr ""
 
-#: .\cookbook\tables.py:35 .\cookbook\templates\books.html:36
-#: .\cookbook\templates\generic\edit_template.html:6
+#: .\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
@@ -452,11 +550,10 @@ msgstr ""
 msgid "Edit"
 msgstr "Edita"
 
-#: .\cookbook\tables.py:124 .\cookbook\tables.py:147
-#: .\cookbook\templates\books.html:38
+#: .\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\edit_template.html:27
+#: .\cookbook\templates\generic\edit_template.html:28
 #: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
@@ -486,7 +583,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:154 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -566,7 +663,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:21
+#: .\cookbook\templates\generic\delete_template.html:22
 msgid "Confirm"
 msgstr "Confirma"
 
@@ -578,7 +675,7 @@ msgid ""
 "request</a>."
 msgstr ""
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:189
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
 msgid "Login"
 msgstr "Iniciar Sessió"
 
@@ -633,7 +730,7 @@ msgstr "Canvis desats!"
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:52
+#: .\cookbook\templates\settings.html:64
 #, fuzzy
 #| msgid "Settings"
 msgid "Password"
@@ -719,103 +816,88 @@ msgstr ""
 msgid "We are sorry, but the sign up is currently closed."
 msgstr ""
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:179
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr "Documentació API "
 
-#: .\cookbook\templates\base.html:85
-msgid "Utensils"
-msgstr "Estris"
-
-#: .\cookbook\templates\base.html:95
+#: .\cookbook\templates\base.html:86
 msgid "Shopping"
 msgstr "Compres"
 
-#: .\cookbook\templates\base.html:101
+#: .\cookbook\templates\base.html:113
+msgid "Keyword"
+msgstr "Paraula Clau"
+
+#: .\cookbook\templates\base.html:137
+#: .\cookbook\templates\forms\ingredients.html:24
+#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
+#: .\cookbook\views\lists.py:146
+msgid "Units"
+msgstr "Unitats"
+
+#: .\cookbook\templates\base.html:151
 #: .\cookbook\templates\shopping_list.html:230
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr "Supermercat"
 
-#: .\cookbook\templates\base.html:112 .\cookbook\views\delete.py:84
-#: .\cookbook\views\edit.py:102 .\cookbook\views\lists.py:26
-#: .\cookbook\views\new.py:78
-msgid "Keyword"
-msgstr "Paraula Clau"
-
-#: .\cookbook\templates\base.html:114
+#: .\cookbook\templates\base.html:163
 msgid "Batch Edit"
 msgstr "Edició per lots"
 
-#: .\cookbook\templates\base.html:119
-msgid "Storage Data"
-msgstr "Emmagatzematge de dades"
-
-#: .\cookbook\templates\base.html:123
-msgid "Storage Backends"
-msgstr "Backends d'emmagatzematge"
-
-#: .\cookbook\templates\base.html:125
-msgid "Configure Sync"
-msgstr "Configurar Sync"
-
-#: .\cookbook\templates\base.html:127
-msgid "Discovered Recipes"
-msgstr "Receptes Descobertes"
-
-#: .\cookbook\templates\base.html:129
-msgid "Discovery Log"
-msgstr "Registre de descobriment"
-
-#: .\cookbook\templates\base.html:131 .\cookbook\templates\stats.html:10
-msgid "Statistics"
-msgstr "Estadístiques"
-
-#: .\cookbook\templates\base.html:133
-msgid "Units & Ingredients"
-msgstr "Unitats i ingredients"
-
-#: .\cookbook\templates\base.html:135 .\cookbook\templates\index.html:47
-msgid "Import Recipe"
-msgstr "Importa recepta"
-
-#: .\cookbook\templates\base.html:156 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr "Historial"
 
-#: .\cookbook\templates\base.html:159 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:191 .\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
+msgid "Create"
+msgstr "Crea"
+
+#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
 #: .\cookbook\templates\space.html:19
 #, fuzzy
 #| msgid "Settings"
 msgid "Space Settings"
 msgstr "Opcions"
 
-#: .\cookbook\templates\base.html:163 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr "Sistema"
 
-#: .\cookbook\templates\base.html:165 .\cookbook\templates\base.html:171
+#: .\cookbook\templates\base.html:214
 msgid "Admin"
 msgstr "Admin"
 
-#: .\cookbook\templates\base.html:175
+#: .\cookbook\templates\base.html:218
 msgid "Markdown Guide"
 msgstr "Guia Markdown"
 
-#: .\cookbook\templates\base.html:177
+#: .\cookbook\templates\base.html:220
 msgid "GitHub"
 msgstr "GitHub"
 
-#: .\cookbook\templates\base.html:181
+#: .\cookbook\templates\base.html:224
 msgid "API Browser"
 msgstr "Navegador API"
 
-#: .\cookbook\templates\base.html:184
+#: .\cookbook\templates\base.html:227
 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"
@@ -830,7 +912,7 @@ msgstr ""
 "Afegiu les paraules clau especificades a totes les receptes que continguin "
 "la paraula"
 
-#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:85
+#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:83
 msgid "Sync"
 msgstr "Sync"
 
@@ -850,10 +932,26 @@ msgstr ""
 msgid "The path must be in the following format"
 msgstr "El camí ha de tenir el format següent"
 
-#: .\cookbook\templates\batch\monitor.html:27
+#: .\cookbook\templates\batch\monitor.html:21
+msgid "Manage External Storage"
+msgstr ""
+
+#: .\cookbook\templates\batch\monitor.html:28
 msgid "Sync Now!"
 msgstr "Sincronitza Ara!"
 
+#: .\cookbook\templates\batch\monitor.html:29
+#, fuzzy
+#| msgid "Shopping Recipes"
+msgid "Show Recipes"
+msgstr "Llista de Compra de Receptes"
+
+#: .\cookbook\templates\batch\monitor.html:30
+#, fuzzy
+#| msgid "Show Links"
+msgid "Show Log"
+msgstr "Mostra Enllaços"
+
 #: .\cookbook\templates\batch\waiting.html:4
 #: .\cookbook\templates\batch\waiting.html:10
 msgid "Importing Recipes"
@@ -867,32 +965,10 @@ msgstr ""
 "Això pot trigar uns minuts, en funció del nombre de receptes sincronitzades, "
 "espereu."
 
-#: .\cookbook\templates\books.html:5 .\cookbook\templates\books.html:11
+#: .\cookbook\templates\books.html:7
 msgid "Recipe Books"
 msgstr "Llibres de Receptes"
 
-#: .\cookbook\templates\books.html:15
-msgid "New Book"
-msgstr "Nou Llibre"
-
-#: .\cookbook\templates\books.html:27 .\cookbook\templates\recipe_view.html:26
-msgid "by"
-msgstr "per"
-
-#: .\cookbook\templates\books.html:34
-msgid "Toggle Recipes"
-msgstr "Commuta Receptes"
-
-#: .\cookbook\templates\books.html:54
-#: .\cookbook\templates\meal_plan_entry.html:48
-#: .\cookbook\templates\recipes_table.html:64
-msgid "Last cooked"
-msgstr "Darrera cocció"
-
-#: .\cookbook\templates\books.html:71
-msgid "There are no recipes in this book yet."
-msgstr "Encara no hi ha receptes en aquest llibre."
-
 #: .\cookbook\templates\export.html:6 .\cookbook\templates\test2.html:6
 msgid "Export Recipes"
 msgstr "Exporta Receptes"
@@ -915,217 +991,21 @@ msgid "Import new Recipe"
 msgstr "Importa nova Recepta"
 
 #: .\cookbook\templates\forms\edit_import_recipe.html:14
-#: .\cookbook\templates\forms\edit_internal_recipe.html:439
-#: .\cookbook\templates\forms\edit_internal_recipe.html:471
 #: .\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:46 .\cookbook\templates\settings.html:87
-#: .\cookbook\templates\settings.html:105
+#: .\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
 msgid "Save"
 msgstr "Desa"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:7
-#: .\cookbook\templates\forms\edit_internal_recipe.html:34
 msgid "Edit Recipe"
 msgstr "Edita Recepta"
 
-#: .\cookbook\templates\forms\edit_internal_recipe.html:56
-#: .\cookbook\templates\url_import.html:171
-msgid "Description"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:76
-msgid "Waiting Time"
-msgstr "Temps d'Espera"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:82
-msgid "Servings Text"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:93
-msgid "Select Keywords"
-msgstr "Selecciona Paraules clau"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:94
-#: .\cookbook\templates\url_import.html:583
-#, fuzzy
-#| msgid "All Keywords"
-msgid "Add Keyword"
-msgstr "Totes les paraules clau"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:112
-msgid "Nutrition"
-msgstr "Nutrició"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:116
-#: .\cookbook\templates\forms\edit_internal_recipe.html:166
-msgid "Delete Step"
-msgstr "Esborra Pas"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:120
-msgid "Calories"
-msgstr "Calories"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:123
-msgid "Carbohydrates"
-msgstr "Hidrats de carboni"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:126
-msgid "Fats"
-msgstr "Greixos"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:128
-msgid "Proteins"
-msgstr "Proteïnes"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:150
-#: .\cookbook\templates\forms\edit_internal_recipe.html:504
-msgid "Step"
-msgstr "Pas"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:171
-msgid "Show as header"
-msgstr "Mostra com a capçalera"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:177
-msgid "Hide as header"
-msgstr "Amaga com a capçalera"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:182
-msgid "Move Up"
-msgstr "Mou Amunt"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:187
-msgid "Move Down"
-msgstr "Mou Avall"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:196
-msgid "Step Name"
-msgstr "Nom del Pas"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:200
-msgid "Step Type"
-msgstr "Tipus de Pas"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:213
-msgid "Step time in Minutes"
-msgstr "Temps de pas en Minuts"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:229
-#, fuzzy
-#| msgid "Select one"
-msgid "Select File"
-msgstr "Sel·lecciona un"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:230
-#: .\cookbook\templates\forms\edit_internal_recipe.html:252
-#: .\cookbook\templates\forms\edit_internal_recipe.html:313
-#: .\cookbook\templates\forms\edit_internal_recipe.html:337
-#: .\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
-msgid "Select"
-msgstr "Selecciona"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:251
-#, fuzzy
-#| msgid "Delete Recipe"
-msgid "Select Recipe"
-msgstr "Esborra Recepta"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:311
-#: .\cookbook\templates\shopping_list.html:187
-msgid "Select Unit"
-msgstr "Selecciona Unitat"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:312
-#: .\cookbook\templates\forms\edit_internal_recipe.html:336
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
-msgid "Create"
-msgstr "Crea"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:335
-#: .\cookbook\templates\shopping_list.html:209
-msgid "Select Food"
-msgstr "Selecciona Menjar"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:352
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr "Nota"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:369
-msgid "Delete Ingredient"
-msgstr "Esborra Ingredient"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:375
-msgid "Make Header"
-msgstr "Crea Capçalera"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:381
-msgid "Make Ingredient"
-msgstr "Crea Ingredient"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:387
-msgid "Disable Amount"
-msgstr "Deshabilita Quantitat"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:393
-msgid "Enable Amount"
-msgstr "Habilita Quantitat"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:398
-msgid "Copy Template Reference"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:424
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
-msgid "Instructions"
-msgstr "Instruccions"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:437
-#: .\cookbook\templates\forms\edit_internal_recipe.html:468
-msgid "Save & View"
-msgstr "Desa i Comprova"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:441
-#: .\cookbook\templates\forms\edit_internal_recipe.html:474
-msgid "Add Step"
-msgstr "Afegir Pas"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:444
-#: .\cookbook\templates\forms\edit_internal_recipe.html:478
-msgid "Add Nutrition"
-msgstr "Afegeix nutrients"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:446
-#: .\cookbook\templates\forms\edit_internal_recipe.html:480
-msgid "Remove Nutrition"
-msgstr "Elimina nutrients"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:448
-#: .\cookbook\templates\forms\edit_internal_recipe.html:483
-msgid "View Recipe"
-msgstr "Veure Recepta"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:450
-#: .\cookbook\templates\forms\edit_internal_recipe.html:485
-msgid "Delete Recipe"
-msgstr "Esborra Recepta"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:491
-msgid "Steps"
-msgstr "Passos"
-
 #: .\cookbook\templates\forms\ingredients.html:15
 msgid "Edit Ingredients"
 msgstr "Edita Ingredients"
@@ -1145,11 +1025,6 @@ msgstr ""
 "unitats o ingredients es van crear hi haurien de ser el mateix.\n"
 "Combina dues unitats o ingredients i actualitza totes les receptes amb ells"
 
-#: .\cookbook\templates\forms\ingredients.html:24
-#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
-msgid "Units"
-msgstr "Unitats"
-
 #: .\cookbook\templates\forms\ingredients.html:26
 msgid "Are you sure that you want to merge these two units?"
 msgstr "Estàs segur que vols combinar aquestes dues unitats?"
@@ -1163,29 +1038,33 @@ 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:18
+#: .\cookbook\templates\generic\delete_template.html:19
 #, 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\edit_template.html:30
+#: .\cookbook\templates\generic\delete_template.html:23
+msgid "Cancel"
+msgstr ""
+
+#: .\cookbook\templates\generic\edit_template.html:32
 msgid "View"
 msgstr "Veure"
 
-#: .\cookbook\templates\generic\edit_template.html:34
+#: .\cookbook\templates\generic\edit_template.html:36
 msgid "Delete original file"
 msgstr "Esborra arxiu original"
 
 #: .\cookbook\templates\generic\list_template.html:6
-#: .\cookbook\templates\generic\list_template.html:12
+#: .\cookbook\templates\generic\list_template.html:21
 msgid "List"
 msgstr "Llista"
 
-#: .\cookbook\templates\generic\list_template.html:25
+#: .\cookbook\templates\generic\list_template.html:34
 msgid "Filter"
 msgstr "Filtre"
 
-#: .\cookbook\templates\generic\list_template.html:30
+#: .\cookbook\templates\generic\list_template.html:39
 msgid "Import all"
 msgstr "Importa tot"
 
@@ -1522,6 +1401,11 @@ msgstr "Mostra ajuda"
 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"
@@ -1585,6 +1469,11 @@ msgstr ""
 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"
+msgstr "Darrera cocció"
+
 #: .\cookbook\templates\meal_plan_entry.html:50
 msgid "Never cooked before."
 msgstr "No cuinat abans"
@@ -1687,8 +1576,12 @@ msgstr ""
 msgid "Comments"
 msgstr "Comentaris"
 
+#: .\cookbook\templates\recipe_view.html:26
+msgid "by"
+msgstr "per"
+
 #: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
-#: .\cookbook\views\edit.py:179
+#: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr "Comentari"
 
@@ -1720,56 +1613,227 @@ msgstr "Registre de Cuines"
 msgid "Recipe Home"
 msgstr "Receptes"
 
-#: .\cookbook\templates\settings.html:25
+#: .\cookbook\templates\search_info.html:5
+#: .\cookbook\templates\search_info.html:9
+#: .\cookbook\templates\settings.html:157
+#, fuzzy
+#| msgid "Search String"
+msgid "Search Settings"
+msgstr "Cerca Cadena"
+
+#: .\cookbook\templates\search_info.html:10
+msgid ""
+"\n"
+"        Creating the best search experience is complicated and weighs "
+"heavily on your personal configuration.  \n"
+"        Changing any of the search settings can have significant impact on "
+"the speed and quality of the results.\n"
+"        Search Methods, Trigrams and Full Text Search configurations are "
+"only available if you are using Postgres for your database.\n"
+"    "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:19
+#, fuzzy
+#| msgid "Search"
+msgid "Search Methods"
+msgstr "Cerca"
+
+#: .\cookbook\templates\search_info.html:23
+msgid ""
+" \n"
+"            Full text searches attempt to normalize the words provided to "
+"match common variants.  For example: 'forked', 'forking', 'forks' will all "
+"normalize to 'fork'.\n"
+"            There are several methods available, described below, that will "
+"control how the search behavior should react when multiple words are "
+"searched.\n"
+"            Full technical details on how these operate can be viewed on <a "
+"href=https://www.postgresql.org/docs/current/textsearch-controls."
+"html#TEXTSEARCH-PARSING-QUERIES>Postgresql's website.</a>\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:29
+msgid ""
+" \n"
+"            Simple searches ignore punctuation and common words such as "
+"'the', 'a', 'and'. And will treat seperate words as required.\n"
+"            Searching for 'apple or flour' will return any recipe that "
+"includes both 'apple' and 'flour' anywhere in the fields that have been "
+"selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:34
+msgid ""
+" \n"
+"            Phrase searches ignore punctuation, but will search for all of "
+"the words in the exact order provided.\n"
+"            Searching for 'apple or flour' will only return a recipe that "
+"includes the exact phrase 'apple or flour' in any of the fields that have "
+"been selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:39
+msgid ""
+" \n"
+"            Web searches simulate functionality found on many web search "
+"sites supporting special syntax.\n"
+"            Placing quotes around several words will convert those words "
+"into a phrase.\n"
+"            'or' is recongized as searching for the word (or phrase) "
+"immediately before 'or' OR the word (or phrase) directly after.\n"
+"            '-' is recognized as searching for recipes that do not include "
+"the word (or phrase) that comes immediately after. \n"
+"            For example searching for 'apple pie' or cherry -butter will "
+"return any recipe that includes the phrase 'apple pie' or the word "
+"'cherry' \n"
+"            in any field included in the full text search but exclude any "
+"recipe that has the word 'butter' in any field included.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:48
+msgid ""
+" \n"
+"            Raw search is similar to Web except will take puncuation "
+"operators such as '|', '&' and '()'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:59
+msgid ""
+" \n"
+"            Another approach to searching that also requires Postgresql is "
+"fuzzy search or trigram similarity. A trigram is a group of three "
+"consecutive characters.\n"
+"            For example searching for 'apple' will create x trigrams 'app', "
+"'ppl', 'ple' and will create a score of how closely words match the "
+"generated trigrams.\n"
+"            One benefit of searching trigams is that a search for 'sandwich' "
+"will find mispelled words such as 'sandwhich' that would be missed by other "
+"methods.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:69
+#, fuzzy
+#| msgid "Search Recipe"
+msgid "Search Fields"
+msgstr "Cerca Recepta"
+
+#: .\cookbook\templates\search_info.html:73
+msgid ""
+" \n"
+"            Unaccent is a special case in that it enables searching a field "
+"'unaccented' for each search style attempting to ignore accented values. \n"
+"            For example when you enable unaccent for 'Name' any search "
+"(starts with, contains, trigram) will attempt the search ignoring accented "
+"characters.\n"
+"            \n"
+"            For the other options, you can enable search on any or all "
+"fields and they will be combined together with an assumed 'OR'.\n"
+"            For example enabling 'Name' for Starts With, 'Name' and "
+"'Description' for Partial Match and 'Ingredients' and 'Keywords' for Full "
+"Search\n"
+"            and searching for 'apple' will generate a search that will "
+"return recipes that have:\n"
+"            - A recipe name that starts with 'apple'\n"
+"            - OR a recipe name that contains 'apple'\n"
+"            - OR a recipe description that contains 'apple'\n"
+"            - OR a recipe that will have a full text search match ('apple' "
+"or 'apples') in ingredients\n"
+"            - OR a recipe that will have a full text search match in "
+"Keywords\n"
+"\n"
+"            Combining too many fields in too many types of search can have a "
+"negative impact on performance, create duplicate results or return "
+"unexpected results.\n"
+"            For example, enabling fuzzy search or partial matches will "
+"interfere with web search methods.  \n"
+"            Searching for 'apple -pie' with fuzzy search and full text "
+"search will return the recipe Apple Pie.  Though it is not included in the "
+"full text results, it does match the trigram results.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:95
+#, fuzzy
+#| msgid "Search"
+msgid "Search Index"
+msgstr "Cerca"
+
+#: .\cookbook\templates\search_info.html:99
+msgid ""
+" \n"
+"            Trigram search and Full Text Search both rely on database "
+"indexes to perform effectively.  \n"
+"            You can rebuild the indexes on all fields in the Admin page for "
+"Recipes and selecting all recipes and running 'rebuild index for selected "
+"recipes'\n"
+"            You can also rebuild indexes at the command line by executing "
+"the management command 'python manage.py rebuildindex'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\settings.html:27
 msgid "Account"
 msgstr "Compte"
 
-#: .\cookbook\templates\settings.html:29
+#: .\cookbook\templates\settings.html:33
 msgid "Preferences"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:39
 #, fuzzy
 #| msgid "Settings"
 msgid "API-Settings"
 msgstr "Opcions"
 
-#: .\cookbook\templates\settings.html:41
+#: .\cookbook\templates\settings.html:45
+#, fuzzy
+#| msgid "Search String"
+msgid "Search-Settings"
+msgstr "Cerca Cadena"
+
+#: .\cookbook\templates\settings.html:53
 #, fuzzy
 #| msgid "Settings"
 msgid "Name Settings"
 msgstr "Opcions"
 
-#: .\cookbook\templates\settings.html:49
+#: .\cookbook\templates\settings.html:61
 #, fuzzy
 #| msgid "Settings"
 msgid "Account Settings"
 msgstr "Opcions"
 
-#: .\cookbook\templates\settings.html:51
+#: .\cookbook\templates\settings.html:63
 #, fuzzy
 #| msgid "Settings"
 msgid "Emails"
 msgstr "Opcions"
 
-#: .\cookbook\templates\settings.html:54
+#: .\cookbook\templates\settings.html:66
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:78
 msgid "Language"
 msgstr "Idioma"
 
-#: .\cookbook\templates\settings.html:96
+#: .\cookbook\templates\settings.html:108
 msgid "Style"
 msgstr "Estil"
 
-#: .\cookbook\templates\settings.html:116
+#: .\cookbook\templates\settings.html:128
 msgid "API Token"
 msgstr "Token API"
 
-#: .\cookbook\templates\settings.html:117
+#: .\cookbook\templates\settings.html:129
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
@@ -1777,7 +1841,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:134
+#: .\cookbook\templates\settings.html:146
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
@@ -1785,7 +1849,7 @@ 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:136
+#: .\cookbook\templates\settings.html:148
 msgid "or"
 msgstr "o"
 
@@ -1828,6 +1892,23 @@ msgstr ""
 msgid "Amount"
 msgstr "Quantitat"
 
+#: .\cookbook\templates\shopping_list.html:187
+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
+msgid "Select"
+msgstr "Selecciona"
+
+#: .\cookbook\templates\shopping_list.html:209
+msgid "Select Food"
+msgstr "Selecciona Menjar"
+
 #: .\cookbook\templates\shopping_list.html:240
 msgid "Select Supermarket"
 msgstr "Seleccioni supermercat"
@@ -1926,10 +2007,6 @@ msgstr "Estadístiques d'objectes"
 msgid "Recipes without Keywords"
 msgstr "Receptes sense paraules clau"
 
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr "Receptes Externes"
-
 #: .\cookbook\templates\space.html:60 .\cookbook\templates\stats.html:45
 msgid "Internal Recipes"
 msgstr "Receptes Internes"
@@ -1989,7 +2066,7 @@ msgid "There are no members in your space yet!"
 msgstr "Encara no hi ha receptes en aquest llibre."
 
 #: .\cookbook\templates\space.html:130 .\cookbook\templates\system.html:21
-#: .\cookbook\views\lists.py:115
+#: .\cookbook\views\lists.py:100
 msgid "Invite Links"
 msgstr "Enllaços Invitació"
 
@@ -1997,6 +2074,10 @@ msgstr "Enllaços Invitació"
 msgid "Stats"
 msgstr "Estadístiques"
 
+#: .\cookbook\templates\stats.html:10
+msgid "Statistics"
+msgstr "Estadístiques"
+
 #: .\cookbook\templates\system.html:22
 msgid "Show Links"
 msgstr "Mostra Enllaços"
@@ -2175,6 +2256,10 @@ msgstr ""
 msgid "Text dragged here will be appended to the name."
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:171
+msgid "Description"
+msgstr ""
+
 #: .\cookbook\templates\url_import.html:175
 msgid "Text dragged here will be appended to the description."
 msgstr ""
@@ -2203,6 +2288,11 @@ msgstr "Temps"
 msgid "Ingredients dragged here will be appended to current list."
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:297
+#: .\cookbook\templates\url_import.html:567
+msgid "Instructions"
+msgstr "Instruccions"
+
 #: .\cookbook\templates\url_import.html:302
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
@@ -2262,6 +2352,12 @@ msgstr "Especificació de marcatge de receptes"
 msgid "Select one"
 msgstr "Sel·lecciona un"
 
+#: .\cookbook\templates\url_import.html:583
+#, fuzzy
+#| msgid "All Keywords"
+msgid "Add Keyword"
+msgstr "Totes les paraules clau"
+
 #: .\cookbook\templates\url_import.html:596
 msgid "All Keywords"
 msgstr "Totes les paraules clau"
@@ -2305,38 +2401,95 @@ msgstr "Problemes de GitHub"
 msgid "Recipe Markup Specification"
 msgstr "Especificació de marcatge de receptes"
 
-#: .\cookbook\views\api.py:79
+#: .\cookbook\views\api.py:82 .\cookbook\views\api.py:131
 #, fuzzy
 #| msgid "Parameter filter_list incorrectly formatted"
 msgid "Parameter updated_at incorrectly formatted"
 msgstr "El paràmetre filter_list té un format incorrecte"
 
-#: .\cookbook\views\api.py:580 .\cookbook\views\views.py:303
+#: .\cookbook\views\api.py:151
+#, python-brace-format
+msgid "No {self.basename} with id {pk} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
+#: .\cookbook\views\edit.py:316
+msgid "Cannot merge with the same object!"
+msgstr ""
+
+#: .\cookbook\views\api.py:162
+#, python-brace-format
+msgid "No {self.basename} with id {target} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:167
+msgid "Cannot merge with child object!"
+msgstr ""
+
+#: .\cookbook\views\api.py:195
+#, python-brace-format
+msgid "{source.name} was merged successfully with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:199
+#, python-brace-format
+msgid "An error occurred attempting to merge {source.name} with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:239
+#, python-brace-format
+msgid "No {self.basename} with id {child} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:248
+#, python-brace-format
+msgid "{child.name} was moved successfully to the root."
+msgstr ""
+
+#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+msgid "An error occurred attempting to move "
+msgstr ""
+
+#: .\cookbook\views\api.py:254
+msgid "Cannot move an object to itself!"
+msgstr ""
+
+#: .\cookbook\views\api.py:260
+#, python-brace-format
+msgid "No {self.basename} with id {parent} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:266
+#, python-brace-format
+msgid "{child.name} was moved successfully to parent {parent.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
 msgid "This feature is not available in the demo version!"
 msgstr ""
 
-#: .\cookbook\views\api.py:603
+#: .\cookbook\views\api.py:727
 msgid "Sync successful!"
 msgstr "Sincronització correcte"
 
-#: .\cookbook\views\api.py:608
+#: .\cookbook\views\api.py:732
 msgid "Error synchronizing with Storage"
 msgstr "Error de sincronització amb emmagatzematge"
 
-#: .\cookbook\views\api.py:686
+#: .\cookbook\views\api.py:810
 msgid "Nothing to do."
 msgstr ""
 
-#: .\cookbook\views\api.py:701
+#: .\cookbook\views\api.py:825
 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:708
+#: .\cookbook\views\api.py:832
 msgid "The requested page could not be found."
 msgstr "No s'ha pogut trobar la pàgina sol·licitada."
 
-#: .\cookbook\views\api.py:717
+#: .\cookbook\views\api.py:841
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
@@ -2344,13 +2497,13 @@ msgstr ""
 "El lloc sol·licitat no proporciona cap format de dades reconegut des d’on "
 "importar la recepta."
 
-#: .\cookbook\views\api.py:731
+#: .\cookbook\views\api.py:855
 #, 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:747
+#: .\cookbook\views\api.py:871
 msgid "I couldn't find anything to do."
 msgstr ""
 
@@ -2378,8 +2531,8 @@ msgstr[1] ""
 msgid "Monitor"
 msgstr "Monitoratge"
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:102
-#: .\cookbook\views\new.py:98
+#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr "Backend d'emmagatzematge"
 
@@ -2390,8 +2543,8 @@ 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:213
-#: .\cookbook\views\new.py:156
+#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
+#: .\cookbook\views\new.py:155
 msgid "Recipe Book"
 msgstr "Llibre de Receptes"
 
@@ -2399,47 +2552,39 @@ msgstr "Llibre de Receptes"
 msgid "Bookmarks"
 msgstr "Marcadors"
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:252
+#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
 msgid "Invite Link"
 msgstr "Enllaç de invitació"
 
-#: .\cookbook\views\edit.py:119
-msgid "Food"
-msgstr "Menjar"
-
-#: .\cookbook\views\edit.py:128
+#: .\cookbook\views\edit.py:126
 msgid "You cannot edit this storage!"
 msgstr "No podeu editar aquest emmagatzematge."
 
-#: .\cookbook\views\edit.py:148
+#: .\cookbook\views\edit.py:146
 msgid "Storage saved!"
 msgstr "Emmagatzematge desat."
 
-#: .\cookbook\views\edit.py:154
+#: .\cookbook\views\edit.py:152
 msgid "There was an error updating this storage backend!"
 msgstr "S'ha produït un error en actualitzar aquest backend d'emmagatzematge."
 
-#: .\cookbook\views\edit.py:165
+#: .\cookbook\views\edit.py:163
 msgid "Storage"
 msgstr "Emmagatzematge"
 
-#: .\cookbook\views\edit.py:261
+#: .\cookbook\views\edit.py:259
 msgid "Changes saved!"
 msgstr "Canvis desats!"
 
-#: .\cookbook\views\edit.py:265
+#: .\cookbook\views\edit.py:263
 msgid "Error saving changes!"
 msgstr "Error al desar canvis!"
 
-#: .\cookbook\views\edit.py:299
+#: .\cookbook\views\edit.py:298
 msgid "Units merged!"
 msgstr "Unitats fusionades!"
 
-#: .\cookbook\views\edit.py:301 .\cookbook\views\edit.py:317
-msgid "Cannot merge with the same object!"
-msgstr ""
-
-#: .\cookbook\views\edit.py:315
+#: .\cookbook\views\edit.py:314
 msgid "Foods merged!"
 msgstr "Menjars Fusionats!"
 
@@ -2451,89 +2596,121 @@ msgstr ""
 msgid "Exporting is not implemented for this provider"
 msgstr ""
 
-#: .\cookbook\views\lists.py:40
+#: .\cookbook\views\lists.py:26
 msgid "Import Log"
 msgstr "Importa Registre"
 
-#: .\cookbook\views\lists.py:53
+#: .\cookbook\views\lists.py:39
 msgid "Discovery"
 msgstr "Descobriment"
 
-#: .\cookbook\views\lists.py:85
+#: .\cookbook\views\lists.py:69
 msgid "Shopping Lists"
 msgstr "Llistes de Compra"
 
-#: .\cookbook\views\new.py:123
+#: .\cookbook\views\lists.py:129
+#, fuzzy
+#| msgid "Food"
+msgid "Foods"
+msgstr "Menjar"
+
+#: .\cookbook\views\lists.py:163
+#, fuzzy
+#| msgid "Supermarket"
+msgid "Supermarkets"
+msgstr "Supermercat"
+
+#: .\cookbook\views\lists.py:179
+#, fuzzy
+#| msgid "Shopping Recipes"
+msgid "Shopping Categories"
+msgstr "Llista de Compra de Receptes"
+
+#: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr "Nova Recepta importada!"
 
-#: .\cookbook\views\new.py:126
+#: .\cookbook\views\new.py:125
 msgid "There was an error importing this recipe!"
 msgstr "S'ha produït un error en importar la recepta!"
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "Hello"
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "You have been invited by "
 msgstr ""
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:226
 msgid " to join their Tandoor Recipes space "
 msgstr ""
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:227
 msgid "Click the following link to activate your account: "
 msgstr ""
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:228
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:229
 msgid "The invitation is valid until "
 msgstr ""
 
-#: .\cookbook\views\new.py:231
+#: .\cookbook\views\new.py:230
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 
-#: .\cookbook\views\new.py:234
+#: .\cookbook\views\new.py:233
 msgid "Tandoor Recipes Invite"
 msgstr ""
 
-#: .\cookbook\views\new.py:241
+#: .\cookbook\views\new.py:240
 msgid "Invite link successfully send to user."
 msgstr ""
 
-#: .\cookbook\views\new.py:244
+#: .\cookbook\views\new.py:243
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
 msgstr ""
 
-#: .\cookbook\views\new.py:246
+#: .\cookbook\views\new.py:245
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 
-#: .\cookbook\views\views.py:129
+#: .\cookbook\views\views.py:128
 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:177
+#: .\cookbook\views\views.py:176
 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:188
+#: .\cookbook\views\views.py:187
 msgid "Comment saved!"
 msgstr "Comentari Desat!"
 
-#: .\cookbook\views\views.py:395
+#: .\cookbook\views\views.py:351
+msgid "You must select at least one field to search!"
+msgstr ""
+
+#: .\cookbook\views\views.py:354
+msgid ""
+"To use this search method you must select at least one full text search "
+"field!"
+msgstr ""
+
+#: .\cookbook\views\views.py:357
+msgid "Fuzzy search is not compatible with this search method!"
+msgstr ""
+
+#: .\cookbook\views\views.py:437
 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 "
@@ -2543,44 +2720,168 @@ msgstr ""
 "Si heu oblidat les vostres credencials de superusuari, consulteu la "
 "documentació de django sobre com restablir les contrasenyes."
 
-#: .\cookbook\views\views.py:402
+#: .\cookbook\views\views.py:444
 msgid "Passwords dont match!"
 msgstr "Les contrasenyes no coincideixen!"
 
-#: .\cookbook\views\views.py:418
+#: .\cookbook\views\views.py:460
 msgid "User has been created, please login!"
 msgstr "L'usuari s'ha creat, si us plau inicieu la sessió!"
 
-#: .\cookbook\views\views.py:434
+#: .\cookbook\views\views.py:476
 msgid "Malformed Invite Link supplied!"
 msgstr "S'ha proporcionat un enllaç d'invitació mal format."
 
-#: .\cookbook\views\views.py:441
+#: .\cookbook\views\views.py:483
 #, 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:452
+#: .\cookbook\views\views.py:494
 msgid "Successfully joined space."
 msgstr ""
 
-#: .\cookbook\views\views.py:458
+#: .\cookbook\views\views.py:500
 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:522
+#: .\cookbook\views\views.py:564
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
 msgstr ""
 
-#: .\cookbook\views\views.py:528
+#: .\cookbook\views\views.py:570
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
 msgstr ""
 
+#~ msgid "Utensils"
+#~ msgstr "Estris"
+
+#~ msgid "Storage Data"
+#~ msgstr "Emmagatzematge de dades"
+
+#~ msgid "Storage Backends"
+#~ msgstr "Backends d'emmagatzematge"
+
+#~ msgid "Configure Sync"
+#~ msgstr "Configurar Sync"
+
+#~ msgid "Discovered Recipes"
+#~ msgstr "Receptes Descobertes"
+
+#~ msgid "Discovery Log"
+#~ msgstr "Registre de descobriment"
+
+#~ msgid "Units & Ingredients"
+#~ msgstr "Unitats i ingredients"
+
+#~ msgid "New Book"
+#~ msgstr "Nou Llibre"
+
+#~ msgid "Toggle Recipes"
+#~ msgstr "Commuta Receptes"
+
+#~ msgid "There are no recipes in this book yet."
+#~ msgstr "Encara no hi ha receptes en aquest llibre."
+
+#~ msgid "Waiting Time"
+#~ msgstr "Temps d'Espera"
+
+#~ msgid "Select Keywords"
+#~ msgstr "Selecciona Paraules clau"
+
+#~ msgid "Nutrition"
+#~ msgstr "Nutrició"
+
+#~ msgid "Delete Step"
+#~ msgstr "Esborra Pas"
+
+#~ msgid "Calories"
+#~ msgstr "Calories"
+
+#~ msgid "Carbohydrates"
+#~ msgstr "Hidrats de carboni"
+
+#~ msgid "Fats"
+#~ msgstr "Greixos"
+
+#~ msgid "Proteins"
+#~ msgstr "Proteïnes"
+
+#~ msgid "Step"
+#~ msgstr "Pas"
+
+#~ msgid "Show as header"
+#~ msgstr "Mostra com a capçalera"
+
+#~ msgid "Hide as header"
+#~ msgstr "Amaga com a capçalera"
+
+#~ msgid "Move Up"
+#~ msgstr "Mou Amunt"
+
+#~ msgid "Move Down"
+#~ msgstr "Mou Avall"
+
+#~ msgid "Step Name"
+#~ msgstr "Nom del Pas"
+
+#~ msgid "Step Type"
+#~ msgstr "Tipus de Pas"
+
+#~ msgid "Step time in Minutes"
+#~ msgstr "Temps de pas en Minuts"
+
+#, fuzzy
+#~| msgid "Select one"
+#~ msgid "Select File"
+#~ msgstr "Sel·lecciona un"
+
+#, fuzzy
+#~| msgid "Delete Recipe"
+#~ msgid "Select Recipe"
+#~ msgstr "Esborra Recepta"
+
+#~ msgid "Delete Ingredient"
+#~ msgstr "Esborra Ingredient"
+
+#~ msgid "Make Header"
+#~ msgstr "Crea Capçalera"
+
+#~ msgid "Make Ingredient"
+#~ msgstr "Crea Ingredient"
+
+#~ msgid "Disable Amount"
+#~ msgstr "Deshabilita Quantitat"
+
+#~ msgid "Enable Amount"
+#~ msgstr "Habilita Quantitat"
+
+#~ msgid "Save & View"
+#~ msgstr "Desa i Comprova"
+
+#~ msgid "Add Step"
+#~ msgstr "Afegir Pas"
+
+#~ msgid "Add Nutrition"
+#~ msgstr "Afegeix nutrients"
+
+#~ msgid "Remove Nutrition"
+#~ msgstr "Elimina nutrients"
+
+#~ msgid "View Recipe"
+#~ msgstr "Veure Recepta"
+
+#~ msgid "Delete Recipe"
+#~ msgstr "Esborra Recepta"
+
+#~ msgid "Steps"
+#~ msgstr "Passos"
+
 #~ msgid ""
 #~ "A username is not required, if left blank the new user can choose one."
 #~ msgstr ""
diff --git a/cookbook/locale/de/LC_MESSAGES/django.po b/cookbook/locale/de/LC_MESSAGES/django.po
index c03b22cb..2b878a36 100644
--- a/cookbook/locale/de/LC_MESSAGES/django.po
+++ b/cookbook/locale/de/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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+0200\n"
 "PO-Revision-Date: 2021-06-24 15:49+0000\n"
 "Last-Translator: Maximilian J <maxijannack@t-online.de>\n"
 "Language-Team: German <http://translate.tandoor.dev/projects/tandoor/recipes-"
@@ -26,15 +26,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.7\n"
 
-#: .\cookbook\filters.py:23 .\cookbook\templates\base.html:98
-#: .\cookbook\templates\forms\edit_internal_recipe.html:269
+#: .\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\views\lists.py:67
+#: .\cookbook\templates\url_import.html:270
 msgid "Ingredients"
 msgstr "Zutaten"
 
-#: .\cookbook\forms.py:49
+#: .\cookbook\forms.py:50
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
@@ -42,13 +41,13 @@ msgstr ""
 "Farbe der oberen Navigationsleiste. Nicht alle Farben passen, daher einfach "
 "mal ausprobieren!"
 
-#: .\cookbook\forms.py:51
+#: .\cookbook\forms.py:52
 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:53
+#: .\cookbook\forms.py:54
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
@@ -56,7 +55,7 @@ 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:56
+#: .\cookbook\forms.py:57
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
@@ -64,21 +63,21 @@ msgstr ""
 "Nutzer, mit denen neue Pläne und Einkaufslisten standardmäßig geteilt werden "
 "sollen."
 
-#: .\cookbook\forms.py:58
+#: .\cookbook\forms.py:59
 msgid "Show recently viewed recipes on search page."
 msgstr "Zuletzt angeschaute Rezepte bei der Suche anzeigen."
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:60
 msgid "Number of decimals to round ingredients."
 msgstr "Anzahl an Dezimalstellen, auf die gerundet werden soll."
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:61
 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:62
+#: .\cookbook\forms.py:63
 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 +89,11 @@ msgstr ""
 "aktualisiert. Dies ist nützlich, wenn mehrere Personen eine Liste beim "
 "Einkaufen verwenden, benötigt jedoch etwas Datenvolumen."
 
-#: .\cookbook\forms.py:65
+#: .\cookbook\forms.py:66
 msgid "Makes the navbar stick to the top of the page."
 msgstr "Navigationsleiste wird oben angeheftet."
 
-#: .\cookbook\forms.py:81
+#: .\cookbook\forms.py:82
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
@@ -102,42 +101,39 @@ msgstr ""
 "Beide Felder sind optional. Wenn keins von beiden gegeben ist, wird der "
 "Nutzername angezeigt"
 
-#: .\cookbook\forms.py:102 .\cookbook\forms.py:331
-#: .\cookbook\templates\forms\edit_internal_recipe.html:49
+#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
 #: .\cookbook\templates\url_import.html:154
 msgid "Name"
 msgstr "Name"
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:332
-#: .\cookbook\templates\base.html:108 .\cookbook\templates\base.html:169
-#: .\cookbook\templates\forms\edit_internal_recipe.html:85
+#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
 #: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573
+#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr "Stichwörter"
 
-#: .\cookbook\forms.py:104
+#: .\cookbook\forms.py:105
 msgid "Preparation time in minutes"
 msgstr "Zubereitungszeit in Minuten"
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:106
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "Wartezeit (kochen/backen) in Minuten"
 
-#: .\cookbook\forms.py:106 .\cookbook\forms.py:333
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
 msgid "Path"
 msgstr "Pfad"
 
-#: .\cookbook\forms.py:107
+#: .\cookbook\forms.py:108
 msgid "Storage UID"
 msgstr "Speicher-UID"
 
-#: .\cookbook\forms.py:133
+#: .\cookbook\forms.py:134
 msgid "Default"
 msgstr "Standard"
 
-#: .\cookbook\forms.py:144 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
@@ -145,51 +141,51 @@ msgstr ""
 "Um Duplikate zu vermeiden werden Rezepte mit dem gleichen Namen ignoriert. "
 "Aktivieren Sie dieses Kontrollkästchen, um alles zu importieren."
 
-#: .\cookbook\forms.py:164
+#: .\cookbook\forms.py:165
 msgid "New Unit"
 msgstr "Neue Einheit"
 
-#: .\cookbook\forms.py:165
+#: .\cookbook\forms.py:166
 msgid "New unit that other gets replaced by."
 msgstr "Neue Einheit, die die alte ersetzt."
 
-#: .\cookbook\forms.py:170
+#: .\cookbook\forms.py:171
 msgid "Old Unit"
 msgstr "Alte Einheit"
 
-#: .\cookbook\forms.py:171
+#: .\cookbook\forms.py:172
 msgid "Unit that should be replaced."
 msgstr "Einheit, die ersetzt werden soll."
 
-#: .\cookbook\forms.py:187
+#: .\cookbook\forms.py:189
 msgid "New Food"
 msgstr "Neue Zutat"
 
-#: .\cookbook\forms.py:188
+#: .\cookbook\forms.py:190
 msgid "New food that other gets replaced by."
 msgstr "Neue Zutat, die die alte ersetzt."
 
-#: .\cookbook\forms.py:193
+#: .\cookbook\forms.py:195
 msgid "Old Food"
 msgstr "Alte Zutat"
 
-#: .\cookbook\forms.py:194
+#: .\cookbook\forms.py:196
 msgid "Food that should be replaced."
 msgstr "Zutat, die ersetzt werden soll."
 
-#: .\cookbook\forms.py:212
+#: .\cookbook\forms.py:214
 msgid "Add your comment: "
 msgstr "Schreibe einen Kommentar: "
 
-#: .\cookbook\forms.py:253
+#: .\cookbook\forms.py:256
 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:260
+#: .\cookbook\forms.py:263
 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:269
+#: .\cookbook\forms.py:272
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
@@ -197,26 +193,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:307
+#: .\cookbook\forms.py:310
 msgid "Search String"
 msgstr "Suchwort"
 
-#: .\cookbook\forms.py:334
+#: .\cookbook\forms.py:337
 msgid "File ID"
 msgstr "Datei-ID"
 
-#: .\cookbook\forms.py:370
+#: .\cookbook\forms.py:373
 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:383
+#: .\cookbook\forms.py:386
 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:384
-#: .\cookbook\templates\forms\edit_internal_recipe.html:427
+#: .\cookbook\forms.py:387
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
@@ -224,15 +219,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:409
+#: .\cookbook\forms.py:412
 msgid "Maximum number of users for this space reached."
 msgstr "Maximale Nutzer-Anzahl wurde für diesen Space erreicht."
 
-#: .\cookbook\forms.py:415
+#: .\cookbook\forms.py:418
 msgid "Email address already taken!"
 msgstr "Email-Adresse ist bereits vergeben!"
 
-#: .\cookbook\forms.py:423
+#: .\cookbook\forms.py:426
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
@@ -240,14 +235,90 @@ msgstr ""
 "Eine Email-Adresse wird nicht benötigt, aber falls vorhanden, wird der "
 "Einladungslink zum Benutzer geschickt."
 
-#: .\cookbook\forms.py:438
+#: .\cookbook\forms.py:441
 msgid "Name already taken."
 msgstr "Name wird bereits verwendet."
 
-#: .\cookbook\forms.py:449
+#: .\cookbook\forms.py:452
 msgid "Accept Terms and Privacy"
 msgstr "AGBs und Datenschutz akzeptieren"
 
+#: .\cookbook\forms.py:487
+msgid ""
+"Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
+"full desciption of choices."
+msgstr ""
+
+#: .\cookbook\forms.py:488
+msgid ""
+"Use fuzzy matching on units, keywords and ingredients when editing and "
+"importing recipes."
+msgstr ""
+
+#: .\cookbook\forms.py:489
+msgid ""
+"Fields to search ignoring accents.  Selecting this option can improve or "
+"degrade search quality depending on language"
+msgstr ""
+
+#: .\cookbook\forms.py:490
+msgid ""
+"Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
+"'pie' and 'piece' and 'soapie')"
+msgstr ""
+
+#: .\cookbook\forms.py:491
+msgid ""
+"Fields to search for beginning of word matches. (e.g. searching for 'sa' "
+"will return 'salad' and 'sandwich')"
+msgstr ""
+
+#: .\cookbook\forms.py:492
+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
+msgid ""
+"Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
+"only function with fulltext fields."
+msgstr ""
+
+#: .\cookbook\forms.py:497
+#, fuzzy
+#| msgid "Search"
+msgid "Search Method"
+msgstr "Suche"
+
+#: .\cookbook\forms.py:498
+msgid "Fuzzy Lookups"
+msgstr ""
+
+#: .\cookbook\forms.py:499
+msgid "Ignore Accent"
+msgstr ""
+
+#: .\cookbook\forms.py:500
+msgid "Partial Match"
+msgstr ""
+
+#: .\cookbook\forms.py:501
+msgid "Starts Wtih"
+msgstr ""
+
+#: .\cookbook\forms.py:502
+#, fuzzy
+#| msgid "Search"
+msgid "Fuzzy Search"
+msgstr "Suche"
+
+#: .\cookbook\forms.py:503
+#, fuzzy
+#| msgid "Text"
+msgid "Full Text"
+msgstr "Text"
+
 #: .\cookbook\helper\AllAuthCustomAdapter.py:36
 msgid ""
 "In order to prevent spam, the requested email was not send. Please wait a "
@@ -256,36 +327,36 @@ msgstr ""
 "Um Spam zu vermeiden, wurde die angeforderte Email nicht gesendet. Bitte "
 "warte ein paar Minuten und versuche es erneut."
 
-#: .\cookbook\helper\permission_helper.py:138
-#: .\cookbook\helper\permission_helper.py:161 .\cookbook\views\views.py:151
+#: .\cookbook\helper\permission_helper.py:136
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr "Du bist nicht angemeldet, daher kannst du diese Seite nicht sehen!"
 
-#: .\cookbook\helper\permission_helper.py:142
-#: .\cookbook\helper\permission_helper.py:148
-#: .\cookbook\helper\permission_helper.py:173
-#: .\cookbook\helper\permission_helper.py:218
-#: .\cookbook\helper\permission_helper.py:232
-#: .\cookbook\helper\permission_helper.py:243
-#: .\cookbook\helper\permission_helper.py:254 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:162 .\cookbook\views\views.py:169
-#: .\cookbook\views\views.py:259
+#: .\cookbook\helper\permission_helper.py:140
+#: .\cookbook\helper\permission_helper.py:146
+#: .\cookbook\helper\permission_helper.py:171
+#: .\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
 msgid "You do not have the required permissions to view this page!"
 msgstr "Du hast nicht die notwendigen Rechte um diese Seite zu sehen!"
 
-#: .\cookbook\helper\permission_helper.py:166
-#: .\cookbook\helper\permission_helper.py:189
-#: .\cookbook\helper\permission_helper.py:204
+#: .\cookbook\helper\permission_helper.py:164
+#: .\cookbook\helper\permission_helper.py:187
+#: .\cookbook\helper\permission_helper.py:202
 msgid "You cannot interact with this object as it is not owned by you!"
 msgstr ""
 "Du kannst mit diesem Objekt nicht interagieren, da es dir nicht gehört!"
 
-#: .\cookbook\helper\template_helper.py:60
-#: .\cookbook\helper\template_helper.py:62
+#: .\cookbook\helper\template_helper.py:61
+#: .\cookbook\helper\template_helper.py:63
 msgid "Could not parse template code."
 msgstr "Konnte den Template code nicht verarbeiten."
 
-#: .\cookbook\integration\integration.py:104
+#: .\cookbook\integration\integration.py:119
 #: .\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
@@ -294,11 +365,11 @@ msgstr "Konnte den Template code nicht verarbeiten."
 #: .\cookbook\templates\url_import.html:123
 #: .\cookbook\templates\url_import.html:317
 #: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
-#: .\cookbook\views\edit.py:199
+#: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr "Importieren"
 
-#: .\cookbook\integration\integration.py:185
+#: .\cookbook\integration\integration.py:200
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
@@ -306,7 +377,7 @@ msgstr ""
 "Importer erwartet eine .zip Datei. Hast du den richtigen Importer-Typ für "
 "deine Daten ausgewählt?"
 
-#: .\cookbook\integration\integration.py:188
+#: .\cookbook\integration\integration.py:203
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
@@ -314,11 +385,11 @@ msgstr ""
 "Ein unerwarteter Fehler trat beim Importieren auf. Bitte stelle sicher, dass "
 "die hochgeladene Datei gültig ist."
 
-#: .\cookbook\integration\integration.py:192
+#: .\cookbook\integration\integration.py:208
 msgid "The following recipes were ignored because they already existed:"
 msgstr "Die folgenden Rezepte wurden ignoriert da sie bereits existieren:"
 
-#: .\cookbook\integration\integration.py:196
+#: .\cookbook\integration\integration.py:212
 #, python-format
 msgid "Imported %s recipes."
 msgstr "%s Rezepte importiert."
@@ -336,7 +407,6 @@ msgid "Source"
 msgstr "Quelle"
 
 #: .\cookbook\integration\safron.py:23
-#: .\cookbook\templates\forms\edit_internal_recipe.html:79
 #: .\cookbook\templates\include\log_cooking.html:16
 #: .\cookbook\templates\url_import.html:224
 #: .\cookbook\templates\url_import.html:455
@@ -349,7 +419,6 @@ msgid "Waiting time"
 msgstr "Wartezeit"
 
 #: .\cookbook\integration\safron.py:27
-#: .\cookbook\templates\forms\edit_internal_recipe.html:73
 msgid "Preparation Time"
 msgstr "Vorbereitungszeit"
 
@@ -363,6 +432,22 @@ msgstr "Kochbuch"
 msgid "Section"
 msgstr "Sektion"
 
+#: .\cookbook\management\commands\rebuildindex.py:14
+msgid "Rebuilds full text search index on Recipe"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:18
+msgid "Only Postgress databases use full text search, no index to rebuild"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:29
+msgid "Recipe index rebuild complete."
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:31
+msgid "Recipe index rebuild failed."
+msgstr ""
+
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:14
 msgid "Breakfast"
 msgstr "Frühstück"
@@ -379,7 +464,7 @@ msgstr "Abendessen"
 msgid "Other"
 msgstr "Andere"
 
-#: .\cookbook\models.py:72
+#: .\cookbook\models.py:144
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
@@ -387,72 +472,85 @@ msgstr ""
 "Maximale Datei-Speichergröße in MB. 0 für unbegrenzt, -1 um den Datei-Upload "
 "zu deaktivieren."
 
-#: .\cookbook\models.py:123 .\cookbook\templates\search.html:7
+#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
 #: .\cookbook\templates\shopping_list.html:52
 msgid "Search"
 msgstr "Suche"
 
-#: .\cookbook\models.py:124 .\cookbook\templates\base.html:92
+#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
 #: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:233 .\cookbook\views\new.py:201
+#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
 msgid "Meal-Plan"
 msgstr "Essensplan"
 
-#: .\cookbook\models.py:125 .\cookbook\templates\base.html:89
+#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr "Bücher"
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Small"
 msgstr "Klein"
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Large"
 msgstr "Groß"
 
-#: .\cookbook\models.py:133 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:206 .\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:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:202
+#: .\cookbook\models.py:389
+msgid " is part of a recipe step and cannot be deleted"
+msgstr ""
+
+#: .\cookbook\models.py:429
 msgid "Text"
 msgstr "Text"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:203
+#: .\cookbook\models.py:429
 msgid "Time"
 msgstr "Zeit"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:204
-#: .\cookbook\templates\forms\edit_internal_recipe.html:219
+#: .\cookbook\models.py:429
 #, fuzzy
 #| msgid "File ID"
 msgid "File"
 msgstr "Datei-ID"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:205
-#: .\cookbook\templates\forms\edit_internal_recipe.html:241
+#: .\cookbook\models.py:429
 #: .\cookbook\templates\include\recipe_open_modal.html:7
 #: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:273 .\cookbook\views\new.py:52
+#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr "Rezept"
 
-#: .\cookbook\serializer.py:109
+#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+msgid "Simple"
+msgstr ""
+
+#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+msgid "Phrase"
+msgstr ""
+
+#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+msgid "Web"
+msgstr ""
+
+#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+msgid "Raw"
+msgstr ""
+
+#: .\cookbook\serializer.py:112
 msgid "File uploads are not enabled for this Space."
 msgstr "Datei-Uploads sind in diesem Space nicht aktiviert."
 
-#: .\cookbook\serializer.py:117
+#: .\cookbook\serializer.py:125
 msgid "You have reached your file upload limit."
 msgstr "Du hast Dein Datei-Uploadlimit erreicht."
 
-#: .\cookbook\tables.py:35 .\cookbook\templates\books.html:36
-#: .\cookbook\templates\generic\edit_template.html:6
+#: .\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
@@ -461,11 +559,10 @@ msgstr "Du hast Dein Datei-Uploadlimit erreicht."
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: .\cookbook\tables.py:124 .\cookbook\tables.py:147
-#: .\cookbook\templates\books.html:38
+#: .\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\edit_template.html:27
+#: .\cookbook\templates\generic\edit_template.html:28
 #: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
@@ -495,7 +592,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:154 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -582,7 +679,7 @@ msgstr ""
 "             ist."
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:21
+#: .\cookbook\templates\generic\delete_template.html:22
 msgid "Confirm"
 msgstr "Bestätigen"
 
@@ -597,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:189
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
 msgid "Login"
 msgstr "Anmelden"
 
@@ -652,7 +749,7 @@ msgstr "Passwort zurücksetzen"
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:52
+#: .\cookbook\templates\settings.html:64
 #, fuzzy
 #| msgid "Password Reset"
 msgid "Password"
@@ -744,101 +841,86 @@ 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:179
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr "API-Dokumentation"
 
-#: .\cookbook\templates\base.html:85
-msgid "Utensils"
-msgstr "Utensilien"
-
-#: .\cookbook\templates\base.html:95
+#: .\cookbook\templates\base.html:86
 msgid "Shopping"
 msgstr "Einkaufsliste"
 
-#: .\cookbook\templates\base.html:101
+#: .\cookbook\templates\base.html:113
+msgid "Keyword"
+msgstr "Schlagwort"
+
+#: .\cookbook\templates\base.html:137
+#: .\cookbook\templates\forms\ingredients.html:24
+#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
+#: .\cookbook\views\lists.py:146
+msgid "Units"
+msgstr "Einheiten"
+
+#: .\cookbook\templates\base.html:151
 #: .\cookbook\templates\shopping_list.html:230
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr "Supermarkt"
 
-#: .\cookbook\templates\base.html:112 .\cookbook\views\delete.py:84
-#: .\cookbook\views\edit.py:102 .\cookbook\views\lists.py:26
-#: .\cookbook\views\new.py:78
-msgid "Keyword"
-msgstr "Schlagwort"
-
-#: .\cookbook\templates\base.html:114
+#: .\cookbook\templates\base.html:163
 msgid "Batch Edit"
 msgstr "Massenbearbeitung"
 
-#: .\cookbook\templates\base.html:119
-msgid "Storage Data"
-msgstr "Datenquellen"
-
-#: .\cookbook\templates\base.html:123
-msgid "Storage Backends"
-msgstr "Speicherquellen"
-
-#: .\cookbook\templates\base.html:125
-msgid "Configure Sync"
-msgstr "Synchronisation einstellen"
-
-#: .\cookbook\templates\base.html:127
-msgid "Discovered Recipes"
-msgstr "Entdeckte Rezepte"
-
-#: .\cookbook\templates\base.html:129
-msgid "Discovery Log"
-msgstr "Entdeckungsverlauf"
-
-#: .\cookbook\templates\base.html:131 .\cookbook\templates\stats.html:10
-msgid "Statistics"
-msgstr "Statistiken"
-
-#: .\cookbook\templates\base.html:133
-msgid "Units & Ingredients"
-msgstr "Einheiten & Zutaten"
-
-#: .\cookbook\templates\base.html:135 .\cookbook\templates\index.html:47
-msgid "Import Recipe"
-msgstr "Rezept importieren"
-
-#: .\cookbook\templates\base.html:156 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr "Verlauf"
 
-#: .\cookbook\templates\base.html:159 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:191 .\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
+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:163 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr "System"
 
-#: .\cookbook\templates\base.html:165 .\cookbook\templates\base.html:171
+#: .\cookbook\templates\base.html:214
 msgid "Admin"
 msgstr "Admin"
 
-#: .\cookbook\templates\base.html:175
+#: .\cookbook\templates\base.html:218
 msgid "Markdown Guide"
 msgstr "Markdown-Anleitung"
 
-#: .\cookbook\templates\base.html:177
+#: .\cookbook\templates\base.html:220
 msgid "GitHub"
 msgstr "GitHub"
 
-#: .\cookbook\templates\base.html:181
+#: .\cookbook\templates\base.html:224
 msgid "API Browser"
 msgstr "API Browser"
 
-#: .\cookbook\templates\base.html:184
+#: .\cookbook\templates\base.html:227
 msgid "Log out"
 msgstr "Ausloggen"
 
+#: .\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 "Externe Rezepte"
+
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
 msgstr "Kategorie-Massenbearbeitung"
@@ -853,7 +935,7 @@ msgstr ""
 "Ausgewählte Schlagwörter zu allen Rezepten, die das Suchwort enthalten, "
 "hinzufügen"
 
-#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:85
+#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:83
 msgid "Sync"
 msgstr "Synchronisieren"
 
@@ -873,10 +955,28 @@ msgstr ""
 msgid "The path must be in the following format"
 msgstr "Der Pfad muss folgendes Format haben"
 
-#: .\cookbook\templates\batch\monitor.html:27
+#: .\cookbook\templates\batch\monitor.html:21
+#, fuzzy
+#| msgid "Manage Email Settings"
+msgid "Manage External Storage"
+msgstr "Email-Einstellungen verwalten"
+
+#: .\cookbook\templates\batch\monitor.html:28
 msgid "Sync Now!"
 msgstr "Jetzt Synchronisieren!"
 
+#: .\cookbook\templates\batch\monitor.html:29
+#, fuzzy
+#| msgid "Shopping Recipes"
+msgid "Show Recipes"
+msgstr "Einkaufs-Rezepte"
+
+#: .\cookbook\templates\batch\monitor.html:30
+#, fuzzy
+#| msgid "Show Links"
+msgid "Show Log"
+msgstr "Links anzeigen"
+
 #: .\cookbook\templates\batch\waiting.html:4
 #: .\cookbook\templates\batch\waiting.html:10
 msgid "Importing Recipes"
@@ -890,32 +990,10 @@ msgstr ""
 "Abhängig von der Anzahl der Rezepte kann dieser Vorgang einige Minuten "
 "dauern, bitte gedulde dich ein wenig."
 
-#: .\cookbook\templates\books.html:5 .\cookbook\templates\books.html:11
+#: .\cookbook\templates\books.html:7
 msgid "Recipe Books"
 msgstr "Rezeptbuch"
 
-#: .\cookbook\templates\books.html:15
-msgid "New Book"
-msgstr "Neues Buch"
-
-#: .\cookbook\templates\books.html:27 .\cookbook\templates\recipe_view.html:26
-msgid "by"
-msgstr "von"
-
-#: .\cookbook\templates\books.html:34
-msgid "Toggle Recipes"
-msgstr "Rezepte umschalten"
-
-#: .\cookbook\templates\books.html:54
-#: .\cookbook\templates\meal_plan_entry.html:48
-#: .\cookbook\templates\recipes_table.html:64
-msgid "Last cooked"
-msgstr "Zuletzt gekocht"
-
-#: .\cookbook\templates\books.html:71
-msgid "There are no recipes in this book yet."
-msgstr "In diesem Buch sind bisher noch keine Rezepte."
-
 #: .\cookbook\templates\export.html:6 .\cookbook\templates\test2.html:6
 msgid "Export Recipes"
 msgstr "Rezepte exportieren"
@@ -936,213 +1014,21 @@ msgid "Import new Recipe"
 msgstr "Rezept importieren"
 
 #: .\cookbook\templates\forms\edit_import_recipe.html:14
-#: .\cookbook\templates\forms\edit_internal_recipe.html:439
-#: .\cookbook\templates\forms\edit_internal_recipe.html:471
 #: .\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:46 .\cookbook\templates\settings.html:87
-#: .\cookbook\templates\settings.html:105
+#: .\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
 msgid "Save"
 msgstr "Speichern"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:7
-#: .\cookbook\templates\forms\edit_internal_recipe.html:34
 msgid "Edit Recipe"
 msgstr "Rezept bearbeiten"
 
-#: .\cookbook\templates\forms\edit_internal_recipe.html:56
-#: .\cookbook\templates\url_import.html:171
-msgid "Description"
-msgstr "Beschreibung"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:76
-msgid "Waiting Time"
-msgstr "Wartezeit"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:82
-msgid "Servings Text"
-msgstr "Portionen-Text"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:93
-msgid "Select Keywords"
-msgstr "Schlagwörter wählen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:94
-#: .\cookbook\templates\url_import.html:583
-msgid "Add Keyword"
-msgstr "Schlagwort hinzufügen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:112
-msgid "Nutrition"
-msgstr "Nährwerte"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:116
-#: .\cookbook\templates\forms\edit_internal_recipe.html:166
-msgid "Delete Step"
-msgstr "Schritt löschen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:120
-msgid "Calories"
-msgstr "Kalorien"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:123
-msgid "Carbohydrates"
-msgstr "Kohlenhydrate"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:126
-msgid "Fats"
-msgstr "Fette"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:128
-msgid "Proteins"
-msgstr "Proteine"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:150
-#: .\cookbook\templates\forms\edit_internal_recipe.html:504
-msgid "Step"
-msgstr "Schritt"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:171
-msgid "Show as header"
-msgstr "Als Überschrift anzeigen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:177
-msgid "Hide as header"
-msgstr "Nicht als Überschrift anzeigen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:182
-msgid "Move Up"
-msgstr "Nach oben"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:187
-msgid "Move Down"
-msgstr "Nach unten"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:196
-msgid "Step Name"
-msgstr "Name des Schritts"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:200
-msgid "Step Type"
-msgstr "Art des Schritts"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:213
-msgid "Step time in Minutes"
-msgstr "Zeit in Minuten"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:229
-msgid "Select File"
-msgstr "Datei auswählen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:230
-#: .\cookbook\templates\forms\edit_internal_recipe.html:252
-#: .\cookbook\templates\forms\edit_internal_recipe.html:313
-#: .\cookbook\templates\forms\edit_internal_recipe.html:337
-#: .\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
-msgid "Select"
-msgstr "Auswählen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:251
-#, fuzzy
-#| msgid "Delete Recipe"
-msgid "Select Recipe"
-msgstr "Rezept löschen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:311
-#: .\cookbook\templates\shopping_list.html:187
-msgid "Select Unit"
-msgstr "Einheit wählen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:312
-#: .\cookbook\templates\forms\edit_internal_recipe.html:336
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
-msgid "Create"
-msgstr "Erstellen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:335
-#: .\cookbook\templates\shopping_list.html:209
-msgid "Select Food"
-msgstr "Zutat auswählen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:352
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr "Notiz"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:369
-msgid "Delete Ingredient"
-msgstr "Zutat löschen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:375
-msgid "Make Header"
-msgstr "Überschrift erstellen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:381
-msgid "Make Ingredient"
-msgstr "Zutat erstellen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:387
-msgid "Disable Amount"
-msgstr "Menge deaktivieren"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:393
-msgid "Enable Amount"
-msgstr "Menge aktivieren"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:398
-msgid "Copy Template Reference"
-msgstr "Kopiere Vorlagen-Referenz"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:424
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
-msgid "Instructions"
-msgstr "Anleitung"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:437
-#: .\cookbook\templates\forms\edit_internal_recipe.html:468
-msgid "Save & View"
-msgstr "Speichern & Ansehen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:441
-#: .\cookbook\templates\forms\edit_internal_recipe.html:474
-msgid "Add Step"
-msgstr "Schritt hinzufügen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:444
-#: .\cookbook\templates\forms\edit_internal_recipe.html:478
-msgid "Add Nutrition"
-msgstr "Nährwerte hinzufügen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:446
-#: .\cookbook\templates\forms\edit_internal_recipe.html:480
-msgid "Remove Nutrition"
-msgstr "Nährwerte entfernen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:448
-#: .\cookbook\templates\forms\edit_internal_recipe.html:483
-msgid "View Recipe"
-msgstr "Rezept ansehen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:450
-#: .\cookbook\templates\forms\edit_internal_recipe.html:485
-msgid "Delete Recipe"
-msgstr "Rezept löschen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:491
-msgid "Steps"
-msgstr "Schritte"
-
 #: .\cookbook\templates\forms\ingredients.html:15
 msgid "Edit Ingredients"
 msgstr "Zutaten bearbeiten"
@@ -1165,11 +1051,6 @@ msgstr ""
 "entsprechenden Rezepte.\n"
 "    "
 
-#: .\cookbook\templates\forms\ingredients.html:24
-#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
-msgid "Units"
-msgstr "Einheiten"
-
 #: .\cookbook\templates\forms\ingredients.html:26
 msgid "Are you sure that you want to merge these two units?"
 msgstr ""
@@ -1185,30 +1066,34 @@ 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:18
+#: .\cookbook\templates\generic\delete_template.html:19
 #, 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\edit_template.html:30
+#: .\cookbook\templates\generic\delete_template.html:23
+msgid "Cancel"
+msgstr ""
+
+#: .\cookbook\templates\generic\edit_template.html:32
 msgid "View"
 msgstr "Anschauen"
 
-#: .\cookbook\templates\generic\edit_template.html:34
+#: .\cookbook\templates\generic\edit_template.html:36
 msgid "Delete original file"
 msgstr "Original löschen"
 
 #: .\cookbook\templates\generic\list_template.html:6
-#: .\cookbook\templates\generic\list_template.html:12
+#: .\cookbook\templates\generic\list_template.html:21
 msgid "List"
 msgstr "Liste"
 
-#: .\cookbook\templates\generic\list_template.html:25
+#: .\cookbook\templates\generic\list_template.html:34
 msgid "Filter"
 msgstr "Filter"
 
-#: .\cookbook\templates\generic\list_template.html:30
+#: .\cookbook\templates\generic\list_template.html:39
 msgid "Import all"
 msgstr "Alle importieren"
 
@@ -1544,6 +1429,11 @@ msgstr "Hilfe anzeigen"
 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"
@@ -1630,6 +1520,11 @@ msgstr ""
 msgid "Meal Plan View"
 msgstr "Plan-Ansicht"
 
+#: .\cookbook\templates\meal_plan_entry.html:48
+#: .\cookbook\templates\recipes_table.html:64
+msgid "Last cooked"
+msgstr "Zuletzt gekocht"
+
 #: .\cookbook\templates\meal_plan_entry.html:50
 msgid "Never cooked before."
 msgstr "Noch nie gekocht."
@@ -1735,8 +1630,12 @@ msgstr ""
 msgid "Comments"
 msgstr "Kommentare"
 
+#: .\cookbook\templates\recipe_view.html:26
+msgid "by"
+msgstr "von"
+
 #: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
-#: .\cookbook\views\edit.py:179
+#: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -1768,54 +1667,225 @@ msgstr "Kochen protokollieren"
 msgid "Recipe Home"
 msgstr "Rezept-Hauptseite"
 
-#: .\cookbook\templates\settings.html:25
+#: .\cookbook\templates\search_info.html:5
+#: .\cookbook\templates\search_info.html:9
+#: .\cookbook\templates\settings.html:157
+#, fuzzy
+#| msgid "Search String"
+msgid "Search Settings"
+msgstr "Suchwort"
+
+#: .\cookbook\templates\search_info.html:10
+msgid ""
+"\n"
+"        Creating the best search experience is complicated and weighs "
+"heavily on your personal configuration.  \n"
+"        Changing any of the search settings can have significant impact on "
+"the speed and quality of the results.\n"
+"        Search Methods, Trigrams and Full Text Search configurations are "
+"only available if you are using Postgres for your database.\n"
+"    "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:19
+#, fuzzy
+#| msgid "Search"
+msgid "Search Methods"
+msgstr "Suche"
+
+#: .\cookbook\templates\search_info.html:23
+msgid ""
+" \n"
+"            Full text searches attempt to normalize the words provided to "
+"match common variants.  For example: 'forked', 'forking', 'forks' will all "
+"normalize to 'fork'.\n"
+"            There are several methods available, described below, that will "
+"control how the search behavior should react when multiple words are "
+"searched.\n"
+"            Full technical details on how these operate can be viewed on <a "
+"href=https://www.postgresql.org/docs/current/textsearch-controls."
+"html#TEXTSEARCH-PARSING-QUERIES>Postgresql's website.</a>\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:29
+msgid ""
+" \n"
+"            Simple searches ignore punctuation and common words such as "
+"'the', 'a', 'and'. And will treat seperate words as required.\n"
+"            Searching for 'apple or flour' will return any recipe that "
+"includes both 'apple' and 'flour' anywhere in the fields that have been "
+"selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:34
+msgid ""
+" \n"
+"            Phrase searches ignore punctuation, but will search for all of "
+"the words in the exact order provided.\n"
+"            Searching for 'apple or flour' will only return a recipe that "
+"includes the exact phrase 'apple or flour' in any of the fields that have "
+"been selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:39
+msgid ""
+" \n"
+"            Web searches simulate functionality found on many web search "
+"sites supporting special syntax.\n"
+"            Placing quotes around several words will convert those words "
+"into a phrase.\n"
+"            'or' is recongized as searching for the word (or phrase) "
+"immediately before 'or' OR the word (or phrase) directly after.\n"
+"            '-' is recognized as searching for recipes that do not include "
+"the word (or phrase) that comes immediately after. \n"
+"            For example searching for 'apple pie' or cherry -butter will "
+"return any recipe that includes the phrase 'apple pie' or the word "
+"'cherry' \n"
+"            in any field included in the full text search but exclude any "
+"recipe that has the word 'butter' in any field included.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:48
+msgid ""
+" \n"
+"            Raw search is similar to Web except will take puncuation "
+"operators such as '|', '&' and '()'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:59
+msgid ""
+" \n"
+"            Another approach to searching that also requires Postgresql is "
+"fuzzy search or trigram similarity. A trigram is a group of three "
+"consecutive characters.\n"
+"            For example searching for 'apple' will create x trigrams 'app', "
+"'ppl', 'ple' and will create a score of how closely words match the "
+"generated trigrams.\n"
+"            One benefit of searching trigams is that a search for 'sandwich' "
+"will find mispelled words such as 'sandwhich' that would be missed by other "
+"methods.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:69
+#, fuzzy
+#| msgid "Search Recipe"
+msgid "Search Fields"
+msgstr "Rezept suchen"
+
+#: .\cookbook\templates\search_info.html:73
+msgid ""
+" \n"
+"            Unaccent is a special case in that it enables searching a field "
+"'unaccented' for each search style attempting to ignore accented values. \n"
+"            For example when you enable unaccent for 'Name' any search "
+"(starts with, contains, trigram) will attempt the search ignoring accented "
+"characters.\n"
+"            \n"
+"            For the other options, you can enable search on any or all "
+"fields and they will be combined together with an assumed 'OR'.\n"
+"            For example enabling 'Name' for Starts With, 'Name' and "
+"'Description' for Partial Match and 'Ingredients' and 'Keywords' for Full "
+"Search\n"
+"            and searching for 'apple' will generate a search that will "
+"return recipes that have:\n"
+"            - A recipe name that starts with 'apple'\n"
+"            - OR a recipe name that contains 'apple'\n"
+"            - OR a recipe description that contains 'apple'\n"
+"            - OR a recipe that will have a full text search match ('apple' "
+"or 'apples') in ingredients\n"
+"            - OR a recipe that will have a full text search match in "
+"Keywords\n"
+"\n"
+"            Combining too many fields in too many types of search can have a "
+"negative impact on performance, create duplicate results or return "
+"unexpected results.\n"
+"            For example, enabling fuzzy search or partial matches will "
+"interfere with web search methods.  \n"
+"            Searching for 'apple -pie' with fuzzy search and full text "
+"search will return the recipe Apple Pie.  Though it is not included in the "
+"full text results, it does match the trigram results.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:95
+#, fuzzy
+#| msgid "Search"
+msgid "Search Index"
+msgstr "Suche"
+
+#: .\cookbook\templates\search_info.html:99
+msgid ""
+" \n"
+"            Trigram search and Full Text Search both rely on database "
+"indexes to perform effectively.  \n"
+"            You can rebuild the indexes on all fields in the Admin page for "
+"Recipes and selecting all recipes and running 'rebuild index for selected "
+"recipes'\n"
+"            You can also rebuild indexes at the command line by executing "
+"the management command 'python manage.py rebuildindex'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\settings.html:27
 msgid "Account"
 msgstr "Account"
 
-#: .\cookbook\templates\settings.html:29
+#: .\cookbook\templates\settings.html:33
 msgid "Preferences"
 msgstr "Präferenzen"
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:39
 msgid "API-Settings"
 msgstr "API-Einstellungen"
 
-#: .\cookbook\templates\settings.html:41
+#: .\cookbook\templates\settings.html:45
+#, fuzzy
+#| msgid "Search String"
+msgid "Search-Settings"
+msgstr "Suchwort"
+
+#: .\cookbook\templates\settings.html:53
 msgid "Name Settings"
 msgstr "Namen-Einstellungen"
 
-#: .\cookbook\templates\settings.html:49
+#: .\cookbook\templates\settings.html:61
 #, fuzzy
 #| msgid "Account Connections"
 msgid "Account Settings"
 msgstr "Account-Verbindungen"
 
-#: .\cookbook\templates\settings.html:51
+#: .\cookbook\templates\settings.html:63
 #, fuzzy
 #| msgid "Add E-mail"
 msgid "Emails"
 msgstr "Email hinzufügen"
 
-#: .\cookbook\templates\settings.html:54
+#: .\cookbook\templates\settings.html:66
 #: .\cookbook\templates\socialaccount\connections.html:11
 #, fuzzy
 #| msgid "Social Login"
 msgid "Social"
 msgstr "Social Login"
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:78
 msgid "Language"
 msgstr "Sprache"
 
-#: .\cookbook\templates\settings.html:96
+#: .\cookbook\templates\settings.html:108
 msgid "Style"
 msgstr "Stil"
 
-#: .\cookbook\templates\settings.html:116
+#: .\cookbook\templates\settings.html:128
 msgid "API Token"
 msgstr "API-Token"
 
-#: .\cookbook\templates\settings.html:117
+#: .\cookbook\templates\settings.html:129
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
@@ -1823,7 +1893,7 @@ msgstr ""
 "Sowohl Basic Authentication als auch tokenbasierte Authentifizierung können "
 "für die REST-API verwendet werden."
 
-#: .\cookbook\templates\settings.html:134
+#: .\cookbook\templates\settings.html:146
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
@@ -1831,7 +1901,7 @@ msgstr ""
 "Nutz den Token als Authorization-Header mit der Präfix \"Token\" wie in "
 "folgendem Beispiel:"
 
-#: .\cookbook\templates\settings.html:136
+#: .\cookbook\templates\settings.html:148
 msgid "or"
 msgstr "oder"
 
@@ -1874,6 +1944,23 @@ msgstr "Eintrag hinzufügen"
 msgid "Amount"
 msgstr "Menge"
 
+#: .\cookbook\templates\shopping_list.html:187
+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
+msgid "Select"
+msgstr "Auswählen"
+
+#: .\cookbook\templates\shopping_list.html:209
+msgid "Select Food"
+msgstr "Zutat auswählen"
+
 #: .\cookbook\templates\shopping_list.html:240
 msgid "Select Supermarket"
 msgstr "Supermarkt auswählen"
@@ -1982,10 +2069,6 @@ msgstr "Objekt-Statistiken"
 msgid "Recipes without Keywords"
 msgstr "Rezepte ohne Schlagwort"
 
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr "Externe Rezepte"
-
 #: .\cookbook\templates\space.html:60 .\cookbook\templates\stats.html:45
 msgid "Internal Recipes"
 msgstr "Interne Rezepte"
@@ -2039,7 +2122,7 @@ msgid "There are no members in your space yet!"
 msgstr "In diesem Space sind bisher noch keine Mitglieder!"
 
 #: .\cookbook\templates\space.html:130 .\cookbook\templates\system.html:21
-#: .\cookbook\views\lists.py:115
+#: .\cookbook\views\lists.py:100
 msgid "Invite Links"
 msgstr "Einladungslinks"
 
@@ -2047,6 +2130,10 @@ msgstr "Einladungslinks"
 msgid "Stats"
 msgstr "Statistiken"
 
+#: .\cookbook\templates\stats.html:10
+msgid "Statistics"
+msgstr "Statistiken"
+
 #: .\cookbook\templates\system.html:22
 msgid "Show Links"
 msgstr "Links anzeigen"
@@ -2222,6 +2309,10 @@ msgstr ""
 msgid "Text dragged here will be appended to the name."
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:171
+msgid "Description"
+msgstr "Beschreibung"
+
 #: .\cookbook\templates\url_import.html:175
 msgid "Text dragged here will be appended to the description."
 msgstr ""
@@ -2246,6 +2337,11 @@ msgstr "Kochzeit"
 msgid "Ingredients dragged here will be appended to current list."
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:297
+#: .\cookbook\templates\url_import.html:567
+msgid "Instructions"
+msgstr "Anleitung"
+
 #: .\cookbook\templates\url_import.html:302
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
@@ -2295,6 +2391,10 @@ msgstr "Rezept Beschreibung"
 msgid "Select one"
 msgstr "Auswählen"
 
+#: .\cookbook\templates\url_import.html:583
+msgid "Add Keyword"
+msgstr "Schlagwort hinzufügen"
+
 #: .\cookbook\templates\url_import.html:596
 msgid "All Keywords"
 msgstr "Alle Schlagwörter"
@@ -2334,48 +2434,107 @@ msgstr "GitHub-Issues"
 msgid "Recipe Markup Specification"
 msgstr "Rezept-Markup-Spezifikation"
 
-#: .\cookbook\views\api.py:79
+#: .\cookbook\views\api.py:82 .\cookbook\views\api.py:131
 msgid "Parameter updated_at incorrectly formatted"
 msgstr "Der Parameter updated_at ist falsch formatiert"
 
-#: .\cookbook\views\api.py:580 .\cookbook\views\views.py:303
+#: .\cookbook\views\api.py:151
+#, python-brace-format
+msgid "No {self.basename} with id {pk} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
+#: .\cookbook\views\edit.py:316
+msgid "Cannot merge with the same object!"
+msgstr "Zusammenführen mit selben Objekt nicht möglich!"
+
+#: .\cookbook\views\api.py:162
+#, python-brace-format
+msgid "No {self.basename} with id {target} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:167
+#, fuzzy
+#| msgid "Cannot merge with the same object!"
+msgid "Cannot merge with child object!"
+msgstr "Zusammenführen mit selben Objekt nicht möglich!"
+
+#: .\cookbook\views\api.py:195
+#, python-brace-format
+msgid "{source.name} was merged successfully with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:199
+#, python-brace-format
+msgid "An error occurred attempting to merge {source.name} with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:239
+#, python-brace-format
+msgid "No {self.basename} with id {child} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:248
+#, python-brace-format
+msgid "{child.name} was moved successfully to the root."
+msgstr ""
+
+#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+msgid "An error occurred attempting to move "
+msgstr ""
+
+#: .\cookbook\views\api.py:254
+msgid "Cannot move an object to itself!"
+msgstr ""
+
+#: .\cookbook\views\api.py:260
+#, python-brace-format
+msgid "No {self.basename} with id {parent} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:266
+#, python-brace-format
+msgid "{child.name} was moved successfully to parent {parent.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
 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:603
+#: .\cookbook\views\api.py:727
 msgid "Sync successful!"
 msgstr "Synchronisation erfolgreich!"
 
-#: .\cookbook\views\api.py:608
+#: .\cookbook\views\api.py:732
 msgid "Error synchronizing with Storage"
 msgstr "Fehler beim Synchronisieren"
 
-#: .\cookbook\views\api.py:686
+#: .\cookbook\views\api.py:810
 msgid "Nothing to do."
 msgstr "Nichts zu tun."
 
-#: .\cookbook\views\api.py:701
+#: .\cookbook\views\api.py:825
 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:708
+#: .\cookbook\views\api.py:832
 msgid "The requested page could not be found."
 msgstr "Die angefragte Seite konnte nicht gefunden werden."
 
-#: .\cookbook\views\api.py:717
+#: .\cookbook\views\api.py:841
 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:731
+#: .\cookbook\views\api.py:855
 msgid "No useable data could be found."
 msgstr "Es konnten keine nutzbaren Daten gefunden werden."
 
-#: .\cookbook\views\api.py:747
+#: .\cookbook\views\api.py:871
 msgid "I couldn't find anything to do."
 msgstr "Ich konnte nichts zu tun finden."
 
@@ -2403,8 +2562,8 @@ msgstr[1] ""
 msgid "Monitor"
 msgstr "Überwachen"
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:102
-#: .\cookbook\views\new.py:98
+#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr "Speicherquelle"
 
@@ -2415,8 +2574,8 @@ msgstr ""
 "Speicherquelle konnte nicht gelöscht werden, da sie in mindestens einem "
 "Monitor verwendet wird."
 
-#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:213
-#: .\cookbook\views\new.py:156
+#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
+#: .\cookbook\views\new.py:155
 msgid "Recipe Book"
 msgstr "Rezeptbuch"
 
@@ -2424,47 +2583,39 @@ msgstr "Rezeptbuch"
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:252
+#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
 msgid "Invite Link"
 msgstr "Einladungslink"
 
-#: .\cookbook\views\edit.py:119
-msgid "Food"
-msgstr "Lebensmittel"
-
-#: .\cookbook\views\edit.py:128
+#: .\cookbook\views\edit.py:126
 msgid "You cannot edit this storage!"
 msgstr "Du kannst diese Speicherquelle nicht bearbeiten!"
 
-#: .\cookbook\views\edit.py:148
+#: .\cookbook\views\edit.py:146
 msgid "Storage saved!"
 msgstr "Speicherquelle gespeichert!"
 
-#: .\cookbook\views\edit.py:154
+#: .\cookbook\views\edit.py:152
 msgid "There was an error updating this storage backend!"
 msgstr "Es gab einen Fehler beim Aktualisieren dieser Speicherquelle!"
 
-#: .\cookbook\views\edit.py:165
+#: .\cookbook\views\edit.py:163
 msgid "Storage"
 msgstr "Speicher"
 
-#: .\cookbook\views\edit.py:261
+#: .\cookbook\views\edit.py:259
 msgid "Changes saved!"
 msgstr "Änderungen gespeichert!"
 
-#: .\cookbook\views\edit.py:265
+#: .\cookbook\views\edit.py:263
 msgid "Error saving changes!"
 msgstr "Fehler beim Speichern der Daten!"
 
-#: .\cookbook\views\edit.py:299
+#: .\cookbook\views\edit.py:298
 msgid "Units merged!"
 msgstr "Einheiten zusammengeführt!"
 
-#: .\cookbook\views\edit.py:301 .\cookbook\views\edit.py:317
-msgid "Cannot merge with the same object!"
-msgstr "Zusammenführen mit selben Objekt nicht möglich!"
-
-#: .\cookbook\views\edit.py:315
+#: .\cookbook\views\edit.py:314
 msgid "Foods merged!"
 msgstr "Zutaten zusammengeführt!"
 
@@ -2476,55 +2627,73 @@ msgstr "Importieren ist für diesen Anbieter noch nicht implementiert"
 msgid "Exporting is not implemented for this provider"
 msgstr "Exportieren ist für diesen Anbieter noch nicht implementiert"
 
-#: .\cookbook\views\lists.py:40
+#: .\cookbook\views\lists.py:26
 msgid "Import Log"
 msgstr "Importverlauf"
 
-#: .\cookbook\views\lists.py:53
+#: .\cookbook\views\lists.py:39
 msgid "Discovery"
 msgstr "Entdecken"
 
-#: .\cookbook\views\lists.py:85
+#: .\cookbook\views\lists.py:69
 msgid "Shopping Lists"
 msgstr "Einkaufslisten"
 
-#: .\cookbook\views\new.py:123
+#: .\cookbook\views\lists.py:129
+#, fuzzy
+#| msgid "Food"
+msgid "Foods"
+msgstr "Lebensmittel"
+
+#: .\cookbook\views\lists.py:163
+#, fuzzy
+#| msgid "Supermarket"
+msgid "Supermarkets"
+msgstr "Supermarkt"
+
+#: .\cookbook\views\lists.py:179
+#, fuzzy
+#| msgid "Shopping Recipes"
+msgid "Shopping Categories"
+msgstr "Einkaufs-Rezepte"
+
+#: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr "Neues Rezept importiert!"
 
-#: .\cookbook\views\new.py:126
+#: .\cookbook\views\new.py:125
 msgid "There was an error importing this recipe!"
 msgstr "Beim Importieren des Rezeptes ist ein Fehler aufgetreten!"
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "Hello"
 msgstr "Hallo"
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "You have been invited by "
 msgstr "Du wurdest eingeladen von "
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:226
 #, fuzzy
 msgid " to join their Tandoor Recipes space "
 msgstr " um deren Tandoor Recipes Space "
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:227
 msgid "Click the following link to activate your account: "
 msgstr "Klicke auf den folgenden Link, um deinen Account zu aktivieren: "
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:228
 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:230
+#: .\cookbook\views\new.py:229
 msgid "The invitation is valid until "
 msgstr "Die Einladung ist gültig bis "
 
-#: .\cookbook\views\new.py:231
+#: .\cookbook\views\new.py:230
 #, fuzzy
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
@@ -2532,16 +2701,16 @@ msgstr ""
 "Tandoor Recipes ist ein Open-Source Rezept-Manager. Sieh es Dir auf GitHub "
 "an "
 
-#: .\cookbook\views\new.py:234
+#: .\cookbook\views\new.py:233
 #, fuzzy
 msgid "Tandoor Recipes Invite"
 msgstr "Tandoor Recipes Einladung"
 
-#: .\cookbook\views\new.py:241
+#: .\cookbook\views\new.py:240
 msgid "Invite link successfully send to user."
 msgstr "Einladungslink erfolgreich an Benutzer gesendet."
 
-#: .\cookbook\views\new.py:244
+#: .\cookbook\views\new.py:243
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
@@ -2549,13 +2718,13 @@ msgstr ""
 "Du hast zu viele Email gesendet. Bitte teile den Link manuell oder warte ein "
 "paar Stunden."
 
-#: .\cookbook\views\new.py:246
+#: .\cookbook\views\new.py:245
 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:129
+#: .\cookbook\views\views.py:128
 msgid ""
 "You have successfully created your own recipe space. Start by adding some "
 "recipes or invite other people to join you."
@@ -2563,16 +2732,30 @@ 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:177
+#: .\cookbook\views\views.py:176
 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:188
+#: .\cookbook\views\views.py:187
 msgid "Comment saved!"
 msgstr "Kommentar gespeichert!"
 
-#: .\cookbook\views\views.py:395
+#: .\cookbook\views\views.py:351
+msgid "You must select at least one field to search!"
+msgstr ""
+
+#: .\cookbook\views\views.py:354
+msgid ""
+"To use this search method you must select at least one full text search "
+"field!"
+msgstr ""
+
+#: .\cookbook\views\views.py:357
+msgid "Fuzzy search is not compatible with this search method!"
+msgstr ""
+
+#: .\cookbook\views\views.py:437
 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 "
@@ -2581,53 +2764,178 @@ 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:402
+#: .\cookbook\views\views.py:444
 msgid "Passwords dont match!"
 msgstr "Passwörter stimmen nicht überein!"
 
-#: .\cookbook\views\views.py:418
+#: .\cookbook\views\views.py:460
 msgid "User has been created, please login!"
 msgstr "Benutzer wurde erstellt, bitte einloggen!"
 
-#: .\cookbook\views\views.py:434
+#: .\cookbook\views\views.py:476
 msgid "Malformed Invite Link supplied!"
 msgstr "Fehlerhafter Einladungslink angegeben!"
 
-#: .\cookbook\views\views.py:441
+#: .\cookbook\views\views.py:483
 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:452
+#: .\cookbook\views\views.py:494
 msgid "Successfully joined space."
 msgstr "Space erfolgreich beigetreten."
 
-#: .\cookbook\views\views.py:458
+#: .\cookbook\views\views.py:500
 msgid "Invite Link not valid or already used!"
 msgstr "Einladungslink ungültig oder bereits genutzt!"
 
-#: .\cookbook\views\views.py:522
+#: .\cookbook\views\views.py:564
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
 msgstr ""
 
-#: .\cookbook\views\views.py:528
+#: .\cookbook\views\views.py:570
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
 msgstr ""
 
+#~ msgid "Utensils"
+#~ msgstr "Utensilien"
+
+#~ msgid "Storage Data"
+#~ msgstr "Datenquellen"
+
+#~ msgid "Storage Backends"
+#~ msgstr "Speicherquellen"
+
+#~ msgid "Configure Sync"
+#~ msgstr "Synchronisation einstellen"
+
+#~ msgid "Discovered Recipes"
+#~ msgstr "Entdeckte Rezepte"
+
+#~ msgid "Discovery Log"
+#~ msgstr "Entdeckungsverlauf"
+
+#~ msgid "Units & Ingredients"
+#~ msgstr "Einheiten & Zutaten"
+
+#~ msgid "New Book"
+#~ msgstr "Neues Buch"
+
+#~ msgid "Toggle Recipes"
+#~ msgstr "Rezepte umschalten"
+
+#~ msgid "There are no recipes in this book yet."
+#~ msgstr "In diesem Buch sind bisher noch keine Rezepte."
+
+#~ msgid "Waiting Time"
+#~ msgstr "Wartezeit"
+
+#~ msgid "Servings Text"
+#~ msgstr "Portionen-Text"
+
+#~ msgid "Select Keywords"
+#~ msgstr "Schlagwörter wählen"
+
+#~ msgid "Nutrition"
+#~ msgstr "Nährwerte"
+
+#~ msgid "Delete Step"
+#~ msgstr "Schritt löschen"
+
+#~ msgid "Calories"
+#~ msgstr "Kalorien"
+
+#~ msgid "Carbohydrates"
+#~ msgstr "Kohlenhydrate"
+
+#~ msgid "Fats"
+#~ msgstr "Fette"
+
+#~ msgid "Proteins"
+#~ msgstr "Proteine"
+
+#~ msgid "Step"
+#~ msgstr "Schritt"
+
+#~ msgid "Show as header"
+#~ msgstr "Als Überschrift anzeigen"
+
+#~ msgid "Hide as header"
+#~ msgstr "Nicht als Überschrift anzeigen"
+
+#~ msgid "Move Up"
+#~ msgstr "Nach oben"
+
+#~ msgid "Move Down"
+#~ msgstr "Nach unten"
+
+#~ msgid "Step Name"
+#~ msgstr "Name des Schritts"
+
+#~ msgid "Step Type"
+#~ msgstr "Art des Schritts"
+
+#~ msgid "Step time in Minutes"
+#~ msgstr "Zeit in Minuten"
+
+#~ msgid "Select File"
+#~ msgstr "Datei auswählen"
+
+#, fuzzy
+#~| msgid "Delete Recipe"
+#~ msgid "Select Recipe"
+#~ msgstr "Rezept löschen"
+
+#~ msgid "Delete Ingredient"
+#~ msgstr "Zutat löschen"
+
+#~ msgid "Make Header"
+#~ msgstr "Überschrift erstellen"
+
+#~ msgid "Make Ingredient"
+#~ msgstr "Zutat erstellen"
+
+#~ msgid "Disable Amount"
+#~ msgstr "Menge deaktivieren"
+
+#~ msgid "Enable Amount"
+#~ msgstr "Menge aktivieren"
+
+#~ msgid "Copy Template Reference"
+#~ msgstr "Kopiere Vorlagen-Referenz"
+
+#~ msgid "Save & View"
+#~ msgstr "Speichern & Ansehen"
+
+#~ msgid "Add Step"
+#~ msgstr "Schritt hinzufügen"
+
+#~ msgid "Add Nutrition"
+#~ msgstr "Nährwerte hinzufügen"
+
+#~ msgid "Remove Nutrition"
+#~ msgstr "Nährwerte entfernen"
+
+#~ msgid "View Recipe"
+#~ msgstr "Rezept ansehen"
+
+#~ msgid "Delete Recipe"
+#~ msgstr "Rezept löschen"
+
+#~ msgid "Steps"
+#~ msgstr "Schritte"
+
 #~ msgid "Password Settings"
 #~ msgstr "Passwort-Einstellungen"
 
 #~ msgid "Email Settings"
 #~ msgstr "Email-Einstellungen"
 
-#~ msgid "Manage Email Settings"
-#~ msgstr "Email-Einstellungen verwalten"
-
 #~ msgid "Manage Social Accounts"
 #~ msgstr "Social Accounts verwalten"
 
diff --git a/cookbook/locale/en/LC_MESSAGES/django.po b/cookbook/locale/en/LC_MESSAGES/django.po
index a8168d42..2f5d77e6 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+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,49 +18,48 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\cookbook\filters.py:23 .\cookbook\templates\base.html:98
-#: .\cookbook\templates\forms\edit_internal_recipe.html:269
+#: .\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\views\lists.py:67
+#: .\cookbook\templates\url_import.html:270
 msgid "Ingredients"
 msgstr ""
 
-#: .\cookbook\forms.py:49
+#: .\cookbook\forms.py:50
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
 msgstr ""
 
-#: .\cookbook\forms.py:51
+#: .\cookbook\forms.py:52
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
 msgstr ""
 
-#: .\cookbook\forms.py:53
+#: .\cookbook\forms.py:54
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
 msgstr ""
 
-#: .\cookbook\forms.py:56
+#: .\cookbook\forms.py:57
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
 msgstr ""
 
-#: .\cookbook\forms.py:58
+#: .\cookbook\forms.py:59
 msgid "Show recently viewed recipes on search page."
 msgstr ""
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:60
 msgid "Number of decimals to round ingredients."
 msgstr ""
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:61
 msgid "If you want to be able to create and see comments underneath recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:62
+#: .\cookbook\forms.py:63
 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. "
@@ -68,187 +67,253 @@ msgid ""
 "mobile data. If lower than instance limit it is reset when saving."
 msgstr ""
 
-#: .\cookbook\forms.py:65
+#: .\cookbook\forms.py:66
 msgid "Makes the navbar stick to the top of the page."
 msgstr ""
 
-#: .\cookbook\forms.py:81
+#: .\cookbook\forms.py:82
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
 msgstr ""
 
-#: .\cookbook\forms.py:102 .\cookbook\forms.py:331
-#: .\cookbook\templates\forms\edit_internal_recipe.html:49
+#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
 #: .\cookbook\templates\url_import.html:154
 msgid "Name"
 msgstr ""
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:332
-#: .\cookbook\templates\base.html:108 .\cookbook\templates\base.html:169
-#: .\cookbook\templates\forms\edit_internal_recipe.html:85
+#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
 #: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573
+#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr ""
 
-#: .\cookbook\forms.py:104
+#: .\cookbook\forms.py:105
 msgid "Preparation time in minutes"
 msgstr ""
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:106
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr ""
 
-#: .\cookbook\forms.py:106 .\cookbook\forms.py:333
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
 msgid "Path"
 msgstr ""
 
-#: .\cookbook\forms.py:107
+#: .\cookbook\forms.py:108
 msgid "Storage UID"
 msgstr ""
 
-#: .\cookbook\forms.py:133
+#: .\cookbook\forms.py:134
 msgid "Default"
 msgstr ""
 
-#: .\cookbook\forms.py:144 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
 
-#: .\cookbook\forms.py:164
+#: .\cookbook\forms.py:165
 msgid "New Unit"
 msgstr ""
 
-#: .\cookbook\forms.py:165
+#: .\cookbook\forms.py:166
 msgid "New unit that other gets replaced by."
 msgstr ""
 
-#: .\cookbook\forms.py:170
+#: .\cookbook\forms.py:171
 msgid "Old Unit"
 msgstr ""
 
-#: .\cookbook\forms.py:171
+#: .\cookbook\forms.py:172
 msgid "Unit that should be replaced."
 msgstr ""
 
-#: .\cookbook\forms.py:187
+#: .\cookbook\forms.py:189
 msgid "New Food"
 msgstr ""
 
-#: .\cookbook\forms.py:188
+#: .\cookbook\forms.py:190
 msgid "New food that other gets replaced by."
 msgstr ""
 
-#: .\cookbook\forms.py:193
+#: .\cookbook\forms.py:195
 msgid "Old Food"
 msgstr ""
 
-#: .\cookbook\forms.py:194
+#: .\cookbook\forms.py:196
 msgid "Food that should be replaced."
 msgstr ""
 
-#: .\cookbook\forms.py:212
+#: .\cookbook\forms.py:214
 msgid "Add your comment: "
 msgstr ""
 
-#: .\cookbook\forms.py:253
+#: .\cookbook\forms.py:256
 msgid "Leave empty for dropbox and enter app password for nextcloud."
 msgstr ""
 
-#: .\cookbook\forms.py:260
+#: .\cookbook\forms.py:263
 msgid "Leave empty for nextcloud and enter api token for dropbox."
 msgstr ""
 
-#: .\cookbook\forms.py:269
+#: .\cookbook\forms.py:272
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
 msgstr ""
 
-#: .\cookbook\forms.py:307
+#: .\cookbook\forms.py:310
 msgid "Search String"
 msgstr ""
 
-#: .\cookbook\forms.py:334
+#: .\cookbook\forms.py:337
 msgid "File ID"
 msgstr ""
 
-#: .\cookbook\forms.py:370
+#: .\cookbook\forms.py:373
 msgid "You must provide at least a recipe or a title."
 msgstr ""
 
-#: .\cookbook\forms.py:383
+#: .\cookbook\forms.py:386
 msgid "You can list default users to share recipes with in the settings."
 msgstr ""
 
-#: .\cookbook\forms.py:384
-#: .\cookbook\templates\forms\edit_internal_recipe.html:427
+#: .\cookbook\forms.py:387
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
 msgstr ""
 
-#: .\cookbook\forms.py:409
+#: .\cookbook\forms.py:412
 msgid "Maximum number of users for this space reached."
 msgstr ""
 
-#: .\cookbook\forms.py:415
+#: .\cookbook\forms.py:418
 msgid "Email address already taken!"
 msgstr ""
 
-#: .\cookbook\forms.py:423
+#: .\cookbook\forms.py:426
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
 msgstr ""
 
-#: .\cookbook\forms.py:438
+#: .\cookbook\forms.py:441
 msgid "Name already taken."
 msgstr ""
 
-#: .\cookbook\forms.py:449
+#: .\cookbook\forms.py:452
 msgid "Accept Terms and Privacy"
 msgstr ""
 
+#: .\cookbook\forms.py:487
+msgid ""
+"Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
+"full desciption of choices."
+msgstr ""
+
+#: .\cookbook\forms.py:488
+msgid ""
+"Use fuzzy matching on units, keywords and ingredients when editing and "
+"importing recipes."
+msgstr ""
+
+#: .\cookbook\forms.py:489
+msgid ""
+"Fields to search ignoring accents.  Selecting this option can improve or "
+"degrade search quality depending on language"
+msgstr ""
+
+#: .\cookbook\forms.py:490
+msgid ""
+"Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
+"'pie' and 'piece' and 'soapie')"
+msgstr ""
+
+#: .\cookbook\forms.py:491
+msgid ""
+"Fields to search for beginning of word matches. (e.g. searching for 'sa' "
+"will return 'salad' and 'sandwich')"
+msgstr ""
+
+#: .\cookbook\forms.py:492
+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
+msgid ""
+"Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
+"only function with fulltext fields."
+msgstr ""
+
+#: .\cookbook\forms.py:497
+msgid "Search Method"
+msgstr ""
+
+#: .\cookbook\forms.py:498
+msgid "Fuzzy Lookups"
+msgstr ""
+
+#: .\cookbook\forms.py:499
+msgid "Ignore Accent"
+msgstr ""
+
+#: .\cookbook\forms.py:500
+msgid "Partial Match"
+msgstr ""
+
+#: .\cookbook\forms.py:501
+msgid "Starts Wtih"
+msgstr ""
+
+#: .\cookbook\forms.py:502
+msgid "Fuzzy Search"
+msgstr ""
+
+#: .\cookbook\forms.py:503
+msgid "Full Text"
+msgstr ""
+
 #: .\cookbook\helper\AllAuthCustomAdapter.py:36
 msgid ""
 "In order to prevent spam, the requested email was not send. Please wait a "
 "few minutes and try again."
 msgstr ""
 
-#: .\cookbook\helper\permission_helper.py:138
-#: .\cookbook\helper\permission_helper.py:161 .\cookbook\views\views.py:151
+#: .\cookbook\helper\permission_helper.py:136
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr ""
 
-#: .\cookbook\helper\permission_helper.py:142
-#: .\cookbook\helper\permission_helper.py:148
-#: .\cookbook\helper\permission_helper.py:173
-#: .\cookbook\helper\permission_helper.py:218
-#: .\cookbook\helper\permission_helper.py:232
-#: .\cookbook\helper\permission_helper.py:243
-#: .\cookbook\helper\permission_helper.py:254 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:162 .\cookbook\views\views.py:169
-#: .\cookbook\views\views.py:259
+#: .\cookbook\helper\permission_helper.py:140
+#: .\cookbook\helper\permission_helper.py:146
+#: .\cookbook\helper\permission_helper.py:171
+#: .\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
 msgid "You do not have the required permissions to view this page!"
 msgstr ""
 
-#: .\cookbook\helper\permission_helper.py:166
-#: .\cookbook\helper\permission_helper.py:189
-#: .\cookbook\helper\permission_helper.py:204
+#: .\cookbook\helper\permission_helper.py:164
+#: .\cookbook\helper\permission_helper.py:187
+#: .\cookbook\helper\permission_helper.py:202
 msgid "You cannot interact with this object as it is not owned by you!"
 msgstr ""
 
-#: .\cookbook\helper\template_helper.py:60
-#: .\cookbook\helper\template_helper.py:62
+#: .\cookbook\helper\template_helper.py:61
+#: .\cookbook\helper\template_helper.py:63
 msgid "Could not parse template code."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:104
+#: .\cookbook\integration\integration.py:119
 #: .\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
@@ -257,27 +322,27 @@ msgstr ""
 #: .\cookbook\templates\url_import.html:123
 #: .\cookbook\templates\url_import.html:317
 #: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
-#: .\cookbook\views\edit.py:199
+#: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:185
+#: .\cookbook\integration\integration.py:200
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:188
+#: .\cookbook\integration\integration.py:203
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:192
+#: .\cookbook\integration\integration.py:208
 msgid "The following recipes were ignored because they already existed:"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:196
+#: .\cookbook\integration\integration.py:212
 #, python-format
 msgid "Imported %s recipes."
 msgstr ""
@@ -295,7 +360,6 @@ msgid "Source"
 msgstr ""
 
 #: .\cookbook\integration\safron.py:23
-#: .\cookbook\templates\forms\edit_internal_recipe.html:79
 #: .\cookbook\templates\include\log_cooking.html:16
 #: .\cookbook\templates\url_import.html:224
 #: .\cookbook\templates\url_import.html:455
@@ -307,7 +371,6 @@ msgid "Waiting time"
 msgstr ""
 
 #: .\cookbook\integration\safron.py:27
-#: .\cookbook\templates\forms\edit_internal_recipe.html:73
 msgid "Preparation Time"
 msgstr ""
 
@@ -321,6 +384,22 @@ msgstr ""
 msgid "Section"
 msgstr ""
 
+#: .\cookbook\management\commands\rebuildindex.py:14
+msgid "Rebuilds full text search index on Recipe"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:18
+msgid "Only Postgress databases use full text search, no index to rebuild"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:29
+msgid "Recipe index rebuild complete."
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:31
+msgid "Recipe index rebuild failed."
+msgstr ""
+
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:14
 msgid "Breakfast"
 msgstr ""
@@ -337,76 +416,89 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: .\cookbook\models.py:72
+#: .\cookbook\models.py:144
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr ""
 
-#: .\cookbook\models.py:123 .\cookbook\templates\search.html:7
+#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
 #: .\cookbook\templates\shopping_list.html:52
 msgid "Search"
 msgstr ""
 
-#: .\cookbook\models.py:124 .\cookbook\templates\base.html:92
+#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
 #: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:233 .\cookbook\views\new.py:201
+#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
 msgid "Meal-Plan"
 msgstr ""
 
-#: .\cookbook\models.py:125 .\cookbook\templates\base.html:89
+#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr ""
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Small"
 msgstr ""
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Large"
 msgstr ""
 
-#: .\cookbook\models.py:133 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:206 .\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:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:202
+#: .\cookbook\models.py:389
+msgid " is part of a recipe step and cannot be deleted"
+msgstr ""
+
+#: .\cookbook\models.py:429
 msgid "Text"
 msgstr ""
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:203
+#: .\cookbook\models.py:429
 msgid "Time"
 msgstr ""
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:204
-#: .\cookbook\templates\forms\edit_internal_recipe.html:219
+#: .\cookbook\models.py:429
 msgid "File"
 msgstr ""
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:205
-#: .\cookbook\templates\forms\edit_internal_recipe.html:241
+#: .\cookbook\models.py:429
 #: .\cookbook\templates\include\recipe_open_modal.html:7
 #: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:273 .\cookbook\views\new.py:52
+#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr ""
 
-#: .\cookbook\serializer.py:109
+#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+msgid "Simple"
+msgstr ""
+
+#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+msgid "Phrase"
+msgstr ""
+
+#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+msgid "Web"
+msgstr ""
+
+#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+msgid "Raw"
+msgstr ""
+
+#: .\cookbook\serializer.py:112
 msgid "File uploads are not enabled for this Space."
 msgstr ""
 
-#: .\cookbook\serializer.py:117
+#: .\cookbook\serializer.py:125
 msgid "You have reached your file upload limit."
 msgstr ""
 
-#: .\cookbook\tables.py:35 .\cookbook\templates\books.html:36
-#: .\cookbook\templates\generic\edit_template.html:6
+#: .\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
@@ -415,11 +507,10 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: .\cookbook\tables.py:124 .\cookbook\tables.py:147
-#: .\cookbook\templates\books.html:38
+#: .\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\edit_template.html:27
+#: .\cookbook\templates\generic\edit_template.html:28
 #: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
@@ -449,7 +540,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:154 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -525,7 +616,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:21
+#: .\cookbook\templates\generic\delete_template.html:22
 msgid "Confirm"
 msgstr ""
 
@@ -537,7 +628,7 @@ msgid ""
 "request</a>."
 msgstr ""
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:189
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
 msgid "Login"
 msgstr ""
 
@@ -590,7 +681,7 @@ msgstr ""
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:52
+#: .\cookbook\templates\settings.html:64
 msgid "Password"
 msgstr ""
 
@@ -672,101 +763,86 @@ msgstr ""
 msgid "We are sorry, but the sign up is currently closed."
 msgstr ""
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:179
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr ""
 
-#: .\cookbook\templates\base.html:85
-msgid "Utensils"
-msgstr ""
-
-#: .\cookbook\templates\base.html:95
+#: .\cookbook\templates\base.html:86
 msgid "Shopping"
 msgstr ""
 
-#: .\cookbook\templates\base.html:101
+#: .\cookbook\templates\base.html:113
+msgid "Keyword"
+msgstr ""
+
+#: .\cookbook\templates\base.html:137
+#: .\cookbook\templates\forms\ingredients.html:24
+#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
+#: .\cookbook\views\lists.py:146
+msgid "Units"
+msgstr ""
+
+#: .\cookbook\templates\base.html:151
 #: .\cookbook\templates\shopping_list.html:230
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr ""
 
-#: .\cookbook\templates\base.html:112 .\cookbook\views\delete.py:84
-#: .\cookbook\views\edit.py:102 .\cookbook\views\lists.py:26
-#: .\cookbook\views\new.py:78
-msgid "Keyword"
-msgstr ""
-
-#: .\cookbook\templates\base.html:114
+#: .\cookbook\templates\base.html:163
 msgid "Batch Edit"
 msgstr ""
 
-#: .\cookbook\templates\base.html:119
-msgid "Storage Data"
-msgstr ""
-
-#: .\cookbook\templates\base.html:123
-msgid "Storage Backends"
-msgstr ""
-
-#: .\cookbook\templates\base.html:125
-msgid "Configure Sync"
-msgstr ""
-
-#: .\cookbook\templates\base.html:127
-msgid "Discovered Recipes"
-msgstr ""
-
-#: .\cookbook\templates\base.html:129
-msgid "Discovery Log"
-msgstr ""
-
-#: .\cookbook\templates\base.html:131 .\cookbook\templates\stats.html:10
-msgid "Statistics"
-msgstr ""
-
-#: .\cookbook\templates\base.html:133
-msgid "Units & Ingredients"
-msgstr ""
-
-#: .\cookbook\templates\base.html:135 .\cookbook\templates\index.html:47
-msgid "Import Recipe"
-msgstr ""
-
-#: .\cookbook\templates\base.html:156 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr ""
 
-#: .\cookbook\templates\base.html:159 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:191 .\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
+msgid "Create"
+msgstr ""
+
+#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
 #: .\cookbook\templates\space.html:19
 msgid "Space Settings"
 msgstr ""
 
-#: .\cookbook\templates\base.html:163 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr ""
 
-#: .\cookbook\templates\base.html:165 .\cookbook\templates\base.html:171
+#: .\cookbook\templates\base.html:214
 msgid "Admin"
 msgstr ""
 
-#: .\cookbook\templates\base.html:175
+#: .\cookbook\templates\base.html:218
 msgid "Markdown Guide"
 msgstr ""
 
-#: .\cookbook\templates\base.html:177
+#: .\cookbook\templates\base.html:220
 msgid "GitHub"
 msgstr ""
 
-#: .\cookbook\templates\base.html:181
+#: .\cookbook\templates\base.html:224
 msgid "API Browser"
 msgstr ""
 
-#: .\cookbook\templates\base.html:184
+#: .\cookbook\templates\base.html:227
 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 ""
@@ -779,7 +855,7 @@ msgstr ""
 msgid "Add the specified keywords to all recipes containing a word"
 msgstr ""
 
-#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:85
+#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:83
 msgid "Sync"
 msgstr ""
 
@@ -797,10 +873,22 @@ msgstr ""
 msgid "The path must be in the following format"
 msgstr ""
 
-#: .\cookbook\templates\batch\monitor.html:27
+#: .\cookbook\templates\batch\monitor.html:21
+msgid "Manage External Storage"
+msgstr ""
+
+#: .\cookbook\templates\batch\monitor.html:28
 msgid "Sync Now!"
 msgstr ""
 
+#: .\cookbook\templates\batch\monitor.html:29
+msgid "Show Recipes"
+msgstr ""
+
+#: .\cookbook\templates\batch\monitor.html:30
+msgid "Show Log"
+msgstr ""
+
 #: .\cookbook\templates\batch\waiting.html:4
 #: .\cookbook\templates\batch\waiting.html:10
 msgid "Importing Recipes"
@@ -812,32 +900,10 @@ msgid ""
 "please wait."
 msgstr ""
 
-#: .\cookbook\templates\books.html:5 .\cookbook\templates\books.html:11
+#: .\cookbook\templates\books.html:7
 msgid "Recipe Books"
 msgstr ""
 
-#: .\cookbook\templates\books.html:15
-msgid "New Book"
-msgstr ""
-
-#: .\cookbook\templates\books.html:27 .\cookbook\templates\recipe_view.html:26
-msgid "by"
-msgstr ""
-
-#: .\cookbook\templates\books.html:34
-msgid "Toggle Recipes"
-msgstr ""
-
-#: .\cookbook\templates\books.html:54
-#: .\cookbook\templates\meal_plan_entry.html:48
-#: .\cookbook\templates\recipes_table.html:64
-msgid "Last cooked"
-msgstr ""
-
-#: .\cookbook\templates\books.html:71
-msgid "There are no recipes in this book yet."
-msgstr ""
-
 #: .\cookbook\templates\export.html:6 .\cookbook\templates\test2.html:6
 msgid "Export Recipes"
 msgstr ""
@@ -858,211 +924,21 @@ msgid "Import new Recipe"
 msgstr ""
 
 #: .\cookbook\templates\forms\edit_import_recipe.html:14
-#: .\cookbook\templates\forms\edit_internal_recipe.html:439
-#: .\cookbook\templates\forms\edit_internal_recipe.html:471
 #: .\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:46 .\cookbook\templates\settings.html:87
-#: .\cookbook\templates\settings.html:105
+#: .\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
 msgid "Save"
 msgstr ""
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:7
-#: .\cookbook\templates\forms\edit_internal_recipe.html:34
 msgid "Edit Recipe"
 msgstr ""
 
-#: .\cookbook\templates\forms\edit_internal_recipe.html:56
-#: .\cookbook\templates\url_import.html:171
-msgid "Description"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:76
-msgid "Waiting Time"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:82
-msgid "Servings Text"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:93
-msgid "Select Keywords"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:94
-#: .\cookbook\templates\url_import.html:583
-msgid "Add Keyword"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:112
-msgid "Nutrition"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:116
-#: .\cookbook\templates\forms\edit_internal_recipe.html:166
-msgid "Delete Step"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:120
-msgid "Calories"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:123
-msgid "Carbohydrates"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:126
-msgid "Fats"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:128
-msgid "Proteins"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:150
-#: .\cookbook\templates\forms\edit_internal_recipe.html:504
-msgid "Step"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:171
-msgid "Show as header"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:177
-msgid "Hide as header"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:182
-msgid "Move Up"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:187
-msgid "Move Down"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:196
-msgid "Step Name"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:200
-msgid "Step Type"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:213
-msgid "Step time in Minutes"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:229
-msgid "Select File"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:230
-#: .\cookbook\templates\forms\edit_internal_recipe.html:252
-#: .\cookbook\templates\forms\edit_internal_recipe.html:313
-#: .\cookbook\templates\forms\edit_internal_recipe.html:337
-#: .\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
-msgid "Select"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:251
-msgid "Select Recipe"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:311
-#: .\cookbook\templates\shopping_list.html:187
-msgid "Select Unit"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:312
-#: .\cookbook\templates\forms\edit_internal_recipe.html:336
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
-msgid "Create"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:335
-#: .\cookbook\templates\shopping_list.html:209
-msgid "Select Food"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:352
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:369
-msgid "Delete Ingredient"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:375
-msgid "Make Header"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:381
-msgid "Make Ingredient"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:387
-msgid "Disable Amount"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:393
-msgid "Enable Amount"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:398
-msgid "Copy Template Reference"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:424
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
-msgid "Instructions"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:437
-#: .\cookbook\templates\forms\edit_internal_recipe.html:468
-msgid "Save & View"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:441
-#: .\cookbook\templates\forms\edit_internal_recipe.html:474
-msgid "Add Step"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:444
-#: .\cookbook\templates\forms\edit_internal_recipe.html:478
-msgid "Add Nutrition"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:446
-#: .\cookbook\templates\forms\edit_internal_recipe.html:480
-msgid "Remove Nutrition"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:448
-#: .\cookbook\templates\forms\edit_internal_recipe.html:483
-msgid "View Recipe"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:450
-#: .\cookbook\templates\forms\edit_internal_recipe.html:485
-msgid "Delete Recipe"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:491
-msgid "Steps"
-msgstr ""
-
 #: .\cookbook\templates\forms\ingredients.html:15
 msgid "Edit Ingredients"
 msgstr ""
@@ -1078,11 +954,6 @@ msgid ""
 "    "
 msgstr ""
 
-#: .\cookbook\templates\forms\ingredients.html:24
-#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
-msgid "Units"
-msgstr ""
-
 #: .\cookbook\templates\forms\ingredients.html:26
 msgid "Are you sure that you want to merge these two units?"
 msgstr ""
@@ -1096,29 +967,33 @@ msgstr ""
 msgid "Are you sure that you want to merge these two ingredients?"
 msgstr ""
 
-#: .\cookbook\templates\generic\delete_template.html:18
+#: .\cookbook\templates\generic\delete_template.html:19
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
 msgstr ""
 
-#: .\cookbook\templates\generic\edit_template.html:30
+#: .\cookbook\templates\generic\delete_template.html:23
+msgid "Cancel"
+msgstr ""
+
+#: .\cookbook\templates\generic\edit_template.html:32
 msgid "View"
 msgstr ""
 
-#: .\cookbook\templates\generic\edit_template.html:34
+#: .\cookbook\templates\generic\edit_template.html:36
 msgid "Delete original file"
 msgstr ""
 
 #: .\cookbook\templates\generic\list_template.html:6
-#: .\cookbook\templates\generic\list_template.html:12
+#: .\cookbook\templates\generic\list_template.html:21
 msgid "List"
 msgstr ""
 
-#: .\cookbook\templates\generic\list_template.html:25
+#: .\cookbook\templates\generic\list_template.html:34
 msgid "Filter"
 msgstr ""
 
-#: .\cookbook\templates\generic\list_template.html:30
+#: .\cookbook\templates\generic\list_template.html:39
 msgid "Import all"
 msgstr ""
 
@@ -1427,6 +1302,11 @@ msgstr ""
 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"
@@ -1490,6 +1370,11 @@ msgstr ""
 msgid "Meal Plan View"
 msgstr ""
 
+#: .\cookbook\templates\meal_plan_entry.html:48
+#: .\cookbook\templates\recipes_table.html:64
+msgid "Last cooked"
+msgstr ""
+
 #: .\cookbook\templates\meal_plan_entry.html:50
 msgid "Never cooked before."
 msgstr ""
@@ -1586,8 +1471,12 @@ msgstr ""
 msgid "Comments"
 msgstr ""
 
+#: .\cookbook\templates\recipe_view.html:26
+msgid "by"
+msgstr ""
+
 #: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
-#: .\cookbook\views\edit.py:179
+#: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr ""
 
@@ -1619,60 +1508,221 @@ msgstr ""
 msgid "Recipe Home"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:25
+#: .\cookbook\templates\search_info.html:5
+#: .\cookbook\templates\search_info.html:9
+#: .\cookbook\templates\settings.html:157
+msgid "Search Settings"
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:10
+msgid ""
+"\n"
+"        Creating the best search experience is complicated and weighs "
+"heavily on your personal configuration.  \n"
+"        Changing any of the search settings can have significant impact on "
+"the speed and quality of the results.\n"
+"        Search Methods, Trigrams and Full Text Search configurations are "
+"only available if you are using Postgres for your database.\n"
+"    "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:19
+msgid "Search Methods"
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:23
+msgid ""
+" \n"
+"            Full text searches attempt to normalize the words provided to "
+"match common variants.  For example: 'forked', 'forking', 'forks' will all "
+"normalize to 'fork'.\n"
+"            There are several methods available, described below, that will "
+"control how the search behavior should react when multiple words are "
+"searched.\n"
+"            Full technical details on how these operate can be viewed on <a "
+"href=https://www.postgresql.org/docs/current/textsearch-controls."
+"html#TEXTSEARCH-PARSING-QUERIES>Postgresql's website.</a>\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:29
+msgid ""
+" \n"
+"            Simple searches ignore punctuation and common words such as "
+"'the', 'a', 'and'. And will treat seperate words as required.\n"
+"            Searching for 'apple or flour' will return any recipe that "
+"includes both 'apple' and 'flour' anywhere in the fields that have been "
+"selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:34
+msgid ""
+" \n"
+"            Phrase searches ignore punctuation, but will search for all of "
+"the words in the exact order provided.\n"
+"            Searching for 'apple or flour' will only return a recipe that "
+"includes the exact phrase 'apple or flour' in any of the fields that have "
+"been selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:39
+msgid ""
+" \n"
+"            Web searches simulate functionality found on many web search "
+"sites supporting special syntax.\n"
+"            Placing quotes around several words will convert those words "
+"into a phrase.\n"
+"            'or' is recongized as searching for the word (or phrase) "
+"immediately before 'or' OR the word (or phrase) directly after.\n"
+"            '-' is recognized as searching for recipes that do not include "
+"the word (or phrase) that comes immediately after. \n"
+"            For example searching for 'apple pie' or cherry -butter will "
+"return any recipe that includes the phrase 'apple pie' or the word "
+"'cherry' \n"
+"            in any field included in the full text search but exclude any "
+"recipe that has the word 'butter' in any field included.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:48
+msgid ""
+" \n"
+"            Raw search is similar to Web except will take puncuation "
+"operators such as '|', '&' and '()'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:59
+msgid ""
+" \n"
+"            Another approach to searching that also requires Postgresql is "
+"fuzzy search or trigram similarity. A trigram is a group of three "
+"consecutive characters.\n"
+"            For example searching for 'apple' will create x trigrams 'app', "
+"'ppl', 'ple' and will create a score of how closely words match the "
+"generated trigrams.\n"
+"            One benefit of searching trigams is that a search for 'sandwich' "
+"will find mispelled words such as 'sandwhich' that would be missed by other "
+"methods.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:69
+msgid "Search Fields"
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:73
+msgid ""
+" \n"
+"            Unaccent is a special case in that it enables searching a field "
+"'unaccented' for each search style attempting to ignore accented values. \n"
+"            For example when you enable unaccent for 'Name' any search "
+"(starts with, contains, trigram) will attempt the search ignoring accented "
+"characters.\n"
+"            \n"
+"            For the other options, you can enable search on any or all "
+"fields and they will be combined together with an assumed 'OR'.\n"
+"            For example enabling 'Name' for Starts With, 'Name' and "
+"'Description' for Partial Match and 'Ingredients' and 'Keywords' for Full "
+"Search\n"
+"            and searching for 'apple' will generate a search that will "
+"return recipes that have:\n"
+"            - A recipe name that starts with 'apple'\n"
+"            - OR a recipe name that contains 'apple'\n"
+"            - OR a recipe description that contains 'apple'\n"
+"            - OR a recipe that will have a full text search match ('apple' "
+"or 'apples') in ingredients\n"
+"            - OR a recipe that will have a full text search match in "
+"Keywords\n"
+"\n"
+"            Combining too many fields in too many types of search can have a "
+"negative impact on performance, create duplicate results or return "
+"unexpected results.\n"
+"            For example, enabling fuzzy search or partial matches will "
+"interfere with web search methods.  \n"
+"            Searching for 'apple -pie' with fuzzy search and full text "
+"search will return the recipe Apple Pie.  Though it is not included in the "
+"full text results, it does match the trigram results.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:95
+msgid "Search Index"
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:99
+msgid ""
+" \n"
+"            Trigram search and Full Text Search both rely on database "
+"indexes to perform effectively.  \n"
+"            You can rebuild the indexes on all fields in the Admin page for "
+"Recipes and selecting all recipes and running 'rebuild index for selected "
+"recipes'\n"
+"            You can also rebuild indexes at the command line by executing "
+"the management command 'python manage.py rebuildindex'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\settings.html:27
 msgid "Account"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:29
+#: .\cookbook\templates\settings.html:33
 msgid "Preferences"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:39
 msgid "API-Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:41
+#: .\cookbook\templates\settings.html:45
+msgid "Search-Settings"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:53
 msgid "Name Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:49
+#: .\cookbook\templates\settings.html:61
 msgid "Account Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:51
+#: .\cookbook\templates\settings.html:63
 msgid "Emails"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:54
+#: .\cookbook\templates\settings.html:66
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:78
 msgid "Language"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:96
+#: .\cookbook\templates\settings.html:108
 msgid "Style"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:116
+#: .\cookbook\templates\settings.html:128
 msgid "API Token"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:117
+#: .\cookbook\templates\settings.html:129
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
 msgstr ""
 
-#: .\cookbook\templates\settings.html:134
+#: .\cookbook\templates\settings.html:146
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:136
+#: .\cookbook\templates\settings.html:148
 msgid "or"
 msgstr ""
 
@@ -1713,6 +1763,23 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#: .\cookbook\templates\shopping_list.html:187
+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
+msgid "Select"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:209
+msgid "Select Food"
+msgstr ""
+
 #: .\cookbook\templates\shopping_list.html:240
 msgid "Select Supermarket"
 msgstr ""
@@ -1810,10 +1877,6 @@ msgstr ""
 msgid "Recipes without Keywords"
 msgstr ""
 
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr ""
-
 #: .\cookbook\templates\space.html:60 .\cookbook\templates\stats.html:45
 msgid "Internal Recipes"
 msgstr ""
@@ -1863,7 +1926,7 @@ msgid "There are no members in your space yet!"
 msgstr ""
 
 #: .\cookbook\templates\space.html:130 .\cookbook\templates\system.html:21
-#: .\cookbook\views\lists.py:115
+#: .\cookbook\views\lists.py:100
 msgid "Invite Links"
 msgstr ""
 
@@ -1871,6 +1934,10 @@ msgstr ""
 msgid "Stats"
 msgstr ""
 
+#: .\cookbook\templates\stats.html:10
+msgid "Statistics"
+msgstr ""
+
 #: .\cookbook\templates\system.html:22
 msgid "Show Links"
 msgstr ""
@@ -2017,6 +2084,10 @@ msgstr ""
 msgid "Text dragged here will be appended to the name."
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:171
+msgid "Description"
+msgstr ""
+
 #: .\cookbook\templates\url_import.html:175
 msgid "Text dragged here will be appended to the description."
 msgstr ""
@@ -2041,6 +2112,11 @@ msgstr ""
 msgid "Ingredients dragged here will be appended to current list."
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:297
+#: .\cookbook\templates\url_import.html:567
+msgid "Instructions"
+msgstr ""
+
 #: .\cookbook\templates\url_import.html:302
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
@@ -2090,6 +2166,10 @@ msgstr ""
 msgid "Select one"
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:583
+msgid "Add Keyword"
+msgstr ""
+
 #: .\cookbook\templates\url_import.html:596
 msgid "All Keywords"
 msgstr ""
@@ -2125,45 +2205,102 @@ msgstr ""
 msgid "Recipe Markup Specification"
 msgstr ""
 
-#: .\cookbook\views\api.py:79
+#: .\cookbook\views\api.py:82 .\cookbook\views\api.py:131
 msgid "Parameter updated_at incorrectly formatted"
 msgstr ""
 
-#: .\cookbook\views\api.py:580 .\cookbook\views\views.py:303
+#: .\cookbook\views\api.py:151
+#, python-brace-format
+msgid "No {self.basename} with id {pk} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
+#: .\cookbook\views\edit.py:316
+msgid "Cannot merge with the same object!"
+msgstr ""
+
+#: .\cookbook\views\api.py:162
+#, python-brace-format
+msgid "No {self.basename} with id {target} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:167
+msgid "Cannot merge with child object!"
+msgstr ""
+
+#: .\cookbook\views\api.py:195
+#, python-brace-format
+msgid "{source.name} was merged successfully with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:199
+#, python-brace-format
+msgid "An error occurred attempting to merge {source.name} with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:239
+#, python-brace-format
+msgid "No {self.basename} with id {child} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:248
+#, python-brace-format
+msgid "{child.name} was moved successfully to the root."
+msgstr ""
+
+#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+msgid "An error occurred attempting to move "
+msgstr ""
+
+#: .\cookbook\views\api.py:254
+msgid "Cannot move an object to itself!"
+msgstr ""
+
+#: .\cookbook\views\api.py:260
+#, python-brace-format
+msgid "No {self.basename} with id {parent} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:266
+#, python-brace-format
+msgid "{child.name} was moved successfully to parent {parent.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
 msgid "This feature is not available in the demo version!"
 msgstr ""
 
-#: .\cookbook\views\api.py:603
+#: .\cookbook\views\api.py:727
 msgid "Sync successful!"
 msgstr ""
 
-#: .\cookbook\views\api.py:608
+#: .\cookbook\views\api.py:732
 msgid "Error synchronizing with Storage"
 msgstr ""
 
-#: .\cookbook\views\api.py:686
+#: .\cookbook\views\api.py:810
 msgid "Nothing to do."
 msgstr ""
 
-#: .\cookbook\views\api.py:701
+#: .\cookbook\views\api.py:825
 msgid "The requested site provided malformed data and cannot be read."
 msgstr ""
 
-#: .\cookbook\views\api.py:708
+#: .\cookbook\views\api.py:832
 msgid "The requested page could not be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:717
+#: .\cookbook\views\api.py:841
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
 msgstr ""
 
-#: .\cookbook\views\api.py:731
+#: .\cookbook\views\api.py:855
 msgid "No useable data could be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:747
+#: .\cookbook\views\api.py:871
 msgid "I couldn't find anything to do."
 msgstr ""
 
@@ -2190,8 +2327,8 @@ msgstr[1] ""
 msgid "Monitor"
 msgstr ""
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:102
-#: .\cookbook\views\new.py:98
+#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr ""
 
@@ -2200,8 +2337,8 @@ 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:213
-#: .\cookbook\views\new.py:156
+#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
+#: .\cookbook\views\new.py:155
 msgid "Recipe Book"
 msgstr ""
 
@@ -2209,47 +2346,39 @@ msgstr ""
 msgid "Bookmarks"
 msgstr ""
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:252
+#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
 msgid "Invite Link"
 msgstr ""
 
-#: .\cookbook\views\edit.py:119
-msgid "Food"
-msgstr ""
-
-#: .\cookbook\views\edit.py:128
+#: .\cookbook\views\edit.py:126
 msgid "You cannot edit this storage!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:148
+#: .\cookbook\views\edit.py:146
 msgid "Storage saved!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:154
+#: .\cookbook\views\edit.py:152
 msgid "There was an error updating this storage backend!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:165
+#: .\cookbook\views\edit.py:163
 msgid "Storage"
 msgstr ""
 
-#: .\cookbook\views\edit.py:261
+#: .\cookbook\views\edit.py:259
 msgid "Changes saved!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:265
+#: .\cookbook\views\edit.py:263
 msgid "Error saving changes!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:299
+#: .\cookbook\views\edit.py:298
 msgid "Units merged!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:301 .\cookbook\views\edit.py:317
-msgid "Cannot merge with the same object!"
-msgstr ""
-
-#: .\cookbook\views\edit.py:315
+#: .\cookbook\views\edit.py:314
 msgid "Foods merged!"
 msgstr ""
 
@@ -2261,126 +2390,152 @@ msgstr ""
 msgid "Exporting is not implemented for this provider"
 msgstr ""
 
-#: .\cookbook\views\lists.py:40
+#: .\cookbook\views\lists.py:26
 msgid "Import Log"
 msgstr ""
 
-#: .\cookbook\views\lists.py:53
+#: .\cookbook\views\lists.py:39
 msgid "Discovery"
 msgstr ""
 
-#: .\cookbook\views\lists.py:85
+#: .\cookbook\views\lists.py:69
 msgid "Shopping Lists"
 msgstr ""
 
-#: .\cookbook\views\new.py:123
+#: .\cookbook\views\lists.py:129
+msgid "Foods"
+msgstr ""
+
+#: .\cookbook\views\lists.py:163
+msgid "Supermarkets"
+msgstr ""
+
+#: .\cookbook\views\lists.py:179
+msgid "Shopping Categories"
+msgstr ""
+
+#: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr ""
 
-#: .\cookbook\views\new.py:126
+#: .\cookbook\views\new.py:125
 msgid "There was an error importing this recipe!"
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "Hello"
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "You have been invited by "
 msgstr ""
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:226
 msgid " to join their Tandoor Recipes space "
 msgstr ""
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:227
 msgid "Click the following link to activate your account: "
 msgstr ""
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:228
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:229
 msgid "The invitation is valid until "
 msgstr ""
 
-#: .\cookbook\views\new.py:231
+#: .\cookbook\views\new.py:230
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 
-#: .\cookbook\views\new.py:234
+#: .\cookbook\views\new.py:233
 msgid "Tandoor Recipes Invite"
 msgstr ""
 
-#: .\cookbook\views\new.py:241
+#: .\cookbook\views\new.py:240
 msgid "Invite link successfully send to user."
 msgstr ""
 
-#: .\cookbook\views\new.py:244
+#: .\cookbook\views\new.py:243
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
 msgstr ""
 
-#: .\cookbook\views\new.py:246
+#: .\cookbook\views\new.py:245
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 
-#: .\cookbook\views\views.py:129
+#: .\cookbook\views\views.py:128
 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:177
+#: .\cookbook\views\views.py:176
 msgid "You do not have the required permissions to perform this action!"
 msgstr ""
 
-#: .\cookbook\views\views.py:188
+#: .\cookbook\views\views.py:187
 msgid "Comment saved!"
 msgstr ""
 
-#: .\cookbook\views\views.py:395
+#: .\cookbook\views\views.py:351
+msgid "You must select at least one field to search!"
+msgstr ""
+
+#: .\cookbook\views\views.py:354
+msgid ""
+"To use this search method you must select at least one full text search "
+"field!"
+msgstr ""
+
+#: .\cookbook\views\views.py:357
+msgid "Fuzzy search is not compatible with this search method!"
+msgstr ""
+
+#: .\cookbook\views\views.py:437
 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:402
+#: .\cookbook\views\views.py:444
 msgid "Passwords dont match!"
 msgstr ""
 
-#: .\cookbook\views\views.py:418
+#: .\cookbook\views\views.py:460
 msgid "User has been created, please login!"
 msgstr ""
 
-#: .\cookbook\views\views.py:434
+#: .\cookbook\views\views.py:476
 msgid "Malformed Invite Link supplied!"
 msgstr ""
 
-#: .\cookbook\views\views.py:441
+#: .\cookbook\views\views.py:483
 msgid "You are already member of a space and therefore cannot join this one."
 msgstr ""
 
-#: .\cookbook\views\views.py:452
+#: .\cookbook\views\views.py:494
 msgid "Successfully joined space."
 msgstr ""
 
-#: .\cookbook\views\views.py:458
+#: .\cookbook\views\views.py:500
 msgid "Invite Link not valid or already used!"
 msgstr ""
 
-#: .\cookbook\views\views.py:522
+#: .\cookbook\views\views.py:564
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
 msgstr ""
 
-#: .\cookbook\views\views.py:528
+#: .\cookbook\views\views.py:570
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
diff --git a/cookbook/locale/es/LC_MESSAGES/django.po b/cookbook/locale/es/LC_MESSAGES/django.po
index 5674a3be..560eb104 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+0200\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/"
@@ -25,15 +25,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\cookbook\filters.py:23 .\cookbook\templates\base.html:98
-#: .\cookbook\templates\forms\edit_internal_recipe.html:269
+#: .\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\views\lists.py:67
+#: .\cookbook\templates\url_import.html:270
 msgid "Ingredients"
 msgstr "Ingredientes"
 
-#: .\cookbook\forms.py:49
+#: .\cookbook\forms.py:50
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
@@ -41,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:51
+#: .\cookbook\forms.py:52
 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:53
+#: .\cookbook\forms.py:54
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
@@ -55,7 +54,7 @@ msgstr ""
 "Permite utilizar fracciones en cantidades de ingredientes (e.g. convierte "
 "los decimales en fracciones automáticamente)"
 
-#: .\cookbook\forms.py:56
+#: .\cookbook\forms.py:57
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
@@ -63,19 +62,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:58
+#: .\cookbook\forms.py:59
 msgid "Show recently viewed recipes on search page."
 msgstr "Muestra recetas vistas recientemente en la página de búsqueda."
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:60
 msgid "Number of decimals to round ingredients."
 msgstr "Número de decimales para redondear los ingredientes."
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:61
 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:62
+#: .\cookbook\forms.py:63
 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 +88,11 @@ msgstr ""
 "valor establecido es inferior al límite de la instancia, este se "
 "restablecerá al guardar."
 
-#: .\cookbook\forms.py:65
+#: .\cookbook\forms.py:66
 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:81
+#: .\cookbook\forms.py:82
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
@@ -105,95 +104,92 @@ msgstr ""
 " \n"
 " "
 
-#: .\cookbook\forms.py:102 .\cookbook\forms.py:331
-#: .\cookbook\templates\forms\edit_internal_recipe.html:49
+#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
 #: .\cookbook\templates\url_import.html:154
 msgid "Name"
 msgstr "Nombre"
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:332
-#: .\cookbook\templates\base.html:108 .\cookbook\templates\base.html:169
-#: .\cookbook\templates\forms\edit_internal_recipe.html:85
+#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
 #: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573
+#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr "Palabras clave"
 
-#: .\cookbook\forms.py:104
+#: .\cookbook\forms.py:105
 msgid "Preparation time in minutes"
 msgstr "Tiempo de preparación en minutos"
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:106
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "Tiempo de espera (cocinar/hornear) en minutos"
 
-#: .\cookbook\forms.py:106 .\cookbook\forms.py:333
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
 msgid "Path"
 msgstr "Ruta"
 
-#: .\cookbook\forms.py:107
+#: .\cookbook\forms.py:108
 msgid "Storage UID"
 msgstr "UID de almacenamiento"
 
-#: .\cookbook\forms.py:133
+#: .\cookbook\forms.py:134
 msgid "Default"
 msgstr "Por defecto"
 
-#: .\cookbook\forms.py:144 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
 
-#: .\cookbook\forms.py:164
+#: .\cookbook\forms.py:165
 msgid "New Unit"
 msgstr "Nueva Unidad"
 
-#: .\cookbook\forms.py:165
+#: .\cookbook\forms.py:166
 msgid "New unit that other gets replaced by."
 msgstr "Nueva unidad que reemplaza a la anterior."
 
-#: .\cookbook\forms.py:170
+#: .\cookbook\forms.py:171
 msgid "Old Unit"
 msgstr "Antigua unidad"
 
-#: .\cookbook\forms.py:171
+#: .\cookbook\forms.py:172
 msgid "Unit that should be replaced."
 msgstr "Unidad que se va a reemplazar."
 
-#: .\cookbook\forms.py:187
+#: .\cookbook\forms.py:189
 msgid "New Food"
 msgstr "Nuevo Alimento"
 
-#: .\cookbook\forms.py:188
+#: .\cookbook\forms.py:190
 msgid "New food that other gets replaced by."
 msgstr "Nuevo alimento que remplaza al anterior."
 
-#: .\cookbook\forms.py:193
+#: .\cookbook\forms.py:195
 msgid "Old Food"
 msgstr "Antiguo alimento"
 
-#: .\cookbook\forms.py:194
+#: .\cookbook\forms.py:196
 msgid "Food that should be replaced."
 msgstr "Alimento que se va a reemplazar."
 
-#: .\cookbook\forms.py:212
+#: .\cookbook\forms.py:214
 msgid "Add your comment: "
 msgstr "Añada su comentario:"
 
-#: .\cookbook\forms.py:253
+#: .\cookbook\forms.py:256
 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:260
+#: .\cookbook\forms.py:263
 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:269
+#: .\cookbook\forms.py:272
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
@@ -201,26 +197,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:307
+#: .\cookbook\forms.py:310
 msgid "Search String"
 msgstr "Cadena de búsqueda"
 
-#: .\cookbook\forms.py:334
+#: .\cookbook\forms.py:337
 msgid "File ID"
 msgstr "ID de Fichero"
 
-#: .\cookbook\forms.py:370
+#: .\cookbook\forms.py:373
 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:383
+#: .\cookbook\forms.py:386
 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:384
-#: .\cookbook\templates\forms\edit_internal_recipe.html:427
+#: .\cookbook\forms.py:387
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
@@ -228,63 +223,139 @@ msgstr ""
 "Puede utilizar Markdown para formatear este campo. Vea la <a href=\"/docs/"
 "markdown/\">documentación aqui</a>"
 
-#: .\cookbook\forms.py:409
+#: .\cookbook\forms.py:412
 msgid "Maximum number of users for this space reached."
 msgstr ""
 
-#: .\cookbook\forms.py:415
+#: .\cookbook\forms.py:418
 msgid "Email address already taken!"
 msgstr ""
 
-#: .\cookbook\forms.py:423
+#: .\cookbook\forms.py:426
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
 msgstr ""
 
-#: .\cookbook\forms.py:438
+#: .\cookbook\forms.py:441
 msgid "Name already taken."
 msgstr ""
 
-#: .\cookbook\forms.py:449
+#: .\cookbook\forms.py:452
 msgid "Accept Terms and Privacy"
 msgstr ""
 
+#: .\cookbook\forms.py:487
+msgid ""
+"Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
+"full desciption of choices."
+msgstr ""
+
+#: .\cookbook\forms.py:488
+msgid ""
+"Use fuzzy matching on units, keywords and ingredients when editing and "
+"importing recipes."
+msgstr ""
+
+#: .\cookbook\forms.py:489
+msgid ""
+"Fields to search ignoring accents.  Selecting this option can improve or "
+"degrade search quality depending on language"
+msgstr ""
+
+#: .\cookbook\forms.py:490
+msgid ""
+"Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
+"'pie' and 'piece' and 'soapie')"
+msgstr ""
+
+#: .\cookbook\forms.py:491
+msgid ""
+"Fields to search for beginning of word matches. (e.g. searching for 'sa' "
+"will return 'salad' and 'sandwich')"
+msgstr ""
+
+#: .\cookbook\forms.py:492
+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
+msgid ""
+"Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
+"only function with fulltext fields."
+msgstr ""
+
+#: .\cookbook\forms.py:497
+#, fuzzy
+#| msgid "Search"
+msgid "Search Method"
+msgstr "Buscar"
+
+#: .\cookbook\forms.py:498
+msgid "Fuzzy Lookups"
+msgstr ""
+
+#: .\cookbook\forms.py:499
+msgid "Ignore Accent"
+msgstr ""
+
+#: .\cookbook\forms.py:500
+msgid "Partial Match"
+msgstr ""
+
+#: .\cookbook\forms.py:501
+msgid "Starts Wtih"
+msgstr ""
+
+#: .\cookbook\forms.py:502
+#, fuzzy
+#| msgid "Search"
+msgid "Fuzzy Search"
+msgstr "Buscar"
+
+#: .\cookbook\forms.py:503
+#, fuzzy
+#| msgid "Text"
+msgid "Full Text"
+msgstr "Texto"
+
 #: .\cookbook\helper\AllAuthCustomAdapter.py:36
 msgid ""
 "In order to prevent spam, the requested email was not send. Please wait a "
 "few minutes and try again."
 msgstr ""
 
-#: .\cookbook\helper\permission_helper.py:138
-#: .\cookbook\helper\permission_helper.py:161 .\cookbook\views\views.py:151
+#: .\cookbook\helper\permission_helper.py:136
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
 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!"
 
-#: .\cookbook\helper\permission_helper.py:142
-#: .\cookbook\helper\permission_helper.py:148
-#: .\cookbook\helper\permission_helper.py:173
-#: .\cookbook\helper\permission_helper.py:218
-#: .\cookbook\helper\permission_helper.py:232
-#: .\cookbook\helper\permission_helper.py:243
-#: .\cookbook\helper\permission_helper.py:254 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:162 .\cookbook\views\views.py:169
-#: .\cookbook\views\views.py:259
+#: .\cookbook\helper\permission_helper.py:140
+#: .\cookbook\helper\permission_helper.py:146
+#: .\cookbook\helper\permission_helper.py:171
+#: .\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
 msgid "You do not have the required permissions to view this page!"
 msgstr "¡No tienes los permisos necesarios para ver esta página!"
 
-#: .\cookbook\helper\permission_helper.py:166
-#: .\cookbook\helper\permission_helper.py:189
-#: .\cookbook\helper\permission_helper.py:204
+#: .\cookbook\helper\permission_helper.py:164
+#: .\cookbook\helper\permission_helper.py:187
+#: .\cookbook\helper\permission_helper.py:202
 msgid "You cannot interact with this object as it is not owned by you!"
 msgstr "¡No puede interactuar con este objeto ya que no es de tu propiedad!"
 
-#: .\cookbook\helper\template_helper.py:60
-#: .\cookbook\helper\template_helper.py:62
+#: .\cookbook\helper\template_helper.py:61
+#: .\cookbook\helper\template_helper.py:63
 msgid "Could not parse template code."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:104
+#: .\cookbook\integration\integration.py:119
 #: .\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
@@ -293,11 +364,11 @@ msgstr ""
 #: .\cookbook\templates\url_import.html:123
 #: .\cookbook\templates\url_import.html:317
 #: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
-#: .\cookbook\views\edit.py:199
+#: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr "Importar"
 
-#: .\cookbook\integration\integration.py:185
+#: .\cookbook\integration\integration.py:200
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
@@ -305,17 +376,17 @@ msgstr ""
 "El importador esperaba un fichero.zip. ¿Has escogido el tipo de importador "
 "correcto para tus datos?"
 
-#: .\cookbook\integration\integration.py:188
+#: .\cookbook\integration\integration.py:203
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:192
+#: .\cookbook\integration\integration.py:208
 msgid "The following recipes were ignored because they already existed:"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:196
+#: .\cookbook\integration\integration.py:212
 #, fuzzy, python-format
 #| msgid "Imported new recipe!"
 msgid "Imported %s recipes."
@@ -338,7 +409,6 @@ msgid "Source"
 msgstr ""
 
 #: .\cookbook\integration\safron.py:23
-#: .\cookbook\templates\forms\edit_internal_recipe.html:79
 #: .\cookbook\templates\include\log_cooking.html:16
 #: .\cookbook\templates\url_import.html:224
 #: .\cookbook\templates\url_import.html:455
@@ -350,7 +420,6 @@ msgid "Waiting time"
 msgstr "Tiempo de espera"
 
 #: .\cookbook\integration\safron.py:27
-#: .\cookbook\templates\forms\edit_internal_recipe.html:73
 msgid "Preparation Time"
 msgstr "Tiempo de Preparación"
 
@@ -364,6 +433,22 @@ msgstr "Libro de cocina"
 msgid "Section"
 msgstr "Sección"
 
+#: .\cookbook\management\commands\rebuildindex.py:14
+msgid "Rebuilds full text search index on Recipe"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:18
+msgid "Only Postgress databases use full text search, no index to rebuild"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:29
+msgid "Recipe index rebuild complete."
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:31
+msgid "Recipe index rebuild failed."
+msgstr ""
+
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:14
 msgid "Breakfast"
 msgstr "Desayuno"
@@ -380,78 +465,91 @@ msgstr "Cena"
 msgid "Other"
 msgstr "Otro"
 
-#: .\cookbook\models.py:72
+#: .\cookbook\models.py:144
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr ""
 
-#: .\cookbook\models.py:123 .\cookbook\templates\search.html:7
+#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
 #: .\cookbook\templates\shopping_list.html:52
 msgid "Search"
 msgstr "Buscar"
 
-#: .\cookbook\models.py:124 .\cookbook\templates\base.html:92
+#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
 #: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:233 .\cookbook\views\new.py:201
+#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
 msgid "Meal-Plan"
 msgstr "Régimen de comidas"
 
-#: .\cookbook\models.py:125 .\cookbook\templates\base.html:89
+#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr "Libros"
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Small"
 msgstr "Pequeño"
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Large"
 msgstr "Grande"
 
-#: .\cookbook\models.py:133 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:206 .\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:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:202
+#: .\cookbook\models.py:389
+msgid " is part of a recipe step and cannot be deleted"
+msgstr ""
+
+#: .\cookbook\models.py:429
 msgid "Text"
 msgstr "Texto"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:203
+#: .\cookbook\models.py:429
 msgid "Time"
 msgstr "Tiempo"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:204
-#: .\cookbook\templates\forms\edit_internal_recipe.html:219
+#: .\cookbook\models.py:429
 #, fuzzy
 #| msgid "File ID"
 msgid "File"
 msgstr "ID de Fichero"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:205
-#: .\cookbook\templates\forms\edit_internal_recipe.html:241
+#: .\cookbook\models.py:429
 #: .\cookbook\templates\include\recipe_open_modal.html:7
 #: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:273 .\cookbook\views\new.py:52
+#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr "Receta"
 
-#: .\cookbook\serializer.py:109
+#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+msgid "Simple"
+msgstr ""
+
+#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+msgid "Phrase"
+msgstr ""
+
+#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+msgid "Web"
+msgstr ""
+
+#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+msgid "Raw"
+msgstr ""
+
+#: .\cookbook\serializer.py:112
 msgid "File uploads are not enabled for this Space."
 msgstr ""
 
-#: .\cookbook\serializer.py:117
+#: .\cookbook\serializer.py:125
 msgid "You have reached your file upload limit."
 msgstr ""
 
-#: .\cookbook\tables.py:35 .\cookbook\templates\books.html:36
-#: .\cookbook\templates\generic\edit_template.html:6
+#: .\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
@@ -460,11 +558,10 @@ msgstr ""
 msgid "Edit"
 msgstr "Editar"
 
-#: .\cookbook\tables.py:124 .\cookbook\tables.py:147
-#: .\cookbook\templates\books.html:38
+#: .\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\edit_template.html:27
+#: .\cookbook\templates\generic\edit_template.html:28
 #: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
@@ -494,7 +591,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:154 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -574,7 +671,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:21
+#: .\cookbook\templates\generic\delete_template.html:22
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -586,7 +683,7 @@ msgid ""
 "request</a>."
 msgstr ""
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:189
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
 msgid "Login"
 msgstr "Iniciar sesión"
 
@@ -644,7 +741,7 @@ msgstr "¡Cambios guardados!"
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:52
+#: .\cookbook\templates\settings.html:64
 #, fuzzy
 #| msgid "Password Reset"
 msgid "Password"
@@ -734,103 +831,88 @@ msgstr ""
 msgid "We are sorry, but the sign up is currently closed."
 msgstr ""
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:179
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr "Documentación de API"
 
-#: .\cookbook\templates\base.html:85
-msgid "Utensils"
-msgstr "Utensilios"
-
-#: .\cookbook\templates\base.html:95
+#: .\cookbook\templates\base.html:86
 msgid "Shopping"
 msgstr "Compras"
 
-#: .\cookbook\templates\base.html:101
+#: .\cookbook\templates\base.html:113
+msgid "Keyword"
+msgstr "Palabra clave"
+
+#: .\cookbook\templates\base.html:137
+#: .\cookbook\templates\forms\ingredients.html:24
+#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
+#: .\cookbook\views\lists.py:146
+msgid "Units"
+msgstr "Unidades"
+
+#: .\cookbook\templates\base.html:151
 #: .\cookbook\templates\shopping_list.html:230
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr "Supermercado"
 
-#: .\cookbook\templates\base.html:112 .\cookbook\views\delete.py:84
-#: .\cookbook\views\edit.py:102 .\cookbook\views\lists.py:26
-#: .\cookbook\views\new.py:78
-msgid "Keyword"
-msgstr "Palabra clave"
-
-#: .\cookbook\templates\base.html:114
+#: .\cookbook\templates\base.html:163
 msgid "Batch Edit"
 msgstr "Edición Masiva"
 
-#: .\cookbook\templates\base.html:119
-msgid "Storage Data"
-msgstr "Almacenamiento de Datos"
-
-#: .\cookbook\templates\base.html:123
-msgid "Storage Backends"
-msgstr "Backends de Almacenamiento"
-
-#: .\cookbook\templates\base.html:125
-msgid "Configure Sync"
-msgstr "Configurar Sincronización"
-
-#: .\cookbook\templates\base.html:127
-msgid "Discovered Recipes"
-msgstr "Recetas Descubiertas"
-
-#: .\cookbook\templates\base.html:129
-msgid "Discovery Log"
-msgstr "Registro de descubrimiento"
-
-#: .\cookbook\templates\base.html:131 .\cookbook\templates\stats.html:10
-msgid "Statistics"
-msgstr "Estadísticas"
-
-#: .\cookbook\templates\base.html:133
-msgid "Units & Ingredients"
-msgstr "Unidades e ingredientes"
-
-#: .\cookbook\templates\base.html:135 .\cookbook\templates\index.html:47
-msgid "Import Recipe"
-msgstr "Importar receta"
-
-#: .\cookbook\templates\base.html:156 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr "Historial"
 
-#: .\cookbook\templates\base.html:159 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:191 .\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
+msgid "Create"
+msgstr "Crear"
+
+#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
 #: .\cookbook\templates\space.html:19
 #, fuzzy
 #| msgid "Settings"
 msgid "Space Settings"
 msgstr "Opciones"
 
-#: .\cookbook\templates\base.html:163 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr "Sistema"
 
-#: .\cookbook\templates\base.html:165 .\cookbook\templates\base.html:171
+#: .\cookbook\templates\base.html:214
 msgid "Admin"
 msgstr "Administrador"
 
-#: .\cookbook\templates\base.html:175
+#: .\cookbook\templates\base.html:218
 msgid "Markdown Guide"
 msgstr "Guia Markdown"
 
-#: .\cookbook\templates\base.html:177
+#: .\cookbook\templates\base.html:220
 msgid "GitHub"
 msgstr "GitHub"
 
-#: .\cookbook\templates\base.html:181
+#: .\cookbook\templates\base.html:224
 msgid "API Browser"
 msgstr "Explorador de API"
 
-#: .\cookbook\templates\base.html:184
+#: .\cookbook\templates\base.html:227
 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"
@@ -845,7 +927,7 @@ msgstr ""
 "Agregue las palabras clave especificadas a todas las recetas que contengan "
 "una palabra"
 
-#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:85
+#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:83
 msgid "Sync"
 msgstr "Sincronizar"
 
@@ -865,10 +947,26 @@ msgstr ""
 msgid "The path must be in the following format"
 msgstr "La ruta debe tener el siguiente formato"
 
-#: .\cookbook\templates\batch\monitor.html:27
+#: .\cookbook\templates\batch\monitor.html:21
+msgid "Manage External Storage"
+msgstr ""
+
+#: .\cookbook\templates\batch\monitor.html:28
 msgid "Sync Now!"
 msgstr "¡Sincronizar ahora!"
 
+#: .\cookbook\templates\batch\monitor.html:29
+#, fuzzy
+#| msgid "Shopping Recipes"
+msgid "Show Recipes"
+msgstr "Recetas en el carro de la compra"
+
+#: .\cookbook\templates\batch\monitor.html:30
+#, fuzzy
+#| msgid "Show Links"
+msgid "Show Log"
+msgstr "Mostrar Enlaces"
+
 #: .\cookbook\templates\batch\waiting.html:4
 #: .\cookbook\templates\batch\waiting.html:10
 msgid "Importing Recipes"
@@ -882,32 +980,10 @@ msgstr ""
 "Esto puede tardar unos minutos, dependiendo de la cantidad de recetas "
 "sincronizadas, espere."
 
-#: .\cookbook\templates\books.html:5 .\cookbook\templates\books.html:11
+#: .\cookbook\templates\books.html:7
 msgid "Recipe Books"
 msgstr "Libros de recetas"
 
-#: .\cookbook\templates\books.html:15
-msgid "New Book"
-msgstr "Nuevo Libro"
-
-#: .\cookbook\templates\books.html:27 .\cookbook\templates\recipe_view.html:26
-msgid "by"
-msgstr "por"
-
-#: .\cookbook\templates\books.html:34
-msgid "Toggle Recipes"
-msgstr "Alternar recetas"
-
-#: .\cookbook\templates\books.html:54
-#: .\cookbook\templates\meal_plan_entry.html:48
-#: .\cookbook\templates\recipes_table.html:64
-msgid "Last cooked"
-msgstr "Cocinado por última vez"
-
-#: .\cookbook\templates\books.html:71
-msgid "There are no recipes in this book yet."
-msgstr "Todavía no hay recetas en este libro."
-
 #: .\cookbook\templates\export.html:6 .\cookbook\templates\test2.html:6
 msgid "Export Recipes"
 msgstr "Exportar recetas"
@@ -930,217 +1006,21 @@ msgid "Import new Recipe"
 msgstr "Importar nueva receta"
 
 #: .\cookbook\templates\forms\edit_import_recipe.html:14
-#: .\cookbook\templates\forms\edit_internal_recipe.html:439
-#: .\cookbook\templates\forms\edit_internal_recipe.html:471
 #: .\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:46 .\cookbook\templates\settings.html:87
-#: .\cookbook\templates\settings.html:105
+#: .\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
 msgid "Save"
 msgstr "Guardar"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:7
-#: .\cookbook\templates\forms\edit_internal_recipe.html:34
 msgid "Edit Recipe"
 msgstr "Editar receta"
 
-#: .\cookbook\templates\forms\edit_internal_recipe.html:56
-#: .\cookbook\templates\url_import.html:171
-msgid "Description"
-msgstr "Descripción"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:76
-msgid "Waiting Time"
-msgstr "Tiempo de espera"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:82
-msgid "Servings Text"
-msgstr "Texto de raciones"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:93
-msgid "Select Keywords"
-msgstr "Seleccionar palabras clave"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:94
-#: .\cookbook\templates\url_import.html:583
-#, fuzzy
-#| msgid "All Keywords"
-msgid "Add Keyword"
-msgstr "Todas las palabras clave."
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:112
-msgid "Nutrition"
-msgstr "Información Nutricional"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:116
-#: .\cookbook\templates\forms\edit_internal_recipe.html:166
-msgid "Delete Step"
-msgstr "Eliminar paso"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:120
-msgid "Calories"
-msgstr "Calorías"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:123
-msgid "Carbohydrates"
-msgstr "Carbohidratos"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:126
-msgid "Fats"
-msgstr "Grasas"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:128
-msgid "Proteins"
-msgstr "Proteinas"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:150
-#: .\cookbook\templates\forms\edit_internal_recipe.html:504
-msgid "Step"
-msgstr "Paso"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:171
-msgid "Show as header"
-msgstr "Mostrar como encabezado"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:177
-msgid "Hide as header"
-msgstr "Ocultar como encabezado"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:182
-msgid "Move Up"
-msgstr "Mover Arriba"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:187
-msgid "Move Down"
-msgstr "Mover Abajo"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:196
-msgid "Step Name"
-msgstr "Nombre del paso"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:200
-msgid "Step Type"
-msgstr "Tipo de paso"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:213
-msgid "Step time in Minutes"
-msgstr "Tiempo de paso en minutos"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:229
-#, fuzzy
-#| msgid "Select one"
-msgid "Select File"
-msgstr "Seleccione uno"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:230
-#: .\cookbook\templates\forms\edit_internal_recipe.html:252
-#: .\cookbook\templates\forms\edit_internal_recipe.html:313
-#: .\cookbook\templates\forms\edit_internal_recipe.html:337
-#: .\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
-msgid "Select"
-msgstr "Seleccionar"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:251
-#, fuzzy
-#| msgid "Delete Recipe"
-msgid "Select Recipe"
-msgstr "Eliminar receta"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:311
-#: .\cookbook\templates\shopping_list.html:187
-msgid "Select Unit"
-msgstr "Seleccionar unidad"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:312
-#: .\cookbook\templates\forms\edit_internal_recipe.html:336
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
-msgid "Create"
-msgstr "Crear"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:335
-#: .\cookbook\templates\shopping_list.html:209
-msgid "Select Food"
-msgstr "Seleccionar Alimento"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:352
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr "Nota"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:369
-msgid "Delete Ingredient"
-msgstr "Eliminar ingrediente"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:375
-msgid "Make Header"
-msgstr "Crear encabezado"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:381
-msgid "Make Ingredient"
-msgstr "Crear ingrediente"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:387
-msgid "Disable Amount"
-msgstr "Deshabilitar cantidad"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:393
-msgid "Enable Amount"
-msgstr "Habilitar cantidad"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:398
-msgid "Copy Template Reference"
-msgstr "Copiar Referencia de Plantilla"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:424
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
-msgid "Instructions"
-msgstr "Instrucciones"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:437
-#: .\cookbook\templates\forms\edit_internal_recipe.html:468
-msgid "Save & View"
-msgstr "Guardar y ver"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:441
-#: .\cookbook\templates\forms\edit_internal_recipe.html:474
-msgid "Add Step"
-msgstr "Agregar paso"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:444
-#: .\cookbook\templates\forms\edit_internal_recipe.html:478
-msgid "Add Nutrition"
-msgstr "Añadir Información Nutricional"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:446
-#: .\cookbook\templates\forms\edit_internal_recipe.html:480
-msgid "Remove Nutrition"
-msgstr "Eliminar Información Nutricional"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:448
-#: .\cookbook\templates\forms\edit_internal_recipe.html:483
-msgid "View Recipe"
-msgstr "Ver la receta"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:450
-#: .\cookbook\templates\forms\edit_internal_recipe.html:485
-msgid "Delete Recipe"
-msgstr "Eliminar receta"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:491
-msgid "Steps"
-msgstr "Pasos"
-
 #: .\cookbook\templates\forms\ingredients.html:15
 msgid "Edit Ingredients"
 msgstr "Editar ingredientes"
@@ -1163,11 +1043,6 @@ msgstr ""
 "que los usan.\n"
 "    "
 
-#: .\cookbook\templates\forms\ingredients.html:24
-#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
-msgid "Units"
-msgstr "Unidades"
-
 #: .\cookbook\templates\forms\ingredients.html:26
 msgid "Are you sure that you want to merge these two units?"
 msgstr "¿Estás seguro de que quieres combinar estas dos unidades?"
@@ -1181,29 +1056,33 @@ 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:18
+#: .\cookbook\templates\generic\delete_template.html:19
 #, 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\edit_template.html:30
+#: .\cookbook\templates\generic\delete_template.html:23
+msgid "Cancel"
+msgstr ""
+
+#: .\cookbook\templates\generic\edit_template.html:32
 msgid "View"
 msgstr "Ver"
 
-#: .\cookbook\templates\generic\edit_template.html:34
+#: .\cookbook\templates\generic\edit_template.html:36
 msgid "Delete original file"
 msgstr "Eliminar archivo original"
 
 #: .\cookbook\templates\generic\list_template.html:6
-#: .\cookbook\templates\generic\list_template.html:12
+#: .\cookbook\templates\generic\list_template.html:21
 msgid "List"
 msgstr "Lista"
 
-#: .\cookbook\templates\generic\list_template.html:25
+#: .\cookbook\templates\generic\list_template.html:34
 msgid "Filter"
 msgstr "Filtro"
 
-#: .\cookbook\templates\generic\list_template.html:30
+#: .\cookbook\templates\generic\list_template.html:39
 msgid "Import all"
 msgstr "Importar todo"
 
@@ -1544,6 +1423,11 @@ msgstr "Mostrar Ayuda"
 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"
@@ -1639,6 +1523,11 @@ msgstr ""
 msgid "Meal Plan View"
 msgstr "Vista de menú"
 
+#: .\cookbook\templates\meal_plan_entry.html:48
+#: .\cookbook\templates\recipes_table.html:64
+msgid "Last cooked"
+msgstr "Cocinado por última vez"
+
 #: .\cookbook\templates\meal_plan_entry.html:50
 msgid "Never cooked before."
 msgstr "Nunca antes cocinado."
@@ -1750,8 +1639,12 @@ msgstr ""
 msgid "Comments"
 msgstr "Comentarios"
 
+#: .\cookbook\templates\recipe_view.html:26
+msgid "by"
+msgstr "por"
+
 #: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
-#: .\cookbook\views\edit.py:179
+#: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr "Comentario"
 
@@ -1783,58 +1676,229 @@ msgstr "Registrar receta cocinada"
 msgid "Recipe Home"
 msgstr "Página de inicio"
 
-#: .\cookbook\templates\settings.html:25
+#: .\cookbook\templates\search_info.html:5
+#: .\cookbook\templates\search_info.html:9
+#: .\cookbook\templates\settings.html:157
+#, fuzzy
+#| msgid "Search String"
+msgid "Search Settings"
+msgstr "Cadena de búsqueda"
+
+#: .\cookbook\templates\search_info.html:10
+msgid ""
+"\n"
+"        Creating the best search experience is complicated and weighs "
+"heavily on your personal configuration.  \n"
+"        Changing any of the search settings can have significant impact on "
+"the speed and quality of the results.\n"
+"        Search Methods, Trigrams and Full Text Search configurations are "
+"only available if you are using Postgres for your database.\n"
+"    "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:19
+#, fuzzy
+#| msgid "Search"
+msgid "Search Methods"
+msgstr "Buscar"
+
+#: .\cookbook\templates\search_info.html:23
+msgid ""
+" \n"
+"            Full text searches attempt to normalize the words provided to "
+"match common variants.  For example: 'forked', 'forking', 'forks' will all "
+"normalize to 'fork'.\n"
+"            There are several methods available, described below, that will "
+"control how the search behavior should react when multiple words are "
+"searched.\n"
+"            Full technical details on how these operate can be viewed on <a "
+"href=https://www.postgresql.org/docs/current/textsearch-controls."
+"html#TEXTSEARCH-PARSING-QUERIES>Postgresql's website.</a>\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:29
+msgid ""
+" \n"
+"            Simple searches ignore punctuation and common words such as "
+"'the', 'a', 'and'. And will treat seperate words as required.\n"
+"            Searching for 'apple or flour' will return any recipe that "
+"includes both 'apple' and 'flour' anywhere in the fields that have been "
+"selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:34
+msgid ""
+" \n"
+"            Phrase searches ignore punctuation, but will search for all of "
+"the words in the exact order provided.\n"
+"            Searching for 'apple or flour' will only return a recipe that "
+"includes the exact phrase 'apple or flour' in any of the fields that have "
+"been selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:39
+msgid ""
+" \n"
+"            Web searches simulate functionality found on many web search "
+"sites supporting special syntax.\n"
+"            Placing quotes around several words will convert those words "
+"into a phrase.\n"
+"            'or' is recongized as searching for the word (or phrase) "
+"immediately before 'or' OR the word (or phrase) directly after.\n"
+"            '-' is recognized as searching for recipes that do not include "
+"the word (or phrase) that comes immediately after. \n"
+"            For example searching for 'apple pie' or cherry -butter will "
+"return any recipe that includes the phrase 'apple pie' or the word "
+"'cherry' \n"
+"            in any field included in the full text search but exclude any "
+"recipe that has the word 'butter' in any field included.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:48
+msgid ""
+" \n"
+"            Raw search is similar to Web except will take puncuation "
+"operators such as '|', '&' and '()'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:59
+msgid ""
+" \n"
+"            Another approach to searching that also requires Postgresql is "
+"fuzzy search or trigram similarity. A trigram is a group of three "
+"consecutive characters.\n"
+"            For example searching for 'apple' will create x trigrams 'app', "
+"'ppl', 'ple' and will create a score of how closely words match the "
+"generated trigrams.\n"
+"            One benefit of searching trigams is that a search for 'sandwich' "
+"will find mispelled words such as 'sandwhich' that would be missed by other "
+"methods.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:69
+#, fuzzy
+#| msgid "Search Recipe"
+msgid "Search Fields"
+msgstr "Buscar Receta"
+
+#: .\cookbook\templates\search_info.html:73
+msgid ""
+" \n"
+"            Unaccent is a special case in that it enables searching a field "
+"'unaccented' for each search style attempting to ignore accented values. \n"
+"            For example when you enable unaccent for 'Name' any search "
+"(starts with, contains, trigram) will attempt the search ignoring accented "
+"characters.\n"
+"            \n"
+"            For the other options, you can enable search on any or all "
+"fields and they will be combined together with an assumed 'OR'.\n"
+"            For example enabling 'Name' for Starts With, 'Name' and "
+"'Description' for Partial Match and 'Ingredients' and 'Keywords' for Full "
+"Search\n"
+"            and searching for 'apple' will generate a search that will "
+"return recipes that have:\n"
+"            - A recipe name that starts with 'apple'\n"
+"            - OR a recipe name that contains 'apple'\n"
+"            - OR a recipe description that contains 'apple'\n"
+"            - OR a recipe that will have a full text search match ('apple' "
+"or 'apples') in ingredients\n"
+"            - OR a recipe that will have a full text search match in "
+"Keywords\n"
+"\n"
+"            Combining too many fields in too many types of search can have a "
+"negative impact on performance, create duplicate results or return "
+"unexpected results.\n"
+"            For example, enabling fuzzy search or partial matches will "
+"interfere with web search methods.  \n"
+"            Searching for 'apple -pie' with fuzzy search and full text "
+"search will return the recipe Apple Pie.  Though it is not included in the "
+"full text results, it does match the trigram results.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:95
+#, fuzzy
+#| msgid "Search"
+msgid "Search Index"
+msgstr "Buscar"
+
+#: .\cookbook\templates\search_info.html:99
+msgid ""
+" \n"
+"            Trigram search and Full Text Search both rely on database "
+"indexes to perform effectively.  \n"
+"            You can rebuild the indexes on all fields in the Admin page for "
+"Recipes and selecting all recipes and running 'rebuild index for selected "
+"recipes'\n"
+"            You can also rebuild indexes at the command line by executing "
+"the management command 'python manage.py rebuildindex'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\settings.html:27
 msgid "Account"
 msgstr "Cuenta"
 
-#: .\cookbook\templates\settings.html:29
+#: .\cookbook\templates\settings.html:33
 msgid "Preferences"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:39
 #, fuzzy
 #| msgid "Settings"
 msgid "API-Settings"
 msgstr "Opciones"
 
-#: .\cookbook\templates\settings.html:41
+#: .\cookbook\templates\settings.html:45
+#, fuzzy
+#| msgid "Search String"
+msgid "Search-Settings"
+msgstr "Cadena de búsqueda"
+
+#: .\cookbook\templates\settings.html:53
 #, fuzzy
 #| msgid "Settings"
 msgid "Name Settings"
 msgstr "Opciones"
 
-#: .\cookbook\templates\settings.html:49
+#: .\cookbook\templates\settings.html:61
 #, fuzzy
 #| msgid "Account Connections"
 msgid "Account Settings"
 msgstr "Conexiones de la cuenta"
 
-#: .\cookbook\templates\settings.html:51
+#: .\cookbook\templates\settings.html:63
 #, fuzzy
 #| msgid "Settings"
 msgid "Emails"
 msgstr "Opciones"
 
-#: .\cookbook\templates\settings.html:54
+#: .\cookbook\templates\settings.html:66
 #: .\cookbook\templates\socialaccount\connections.html:11
 #, fuzzy
 #| msgid "Social Login"
 msgid "Social"
 msgstr "Inicio de sesión social"
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:78
 msgid "Language"
 msgstr "Idioma"
 
-#: .\cookbook\templates\settings.html:96
+#: .\cookbook\templates\settings.html:108
 msgid "Style"
 msgstr "Estilo"
 
-#: .\cookbook\templates\settings.html:116
+#: .\cookbook\templates\settings.html:128
 msgid "API Token"
 msgstr "Token API"
 
-#: .\cookbook\templates\settings.html:117
+#: .\cookbook\templates\settings.html:129
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
@@ -1842,7 +1906,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:134
+#: .\cookbook\templates\settings.html:146
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
@@ -1850,7 +1914,7 @@ 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:136
+#: .\cookbook\templates\settings.html:148
 msgid "or"
 msgstr "o"
 
@@ -1893,6 +1957,23 @@ msgstr "Añadir entrada"
 msgid "Amount"
 msgstr "Cantidad"
 
+#: .\cookbook\templates\shopping_list.html:187
+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
+msgid "Select"
+msgstr "Seleccionar"
+
+#: .\cookbook\templates\shopping_list.html:209
+msgid "Select Food"
+msgstr "Seleccionar Alimento"
+
 #: .\cookbook\templates\shopping_list.html:240
 msgid "Select Supermarket"
 msgstr "Seleccionar supermercado"
@@ -1998,10 +2079,6 @@ msgstr "Estadísticas de objetos"
 msgid "Recipes without Keywords"
 msgstr "Recetas sin palabras clave"
 
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr "Recetas Externas"
-
 #: .\cookbook\templates\space.html:60 .\cookbook\templates\stats.html:45
 msgid "Internal Recipes"
 msgstr "Recetas Internas"
@@ -2061,7 +2138,7 @@ msgid "There are no members in your space yet!"
 msgstr "Todavía no hay recetas en este libro."
 
 #: .\cookbook\templates\space.html:130 .\cookbook\templates\system.html:21
-#: .\cookbook\views\lists.py:115
+#: .\cookbook\views\lists.py:100
 msgid "Invite Links"
 msgstr "Enlaces de Invitación"
 
@@ -2069,6 +2146,10 @@ msgstr "Enlaces de Invitación"
 msgid "Stats"
 msgstr "Estadísticas"
 
+#: .\cookbook\templates\stats.html:10
+msgid "Statistics"
+msgstr "Estadísticas"
+
 #: .\cookbook\templates\system.html:22
 msgid "Show Links"
 msgstr "Mostrar Enlaces"
@@ -2254,6 +2335,10 @@ msgstr ""
 msgid "Text dragged here will be appended to the name."
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:171
+msgid "Description"
+msgstr "Descripción"
+
 #: .\cookbook\templates\url_import.html:175
 msgid "Text dragged here will be appended to the description."
 msgstr ""
@@ -2282,6 +2367,11 @@ msgstr "Tiempo"
 msgid "Ingredients dragged here will be appended to current list."
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:297
+#: .\cookbook\templates\url_import.html:567
+msgid "Instructions"
+msgstr "Instrucciones"
+
 #: .\cookbook\templates\url_import.html:302
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
@@ -2341,6 +2431,12 @@ msgstr "Descripción"
 msgid "Select one"
 msgstr "Seleccione uno"
 
+#: .\cookbook\templates\url_import.html:583
+#, fuzzy
+#| msgid "All Keywords"
+msgid "Add Keyword"
+msgstr "Todas las palabras clave."
+
 #: .\cookbook\templates\url_import.html:596
 msgid "All Keywords"
 msgstr "Todas las palabras clave."
@@ -2384,39 +2480,98 @@ msgstr "Propuestas de GitHub"
 msgid "Recipe Markup Specification"
 msgstr "Especificación de anotaciones de la receta"
 
-#: .\cookbook\views\api.py:79
+#: .\cookbook\views\api.py:82 .\cookbook\views\api.py:131
 #, fuzzy
 #| msgid "Parameter filter_list incorrectly formatted"
 msgid "Parameter updated_at incorrectly formatted"
 msgstr "Parámetro filter_list formateado incorrectamente"
 
-#: .\cookbook\views\api.py:580 .\cookbook\views\views.py:303
+#: .\cookbook\views\api.py:151
+#, python-brace-format
+msgid "No {self.basename} with id {pk} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
+#: .\cookbook\views\edit.py:316
+msgid "Cannot merge with the same object!"
+msgstr "¡No se puede unir con el mismo objeto!"
+
+#: .\cookbook\views\api.py:162
+#, python-brace-format
+msgid "No {self.basename} with id {target} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:167
+#, fuzzy
+#| msgid "Cannot merge with the same object!"
+msgid "Cannot merge with child object!"
+msgstr "¡No se puede unir con el mismo objeto!"
+
+#: .\cookbook\views\api.py:195
+#, python-brace-format
+msgid "{source.name} was merged successfully with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:199
+#, python-brace-format
+msgid "An error occurred attempting to merge {source.name} with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:239
+#, python-brace-format
+msgid "No {self.basename} with id {child} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:248
+#, python-brace-format
+msgid "{child.name} was moved successfully to the root."
+msgstr ""
+
+#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+msgid "An error occurred attempting to move "
+msgstr ""
+
+#: .\cookbook\views\api.py:254
+msgid "Cannot move an object to itself!"
+msgstr ""
+
+#: .\cookbook\views\api.py:260
+#, python-brace-format
+msgid "No {self.basename} with id {parent} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:266
+#, python-brace-format
+msgid "{child.name} was moved successfully to parent {parent.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
 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:603
+#: .\cookbook\views\api.py:727
 msgid "Sync successful!"
 msgstr "¡Sincronización exitosa!"
 
-#: .\cookbook\views\api.py:608
+#: .\cookbook\views\api.py:732
 msgid "Error synchronizing with Storage"
 msgstr "Error de sincronización con el almacenamiento"
 
-#: .\cookbook\views\api.py:686
+#: .\cookbook\views\api.py:810
 msgid "Nothing to do."
 msgstr ""
 
-#: .\cookbook\views\api.py:701
+#: .\cookbook\views\api.py:825
 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:708
+#: .\cookbook\views\api.py:832
 msgid "The requested page could not be found."
 msgstr "La página solicitada no pudo ser encontrada."
 
-#: .\cookbook\views\api.py:717
+#: .\cookbook\views\api.py:841
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
@@ -2424,13 +2579,13 @@ msgstr ""
 "El sitio solicitado no proporciona ningún formato de datos reconocido para "
 "importar la receta."
 
-#: .\cookbook\views\api.py:731
+#: .\cookbook\views\api.py:855
 #, 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:747
+#: .\cookbook\views\api.py:871
 msgid "I couldn't find anything to do."
 msgstr ""
 
@@ -2457,8 +2612,8 @@ msgstr[1] "Edición masiva realizada. %(count)d Recetas fueron actualizadas."
 msgid "Monitor"
 msgstr "Monitor"
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:102
-#: .\cookbook\views\new.py:98
+#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr "Backend de Almacenamiento"
 
@@ -2469,8 +2624,8 @@ 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:213
-#: .\cookbook\views\new.py:156
+#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
+#: .\cookbook\views\new.py:155
 msgid "Recipe Book"
 msgstr "Libro de recetas"
 
@@ -2478,47 +2633,39 @@ msgstr "Libro de recetas"
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:252
+#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
 msgid "Invite Link"
 msgstr "Enlace de invitación"
 
-#: .\cookbook\views\edit.py:119
-msgid "Food"
-msgstr "Comida"
-
-#: .\cookbook\views\edit.py:128
+#: .\cookbook\views\edit.py:126
 msgid "You cannot edit this storage!"
 msgstr "¡No puede editar este almacenamiento!"
 
-#: .\cookbook\views\edit.py:148
+#: .\cookbook\views\edit.py:146
 msgid "Storage saved!"
 msgstr "¡Almacenamiento guardado!"
 
-#: .\cookbook\views\edit.py:154
+#: .\cookbook\views\edit.py:152
 msgid "There was an error updating this storage backend!"
 msgstr "¡Hubo un error al actualizar este backend de almacenamiento!"
 
-#: .\cookbook\views\edit.py:165
+#: .\cookbook\views\edit.py:163
 msgid "Storage"
 msgstr "Almacenamiento"
 
-#: .\cookbook\views\edit.py:261
+#: .\cookbook\views\edit.py:259
 msgid "Changes saved!"
 msgstr "¡Cambios guardados!"
 
-#: .\cookbook\views\edit.py:265
+#: .\cookbook\views\edit.py:263
 msgid "Error saving changes!"
 msgstr "¡Error al guardar los cambios!"
 
-#: .\cookbook\views\edit.py:299
+#: .\cookbook\views\edit.py:298
 msgid "Units merged!"
 msgstr "¡Unidades fusionadas!"
 
-#: .\cookbook\views\edit.py:301 .\cookbook\views\edit.py:317
-msgid "Cannot merge with the same object!"
-msgstr "¡No se puede unir con el mismo objeto!"
-
-#: .\cookbook\views\edit.py:315
+#: .\cookbook\views\edit.py:314
 msgid "Foods merged!"
 msgstr "¡Alimentos fusionados!"
 
@@ -2530,89 +2677,121 @@ msgstr "La importación no está implementada para este proveedor"
 msgid "Exporting is not implemented for this provider"
 msgstr "La exportación no está implementada para este proveedor"
 
-#: .\cookbook\views\lists.py:40
+#: .\cookbook\views\lists.py:26
 msgid "Import Log"
 msgstr "Importar registro"
 
-#: .\cookbook\views\lists.py:53
+#: .\cookbook\views\lists.py:39
 msgid "Discovery"
 msgstr "Descubrimiento"
 
-#: .\cookbook\views\lists.py:85
+#: .\cookbook\views\lists.py:69
 msgid "Shopping Lists"
 msgstr "Listas de la compra"
 
-#: .\cookbook\views\new.py:123
+#: .\cookbook\views\lists.py:129
+#, fuzzy
+#| msgid "Food"
+msgid "Foods"
+msgstr "Comida"
+
+#: .\cookbook\views\lists.py:163
+#, fuzzy
+#| msgid "Supermarket"
+msgid "Supermarkets"
+msgstr "Supermercado"
+
+#: .\cookbook\views\lists.py:179
+#, fuzzy
+#| msgid "Shopping Recipes"
+msgid "Shopping Categories"
+msgstr "Recetas en el carro de la compra"
+
+#: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr "¡Nueva receta importada!"
 
-#: .\cookbook\views\new.py:126
+#: .\cookbook\views\new.py:125
 msgid "There was an error importing this recipe!"
 msgstr "¡Hubo un error al importar esta receta!"
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "Hello"
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "You have been invited by "
 msgstr ""
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:226
 msgid " to join their Tandoor Recipes space "
 msgstr ""
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:227
 msgid "Click the following link to activate your account: "
 msgstr ""
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:228
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:229
 msgid "The invitation is valid until "
 msgstr ""
 
-#: .\cookbook\views\new.py:231
+#: .\cookbook\views\new.py:230
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 
-#: .\cookbook\views\new.py:234
+#: .\cookbook\views\new.py:233
 msgid "Tandoor Recipes Invite"
 msgstr ""
 
-#: .\cookbook\views\new.py:241
+#: .\cookbook\views\new.py:240
 msgid "Invite link successfully send to user."
 msgstr ""
 
-#: .\cookbook\views\new.py:244
+#: .\cookbook\views\new.py:243
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
 msgstr ""
 
-#: .\cookbook\views\new.py:246
+#: .\cookbook\views\new.py:245
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 
-#: .\cookbook\views\views.py:129
+#: .\cookbook\views\views.py:128
 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:177
+#: .\cookbook\views\views.py:176
 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:188
+#: .\cookbook\views\views.py:187
 msgid "Comment saved!"
 msgstr "¡Comentario guardado!"
 
-#: .\cookbook\views\views.py:395
+#: .\cookbook\views\views.py:351
+msgid "You must select at least one field to search!"
+msgstr ""
+
+#: .\cookbook\views\views.py:354
+msgid ""
+"To use this search method you must select at least one full text search "
+"field!"
+msgstr ""
+
+#: .\cookbook\views\views.py:357
+msgid "Fuzzy search is not compatible with this search method!"
+msgstr ""
+
+#: .\cookbook\views\views.py:437
 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 "
@@ -2622,44 +2801,174 @@ 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:402
+#: .\cookbook\views\views.py:444
 msgid "Passwords dont match!"
 msgstr "¡Las contraseñas no coinciden!"
 
-#: .\cookbook\views\views.py:418
+#: .\cookbook\views\views.py:460
 msgid "User has been created, please login!"
 msgstr "El usuario ha sido creado, ¡inicie sesión!"
 
-#: .\cookbook\views\views.py:434
+#: .\cookbook\views\views.py:476
 msgid "Malformed Invite Link supplied!"
 msgstr "¡Se proporcionó un enlace de invitación con formato incorrecto!"
 
-#: .\cookbook\views\views.py:441
+#: .\cookbook\views\views.py:483
 #, 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:452
+#: .\cookbook\views\views.py:494
 msgid "Successfully joined space."
 msgstr ""
 
-#: .\cookbook\views\views.py:458
+#: .\cookbook\views\views.py:500
 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:522
+#: .\cookbook\views\views.py:564
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
 msgstr ""
 
-#: .\cookbook\views\views.py:528
+#: .\cookbook\views\views.py:570
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
 msgstr ""
 
+#~ msgid "Utensils"
+#~ msgstr "Utensilios"
+
+#~ msgid "Storage Data"
+#~ msgstr "Almacenamiento de Datos"
+
+#~ msgid "Storage Backends"
+#~ msgstr "Backends de Almacenamiento"
+
+#~ msgid "Configure Sync"
+#~ msgstr "Configurar Sincronización"
+
+#~ msgid "Discovered Recipes"
+#~ msgstr "Recetas Descubiertas"
+
+#~ msgid "Discovery Log"
+#~ msgstr "Registro de descubrimiento"
+
+#~ msgid "Units & Ingredients"
+#~ msgstr "Unidades e ingredientes"
+
+#~ msgid "New Book"
+#~ msgstr "Nuevo Libro"
+
+#~ msgid "Toggle Recipes"
+#~ msgstr "Alternar recetas"
+
+#~ msgid "There are no recipes in this book yet."
+#~ msgstr "Todavía no hay recetas en este libro."
+
+#~ msgid "Waiting Time"
+#~ msgstr "Tiempo de espera"
+
+#~ msgid "Servings Text"
+#~ msgstr "Texto de raciones"
+
+#~ msgid "Select Keywords"
+#~ msgstr "Seleccionar palabras clave"
+
+#~ msgid "Nutrition"
+#~ msgstr "Información Nutricional"
+
+#~ msgid "Delete Step"
+#~ msgstr "Eliminar paso"
+
+#~ msgid "Calories"
+#~ msgstr "Calorías"
+
+#~ msgid "Carbohydrates"
+#~ msgstr "Carbohidratos"
+
+#~ msgid "Fats"
+#~ msgstr "Grasas"
+
+#~ msgid "Proteins"
+#~ msgstr "Proteinas"
+
+#~ msgid "Step"
+#~ msgstr "Paso"
+
+#~ msgid "Show as header"
+#~ msgstr "Mostrar como encabezado"
+
+#~ msgid "Hide as header"
+#~ msgstr "Ocultar como encabezado"
+
+#~ msgid "Move Up"
+#~ msgstr "Mover Arriba"
+
+#~ msgid "Move Down"
+#~ msgstr "Mover Abajo"
+
+#~ msgid "Step Name"
+#~ msgstr "Nombre del paso"
+
+#~ msgid "Step Type"
+#~ msgstr "Tipo de paso"
+
+#~ msgid "Step time in Minutes"
+#~ msgstr "Tiempo de paso en minutos"
+
+#, fuzzy
+#~| msgid "Select one"
+#~ msgid "Select File"
+#~ msgstr "Seleccione uno"
+
+#, fuzzy
+#~| msgid "Delete Recipe"
+#~ msgid "Select Recipe"
+#~ msgstr "Eliminar receta"
+
+#~ msgid "Delete Ingredient"
+#~ msgstr "Eliminar ingrediente"
+
+#~ msgid "Make Header"
+#~ msgstr "Crear encabezado"
+
+#~ msgid "Make Ingredient"
+#~ msgstr "Crear ingrediente"
+
+#~ msgid "Disable Amount"
+#~ msgstr "Deshabilitar cantidad"
+
+#~ msgid "Enable Amount"
+#~ msgstr "Habilitar cantidad"
+
+#~ msgid "Copy Template Reference"
+#~ msgstr "Copiar Referencia de Plantilla"
+
+#~ msgid "Save & View"
+#~ msgstr "Guardar y ver"
+
+#~ msgid "Add Step"
+#~ msgstr "Agregar paso"
+
+#~ msgid "Add Nutrition"
+#~ msgstr "Añadir Información Nutricional"
+
+#~ msgid "Remove Nutrition"
+#~ msgstr "Eliminar Información Nutricional"
+
+#~ msgid "View Recipe"
+#~ msgstr "Ver la receta"
+
+#~ msgid "Delete Recipe"
+#~ msgstr "Eliminar receta"
+
+#~ msgid "Steps"
+#~ msgstr "Pasos"
+
 #, fuzzy
 #~| msgid "Password Reset"
 #~ msgid "Password Settings"
diff --git a/cookbook/locale/fr/LC_MESSAGES/django.po b/cookbook/locale/fr/LC_MESSAGES/django.po
index 11484eb4..1d972585 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+0200\n"
 "PO-Revision-Date: 2021-09-07 16:06+0000\n"
 "Last-Translator: Afaren <Afaren@outlook.com>\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"
@@ -25,15 +25,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.8\n"
 
-#: .\cookbook\filters.py:23 .\cookbook\templates\base.html:98
-#: .\cookbook\templates\forms\edit_internal_recipe.html:269
+#: .\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\views\lists.py:67
+#: .\cookbook\templates\url_import.html:270
 msgid "Ingredients"
 msgstr "Ingrédients"
 
-#: .\cookbook\forms.py:49
+#: .\cookbook\forms.py:50
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
@@ -41,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:51
+#: .\cookbook\forms.py:52
 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:53
+#: .\cookbook\forms.py:54
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
@@ -55,7 +54,7 @@ msgstr ""
 "Autorise l'usage des fractions dans les quantités des ingrédients (convertit "
 "les décimales en fractions automatiquement)"
 
-#: .\cookbook\forms.py:56
+#: .\cookbook\forms.py:57
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
@@ -63,21 +62,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:58
+#: .\cookbook\forms.py:59
 msgid "Show recently viewed recipes on search page."
 msgstr "Afficher les recettes récemment consultées sur la page de recherche."
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:60
 msgid "Number of decimals to round ingredients."
 msgstr "Nombre de décimales pour arrondir les ingrédients."
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:61
 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:62
+#: .\cookbook\forms.py:63
 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. "
@@ -91,11 +90,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:65
+#: .\cookbook\forms.py:66
 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:81
+#: .\cookbook\forms.py:82
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
@@ -103,42 +102,39 @@ msgstr ""
 "Les deux champs sont facultatifs. Si aucun n'est rempli, le nom "
 "d'utilisateur sera affiché à la place"
 
-#: .\cookbook\forms.py:102 .\cookbook\forms.py:331
-#: .\cookbook\templates\forms\edit_internal_recipe.html:49
+#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
 #: .\cookbook\templates\url_import.html:154
 msgid "Name"
 msgstr "Nom"
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:332
-#: .\cookbook\templates\base.html:108 .\cookbook\templates\base.html:169
-#: .\cookbook\templates\forms\edit_internal_recipe.html:85
+#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
 #: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573
+#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr "Mots-clés"
 
-#: .\cookbook\forms.py:104
+#: .\cookbook\forms.py:105
 msgid "Preparation time in minutes"
 msgstr "Le temps de préparation en minutes"
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:106
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "Temps d'attente (pose/cuisson) en minutes"
 
-#: .\cookbook\forms.py:106 .\cookbook\forms.py:333
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
 msgid "Path"
 msgstr "Chemin"
 
-#: .\cookbook\forms.py:107
+#: .\cookbook\forms.py:108
 msgid "Storage UID"
 msgstr "UID de stockage"
 
-#: .\cookbook\forms.py:133
+#: .\cookbook\forms.py:134
 msgid "Default"
 msgstr "Par défaut"
 
-#: .\cookbook\forms.py:144 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
@@ -146,54 +142,54 @@ msgstr ""
 "Pour éviter les doublons, les recettes de même nom seront ignorées. Cocher "
 "cette case pour tout importer."
 
-#: .\cookbook\forms.py:164
+#: .\cookbook\forms.py:165
 msgid "New Unit"
 msgstr "Nouvelle unité"
 
-#: .\cookbook\forms.py:165
+#: .\cookbook\forms.py:166
 msgid "New unit that other gets replaced by."
 msgstr "La nouvelle unité qui remplacera l'autre."
 
-#: .\cookbook\forms.py:170
+#: .\cookbook\forms.py:171
 msgid "Old Unit"
 msgstr "Ancienne unité"
 
-#: .\cookbook\forms.py:171
+#: .\cookbook\forms.py:172
 msgid "Unit that should be replaced."
 msgstr "L'unité qui doit être remplacée."
 
-#: .\cookbook\forms.py:187
+#: .\cookbook\forms.py:189
 msgid "New Food"
 msgstr "Nouvel aliment"
 
-#: .\cookbook\forms.py:188
+#: .\cookbook\forms.py:190
 msgid "New food that other gets replaced by."
 msgstr "Nouvel aliment qui remplace les autres."
 
-#: .\cookbook\forms.py:193
+#: .\cookbook\forms.py:195
 msgid "Old Food"
 msgstr "Ancien aliment"
 
-#: .\cookbook\forms.py:194
+#: .\cookbook\forms.py:196
 msgid "Food that should be replaced."
 msgstr "Aliment qui devrait être remplacé."
 
-#: .\cookbook\forms.py:212
+#: .\cookbook\forms.py:214
 msgid "Add your comment: "
 msgstr "Ajoutez votre commentaire : "
 
-#: .\cookbook\forms.py:253
+#: .\cookbook\forms.py:256
 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:260
+#: .\cookbook\forms.py:263
 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:269
+#: .\cookbook\forms.py:272
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
@@ -201,26 +197,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:307
+#: .\cookbook\forms.py:310
 msgid "Search String"
 msgstr "Texte recherché"
 
-#: .\cookbook\forms.py:334
+#: .\cookbook\forms.py:337
 msgid "File ID"
 msgstr "ID du fichier"
 
-#: .\cookbook\forms.py:370
+#: .\cookbook\forms.py:373
 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:383
+#: .\cookbook\forms.py:386
 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:384
-#: .\cookbook\templates\forms\edit_internal_recipe.html:427
+#: .\cookbook\forms.py:387
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
@@ -228,15 +223,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:409
+#: .\cookbook\forms.py:412
 msgid "Maximum number of users for this space reached."
 msgstr "Nombre maximum d'utilisateurs atteint pour ce groupe."
 
-#: .\cookbook\forms.py:415
+#: .\cookbook\forms.py:418
 msgid "Email address already taken!"
 msgstr "Adresse mail déjà utilisée !"
 
-#: .\cookbook\forms.py:423
+#: .\cookbook\forms.py:426
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
@@ -244,14 +239,90 @@ 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:438
+#: .\cookbook\forms.py:441
 msgid "Name already taken."
 msgstr "Nom déjà pris."
 
-#: .\cookbook\forms.py:449
+#: .\cookbook\forms.py:452
 msgid "Accept Terms and Privacy"
 msgstr "Accepter les conditions d'utilisation"
 
+#: .\cookbook\forms.py:487
+msgid ""
+"Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
+"full desciption of choices."
+msgstr ""
+
+#: .\cookbook\forms.py:488
+msgid ""
+"Use fuzzy matching on units, keywords and ingredients when editing and "
+"importing recipes."
+msgstr ""
+
+#: .\cookbook\forms.py:489
+msgid ""
+"Fields to search ignoring accents.  Selecting this option can improve or "
+"degrade search quality depending on language"
+msgstr ""
+
+#: .\cookbook\forms.py:490
+msgid ""
+"Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
+"'pie' and 'piece' and 'soapie')"
+msgstr ""
+
+#: .\cookbook\forms.py:491
+msgid ""
+"Fields to search for beginning of word matches. (e.g. searching for 'sa' "
+"will return 'salad' and 'sandwich')"
+msgstr ""
+
+#: .\cookbook\forms.py:492
+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
+msgid ""
+"Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
+"only function with fulltext fields."
+msgstr ""
+
+#: .\cookbook\forms.py:497
+#, fuzzy
+#| msgid "Search"
+msgid "Search Method"
+msgstr "Rechercher"
+
+#: .\cookbook\forms.py:498
+msgid "Fuzzy Lookups"
+msgstr ""
+
+#: .\cookbook\forms.py:499
+msgid "Ignore Accent"
+msgstr ""
+
+#: .\cookbook\forms.py:500
+msgid "Partial Match"
+msgstr ""
+
+#: .\cookbook\forms.py:501
+msgid "Starts Wtih"
+msgstr ""
+
+#: .\cookbook\forms.py:502
+#, fuzzy
+#| msgid "Search"
+msgid "Fuzzy Search"
+msgstr "Rechercher"
+
+#: .\cookbook\forms.py:503
+#, fuzzy
+#| msgid "Text"
+msgid "Full Text"
+msgstr "Texte"
+
 #: .\cookbook\helper\AllAuthCustomAdapter.py:36
 msgid ""
 "In order to prevent spam, the requested email was not send. Please wait a "
@@ -260,37 +331,37 @@ msgstr ""
 "Pour éviter les spam, l'email demandé n'a pas été envoyé. Attendez quelques "
 "minutes et réessayez."
 
-#: .\cookbook\helper\permission_helper.py:138
-#: .\cookbook\helper\permission_helper.py:161 .\cookbook\views\views.py:151
+#: .\cookbook\helper\permission_helper.py:136
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
 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 !"
 
-#: .\cookbook\helper\permission_helper.py:142
-#: .\cookbook\helper\permission_helper.py:148
-#: .\cookbook\helper\permission_helper.py:173
-#: .\cookbook\helper\permission_helper.py:218
-#: .\cookbook\helper\permission_helper.py:232
-#: .\cookbook\helper\permission_helper.py:243
-#: .\cookbook\helper\permission_helper.py:254 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:162 .\cookbook\views\views.py:169
-#: .\cookbook\views\views.py:259
+#: .\cookbook\helper\permission_helper.py:140
+#: .\cookbook\helper\permission_helper.py:146
+#: .\cookbook\helper\permission_helper.py:171
+#: .\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
 msgid "You do not have the required permissions to view this page!"
 msgstr "Vous n'avez pas les droits suffisants pour afficher cette page !"
 
-#: .\cookbook\helper\permission_helper.py:166
-#: .\cookbook\helper\permission_helper.py:189
-#: .\cookbook\helper\permission_helper.py:204
+#: .\cookbook\helper\permission_helper.py:164
+#: .\cookbook\helper\permission_helper.py:187
+#: .\cookbook\helper\permission_helper.py:202
 msgid "You cannot interact with this object as it is not owned by you!"
 msgstr ""
 "Vous ne pouvez pas interagir avec cet objet car il appartient à un autre "
 "utilisateur !"
 
-#: .\cookbook\helper\template_helper.py:60
-#: .\cookbook\helper\template_helper.py:62
+#: .\cookbook\helper\template_helper.py:61
+#: .\cookbook\helper\template_helper.py:63
 msgid "Could not parse template code."
 msgstr "Le code du modèle n'a pas pu être analysé."
 
-#: .\cookbook\integration\integration.py:104
+#: .\cookbook\integration\integration.py:119
 #: .\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
@@ -299,11 +370,11 @@ msgstr "Le code du modèle n'a pas pu être analysé."
 #: .\cookbook\templates\url_import.html:123
 #: .\cookbook\templates\url_import.html:317
 #: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
-#: .\cookbook\views\edit.py:199
+#: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr "Importer"
 
-#: .\cookbook\integration\integration.py:185
+#: .\cookbook\integration\integration.py:200
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
@@ -311,7 +382,7 @@ msgstr ""
 "Un fichier .zip était attendu à l'importation. Avez-vous choisi le bon "
 "format pour vos données ?"
 
-#: .\cookbook\integration\integration.py:188
+#: .\cookbook\integration\integration.py:203
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
@@ -319,11 +390,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:192
+#: .\cookbook\integration\integration.py:208
 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:196
+#: .\cookbook\integration\integration.py:212
 #, python-format
 msgid "Imported %s recipes."
 msgstr "%s recettes importées."
@@ -341,7 +412,6 @@ msgid "Source"
 msgstr "Source"
 
 #: .\cookbook\integration\safron.py:23
-#: .\cookbook\templates\forms\edit_internal_recipe.html:79
 #: .\cookbook\templates\include\log_cooking.html:16
 #: .\cookbook\templates\url_import.html:224
 #: .\cookbook\templates\url_import.html:455
@@ -353,7 +423,6 @@ msgid "Waiting time"
 msgstr "Temps d'attente"
 
 #: .\cookbook\integration\safron.py:27
-#: .\cookbook\templates\forms\edit_internal_recipe.html:73
 msgid "Preparation Time"
 msgstr "Temps de préparation"
 
@@ -367,6 +436,22 @@ msgstr "Livre de recettes"
 msgid "Section"
 msgstr "Rubrique"
 
+#: .\cookbook\management\commands\rebuildindex.py:14
+msgid "Rebuilds full text search index on Recipe"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:18
+msgid "Only Postgress databases use full text search, no index to rebuild"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:29
+msgid "Recipe index rebuild complete."
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:31
+msgid "Recipe index rebuild failed."
+msgstr ""
+
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:14
 msgid "Breakfast"
 msgstr "Petit-déjeuner"
@@ -383,7 +468,7 @@ msgstr "Dîner"
 msgid "Other"
 msgstr "Autre"
 
-#: .\cookbook\models.py:72
+#: .\cookbook\models.py:144
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
@@ -391,70 +476,83 @@ 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:123 .\cookbook\templates\search.html:7
+#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
 #: .\cookbook\templates\shopping_list.html:52
 msgid "Search"
 msgstr "Rechercher"
 
-#: .\cookbook\models.py:124 .\cookbook\templates\base.html:92
+#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
 #: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:233 .\cookbook\views\new.py:201
+#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
 msgid "Meal-Plan"
 msgstr "Menu de la semaine"
 
-#: .\cookbook\models.py:125 .\cookbook\templates\base.html:89
+#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr "Livres"
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Small"
 msgstr "Petit"
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Large"
 msgstr "Grand"
 
-#: .\cookbook\models.py:133 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:206 .\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:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:202
+#: .\cookbook\models.py:389
+msgid " is part of a recipe step and cannot be deleted"
+msgstr ""
+
+#: .\cookbook\models.py:429
 msgid "Text"
 msgstr "Texte"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:203
+#: .\cookbook\models.py:429
 msgid "Time"
 msgstr "Temps"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:204
-#: .\cookbook\templates\forms\edit_internal_recipe.html:219
+#: .\cookbook\models.py:429
 msgid "File"
 msgstr "Fichier"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:205
-#: .\cookbook\templates\forms\edit_internal_recipe.html:241
+#: .\cookbook\models.py:429
 #: .\cookbook\templates\include\recipe_open_modal.html:7
 #: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:273 .\cookbook\views\new.py:52
+#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr "Recette"
 
-#: .\cookbook\serializer.py:109
+#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+msgid "Simple"
+msgstr ""
+
+#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+msgid "Phrase"
+msgstr ""
+
+#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+msgid "Web"
+msgstr ""
+
+#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+msgid "Raw"
+msgstr ""
+
+#: .\cookbook\serializer.py:112
 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:117
+#: .\cookbook\serializer.py:125
 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\books.html:36
-#: .\cookbook\templates\generic\edit_template.html:6
+#: .\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
@@ -463,11 +561,10 @@ msgstr "Vous avez atteint votre limite de téléversement de fichiers."
 msgid "Edit"
 msgstr "Modifier"
 
-#: .\cookbook\tables.py:124 .\cookbook\tables.py:147
-#: .\cookbook\templates\books.html:38
+#: .\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\edit_template.html:27
+#: .\cookbook\templates\generic\edit_template.html:28
 #: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
@@ -497,7 +594,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:154 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -577,7 +674,7 @@ msgstr ""
 "l'utilisateur %(user_display)s."
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:21
+#: .\cookbook\templates\generic\delete_template.html:22
 msgid "Confirm"
 msgstr "Confirmer"
 
@@ -591,7 +688,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:189
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
 msgid "Login"
 msgstr "Connexion"
 
@@ -644,7 +741,7 @@ msgstr "Modifier le mot de passe"
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:52
+#: .\cookbook\templates\settings.html:64
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -731,101 +828,86 @@ 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:179
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr "Documentation API"
 
-#: .\cookbook\templates\base.html:85
-msgid "Utensils"
-msgstr "Ustensiles"
-
-#: .\cookbook\templates\base.html:95
+#: .\cookbook\templates\base.html:86
 msgid "Shopping"
 msgstr "Courses"
 
-#: .\cookbook\templates\base.html:101
+#: .\cookbook\templates\base.html:113
+msgid "Keyword"
+msgstr "Mot-clé"
+
+#: .\cookbook\templates\base.html:137
+#: .\cookbook\templates\forms\ingredients.html:24
+#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
+#: .\cookbook\views\lists.py:146
+msgid "Units"
+msgstr "Unités"
+
+#: .\cookbook\templates\base.html:151
 #: .\cookbook\templates\shopping_list.html:230
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr "Supermarché"
 
-#: .\cookbook\templates\base.html:112 .\cookbook\views\delete.py:84
-#: .\cookbook\views\edit.py:102 .\cookbook\views\lists.py:26
-#: .\cookbook\views\new.py:78
-msgid "Keyword"
-msgstr "Mot-clé"
-
-#: .\cookbook\templates\base.html:114
+#: .\cookbook\templates\base.html:163
 msgid "Batch Edit"
 msgstr "Modification en masse"
 
-#: .\cookbook\templates\base.html:119
-msgid "Storage Data"
-msgstr "Données de stockage"
-
-#: .\cookbook\templates\base.html:123
-msgid "Storage Backends"
-msgstr "Espaces de stockage"
-
-#: .\cookbook\templates\base.html:125
-msgid "Configure Sync"
-msgstr "Configurer synchro"
-
-#: .\cookbook\templates\base.html:127
-msgid "Discovered Recipes"
-msgstr "Recettes découvertes"
-
-#: .\cookbook\templates\base.html:129
-msgid "Discovery Log"
-msgstr "Historique des découvertes"
-
-#: .\cookbook\templates\base.html:131 .\cookbook\templates\stats.html:10
-msgid "Statistics"
-msgstr "Statistiques"
-
-#: .\cookbook\templates\base.html:133
-msgid "Units & Ingredients"
-msgstr "Unités et ingrédients"
-
-#: .\cookbook\templates\base.html:135 .\cookbook\templates\index.html:47
-msgid "Import Recipe"
-msgstr "Importer une recette"
-
-#: .\cookbook\templates\base.html:156 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr "Historique"
 
-#: .\cookbook\templates\base.html:159 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:191 .\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
+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:163 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr "Système"
 
-#: .\cookbook\templates\base.html:165 .\cookbook\templates\base.html:171
+#: .\cookbook\templates\base.html:214
 msgid "Admin"
 msgstr "Admin"
 
-#: .\cookbook\templates\base.html:175
+#: .\cookbook\templates\base.html:218
 msgid "Markdown Guide"
 msgstr "Guide Markdown"
 
-#: .\cookbook\templates\base.html:177
+#: .\cookbook\templates\base.html:220
 msgid "GitHub"
 msgstr "GitHub"
 
-#: .\cookbook\templates\base.html:181
+#: .\cookbook\templates\base.html:224
 msgid "API Browser"
 msgstr "Navigateur API"
 
-#: .\cookbook\templates\base.html:184
+#: .\cookbook\templates\base.html:227
 msgid "Log out"
 msgstr "Déconnexion"
 
+#: .\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 "Recettes externes"
+
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
 msgstr "Modifier en masse les catégories"
@@ -838,7 +920,7 @@ msgstr "Modifier en masse les recettes"
 msgid "Add the specified keywords to all recipes containing a word"
 msgstr "Ajouter les mots-clés spécifiés à toutes les recettes contenant un mot"
 
-#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:85
+#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:83
 msgid "Sync"
 msgstr "Synchro"
 
@@ -858,10 +940,28 @@ msgstr ""
 msgid "The path must be in the following format"
 msgstr "Le chemin doit être au format suivant"
 
-#: .\cookbook\templates\batch\monitor.html:27
+#: .\cookbook\templates\batch\monitor.html:21
+#, fuzzy
+#| msgid "Manage Email Settings"
+msgid "Manage External Storage"
+msgstr "Gérer les paramètres de mails"
+
+#: .\cookbook\templates\batch\monitor.html:28
 msgid "Sync Now!"
 msgstr "Lancer la synchro !"
 
+#: .\cookbook\templates\batch\monitor.html:29
+#, fuzzy
+#| msgid "Shopping Recipes"
+msgid "Show Recipes"
+msgstr "Recettes dans le panier"
+
+#: .\cookbook\templates\batch\monitor.html:30
+#, fuzzy
+#| msgid "Show Links"
+msgid "Show Log"
+msgstr "Afficher les liens"
+
 #: .\cookbook\templates\batch\waiting.html:4
 #: .\cookbook\templates\batch\waiting.html:10
 msgid "Importing Recipes"
@@ -875,32 +975,10 @@ msgstr ""
 "Cela peut prendre quelques minutes, selon le nombre de recettes à "
 "synchroniser. Veuillez patienter."
 
-#: .\cookbook\templates\books.html:5 .\cookbook\templates\books.html:11
+#: .\cookbook\templates\books.html:7
 msgid "Recipe Books"
 msgstr "Livres de recettes"
 
-#: .\cookbook\templates\books.html:15
-msgid "New Book"
-msgstr "Nouveau livre"
-
-#: .\cookbook\templates\books.html:27 .\cookbook\templates\recipe_view.html:26
-msgid "by"
-msgstr "par"
-
-#: .\cookbook\templates\books.html:34
-msgid "Toggle Recipes"
-msgstr "Afficher les recettes"
-
-#: .\cookbook\templates\books.html:54
-#: .\cookbook\templates\meal_plan_entry.html:48
-#: .\cookbook\templates\recipes_table.html:64
-msgid "Last cooked"
-msgstr "Cuisiné pour la dernière fois le"
-
-#: .\cookbook\templates\books.html:71
-msgid "There are no recipes in this book yet."
-msgstr "Il n'y a pas encore de recettes dans ce livre."
-
 #: .\cookbook\templates\export.html:6 .\cookbook\templates\test2.html:6
 msgid "Export Recipes"
 msgstr "Exporter des ecettes"
@@ -921,211 +999,21 @@ msgid "Import new Recipe"
 msgstr "Importer une nouvelle recette"
 
 #: .\cookbook\templates\forms\edit_import_recipe.html:14
-#: .\cookbook\templates\forms\edit_internal_recipe.html:439
-#: .\cookbook\templates\forms\edit_internal_recipe.html:471
 #: .\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:46 .\cookbook\templates\settings.html:87
-#: .\cookbook\templates\settings.html:105
+#: .\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
 msgid "Save"
 msgstr "Sauvegarder"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:7
-#: .\cookbook\templates\forms\edit_internal_recipe.html:34
 msgid "Edit Recipe"
 msgstr "Modifier une recette"
 
-#: .\cookbook\templates\forms\edit_internal_recipe.html:56
-#: .\cookbook\templates\url_import.html:171
-msgid "Description"
-msgstr "Description"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:76
-msgid "Waiting Time"
-msgstr "Temps d'attente"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:82
-msgid "Servings Text"
-msgstr "Service"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:93
-msgid "Select Keywords"
-msgstr "Sélectionner des mots-clés"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:94
-#: .\cookbook\templates\url_import.html:583
-msgid "Add Keyword"
-msgstr "Ajouter un mot-clé"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:112
-msgid "Nutrition"
-msgstr "Informations nutritionnelles"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:116
-#: .\cookbook\templates\forms\edit_internal_recipe.html:166
-msgid "Delete Step"
-msgstr "Supprimer l'étape"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:120
-msgid "Calories"
-msgstr "Calories"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:123
-msgid "Carbohydrates"
-msgstr "Glucides"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:126
-msgid "Fats"
-msgstr "Matières grasses"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:128
-msgid "Proteins"
-msgstr "Protéines"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:150
-#: .\cookbook\templates\forms\edit_internal_recipe.html:504
-msgid "Step"
-msgstr "Étape"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:171
-msgid "Show as header"
-msgstr "Afficher en entête"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:177
-msgid "Hide as header"
-msgstr "Masquer en entête"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:182
-msgid "Move Up"
-msgstr "Remonter"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:187
-msgid "Move Down"
-msgstr "Descendre"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:196
-msgid "Step Name"
-msgstr "Nom de l'étape"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:200
-msgid "Step Type"
-msgstr "Type de l'étape"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:213
-msgid "Step time in Minutes"
-msgstr "Durée de l'étape en minutes"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:229
-msgid "Select File"
-msgstr "Sélectionner un fichier"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:230
-#: .\cookbook\templates\forms\edit_internal_recipe.html:252
-#: .\cookbook\templates\forms\edit_internal_recipe.html:313
-#: .\cookbook\templates\forms\edit_internal_recipe.html:337
-#: .\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
-msgid "Select"
-msgstr "Sélectionner"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:251
-msgid "Select Recipe"
-msgstr "Sélectionner la recette"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:311
-#: .\cookbook\templates\shopping_list.html:187
-msgid "Select Unit"
-msgstr "Sélectionnez l'unité"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:312
-#: .\cookbook\templates\forms\edit_internal_recipe.html:336
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
-msgid "Create"
-msgstr "Créer"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:335
-#: .\cookbook\templates\shopping_list.html:209
-msgid "Select Food"
-msgstr "Sélectionnez l'aliment"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:352
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr "Notes"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:369
-msgid "Delete Ingredient"
-msgstr "Supprimer l'ingrédient"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:375
-msgid "Make Header"
-msgstr "Transformer en texte"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:381
-msgid "Make Ingredient"
-msgstr "Transformer en ingrédient"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:387
-msgid "Disable Amount"
-msgstr "Sans quantité"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:393
-msgid "Enable Amount"
-msgstr "Avec quantité"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:398
-msgid "Copy Template Reference"
-msgstr "Copier le modèle de référence"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:424
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
-msgid "Instructions"
-msgstr "Instructions"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:437
-#: .\cookbook\templates\forms\edit_internal_recipe.html:468
-msgid "Save & View"
-msgstr "Sauvegarder et afficher"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:441
-#: .\cookbook\templates\forms\edit_internal_recipe.html:474
-msgid "Add Step"
-msgstr "Ajouter une étape"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:444
-#: .\cookbook\templates\forms\edit_internal_recipe.html:478
-msgid "Add Nutrition"
-msgstr "Ajouter les informations nutritionnelles"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:446
-#: .\cookbook\templates\forms\edit_internal_recipe.html:480
-msgid "Remove Nutrition"
-msgstr "Supprimer les informations nutritionnelles"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:448
-#: .\cookbook\templates\forms\edit_internal_recipe.html:483
-msgid "View Recipe"
-msgstr "Afficher la recette"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:450
-#: .\cookbook\templates\forms\edit_internal_recipe.html:485
-msgid "Delete Recipe"
-msgstr "Supprimer la recette"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:491
-msgid "Steps"
-msgstr "Étapes"
-
 #: .\cookbook\templates\forms\ingredients.html:15
 msgid "Edit Ingredients"
 msgstr "Modifier les ingrédients"
@@ -1147,11 +1035,6 @@ msgstr ""
 "utilisant.\n"
 "    "
 
-#: .\cookbook\templates\forms\ingredients.html:24
-#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
-msgid "Units"
-msgstr "Unités"
-
 #: .\cookbook\templates\forms\ingredients.html:26
 msgid "Are you sure that you want to merge these two units?"
 msgstr "Êtes-vous sûr(e) de vouloir fusionner ces deux unités ?"
@@ -1165,29 +1048,33 @@ 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:18
+#: .\cookbook\templates\generic\delete_template.html:19
 #, 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\edit_template.html:30
+#: .\cookbook\templates\generic\delete_template.html:23
+msgid "Cancel"
+msgstr ""
+
+#: .\cookbook\templates\generic\edit_template.html:32
 msgid "View"
 msgstr "Voir"
 
-#: .\cookbook\templates\generic\edit_template.html:34
+#: .\cookbook\templates\generic\edit_template.html:36
 msgid "Delete original file"
 msgstr "Supprimer le fichier original"
 
 #: .\cookbook\templates\generic\list_template.html:6
-#: .\cookbook\templates\generic\list_template.html:12
+#: .\cookbook\templates\generic\list_template.html:21
 msgid "List"
 msgstr "Liste"
 
-#: .\cookbook\templates\generic\list_template.html:25
+#: .\cookbook\templates\generic\list_template.html:34
 msgid "Filter"
 msgstr "Filtre"
 
-#: .\cookbook\templates\generic\list_template.html:30
+#: .\cookbook\templates\generic\list_template.html:39
 msgid "Import all"
 msgstr "Tout importer"
 
@@ -1529,6 +1416,11 @@ msgstr "Afficher l'aide"
 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"
@@ -1613,6 +1505,11 @@ msgstr ""
 msgid "Meal Plan View"
 msgstr "Vue des menus"
 
+#: .\cookbook\templates\meal_plan_entry.html:48
+#: .\cookbook\templates\recipes_table.html:64
+msgid "Last cooked"
+msgstr "Cuisiné pour la dernière fois le"
+
 #: .\cookbook\templates\meal_plan_entry.html:50
 msgid "Never cooked before."
 msgstr "Pas encore cuisiné."
@@ -1721,8 +1618,12 @@ msgstr ""
 msgid "Comments"
 msgstr "Commentaires"
 
+#: .\cookbook\templates\recipe_view.html:26
+msgid "by"
+msgstr "par"
+
 #: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
-#: .\cookbook\views\edit.py:179
+#: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr "Commentaire"
 
@@ -1754,48 +1655,219 @@ msgstr "Marquer comme cuisiné"
 msgid "Recipe Home"
 msgstr "Page d'accueil"
 
-#: .\cookbook\templates\settings.html:25
+#: .\cookbook\templates\search_info.html:5
+#: .\cookbook\templates\search_info.html:9
+#: .\cookbook\templates\settings.html:157
+#, fuzzy
+#| msgid "Search String"
+msgid "Search Settings"
+msgstr "Texte recherché"
+
+#: .\cookbook\templates\search_info.html:10
+msgid ""
+"\n"
+"        Creating the best search experience is complicated and weighs "
+"heavily on your personal configuration.  \n"
+"        Changing any of the search settings can have significant impact on "
+"the speed and quality of the results.\n"
+"        Search Methods, Trigrams and Full Text Search configurations are "
+"only available if you are using Postgres for your database.\n"
+"    "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:19
+#, fuzzy
+#| msgid "Search"
+msgid "Search Methods"
+msgstr "Rechercher"
+
+#: .\cookbook\templates\search_info.html:23
+msgid ""
+" \n"
+"            Full text searches attempt to normalize the words provided to "
+"match common variants.  For example: 'forked', 'forking', 'forks' will all "
+"normalize to 'fork'.\n"
+"            There are several methods available, described below, that will "
+"control how the search behavior should react when multiple words are "
+"searched.\n"
+"            Full technical details on how these operate can be viewed on <a "
+"href=https://www.postgresql.org/docs/current/textsearch-controls."
+"html#TEXTSEARCH-PARSING-QUERIES>Postgresql's website.</a>\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:29
+msgid ""
+" \n"
+"            Simple searches ignore punctuation and common words such as "
+"'the', 'a', 'and'. And will treat seperate words as required.\n"
+"            Searching for 'apple or flour' will return any recipe that "
+"includes both 'apple' and 'flour' anywhere in the fields that have been "
+"selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:34
+msgid ""
+" \n"
+"            Phrase searches ignore punctuation, but will search for all of "
+"the words in the exact order provided.\n"
+"            Searching for 'apple or flour' will only return a recipe that "
+"includes the exact phrase 'apple or flour' in any of the fields that have "
+"been selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:39
+msgid ""
+" \n"
+"            Web searches simulate functionality found on many web search "
+"sites supporting special syntax.\n"
+"            Placing quotes around several words will convert those words "
+"into a phrase.\n"
+"            'or' is recongized as searching for the word (or phrase) "
+"immediately before 'or' OR the word (or phrase) directly after.\n"
+"            '-' is recognized as searching for recipes that do not include "
+"the word (or phrase) that comes immediately after. \n"
+"            For example searching for 'apple pie' or cherry -butter will "
+"return any recipe that includes the phrase 'apple pie' or the word "
+"'cherry' \n"
+"            in any field included in the full text search but exclude any "
+"recipe that has the word 'butter' in any field included.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:48
+msgid ""
+" \n"
+"            Raw search is similar to Web except will take puncuation "
+"operators such as '|', '&' and '()'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:59
+msgid ""
+" \n"
+"            Another approach to searching that also requires Postgresql is "
+"fuzzy search or trigram similarity. A trigram is a group of three "
+"consecutive characters.\n"
+"            For example searching for 'apple' will create x trigrams 'app', "
+"'ppl', 'ple' and will create a score of how closely words match the "
+"generated trigrams.\n"
+"            One benefit of searching trigams is that a search for 'sandwich' "
+"will find mispelled words such as 'sandwhich' that would be missed by other "
+"methods.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:69
+#, fuzzy
+#| msgid "Search Recipe"
+msgid "Search Fields"
+msgstr "Rechercher une recette"
+
+#: .\cookbook\templates\search_info.html:73
+msgid ""
+" \n"
+"            Unaccent is a special case in that it enables searching a field "
+"'unaccented' for each search style attempting to ignore accented values. \n"
+"            For example when you enable unaccent for 'Name' any search "
+"(starts with, contains, trigram) will attempt the search ignoring accented "
+"characters.\n"
+"            \n"
+"            For the other options, you can enable search on any or all "
+"fields and they will be combined together with an assumed 'OR'.\n"
+"            For example enabling 'Name' for Starts With, 'Name' and "
+"'Description' for Partial Match and 'Ingredients' and 'Keywords' for Full "
+"Search\n"
+"            and searching for 'apple' will generate a search that will "
+"return recipes that have:\n"
+"            - A recipe name that starts with 'apple'\n"
+"            - OR a recipe name that contains 'apple'\n"
+"            - OR a recipe description that contains 'apple'\n"
+"            - OR a recipe that will have a full text search match ('apple' "
+"or 'apples') in ingredients\n"
+"            - OR a recipe that will have a full text search match in "
+"Keywords\n"
+"\n"
+"            Combining too many fields in too many types of search can have a "
+"negative impact on performance, create duplicate results or return "
+"unexpected results.\n"
+"            For example, enabling fuzzy search or partial matches will "
+"interfere with web search methods.  \n"
+"            Searching for 'apple -pie' with fuzzy search and full text "
+"search will return the recipe Apple Pie.  Though it is not included in the "
+"full text results, it does match the trigram results.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:95
+#, fuzzy
+#| msgid "Search"
+msgid "Search Index"
+msgstr "Rechercher"
+
+#: .\cookbook\templates\search_info.html:99
+msgid ""
+" \n"
+"            Trigram search and Full Text Search both rely on database "
+"indexes to perform effectively.  \n"
+"            You can rebuild the indexes on all fields in the Admin page for "
+"Recipes and selecting all recipes and running 'rebuild index for selected "
+"recipes'\n"
+"            You can also rebuild indexes at the command line by executing "
+"the management command 'python manage.py rebuildindex'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\settings.html:27
 msgid "Account"
 msgstr "Compte"
 
-#: .\cookbook\templates\settings.html:29
+#: .\cookbook\templates\settings.html:33
 msgid "Preferences"
 msgstr "Préférences"
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:39
 msgid "API-Settings"
 msgstr "Paramètres d'API"
 
-#: .\cookbook\templates\settings.html:41
+#: .\cookbook\templates\settings.html:45
+#, fuzzy
+#| msgid "Search String"
+msgid "Search-Settings"
+msgstr "Texte recherché"
+
+#: .\cookbook\templates\settings.html:53
 msgid "Name Settings"
 msgstr "Paramètres de noms"
 
-#: .\cookbook\templates\settings.html:49
+#: .\cookbook\templates\settings.html:61
 msgid "Account Settings"
 msgstr "Paramètres de compte"
 
-#: .\cookbook\templates\settings.html:51
+#: .\cookbook\templates\settings.html:63
 msgid "Emails"
 msgstr "Adresses mail"
 
-#: .\cookbook\templates\settings.html:54
+#: .\cookbook\templates\settings.html:66
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr "Réseaux sociaux"
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:78
 msgid "Language"
 msgstr "Langue"
 
-#: .\cookbook\templates\settings.html:96
+#: .\cookbook\templates\settings.html:108
 msgid "Style"
 msgstr "Style"
 
-#: .\cookbook\templates\settings.html:116
+#: .\cookbook\templates\settings.html:128
 msgid "API Token"
 msgstr "Jeton API"
 
-#: .\cookbook\templates\settings.html:117
+#: .\cookbook\templates\settings.html:129
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
@@ -1803,7 +1875,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:134
+#: .\cookbook\templates\settings.html:146
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
@@ -1811,7 +1883,7 @@ 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:136
+#: .\cookbook\templates\settings.html:148
 msgid "or"
 msgstr "ou"
 
@@ -1854,6 +1926,23 @@ msgstr "Ajouter une entrée"
 msgid "Amount"
 msgstr "Quantité"
 
+#: .\cookbook\templates\shopping_list.html:187
+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
+msgid "Select"
+msgstr "Sélectionner"
+
+#: .\cookbook\templates\shopping_list.html:209
+msgid "Select Food"
+msgstr "Sélectionnez l'aliment"
+
 #: .\cookbook\templates\shopping_list.html:240
 msgid "Select Supermarket"
 msgstr "Sélectionner un supermarché"
@@ -1958,10 +2047,6 @@ msgstr "Stats d'objets"
 msgid "Recipes without Keywords"
 msgstr "Recettes sans mots-clés"
 
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr "Recettes externes"
-
 #: .\cookbook\templates\space.html:60 .\cookbook\templates\stats.html:45
 msgid "Internal Recipes"
 msgstr "Recettes internes"
@@ -2011,7 +2096,7 @@ msgid "There are no members in your space yet!"
 msgstr "Il n'y a pas encore de membres dans votre groupe !"
 
 #: .\cookbook\templates\space.html:130 .\cookbook\templates\system.html:21
-#: .\cookbook\views\lists.py:115
+#: .\cookbook\views\lists.py:100
 msgid "Invite Links"
 msgstr "Liens d'invitation"
 
@@ -2019,6 +2104,10 @@ msgstr "Liens d'invitation"
 msgid "Stats"
 msgstr "Stats"
 
+#: .\cookbook\templates\stats.html:10
+msgid "Statistics"
+msgstr "Statistiques"
+
 #: .\cookbook\templates\system.html:22
 msgid "Show Links"
 msgstr "Afficher les liens"
@@ -2196,6 +2285,10 @@ msgstr "Effacer le contenu"
 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
+msgid "Description"
+msgstr "Description"
+
 #: .\cookbook\templates\url_import.html:175
 msgid "Text dragged here will be appended to the description."
 msgstr "Le texte glissé ici sera ajouté à la description."
@@ -2220,6 +2313,11 @@ msgstr "Temps de cuisson"
 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
+msgid "Instructions"
+msgstr "Instructions"
+
 #: .\cookbook\templates\url_import.html:302
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
@@ -2273,6 +2371,10 @@ msgstr "Description de la recette"
 msgid "Select one"
 msgstr "Faites votre choix"
 
+#: .\cookbook\templates\url_import.html:583
+msgid "Add Keyword"
+msgstr "Ajouter un mot-clé"
+
 #: .\cookbook\templates\url_import.html:596
 msgid "All Keywords"
 msgstr "Tous les mots-clés"
@@ -2314,35 +2416,94 @@ msgstr "Ticket GitHub"
 msgid "Recipe Markup Specification"
 msgstr "Spécification Recipe Markup"
 
-#: .\cookbook\views\api.py:79
+#: .\cookbook\views\api.py:82 .\cookbook\views\api.py:131
 msgid "Parameter updated_at incorrectly formatted"
 msgstr "Le paramètre « update_at » n'est pas correctement formatté"
 
-#: .\cookbook\views\api.py:580 .\cookbook\views\views.py:303
+#: .\cookbook\views\api.py:151
+#, python-brace-format
+msgid "No {self.basename} with id {pk} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
+#: .\cookbook\views\edit.py:316
+msgid "Cannot merge with the same object!"
+msgstr "Un objet ne peut être fusionné avec lui-même !"
+
+#: .\cookbook\views\api.py:162
+#, python-brace-format
+msgid "No {self.basename} with id {target} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:167
+#, fuzzy
+#| msgid "Cannot merge with the same object!"
+msgid "Cannot merge with child object!"
+msgstr "Un objet ne peut être fusionné avec lui-même !"
+
+#: .\cookbook\views\api.py:195
+#, python-brace-format
+msgid "{source.name} was merged successfully with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:199
+#, python-brace-format
+msgid "An error occurred attempting to merge {source.name} with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:239
+#, python-brace-format
+msgid "No {self.basename} with id {child} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:248
+#, python-brace-format
+msgid "{child.name} was moved successfully to the root."
+msgstr ""
+
+#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+msgid "An error occurred attempting to move "
+msgstr ""
+
+#: .\cookbook\views\api.py:254
+msgid "Cannot move an object to itself!"
+msgstr ""
+
+#: .\cookbook\views\api.py:260
+#, python-brace-format
+msgid "No {self.basename} with id {parent} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:266
+#, python-brace-format
+msgid "{child.name} was moved successfully to parent {parent.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
 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:603
+#: .\cookbook\views\api.py:727
 msgid "Sync successful!"
 msgstr "Synchro réussie !"
 
-#: .\cookbook\views\api.py:608
+#: .\cookbook\views\api.py:732
 msgid "Error synchronizing with Storage"
 msgstr "Erreur lors de la synchronisation avec le stockage"
 
-#: .\cookbook\views\api.py:686
+#: .\cookbook\views\api.py:810
 msgid "Nothing to do."
 msgstr "Rien à faire."
 
-#: .\cookbook\views\api.py:701
+#: .\cookbook\views\api.py:825
 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:708
+#: .\cookbook\views\api.py:832
 msgid "The requested page could not be found."
 msgstr "La page souhaitée n'a pas été trouvée."
 
-#: .\cookbook\views\api.py:717
+#: .\cookbook\views\api.py:841
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
@@ -2350,11 +2511,11 @@ msgstr ""
 "Le site web est dans un format qui ne permet pas d'importer automatiquement "
 "la recette."
 
-#: .\cookbook\views\api.py:731
+#: .\cookbook\views\api.py:855
 msgid "No useable data could be found."
 msgstr "Aucune information utilisable n'a été trouvée."
 
-#: .\cookbook\views\api.py:747
+#: .\cookbook\views\api.py:871
 msgid "I couldn't find anything to do."
 msgstr "Je n'ai rien trouvé à faire."
 
@@ -2383,8 +2544,8 @@ msgstr[1] ""
 msgid "Monitor"
 msgstr "Surveiller"
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:102
-#: .\cookbook\views\new.py:98
+#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr "Espace de stockage"
 
@@ -2395,8 +2556,8 @@ 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:213
-#: .\cookbook\views\new.py:156
+#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
+#: .\cookbook\views\new.py:155
 msgid "Recipe Book"
 msgstr "Livre de recettes"
 
@@ -2404,48 +2565,40 @@ msgstr "Livre de recettes"
 msgid "Bookmarks"
 msgstr "Favoris"
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:252
+#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
 msgid "Invite Link"
 msgstr "Lien d'invitation"
 
-#: .\cookbook\views\edit.py:119
-msgid "Food"
-msgstr "Aliment"
-
-#: .\cookbook\views\edit.py:128
+#: .\cookbook\views\edit.py:126
 msgid "You cannot edit this storage!"
 msgstr "Vous ne pouvez pas modifier ce stockage !"
 
-#: .\cookbook\views\edit.py:148
+#: .\cookbook\views\edit.py:146
 msgid "Storage saved!"
 msgstr "Stockage sauvegardé !"
 
-#: .\cookbook\views\edit.py:154
+#: .\cookbook\views\edit.py:152
 msgid "There was an error updating this storage backend!"
 msgstr ""
 "Une erreur s'est produite lors de la mise à jour de cet espace de stockage !"
 
-#: .\cookbook\views\edit.py:165
+#: .\cookbook\views\edit.py:163
 msgid "Storage"
 msgstr "Stockage"
 
-#: .\cookbook\views\edit.py:261
+#: .\cookbook\views\edit.py:259
 msgid "Changes saved!"
 msgstr "Modifications sauvegardées !"
 
-#: .\cookbook\views\edit.py:265
+#: .\cookbook\views\edit.py:263
 msgid "Error saving changes!"
 msgstr "Erreur lors de la sauvegarde des modifications !"
 
-#: .\cookbook\views\edit.py:299
+#: .\cookbook\views\edit.py:298
 msgid "Units merged!"
 msgstr "Unités fusionnées !"
 
-#: .\cookbook\views\edit.py:301 .\cookbook\views\edit.py:317
-msgid "Cannot merge with the same object!"
-msgstr "Un objet ne peut être fusionné avec lui-même !"
-
-#: .\cookbook\views\edit.py:315
+#: .\cookbook\views\edit.py:314
 msgid "Foods merged!"
 msgstr "Aliments fusionnés !"
 
@@ -2457,69 +2610,87 @@ msgstr "L'importation n'est pas implémentée pour ce fournisseur"
 msgid "Exporting is not implemented for this provider"
 msgstr "L'exportation n'est pas implémentée pour ce fournisseur"
 
-#: .\cookbook\views\lists.py:40
+#: .\cookbook\views\lists.py:26
 msgid "Import Log"
 msgstr "Historique d'import"
 
-#: .\cookbook\views\lists.py:53
+#: .\cookbook\views\lists.py:39
 msgid "Discovery"
 msgstr "Découverte"
 
-#: .\cookbook\views\lists.py:85
+#: .\cookbook\views\lists.py:69
 msgid "Shopping Lists"
 msgstr "Listes de course"
 
-#: .\cookbook\views\new.py:123
+#: .\cookbook\views\lists.py:129
+#, fuzzy
+#| msgid "Food"
+msgid "Foods"
+msgstr "Aliment"
+
+#: .\cookbook\views\lists.py:163
+#, fuzzy
+#| msgid "Supermarket"
+msgid "Supermarkets"
+msgstr "Supermarché"
+
+#: .\cookbook\views\lists.py:179
+#, fuzzy
+#| msgid "Shopping Recipes"
+msgid "Shopping Categories"
+msgstr "Recettes dans le panier"
+
+#: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr "Nouvelle recette importée !"
 
-#: .\cookbook\views\new.py:126
+#: .\cookbook\views\new.py:125
 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:226
+#: .\cookbook\views\new.py:225
 msgid "Hello"
 msgstr "Bonjour"
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "You have been invited by "
 msgstr "Vous avez été invité par "
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:226
 msgid " to join their Tandoor Recipes space "
 msgstr " pour rejoindre leur groupe Tandoor Recipes "
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:227
 msgid "Click the following link to activate your account: "
 msgstr "Cliquez le lien suivant pour activer votre compte : "
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:228
 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:230
+#: .\cookbook\views\new.py:229
 msgid "The invitation is valid until "
 msgstr "L'invitation est valide jusqu'au "
 
-#: .\cookbook\views\new.py:231
+#: .\cookbook\views\new.py:230
 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:234
+#: .\cookbook\views\new.py:233
 msgid "Tandoor Recipes Invite"
 msgstr "Invitation Tandoor Recipes"
 
-#: .\cookbook\views\new.py:241
+#: .\cookbook\views\new.py:240
 msgid "Invite link successfully send to user."
 msgstr "Le lien d'invitation a été correctement envoyé à l'utilisateur."
 
-#: .\cookbook\views\new.py:244
+#: .\cookbook\views\new.py:243
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
@@ -2527,13 +2698,13 @@ msgstr ""
 "Vous avez envoyé trop de mails, partagez le lien manuellement ou attendez "
 "quelques heures."
 
-#: .\cookbook\views\new.py:246
+#: .\cookbook\views\new.py:245
 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:129
+#: .\cookbook\views\views.py:128
 msgid ""
 "You have successfully created your own recipe space. Start by adding some "
 "recipes or invite other people to join you."
@@ -2542,15 +2713,29 @@ msgstr ""
 "Commencez à ajoutez des recettes ou invitez d'autres personnes à vous "
 "rejoindre."
 
-#: .\cookbook\views\views.py:177
+#: .\cookbook\views\views.py:176
 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:188
+#: .\cookbook\views\views.py:187
 msgid "Comment saved!"
 msgstr "Commentaire enregistré !"
 
-#: .\cookbook\views\views.py:395
+#: .\cookbook\views\views.py:351
+msgid "You must select at least one field to search!"
+msgstr ""
+
+#: .\cookbook\views\views.py:354
+msgid ""
+"To use this search method you must select at least one full text search "
+"field!"
+msgstr ""
+
+#: .\cookbook\views\views.py:357
+msgid "Fuzzy search is not compatible with this search method!"
+msgstr ""
+
+#: .\cookbook\views\views.py:437
 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 "
@@ -2561,32 +2746,32 @@ msgstr ""
 "utilisateur, counsultez la documentation Django pour savoir comment "
 "réinitialiser le mot de passe."
 
-#: .\cookbook\views\views.py:402
+#: .\cookbook\views\views.py:444
 msgid "Passwords dont match!"
 msgstr "Les mots de passe ne correspondent pas !"
 
-#: .\cookbook\views\views.py:418
+#: .\cookbook\views\views.py:460
 msgid "User has been created, please login!"
 msgstr "L'utilisateur a été créé, veuillez vous connecter !"
 
-#: .\cookbook\views\views.py:434
+#: .\cookbook\views\views.py:476
 msgid "Malformed Invite Link supplied!"
 msgstr "Le lien d'invitation fourni est mal formé !"
 
-#: .\cookbook\views\views.py:441
+#: .\cookbook\views\views.py:483
 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:452
+#: .\cookbook\views\views.py:494
 msgid "Successfully joined space."
 msgstr "Vous avez bien rejoint le groupe."
 
-#: .\cookbook\views\views.py:458
+#: .\cookbook\views\views.py:500
 msgid "Invite Link not valid or already used!"
 msgstr "Le lien d'invitation est invalide ou déjà utilisé !"
 
-#: .\cookbook\views\views.py:522
+#: .\cookbook\views\views.py:564
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
@@ -2594,7 +2779,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:528
+#: .\cookbook\views\views.py:570
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
@@ -2602,15 +2787,138 @@ msgstr ""
 "Les liens partagés de recettes ont été désactivés ! Pour plus "
 "d'informations, veuillez contacter l'administrateur de la page."
 
+#~ msgid "Utensils"
+#~ msgstr "Ustensiles"
+
+#~ msgid "Storage Data"
+#~ msgstr "Données de stockage"
+
+#~ msgid "Storage Backends"
+#~ msgstr "Espaces de stockage"
+
+#~ msgid "Configure Sync"
+#~ msgstr "Configurer synchro"
+
+#~ msgid "Discovered Recipes"
+#~ msgstr "Recettes découvertes"
+
+#~ msgid "Discovery Log"
+#~ msgstr "Historique des découvertes"
+
+#~ msgid "Units & Ingredients"
+#~ msgstr "Unités et ingrédients"
+
+#~ msgid "New Book"
+#~ msgstr "Nouveau livre"
+
+#~ msgid "Toggle Recipes"
+#~ msgstr "Afficher les recettes"
+
+#~ msgid "There are no recipes in this book yet."
+#~ msgstr "Il n'y a pas encore de recettes dans ce livre."
+
+#~ msgid "Waiting Time"
+#~ msgstr "Temps d'attente"
+
+#~ msgid "Servings Text"
+#~ msgstr "Service"
+
+#~ msgid "Select Keywords"
+#~ msgstr "Sélectionner des mots-clés"
+
+#~ msgid "Nutrition"
+#~ msgstr "Informations nutritionnelles"
+
+#~ msgid "Delete Step"
+#~ msgstr "Supprimer l'étape"
+
+#~ msgid "Calories"
+#~ msgstr "Calories"
+
+#~ msgid "Carbohydrates"
+#~ msgstr "Glucides"
+
+#~ msgid "Fats"
+#~ msgstr "Matières grasses"
+
+#~ msgid "Proteins"
+#~ msgstr "Protéines"
+
+#~ msgid "Step"
+#~ msgstr "Étape"
+
+#~ msgid "Show as header"
+#~ msgstr "Afficher en entête"
+
+#~ msgid "Hide as header"
+#~ msgstr "Masquer en entête"
+
+#~ msgid "Move Up"
+#~ msgstr "Remonter"
+
+#~ msgid "Move Down"
+#~ msgstr "Descendre"
+
+#~ msgid "Step Name"
+#~ msgstr "Nom de l'étape"
+
+#~ msgid "Step Type"
+#~ msgstr "Type de l'étape"
+
+#~ msgid "Step time in Minutes"
+#~ msgstr "Durée de l'étape en minutes"
+
+#~ msgid "Select File"
+#~ msgstr "Sélectionner un fichier"
+
+#~ msgid "Select Recipe"
+#~ msgstr "Sélectionner la recette"
+
+#~ msgid "Delete Ingredient"
+#~ msgstr "Supprimer l'ingrédient"
+
+#~ msgid "Make Header"
+#~ msgstr "Transformer en texte"
+
+#~ msgid "Make Ingredient"
+#~ msgstr "Transformer en ingrédient"
+
+#~ msgid "Disable Amount"
+#~ msgstr "Sans quantité"
+
+#~ msgid "Enable Amount"
+#~ msgstr "Avec quantité"
+
+#~ msgid "Copy Template Reference"
+#~ msgstr "Copier le modèle de référence"
+
+#~ msgid "Save & View"
+#~ msgstr "Sauvegarder et afficher"
+
+#~ msgid "Add Step"
+#~ msgstr "Ajouter une étape"
+
+#~ msgid "Add Nutrition"
+#~ msgstr "Ajouter les informations nutritionnelles"
+
+#~ msgid "Remove Nutrition"
+#~ msgstr "Supprimer les informations nutritionnelles"
+
+#~ msgid "View Recipe"
+#~ msgstr "Afficher la recette"
+
+#~ msgid "Delete Recipe"
+#~ msgstr "Supprimer la recette"
+
+#~ msgid "Steps"
+#~ msgstr "Étapes"
+
 #~ msgid "Password Settings"
 #~ msgstr "Paramètres de mots de passe"
 
 #~ msgid "Email Settings"
 #~ msgstr "Paramètres d'email"
 
-#~ msgid "Manage Email Settings"
-#~ msgstr "Gérer les paramètres de mails"
-
 #~ msgid "Manage Social Accounts"
 #~ msgstr "Gérer les comptes de réseaux sociaux"
 
diff --git a/cookbook/locale/hu_HU/LC_MESSAGES/django.po b/cookbook/locale/hu_HU/LC_MESSAGES/django.po
index 93f38cb1..37bec8ad 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+0200\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/"
@@ -22,15 +22,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\cookbook\filters.py:23 .\cookbook\templates\base.html:98
-#: .\cookbook\templates\forms\edit_internal_recipe.html:269
+#: .\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\views\lists.py:67
+#: .\cookbook\templates\url_import.html:270
 msgid "Ingredients"
 msgstr "Hozzávalók"
 
-#: .\cookbook\forms.py:49
+#: .\cookbook\forms.py:50
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
@@ -38,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:51
+#: .\cookbook\forms.py:52
 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:53
+#: .\cookbook\forms.py:54
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
@@ -51,25 +50,25 @@ 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:56
+#: .\cookbook\forms.py:57
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
 msgstr ""
 
-#: .\cookbook\forms.py:58
+#: .\cookbook\forms.py:59
 msgid "Show recently viewed recipes on search page."
 msgstr ""
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:60
 msgid "Number of decimals to round ingredients."
 msgstr ""
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:61
 msgid "If you want to be able to create and see comments underneath recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:62
+#: .\cookbook\forms.py:63
 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. "
@@ -77,187 +76,255 @@ msgid ""
 "mobile data. If lower than instance limit it is reset when saving."
 msgstr ""
 
-#: .\cookbook\forms.py:65
+#: .\cookbook\forms.py:66
 msgid "Makes the navbar stick to the top of the page."
 msgstr ""
 
-#: .\cookbook\forms.py:81
+#: .\cookbook\forms.py:82
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
 msgstr ""
 
-#: .\cookbook\forms.py:102 .\cookbook\forms.py:331
-#: .\cookbook\templates\forms\edit_internal_recipe.html:49
+#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
 #: .\cookbook\templates\url_import.html:154
 msgid "Name"
 msgstr "Név"
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:332
-#: .\cookbook\templates\base.html:108 .\cookbook\templates\base.html:169
-#: .\cookbook\templates\forms\edit_internal_recipe.html:85
+#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
 #: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573
+#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr "Kulcsszavak"
 
-#: .\cookbook\forms.py:104
+#: .\cookbook\forms.py:105
 msgid "Preparation time in minutes"
 msgstr "Előkészítési idő percben"
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:106
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "Várakozási idő (sütés/főzés) percben"
 
-#: .\cookbook\forms.py:106 .\cookbook\forms.py:333
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
 msgid "Path"
 msgstr "Elérési útvonal"
 
-#: .\cookbook\forms.py:107
+#: .\cookbook\forms.py:108
 msgid "Storage UID"
 msgstr "Tárhely UID"
 
-#: .\cookbook\forms.py:133
+#: .\cookbook\forms.py:134
 msgid "Default"
 msgstr ""
 
-#: .\cookbook\forms.py:144 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
 
-#: .\cookbook\forms.py:164
+#: .\cookbook\forms.py:165
 msgid "New Unit"
 msgstr "Új Mértékegység"
 
-#: .\cookbook\forms.py:165
+#: .\cookbook\forms.py:166
 msgid "New unit that other gets replaced by."
 msgstr ""
 
-#: .\cookbook\forms.py:170
+#: .\cookbook\forms.py:171
 msgid "Old Unit"
 msgstr "Régi Mértékegység"
 
-#: .\cookbook\forms.py:171
+#: .\cookbook\forms.py:172
 msgid "Unit that should be replaced."
 msgstr ""
 
-#: .\cookbook\forms.py:187
+#: .\cookbook\forms.py:189
 msgid "New Food"
 msgstr "Új Étel"
 
-#: .\cookbook\forms.py:188
+#: .\cookbook\forms.py:190
 msgid "New food that other gets replaced by."
 msgstr ""
 
-#: .\cookbook\forms.py:193
+#: .\cookbook\forms.py:195
 msgid "Old Food"
 msgstr "Régi Étel"
 
-#: .\cookbook\forms.py:194
+#: .\cookbook\forms.py:196
 msgid "Food that should be replaced."
 msgstr ""
 
-#: .\cookbook\forms.py:212
+#: .\cookbook\forms.py:214
 msgid "Add your comment: "
 msgstr "Add hozzá a kommented:"
 
-#: .\cookbook\forms.py:253
+#: .\cookbook\forms.py:256
 msgid "Leave empty for dropbox and enter app password for nextcloud."
 msgstr ""
 
-#: .\cookbook\forms.py:260
+#: .\cookbook\forms.py:263
 msgid "Leave empty for nextcloud and enter api token for dropbox."
 msgstr ""
 
-#: .\cookbook\forms.py:269
+#: .\cookbook\forms.py:272
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
 msgstr ""
 
-#: .\cookbook\forms.py:307
+#: .\cookbook\forms.py:310
 msgid "Search String"
 msgstr ""
 
-#: .\cookbook\forms.py:334
+#: .\cookbook\forms.py:337
 msgid "File ID"
 msgstr "Fájl ID:"
 
-#: .\cookbook\forms.py:370
+#: .\cookbook\forms.py:373
 msgid "You must provide at least a recipe or a title."
 msgstr ""
 
-#: .\cookbook\forms.py:383
+#: .\cookbook\forms.py:386
 msgid "You can list default users to share recipes with in the settings."
 msgstr ""
 
-#: .\cookbook\forms.py:384
-#: .\cookbook\templates\forms\edit_internal_recipe.html:427
+#: .\cookbook\forms.py:387
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
 msgstr ""
 
-#: .\cookbook\forms.py:409
+#: .\cookbook\forms.py:412
 msgid "Maximum number of users for this space reached."
 msgstr ""
 
-#: .\cookbook\forms.py:415
+#: .\cookbook\forms.py:418
 msgid "Email address already taken!"
 msgstr ""
 
-#: .\cookbook\forms.py:423
+#: .\cookbook\forms.py:426
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
 msgstr ""
 
-#: .\cookbook\forms.py:438
+#: .\cookbook\forms.py:441
 msgid "Name already taken."
 msgstr ""
 
-#: .\cookbook\forms.py:449
+#: .\cookbook\forms.py:452
 msgid "Accept Terms and Privacy"
 msgstr ""
 
+#: .\cookbook\forms.py:487
+msgid ""
+"Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
+"full desciption of choices."
+msgstr ""
+
+#: .\cookbook\forms.py:488
+msgid ""
+"Use fuzzy matching on units, keywords and ingredients when editing and "
+"importing recipes."
+msgstr ""
+
+#: .\cookbook\forms.py:489
+msgid ""
+"Fields to search ignoring accents.  Selecting this option can improve or "
+"degrade search quality depending on language"
+msgstr ""
+
+#: .\cookbook\forms.py:490
+msgid ""
+"Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
+"'pie' and 'piece' and 'soapie')"
+msgstr ""
+
+#: .\cookbook\forms.py:491
+msgid ""
+"Fields to search for beginning of word matches. (e.g. searching for 'sa' "
+"will return 'salad' and 'sandwich')"
+msgstr ""
+
+#: .\cookbook\forms.py:492
+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
+msgid ""
+"Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
+"only function with fulltext fields."
+msgstr ""
+
+#: .\cookbook\forms.py:497
+msgid "Search Method"
+msgstr ""
+
+#: .\cookbook\forms.py:498
+msgid "Fuzzy Lookups"
+msgstr ""
+
+#: .\cookbook\forms.py:499
+msgid "Ignore Accent"
+msgstr ""
+
+#: .\cookbook\forms.py:500
+msgid "Partial Match"
+msgstr ""
+
+#: .\cookbook\forms.py:501
+msgid "Starts Wtih"
+msgstr ""
+
+#: .\cookbook\forms.py:502
+msgid "Fuzzy Search"
+msgstr ""
+
+#: .\cookbook\forms.py:503
+#, fuzzy
+#| msgid "Text"
+msgid "Full Text"
+msgstr "Szöveg"
+
 #: .\cookbook\helper\AllAuthCustomAdapter.py:36
 msgid ""
 "In order to prevent spam, the requested email was not send. Please wait a "
 "few minutes and try again."
 msgstr ""
 
-#: .\cookbook\helper\permission_helper.py:138
-#: .\cookbook\helper\permission_helper.py:161 .\cookbook\views\views.py:151
+#: .\cookbook\helper\permission_helper.py:136
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr ""
 
-#: .\cookbook\helper\permission_helper.py:142
-#: .\cookbook\helper\permission_helper.py:148
-#: .\cookbook\helper\permission_helper.py:173
-#: .\cookbook\helper\permission_helper.py:218
-#: .\cookbook\helper\permission_helper.py:232
-#: .\cookbook\helper\permission_helper.py:243
-#: .\cookbook\helper\permission_helper.py:254 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:162 .\cookbook\views\views.py:169
-#: .\cookbook\views\views.py:259
+#: .\cookbook\helper\permission_helper.py:140
+#: .\cookbook\helper\permission_helper.py:146
+#: .\cookbook\helper\permission_helper.py:171
+#: .\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
 msgid "You do not have the required permissions to view this page!"
 msgstr ""
 
-#: .\cookbook\helper\permission_helper.py:166
-#: .\cookbook\helper\permission_helper.py:189
-#: .\cookbook\helper\permission_helper.py:204
+#: .\cookbook\helper\permission_helper.py:164
+#: .\cookbook\helper\permission_helper.py:187
+#: .\cookbook\helper\permission_helper.py:202
 msgid "You cannot interact with this object as it is not owned by you!"
 msgstr ""
 
-#: .\cookbook\helper\template_helper.py:60
-#: .\cookbook\helper\template_helper.py:62
+#: .\cookbook\helper\template_helper.py:61
+#: .\cookbook\helper\template_helper.py:63
 msgid "Could not parse template code."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:104
+#: .\cookbook\integration\integration.py:119
 #: .\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
@@ -266,27 +333,27 @@ msgstr ""
 #: .\cookbook\templates\url_import.html:123
 #: .\cookbook\templates\url_import.html:317
 #: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
-#: .\cookbook\views\edit.py:199
+#: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:185
+#: .\cookbook\integration\integration.py:200
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:188
+#: .\cookbook\integration\integration.py:203
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:192
+#: .\cookbook\integration\integration.py:208
 msgid "The following recipes were ignored because they already existed:"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:196
+#: .\cookbook\integration\integration.py:212
 #, python-format
 msgid "Imported %s recipes."
 msgstr ""
@@ -304,7 +371,6 @@ msgid "Source"
 msgstr ""
 
 #: .\cookbook\integration\safron.py:23
-#: .\cookbook\templates\forms\edit_internal_recipe.html:79
 #: .\cookbook\templates\include\log_cooking.html:16
 #: .\cookbook\templates\url_import.html:224
 #: .\cookbook\templates\url_import.html:455
@@ -316,7 +382,6 @@ msgid "Waiting time"
 msgstr ""
 
 #: .\cookbook\integration\safron.py:27
-#: .\cookbook\templates\forms\edit_internal_recipe.html:73
 msgid "Preparation Time"
 msgstr ""
 
@@ -330,6 +395,22 @@ msgstr ""
 msgid "Section"
 msgstr ""
 
+#: .\cookbook\management\commands\rebuildindex.py:14
+msgid "Rebuilds full text search index on Recipe"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:18
+msgid "Only Postgress databases use full text search, no index to rebuild"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:29
+msgid "Recipe index rebuild complete."
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:31
+msgid "Recipe index rebuild failed."
+msgstr ""
+
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:14
 msgid "Breakfast"
 msgstr "Reggeli"
@@ -346,78 +427,91 @@ msgstr "Vacsora"
 msgid "Other"
 msgstr ""
 
-#: .\cookbook\models.py:72
+#: .\cookbook\models.py:144
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr ""
 
-#: .\cookbook\models.py:123 .\cookbook\templates\search.html:7
+#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
 #: .\cookbook\templates\shopping_list.html:52
 msgid "Search"
 msgstr ""
 
-#: .\cookbook\models.py:124 .\cookbook\templates\base.html:92
+#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
 #: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:233 .\cookbook\views\new.py:201
+#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
 msgid "Meal-Plan"
 msgstr ""
 
-#: .\cookbook\models.py:125 .\cookbook\templates\base.html:89
+#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr ""
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Small"
 msgstr ""
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Large"
 msgstr ""
 
-#: .\cookbook\models.py:133 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:206 .\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:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:202
+#: .\cookbook\models.py:389
+msgid " is part of a recipe step and cannot be deleted"
+msgstr ""
+
+#: .\cookbook\models.py:429
 msgid "Text"
 msgstr "Szöveg"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:203
+#: .\cookbook\models.py:429
 msgid "Time"
 msgstr ""
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:204
-#: .\cookbook\templates\forms\edit_internal_recipe.html:219
+#: .\cookbook\models.py:429
 #, fuzzy
 #| msgid "File ID"
 msgid "File"
 msgstr "Fájl ID:"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:205
-#: .\cookbook\templates\forms\edit_internal_recipe.html:241
+#: .\cookbook\models.py:429
 #: .\cookbook\templates\include\recipe_open_modal.html:7
 #: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:273 .\cookbook\views\new.py:52
+#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr ""
 
-#: .\cookbook\serializer.py:109
+#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+msgid "Simple"
+msgstr ""
+
+#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+msgid "Phrase"
+msgstr ""
+
+#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+msgid "Web"
+msgstr ""
+
+#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+msgid "Raw"
+msgstr ""
+
+#: .\cookbook\serializer.py:112
 msgid "File uploads are not enabled for this Space."
 msgstr ""
 
-#: .\cookbook\serializer.py:117
+#: .\cookbook\serializer.py:125
 msgid "You have reached your file upload limit."
 msgstr ""
 
-#: .\cookbook\tables.py:35 .\cookbook\templates\books.html:36
-#: .\cookbook\templates\generic\edit_template.html:6
+#: .\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
@@ -426,11 +520,10 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: .\cookbook\tables.py:124 .\cookbook\tables.py:147
-#: .\cookbook\templates\books.html:38
+#: .\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\edit_template.html:27
+#: .\cookbook\templates\generic\edit_template.html:28
 #: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
@@ -460,7 +553,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:154 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -536,7 +629,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:21
+#: .\cookbook\templates\generic\delete_template.html:22
 msgid "Confirm"
 msgstr ""
 
@@ -548,7 +641,7 @@ msgid ""
 "request</a>."
 msgstr ""
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:189
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
 msgid "Login"
 msgstr ""
 
@@ -601,7 +694,7 @@ msgstr ""
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:52
+#: .\cookbook\templates\settings.html:64
 msgid "Password"
 msgstr ""
 
@@ -683,101 +776,86 @@ msgstr ""
 msgid "We are sorry, but the sign up is currently closed."
 msgstr ""
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:179
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr ""
 
-#: .\cookbook\templates\base.html:85
-msgid "Utensils"
-msgstr ""
-
-#: .\cookbook\templates\base.html:95
+#: .\cookbook\templates\base.html:86
 msgid "Shopping"
 msgstr ""
 
-#: .\cookbook\templates\base.html:101
+#: .\cookbook\templates\base.html:113
+msgid "Keyword"
+msgstr ""
+
+#: .\cookbook\templates\base.html:137
+#: .\cookbook\templates\forms\ingredients.html:24
+#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
+#: .\cookbook\views\lists.py:146
+msgid "Units"
+msgstr ""
+
+#: .\cookbook\templates\base.html:151
 #: .\cookbook\templates\shopping_list.html:230
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr ""
 
-#: .\cookbook\templates\base.html:112 .\cookbook\views\delete.py:84
-#: .\cookbook\views\edit.py:102 .\cookbook\views\lists.py:26
-#: .\cookbook\views\new.py:78
-msgid "Keyword"
-msgstr ""
-
-#: .\cookbook\templates\base.html:114
+#: .\cookbook\templates\base.html:163
 msgid "Batch Edit"
 msgstr ""
 
-#: .\cookbook\templates\base.html:119
-msgid "Storage Data"
-msgstr ""
-
-#: .\cookbook\templates\base.html:123
-msgid "Storage Backends"
-msgstr ""
-
-#: .\cookbook\templates\base.html:125
-msgid "Configure Sync"
-msgstr ""
-
-#: .\cookbook\templates\base.html:127
-msgid "Discovered Recipes"
-msgstr ""
-
-#: .\cookbook\templates\base.html:129
-msgid "Discovery Log"
-msgstr ""
-
-#: .\cookbook\templates\base.html:131 .\cookbook\templates\stats.html:10
-msgid "Statistics"
-msgstr ""
-
-#: .\cookbook\templates\base.html:133
-msgid "Units & Ingredients"
-msgstr ""
-
-#: .\cookbook\templates\base.html:135 .\cookbook\templates\index.html:47
-msgid "Import Recipe"
-msgstr ""
-
-#: .\cookbook\templates\base.html:156 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr ""
 
-#: .\cookbook\templates\base.html:159 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:191 .\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
+msgid "Create"
+msgstr ""
+
+#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
 #: .\cookbook\templates\space.html:19
 msgid "Space Settings"
 msgstr ""
 
-#: .\cookbook\templates\base.html:163 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr ""
 
-#: .\cookbook\templates\base.html:165 .\cookbook\templates\base.html:171
+#: .\cookbook\templates\base.html:214
 msgid "Admin"
 msgstr ""
 
-#: .\cookbook\templates\base.html:175
+#: .\cookbook\templates\base.html:218
 msgid "Markdown Guide"
 msgstr ""
 
-#: .\cookbook\templates\base.html:177
+#: .\cookbook\templates\base.html:220
 msgid "GitHub"
 msgstr ""
 
-#: .\cookbook\templates\base.html:181
+#: .\cookbook\templates\base.html:224
 msgid "API Browser"
 msgstr ""
 
-#: .\cookbook\templates\base.html:184
+#: .\cookbook\templates\base.html:227
 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 ""
@@ -790,7 +868,7 @@ msgstr ""
 msgid "Add the specified keywords to all recipes containing a word"
 msgstr ""
 
-#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:85
+#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:83
 msgid "Sync"
 msgstr ""
 
@@ -808,10 +886,22 @@ msgstr ""
 msgid "The path must be in the following format"
 msgstr ""
 
-#: .\cookbook\templates\batch\monitor.html:27
+#: .\cookbook\templates\batch\monitor.html:21
+msgid "Manage External Storage"
+msgstr ""
+
+#: .\cookbook\templates\batch\monitor.html:28
 msgid "Sync Now!"
 msgstr ""
 
+#: .\cookbook\templates\batch\monitor.html:29
+msgid "Show Recipes"
+msgstr ""
+
+#: .\cookbook\templates\batch\monitor.html:30
+msgid "Show Log"
+msgstr ""
+
 #: .\cookbook\templates\batch\waiting.html:4
 #: .\cookbook\templates\batch\waiting.html:10
 msgid "Importing Recipes"
@@ -823,32 +913,10 @@ msgid ""
 "please wait."
 msgstr ""
 
-#: .\cookbook\templates\books.html:5 .\cookbook\templates\books.html:11
+#: .\cookbook\templates\books.html:7
 msgid "Recipe Books"
 msgstr ""
 
-#: .\cookbook\templates\books.html:15
-msgid "New Book"
-msgstr ""
-
-#: .\cookbook\templates\books.html:27 .\cookbook\templates\recipe_view.html:26
-msgid "by"
-msgstr ""
-
-#: .\cookbook\templates\books.html:34
-msgid "Toggle Recipes"
-msgstr ""
-
-#: .\cookbook\templates\books.html:54
-#: .\cookbook\templates\meal_plan_entry.html:48
-#: .\cookbook\templates\recipes_table.html:64
-msgid "Last cooked"
-msgstr ""
-
-#: .\cookbook\templates\books.html:71
-msgid "There are no recipes in this book yet."
-msgstr ""
-
 #: .\cookbook\templates\export.html:6 .\cookbook\templates\test2.html:6
 msgid "Export Recipes"
 msgstr ""
@@ -871,213 +939,21 @@ msgid "Import new Recipe"
 msgstr ""
 
 #: .\cookbook\templates\forms\edit_import_recipe.html:14
-#: .\cookbook\templates\forms\edit_internal_recipe.html:439
-#: .\cookbook\templates\forms\edit_internal_recipe.html:471
 #: .\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:46 .\cookbook\templates\settings.html:87
-#: .\cookbook\templates\settings.html:105
+#: .\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
 msgid "Save"
 msgstr ""
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:7
-#: .\cookbook\templates\forms\edit_internal_recipe.html:34
 msgid "Edit Recipe"
 msgstr ""
 
-#: .\cookbook\templates\forms\edit_internal_recipe.html:56
-#: .\cookbook\templates\url_import.html:171
-msgid "Description"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:76
-msgid "Waiting Time"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:82
-msgid "Servings Text"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:93
-msgid "Select Keywords"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:94
-#: .\cookbook\templates\url_import.html:583
-#, fuzzy
-#| msgid "Keywords"
-msgid "Add Keyword"
-msgstr "Kulcsszavak"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:112
-msgid "Nutrition"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:116
-#: .\cookbook\templates\forms\edit_internal_recipe.html:166
-msgid "Delete Step"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:120
-msgid "Calories"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:123
-msgid "Carbohydrates"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:126
-msgid "Fats"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:128
-msgid "Proteins"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:150
-#: .\cookbook\templates\forms\edit_internal_recipe.html:504
-msgid "Step"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:171
-msgid "Show as header"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:177
-msgid "Hide as header"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:182
-msgid "Move Up"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:187
-msgid "Move Down"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:196
-msgid "Step Name"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:200
-msgid "Step Type"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:213
-msgid "Step time in Minutes"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:229
-msgid "Select File"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:230
-#: .\cookbook\templates\forms\edit_internal_recipe.html:252
-#: .\cookbook\templates\forms\edit_internal_recipe.html:313
-#: .\cookbook\templates\forms\edit_internal_recipe.html:337
-#: .\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
-msgid "Select"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:251
-msgid "Select Recipe"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:311
-#: .\cookbook\templates\shopping_list.html:187
-msgid "Select Unit"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:312
-#: .\cookbook\templates\forms\edit_internal_recipe.html:336
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
-msgid "Create"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:335
-#: .\cookbook\templates\shopping_list.html:209
-msgid "Select Food"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:352
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:369
-msgid "Delete Ingredient"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:375
-msgid "Make Header"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:381
-msgid "Make Ingredient"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:387
-msgid "Disable Amount"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:393
-msgid "Enable Amount"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:398
-msgid "Copy Template Reference"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:424
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
-msgid "Instructions"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:437
-#: .\cookbook\templates\forms\edit_internal_recipe.html:468
-msgid "Save & View"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:441
-#: .\cookbook\templates\forms\edit_internal_recipe.html:474
-msgid "Add Step"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:444
-#: .\cookbook\templates\forms\edit_internal_recipe.html:478
-msgid "Add Nutrition"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:446
-#: .\cookbook\templates\forms\edit_internal_recipe.html:480
-msgid "Remove Nutrition"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:448
-#: .\cookbook\templates\forms\edit_internal_recipe.html:483
-msgid "View Recipe"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:450
-#: .\cookbook\templates\forms\edit_internal_recipe.html:485
-msgid "Delete Recipe"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:491
-msgid "Steps"
-msgstr ""
-
 #: .\cookbook\templates\forms\ingredients.html:15
 msgid "Edit Ingredients"
 msgstr ""
@@ -1093,11 +969,6 @@ msgid ""
 "    "
 msgstr ""
 
-#: .\cookbook\templates\forms\ingredients.html:24
-#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
-msgid "Units"
-msgstr ""
-
 #: .\cookbook\templates\forms\ingredients.html:26
 msgid "Are you sure that you want to merge these two units?"
 msgstr ""
@@ -1111,29 +982,33 @@ msgstr ""
 msgid "Are you sure that you want to merge these two ingredients?"
 msgstr ""
 
-#: .\cookbook\templates\generic\delete_template.html:18
+#: .\cookbook\templates\generic\delete_template.html:19
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
 msgstr ""
 
-#: .\cookbook\templates\generic\edit_template.html:30
+#: .\cookbook\templates\generic\delete_template.html:23
+msgid "Cancel"
+msgstr ""
+
+#: .\cookbook\templates\generic\edit_template.html:32
 msgid "View"
 msgstr ""
 
-#: .\cookbook\templates\generic\edit_template.html:34
+#: .\cookbook\templates\generic\edit_template.html:36
 msgid "Delete original file"
 msgstr ""
 
 #: .\cookbook\templates\generic\list_template.html:6
-#: .\cookbook\templates\generic\list_template.html:12
+#: .\cookbook\templates\generic\list_template.html:21
 msgid "List"
 msgstr ""
 
-#: .\cookbook\templates\generic\list_template.html:25
+#: .\cookbook\templates\generic\list_template.html:34
 msgid "Filter"
 msgstr ""
 
-#: .\cookbook\templates\generic\list_template.html:30
+#: .\cookbook\templates\generic\list_template.html:39
 msgid "Import all"
 msgstr ""
 
@@ -1442,6 +1317,11 @@ msgstr ""
 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"
@@ -1505,6 +1385,11 @@ msgstr ""
 msgid "Meal Plan View"
 msgstr ""
 
+#: .\cookbook\templates\meal_plan_entry.html:48
+#: .\cookbook\templates\recipes_table.html:64
+msgid "Last cooked"
+msgstr ""
+
 #: .\cookbook\templates\meal_plan_entry.html:50
 msgid "Never cooked before."
 msgstr ""
@@ -1601,8 +1486,12 @@ msgstr ""
 msgid "Comments"
 msgstr ""
 
+#: .\cookbook\templates\recipe_view.html:26
+msgid "by"
+msgstr ""
+
 #: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
-#: .\cookbook\views\edit.py:179
+#: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr ""
 
@@ -1634,60 +1523,221 @@ msgstr ""
 msgid "Recipe Home"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:25
+#: .\cookbook\templates\search_info.html:5
+#: .\cookbook\templates\search_info.html:9
+#: .\cookbook\templates\settings.html:157
+msgid "Search Settings"
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:10
+msgid ""
+"\n"
+"        Creating the best search experience is complicated and weighs "
+"heavily on your personal configuration.  \n"
+"        Changing any of the search settings can have significant impact on "
+"the speed and quality of the results.\n"
+"        Search Methods, Trigrams and Full Text Search configurations are "
+"only available if you are using Postgres for your database.\n"
+"    "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:19
+msgid "Search Methods"
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:23
+msgid ""
+" \n"
+"            Full text searches attempt to normalize the words provided to "
+"match common variants.  For example: 'forked', 'forking', 'forks' will all "
+"normalize to 'fork'.\n"
+"            There are several methods available, described below, that will "
+"control how the search behavior should react when multiple words are "
+"searched.\n"
+"            Full technical details on how these operate can be viewed on <a "
+"href=https://www.postgresql.org/docs/current/textsearch-controls."
+"html#TEXTSEARCH-PARSING-QUERIES>Postgresql's website.</a>\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:29
+msgid ""
+" \n"
+"            Simple searches ignore punctuation and common words such as "
+"'the', 'a', 'and'. And will treat seperate words as required.\n"
+"            Searching for 'apple or flour' will return any recipe that "
+"includes both 'apple' and 'flour' anywhere in the fields that have been "
+"selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:34
+msgid ""
+" \n"
+"            Phrase searches ignore punctuation, but will search for all of "
+"the words in the exact order provided.\n"
+"            Searching for 'apple or flour' will only return a recipe that "
+"includes the exact phrase 'apple or flour' in any of the fields that have "
+"been selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:39
+msgid ""
+" \n"
+"            Web searches simulate functionality found on many web search "
+"sites supporting special syntax.\n"
+"            Placing quotes around several words will convert those words "
+"into a phrase.\n"
+"            'or' is recongized as searching for the word (or phrase) "
+"immediately before 'or' OR the word (or phrase) directly after.\n"
+"            '-' is recognized as searching for recipes that do not include "
+"the word (or phrase) that comes immediately after. \n"
+"            For example searching for 'apple pie' or cherry -butter will "
+"return any recipe that includes the phrase 'apple pie' or the word "
+"'cherry' \n"
+"            in any field included in the full text search but exclude any "
+"recipe that has the word 'butter' in any field included.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:48
+msgid ""
+" \n"
+"            Raw search is similar to Web except will take puncuation "
+"operators such as '|', '&' and '()'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:59
+msgid ""
+" \n"
+"            Another approach to searching that also requires Postgresql is "
+"fuzzy search or trigram similarity. A trigram is a group of three "
+"consecutive characters.\n"
+"            For example searching for 'apple' will create x trigrams 'app', "
+"'ppl', 'ple' and will create a score of how closely words match the "
+"generated trigrams.\n"
+"            One benefit of searching trigams is that a search for 'sandwich' "
+"will find mispelled words such as 'sandwhich' that would be missed by other "
+"methods.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:69
+msgid "Search Fields"
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:73
+msgid ""
+" \n"
+"            Unaccent is a special case in that it enables searching a field "
+"'unaccented' for each search style attempting to ignore accented values. \n"
+"            For example when you enable unaccent for 'Name' any search "
+"(starts with, contains, trigram) will attempt the search ignoring accented "
+"characters.\n"
+"            \n"
+"            For the other options, you can enable search on any or all "
+"fields and they will be combined together with an assumed 'OR'.\n"
+"            For example enabling 'Name' for Starts With, 'Name' and "
+"'Description' for Partial Match and 'Ingredients' and 'Keywords' for Full "
+"Search\n"
+"            and searching for 'apple' will generate a search that will "
+"return recipes that have:\n"
+"            - A recipe name that starts with 'apple'\n"
+"            - OR a recipe name that contains 'apple'\n"
+"            - OR a recipe description that contains 'apple'\n"
+"            - OR a recipe that will have a full text search match ('apple' "
+"or 'apples') in ingredients\n"
+"            - OR a recipe that will have a full text search match in "
+"Keywords\n"
+"\n"
+"            Combining too many fields in too many types of search can have a "
+"negative impact on performance, create duplicate results or return "
+"unexpected results.\n"
+"            For example, enabling fuzzy search or partial matches will "
+"interfere with web search methods.  \n"
+"            Searching for 'apple -pie' with fuzzy search and full text "
+"search will return the recipe Apple Pie.  Though it is not included in the "
+"full text results, it does match the trigram results.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:95
+msgid "Search Index"
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:99
+msgid ""
+" \n"
+"            Trigram search and Full Text Search both rely on database "
+"indexes to perform effectively.  \n"
+"            You can rebuild the indexes on all fields in the Admin page for "
+"Recipes and selecting all recipes and running 'rebuild index for selected "
+"recipes'\n"
+"            You can also rebuild indexes at the command line by executing "
+"the management command 'python manage.py rebuildindex'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\settings.html:27
 msgid "Account"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:29
+#: .\cookbook\templates\settings.html:33
 msgid "Preferences"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:39
 msgid "API-Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:41
+#: .\cookbook\templates\settings.html:45
+msgid "Search-Settings"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:53
 msgid "Name Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:49
+#: .\cookbook\templates\settings.html:61
 msgid "Account Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:51
+#: .\cookbook\templates\settings.html:63
 msgid "Emails"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:54
+#: .\cookbook\templates\settings.html:66
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:78
 msgid "Language"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:96
+#: .\cookbook\templates\settings.html:108
 msgid "Style"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:116
+#: .\cookbook\templates\settings.html:128
 msgid "API Token"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:117
+#: .\cookbook\templates\settings.html:129
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
 msgstr ""
 
-#: .\cookbook\templates\settings.html:134
+#: .\cookbook\templates\settings.html:146
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:136
+#: .\cookbook\templates\settings.html:148
 msgid "or"
 msgstr ""
 
@@ -1728,6 +1778,23 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#: .\cookbook\templates\shopping_list.html:187
+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
+msgid "Select"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:209
+msgid "Select Food"
+msgstr ""
+
 #: .\cookbook\templates\shopping_list.html:240
 msgid "Select Supermarket"
 msgstr ""
@@ -1825,10 +1892,6 @@ msgstr ""
 msgid "Recipes without Keywords"
 msgstr ""
 
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr ""
-
 #: .\cookbook\templates\space.html:60 .\cookbook\templates\stats.html:45
 msgid "Internal Recipes"
 msgstr ""
@@ -1878,7 +1941,7 @@ msgid "There are no members in your space yet!"
 msgstr ""
 
 #: .\cookbook\templates\space.html:130 .\cookbook\templates\system.html:21
-#: .\cookbook\views\lists.py:115
+#: .\cookbook\views\lists.py:100
 msgid "Invite Links"
 msgstr ""
 
@@ -1886,6 +1949,10 @@ msgstr ""
 msgid "Stats"
 msgstr ""
 
+#: .\cookbook\templates\stats.html:10
+msgid "Statistics"
+msgstr ""
+
 #: .\cookbook\templates\system.html:22
 msgid "Show Links"
 msgstr ""
@@ -2032,6 +2099,10 @@ msgstr ""
 msgid "Text dragged here will be appended to the name."
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:171
+msgid "Description"
+msgstr ""
+
 #: .\cookbook\templates\url_import.html:175
 msgid "Text dragged here will be appended to the description."
 msgstr ""
@@ -2056,6 +2127,11 @@ msgstr ""
 msgid "Ingredients dragged here will be appended to current list."
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:297
+#: .\cookbook\templates\url_import.html:567
+msgid "Instructions"
+msgstr ""
+
 #: .\cookbook\templates\url_import.html:302
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
@@ -2105,6 +2181,12 @@ msgstr ""
 msgid "Select one"
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:583
+#, fuzzy
+#| msgid "Keywords"
+msgid "Add Keyword"
+msgstr "Kulcsszavak"
+
 #: .\cookbook\templates\url_import.html:596
 msgid "All Keywords"
 msgstr ""
@@ -2140,45 +2222,102 @@ msgstr ""
 msgid "Recipe Markup Specification"
 msgstr ""
 
-#: .\cookbook\views\api.py:79
+#: .\cookbook\views\api.py:82 .\cookbook\views\api.py:131
 msgid "Parameter updated_at incorrectly formatted"
 msgstr ""
 
-#: .\cookbook\views\api.py:580 .\cookbook\views\views.py:303
+#: .\cookbook\views\api.py:151
+#, python-brace-format
+msgid "No {self.basename} with id {pk} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
+#: .\cookbook\views\edit.py:316
+msgid "Cannot merge with the same object!"
+msgstr ""
+
+#: .\cookbook\views\api.py:162
+#, python-brace-format
+msgid "No {self.basename} with id {target} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:167
+msgid "Cannot merge with child object!"
+msgstr ""
+
+#: .\cookbook\views\api.py:195
+#, python-brace-format
+msgid "{source.name} was merged successfully with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:199
+#, python-brace-format
+msgid "An error occurred attempting to merge {source.name} with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:239
+#, python-brace-format
+msgid "No {self.basename} with id {child} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:248
+#, python-brace-format
+msgid "{child.name} was moved successfully to the root."
+msgstr ""
+
+#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+msgid "An error occurred attempting to move "
+msgstr ""
+
+#: .\cookbook\views\api.py:254
+msgid "Cannot move an object to itself!"
+msgstr ""
+
+#: .\cookbook\views\api.py:260
+#, python-brace-format
+msgid "No {self.basename} with id {parent} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:266
+#, python-brace-format
+msgid "{child.name} was moved successfully to parent {parent.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
 msgid "This feature is not available in the demo version!"
 msgstr ""
 
-#: .\cookbook\views\api.py:603
+#: .\cookbook\views\api.py:727
 msgid "Sync successful!"
 msgstr ""
 
-#: .\cookbook\views\api.py:608
+#: .\cookbook\views\api.py:732
 msgid "Error synchronizing with Storage"
 msgstr ""
 
-#: .\cookbook\views\api.py:686
+#: .\cookbook\views\api.py:810
 msgid "Nothing to do."
 msgstr ""
 
-#: .\cookbook\views\api.py:701
+#: .\cookbook\views\api.py:825
 msgid "The requested site provided malformed data and cannot be read."
 msgstr ""
 
-#: .\cookbook\views\api.py:708
+#: .\cookbook\views\api.py:832
 msgid "The requested page could not be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:717
+#: .\cookbook\views\api.py:841
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
 msgstr ""
 
-#: .\cookbook\views\api.py:731
+#: .\cookbook\views\api.py:855
 msgid "No useable data could be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:747
+#: .\cookbook\views\api.py:871
 msgid "I couldn't find anything to do."
 msgstr ""
 
@@ -2205,8 +2344,8 @@ msgstr[1] ""
 msgid "Monitor"
 msgstr ""
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:102
-#: .\cookbook\views\new.py:98
+#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr ""
 
@@ -2215,8 +2354,8 @@ 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:213
-#: .\cookbook\views\new.py:156
+#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
+#: .\cookbook\views\new.py:155
 msgid "Recipe Book"
 msgstr ""
 
@@ -2224,47 +2363,39 @@ msgstr ""
 msgid "Bookmarks"
 msgstr ""
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:252
+#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
 msgid "Invite Link"
 msgstr ""
 
-#: .\cookbook\views\edit.py:119
-msgid "Food"
-msgstr ""
-
-#: .\cookbook\views\edit.py:128
+#: .\cookbook\views\edit.py:126
 msgid "You cannot edit this storage!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:148
+#: .\cookbook\views\edit.py:146
 msgid "Storage saved!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:154
+#: .\cookbook\views\edit.py:152
 msgid "There was an error updating this storage backend!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:165
+#: .\cookbook\views\edit.py:163
 msgid "Storage"
 msgstr ""
 
-#: .\cookbook\views\edit.py:261
+#: .\cookbook\views\edit.py:259
 msgid "Changes saved!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:265
+#: .\cookbook\views\edit.py:263
 msgid "Error saving changes!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:299
+#: .\cookbook\views\edit.py:298
 msgid "Units merged!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:301 .\cookbook\views\edit.py:317
-msgid "Cannot merge with the same object!"
-msgstr ""
-
-#: .\cookbook\views\edit.py:315
+#: .\cookbook\views\edit.py:314
 msgid "Foods merged!"
 msgstr ""
 
@@ -2276,126 +2407,154 @@ msgstr ""
 msgid "Exporting is not implemented for this provider"
 msgstr ""
 
-#: .\cookbook\views\lists.py:40
+#: .\cookbook\views\lists.py:26
 msgid "Import Log"
 msgstr ""
 
-#: .\cookbook\views\lists.py:53
+#: .\cookbook\views\lists.py:39
 msgid "Discovery"
 msgstr ""
 
-#: .\cookbook\views\lists.py:85
+#: .\cookbook\views\lists.py:69
 msgid "Shopping Lists"
 msgstr ""
 
-#: .\cookbook\views\new.py:123
+#: .\cookbook\views\lists.py:129
+#, fuzzy
+#| msgid "New Food"
+msgid "Foods"
+msgstr "Új Étel"
+
+#: .\cookbook\views\lists.py:163
+msgid "Supermarkets"
+msgstr ""
+
+#: .\cookbook\views\lists.py:179
+msgid "Shopping Categories"
+msgstr ""
+
+#: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr ""
 
-#: .\cookbook\views\new.py:126
+#: .\cookbook\views\new.py:125
 msgid "There was an error importing this recipe!"
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "Hello"
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "You have been invited by "
 msgstr ""
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:226
 msgid " to join their Tandoor Recipes space "
 msgstr ""
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:227
 msgid "Click the following link to activate your account: "
 msgstr ""
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:228
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:229
 msgid "The invitation is valid until "
 msgstr ""
 
-#: .\cookbook\views\new.py:231
+#: .\cookbook\views\new.py:230
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 
-#: .\cookbook\views\new.py:234
+#: .\cookbook\views\new.py:233
 msgid "Tandoor Recipes Invite"
 msgstr ""
 
-#: .\cookbook\views\new.py:241
+#: .\cookbook\views\new.py:240
 msgid "Invite link successfully send to user."
 msgstr ""
 
-#: .\cookbook\views\new.py:244
+#: .\cookbook\views\new.py:243
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
 msgstr ""
 
-#: .\cookbook\views\new.py:246
+#: .\cookbook\views\new.py:245
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 
-#: .\cookbook\views\views.py:129
+#: .\cookbook\views\views.py:128
 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:177
+#: .\cookbook\views\views.py:176
 msgid "You do not have the required permissions to perform this action!"
 msgstr ""
 
-#: .\cookbook\views\views.py:188
+#: .\cookbook\views\views.py:187
 msgid "Comment saved!"
 msgstr ""
 
-#: .\cookbook\views\views.py:395
+#: .\cookbook\views\views.py:351
+msgid "You must select at least one field to search!"
+msgstr ""
+
+#: .\cookbook\views\views.py:354
+msgid ""
+"To use this search method you must select at least one full text search "
+"field!"
+msgstr ""
+
+#: .\cookbook\views\views.py:357
+msgid "Fuzzy search is not compatible with this search method!"
+msgstr ""
+
+#: .\cookbook\views\views.py:437
 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:402
+#: .\cookbook\views\views.py:444
 msgid "Passwords dont match!"
 msgstr ""
 
-#: .\cookbook\views\views.py:418
+#: .\cookbook\views\views.py:460
 msgid "User has been created, please login!"
 msgstr ""
 
-#: .\cookbook\views\views.py:434
+#: .\cookbook\views\views.py:476
 msgid "Malformed Invite Link supplied!"
 msgstr ""
 
-#: .\cookbook\views\views.py:441
+#: .\cookbook\views\views.py:483
 msgid "You are already member of a space and therefore cannot join this one."
 msgstr ""
 
-#: .\cookbook\views\views.py:452
+#: .\cookbook\views\views.py:494
 msgid "Successfully joined space."
 msgstr ""
 
-#: .\cookbook\views\views.py:458
+#: .\cookbook\views\views.py:500
 msgid "Invite Link not valid or already used!"
 msgstr ""
 
-#: .\cookbook\views\views.py:522
+#: .\cookbook\views\views.py:564
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
 msgstr ""
 
-#: .\cookbook\views\views.py:528
+#: .\cookbook\views\views.py:570
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
diff --git a/cookbook/locale/it/LC_MESSAGES/django.po b/cookbook/locale/it/LC_MESSAGES/django.po
index 051571e9..19c49da5 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+0200\n"
 "PO-Revision-Date: 2021-09-02 11:06+0000\n"
 "Last-Translator: Oliver Cervera <olivercervera@yahoo.it>\n"
 "Language-Team: Italian <http://translate.tandoor.dev/projects/tandoor/"
@@ -23,15 +23,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.8\n"
 
-#: .\cookbook\filters.py:23 .\cookbook\templates\base.html:98
-#: .\cookbook\templates\forms\edit_internal_recipe.html:269
+#: .\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\views\lists.py:67
+#: .\cookbook\templates\url_import.html:270
 msgid "Ingredients"
 msgstr "Ingredienti"
 
-#: .\cookbook\forms.py:49
+#: .\cookbook\forms.py:50
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
@@ -39,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:51
+#: .\cookbook\forms.py:52
 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:53
+#: .\cookbook\forms.py:54
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
@@ -53,7 +52,7 @@ msgstr ""
 "Abilita il supporto alle frazioni per le quantità degli ingredienti (ad "
 "esempio converte i decimali in frazioni automaticamente)"
 
-#: .\cookbook\forms.py:56
+#: .\cookbook\forms.py:57
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
@@ -61,20 +60,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:58
+#: .\cookbook\forms.py:59
 msgid "Show recently viewed recipes on search page."
 msgstr "Mostra le ricette visualizzate di recente nella pagina di ricerca."
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:60
 msgid "Number of decimals to round ingredients."
 msgstr "Numero di decimali per approssimare gli ingredienti."
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:61
 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:62
+#: .\cookbook\forms.py:63
 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 +87,11 @@ msgstr ""
 "di dati mobili. Se inferiore al limite della istanza viene ripristinato "
 "durante il salvataggio."
 
-#: .\cookbook\forms.py:65
+#: .\cookbook\forms.py:66
 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:81
+#: .\cookbook\forms.py:82
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
@@ -100,42 +99,39 @@ msgstr ""
 "Entrambi i campi sono facoltativi. Se non viene fornito, verrà visualizzato "
 "il nome utente"
 
-#: .\cookbook\forms.py:102 .\cookbook\forms.py:331
-#: .\cookbook\templates\forms\edit_internal_recipe.html:49
+#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
 #: .\cookbook\templates\url_import.html:154
 msgid "Name"
 msgstr "Nome"
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:332
-#: .\cookbook\templates\base.html:108 .\cookbook\templates\base.html:169
-#: .\cookbook\templates\forms\edit_internal_recipe.html:85
+#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
 #: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573
+#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr "Parole chiave"
 
-#: .\cookbook\forms.py:104
+#: .\cookbook\forms.py:105
 msgid "Preparation time in minutes"
 msgstr "Tempo di preparazione in minuti"
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:106
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "Tempo di attesa (cottura) in minuti"
 
-#: .\cookbook\forms.py:106 .\cookbook\forms.py:333
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
 msgid "Path"
 msgstr "Percorso"
 
-#: .\cookbook\forms.py:107
+#: .\cookbook\forms.py:108
 msgid "Storage UID"
 msgstr "UID di archiviazione"
 
-#: .\cookbook\forms.py:133
+#: .\cookbook\forms.py:134
 msgid "Default"
 msgstr "Predefinito"
 
-#: .\cookbook\forms.py:144 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
@@ -143,52 +139,52 @@ 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:164
+#: .\cookbook\forms.py:165
 msgid "New Unit"
 msgstr "Nuova unità di misura"
 
-#: .\cookbook\forms.py:165
+#: .\cookbook\forms.py:166
 msgid "New unit that other gets replaced by."
 msgstr "Nuova unità di misura che sostituisce le altre."
 
-#: .\cookbook\forms.py:170
+#: .\cookbook\forms.py:171
 msgid "Old Unit"
 msgstr "Vecchia unità di misura"
 
-#: .\cookbook\forms.py:171
+#: .\cookbook\forms.py:172
 msgid "Unit that should be replaced."
 msgstr "Unità di misura che dovrebbe essere rimpiazzata."
 
-#: .\cookbook\forms.py:187
+#: .\cookbook\forms.py:189
 msgid "New Food"
 msgstr "Nuovo alimento"
 
-#: .\cookbook\forms.py:188
+#: .\cookbook\forms.py:190
 msgid "New food that other gets replaced by."
 msgstr "Nuovo alimento che sostituisce gli altri."
 
-#: .\cookbook\forms.py:193
+#: .\cookbook\forms.py:195
 msgid "Old Food"
 msgstr "Vecchio alimento"
 
-#: .\cookbook\forms.py:194
+#: .\cookbook\forms.py:196
 msgid "Food that should be replaced."
 msgstr "Alimento che dovrebbe essere rimpiazzato."
 
-#: .\cookbook\forms.py:212
+#: .\cookbook\forms.py:214
 msgid "Add your comment: "
 msgstr "Aggiungi il tuo commento: "
 
-#: .\cookbook\forms.py:253
+#: .\cookbook\forms.py:256
 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:260
+#: .\cookbook\forms.py:263
 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:269
+#: .\cookbook\forms.py:272
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
@@ -196,26 +192,25 @@ msgstr ""
 "Lascia vuoto per dropbox e inserisci solo l'url base per nextcloud (<code>/"
 "remote.php/webdav/</code> è aggiunto automaticamente)"
 
-#: .\cookbook\forms.py:307
+#: .\cookbook\forms.py:310
 msgid "Search String"
 msgstr "Stringa di Ricerca"
 
-#: .\cookbook\forms.py:334
+#: .\cookbook\forms.py:337
 msgid "File ID"
 msgstr "ID del File"
 
-#: .\cookbook\forms.py:370
+#: .\cookbook\forms.py:373
 msgid "You must provide at least a recipe or a title."
 msgstr "Devi fornire almeno una ricetta o un titolo."
 
-#: .\cookbook\forms.py:383
+#: .\cookbook\forms.py:386
 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:384
-#: .\cookbook\templates\forms\edit_internal_recipe.html:427
+#: .\cookbook\forms.py:387
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
@@ -223,15 +218,15 @@ msgstr ""
 "Puoi usare markdown per formattare questo campo. Guarda la <a href=\"/docs/"
 "markdown/\">documentazione qui</a>"
 
-#: .\cookbook\forms.py:409
+#: .\cookbook\forms.py:412
 msgid "Maximum number of users for this space reached."
 msgstr "È stato raggiunto il numero massimo di utenti per questa istanza."
 
-#: .\cookbook\forms.py:415
+#: .\cookbook\forms.py:418
 msgid "Email address already taken!"
 msgstr "Questo indirizzo email è già in uso!"
 
-#: .\cookbook\forms.py:423
+#: .\cookbook\forms.py:426
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
@@ -239,14 +234,90 @@ msgstr ""
 "Non è obbligatorio specificare l'indirizzo email, ma se presente verrà "
 "utilizzato per mandare all'utente un link di invito."
 
-#: .\cookbook\forms.py:438
+#: .\cookbook\forms.py:441
 msgid "Name already taken."
 msgstr "Nome già in uso."
 
-#: .\cookbook\forms.py:449
+#: .\cookbook\forms.py:452
 msgid "Accept Terms and Privacy"
 msgstr "Accetta i Termini d'uso e Privacy"
 
+#: .\cookbook\forms.py:487
+msgid ""
+"Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
+"full desciption of choices."
+msgstr ""
+
+#: .\cookbook\forms.py:488
+msgid ""
+"Use fuzzy matching on units, keywords and ingredients when editing and "
+"importing recipes."
+msgstr ""
+
+#: .\cookbook\forms.py:489
+msgid ""
+"Fields to search ignoring accents.  Selecting this option can improve or "
+"degrade search quality depending on language"
+msgstr ""
+
+#: .\cookbook\forms.py:490
+msgid ""
+"Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
+"'pie' and 'piece' and 'soapie')"
+msgstr ""
+
+#: .\cookbook\forms.py:491
+msgid ""
+"Fields to search for beginning of word matches. (e.g. searching for 'sa' "
+"will return 'salad' and 'sandwich')"
+msgstr ""
+
+#: .\cookbook\forms.py:492
+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
+msgid ""
+"Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
+"only function with fulltext fields."
+msgstr ""
+
+#: .\cookbook\forms.py:497
+#, fuzzy
+#| msgid "Search"
+msgid "Search Method"
+msgstr "Cerca"
+
+#: .\cookbook\forms.py:498
+msgid "Fuzzy Lookups"
+msgstr ""
+
+#: .\cookbook\forms.py:499
+msgid "Ignore Accent"
+msgstr ""
+
+#: .\cookbook\forms.py:500
+msgid "Partial Match"
+msgstr ""
+
+#: .\cookbook\forms.py:501
+msgid "Starts Wtih"
+msgstr ""
+
+#: .\cookbook\forms.py:502
+#, fuzzy
+#| msgid "Search"
+msgid "Fuzzy Search"
+msgstr "Cerca"
+
+#: .\cookbook\forms.py:503
+#, fuzzy
+#| msgid "Text"
+msgid "Full Text"
+msgstr "Testo"
+
 #: .\cookbook\helper\AllAuthCustomAdapter.py:36
 msgid ""
 "In order to prevent spam, the requested email was not send. Please wait a "
@@ -255,35 +326,35 @@ msgstr ""
 "Per evitare spam, la mail non è stata inviata. Aspetta qualche minuto e "
 "riprova."
 
-#: .\cookbook\helper\permission_helper.py:138
-#: .\cookbook\helper\permission_helper.py:161 .\cookbook\views\views.py:151
+#: .\cookbook\helper\permission_helper.py:136
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
 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!"
 
-#: .\cookbook\helper\permission_helper.py:142
-#: .\cookbook\helper\permission_helper.py:148
-#: .\cookbook\helper\permission_helper.py:173
-#: .\cookbook\helper\permission_helper.py:218
-#: .\cookbook\helper\permission_helper.py:232
-#: .\cookbook\helper\permission_helper.py:243
-#: .\cookbook\helper\permission_helper.py:254 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:162 .\cookbook\views\views.py:169
-#: .\cookbook\views\views.py:259
+#: .\cookbook\helper\permission_helper.py:140
+#: .\cookbook\helper\permission_helper.py:146
+#: .\cookbook\helper\permission_helper.py:171
+#: .\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
 msgid "You do not have the required permissions to view this page!"
 msgstr "Non hai i permessi necessari per visualizzare questa pagina!"
 
-#: .\cookbook\helper\permission_helper.py:166
-#: .\cookbook\helper\permission_helper.py:189
-#: .\cookbook\helper\permission_helper.py:204
+#: .\cookbook\helper\permission_helper.py:164
+#: .\cookbook\helper\permission_helper.py:187
+#: .\cookbook\helper\permission_helper.py:202
 msgid "You cannot interact with this object as it is not owned by you!"
 msgstr "Non puoi interagire con questo oggetto perché non ne hai i diritti!"
 
-#: .\cookbook\helper\template_helper.py:60
-#: .\cookbook\helper\template_helper.py:62
+#: .\cookbook\helper\template_helper.py:61
+#: .\cookbook\helper\template_helper.py:63
 msgid "Could not parse template code."
 msgstr "Impossibile elaborare il codice del template."
 
-#: .\cookbook\integration\integration.py:104
+#: .\cookbook\integration\integration.py:119
 #: .\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
@@ -292,11 +363,11 @@ msgstr "Impossibile elaborare il codice del template."
 #: .\cookbook\templates\url_import.html:123
 #: .\cookbook\templates\url_import.html:317
 #: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
-#: .\cookbook\views\edit.py:199
+#: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr "Importa"
 
-#: .\cookbook\integration\integration.py:185
+#: .\cookbook\integration\integration.py:200
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
@@ -304,7 +375,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:188
+#: .\cookbook\integration\integration.py:203
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
@@ -312,11 +383,11 @@ msgstr ""
 "Un errore imprevisto si è verificato durante l'importazione. Assicurati di "
 "aver caricato un file valido."
 
-#: .\cookbook\integration\integration.py:192
+#: .\cookbook\integration\integration.py:208
 msgid "The following recipes were ignored because they already existed:"
 msgstr "Le seguenti ricette sono state ignorate perché già esistenti:"
 
-#: .\cookbook\integration\integration.py:196
+#: .\cookbook\integration\integration.py:212
 #, python-format
 msgid "Imported %s recipes."
 msgstr "Importate %s ricette."
@@ -334,7 +405,6 @@ msgid "Source"
 msgstr "Fonte"
 
 #: .\cookbook\integration\safron.py:23
-#: .\cookbook\templates\forms\edit_internal_recipe.html:79
 #: .\cookbook\templates\include\log_cooking.html:16
 #: .\cookbook\templates\url_import.html:224
 #: .\cookbook\templates\url_import.html:455
@@ -346,7 +416,6 @@ msgid "Waiting time"
 msgstr "Tempo di cottura"
 
 #: .\cookbook\integration\safron.py:27
-#: .\cookbook\templates\forms\edit_internal_recipe.html:73
 msgid "Preparation Time"
 msgstr "Tempo di preparazione"
 
@@ -360,6 +429,22 @@ msgstr "Ricettario"
 msgid "Section"
 msgstr "Selezione"
 
+#: .\cookbook\management\commands\rebuildindex.py:14
+msgid "Rebuilds full text search index on Recipe"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:18
+msgid "Only Postgress databases use full text search, no index to rebuild"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:29
+msgid "Recipe index rebuild complete."
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:31
+msgid "Recipe index rebuild failed."
+msgstr ""
+
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:14
 msgid "Breakfast"
 msgstr "Colazione"
@@ -376,7 +461,7 @@ msgstr "Cena"
 msgid "Other"
 msgstr "Altro"
 
-#: .\cookbook\models.py:72
+#: .\cookbook\models.py:144
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
@@ -384,70 +469,83 @@ msgstr ""
 "Archiviazione massima in MB. 0 per illimitata, -1 per disabilitare il "
 "caricamento dei file."
 
-#: .\cookbook\models.py:123 .\cookbook\templates\search.html:7
+#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
 #: .\cookbook\templates\shopping_list.html:52
 msgid "Search"
 msgstr "Cerca"
 
-#: .\cookbook\models.py:124 .\cookbook\templates\base.html:92
+#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
 #: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:233 .\cookbook\views\new.py:201
+#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
 msgid "Meal-Plan"
 msgstr "Piano alimentare"
 
-#: .\cookbook\models.py:125 .\cookbook\templates\base.html:89
+#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr "Libri"
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Small"
 msgstr "Piccolo"
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Large"
 msgstr "Grande"
 
-#: .\cookbook\models.py:133 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:206 .\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:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:202
+#: .\cookbook\models.py:389
+msgid " is part of a recipe step and cannot be deleted"
+msgstr ""
+
+#: .\cookbook\models.py:429
 msgid "Text"
 msgstr "Testo"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:203
+#: .\cookbook\models.py:429
 msgid "Time"
 msgstr "Tempo"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:204
-#: .\cookbook\templates\forms\edit_internal_recipe.html:219
+#: .\cookbook\models.py:429
 msgid "File"
 msgstr "File"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:205
-#: .\cookbook\templates\forms\edit_internal_recipe.html:241
+#: .\cookbook\models.py:429
 #: .\cookbook\templates\include\recipe_open_modal.html:7
 #: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:273 .\cookbook\views\new.py:52
+#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr "Ricetta"
 
-#: .\cookbook\serializer.py:109
+#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+msgid "Simple"
+msgstr ""
+
+#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+msgid "Phrase"
+msgstr ""
+
+#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+msgid "Web"
+msgstr ""
+
+#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+msgid "Raw"
+msgstr ""
+
+#: .\cookbook\serializer.py:112
 msgid "File uploads are not enabled for this Space."
 msgstr "Il caricamento dei file non è abilitato in questa istanza."
 
-#: .\cookbook\serializer.py:117
+#: .\cookbook\serializer.py:125
 msgid "You have reached your file upload limit."
 msgstr "Hai raggiungo il limite per il caricamento dei file."
 
-#: .\cookbook\tables.py:35 .\cookbook\templates\books.html:36
-#: .\cookbook\templates\generic\edit_template.html:6
+#: .\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
@@ -456,11 +554,10 @@ msgstr "Hai raggiungo il limite per il caricamento dei file."
 msgid "Edit"
 msgstr "Modifica"
 
-#: .\cookbook\tables.py:124 .\cookbook\tables.py:147
-#: .\cookbook\templates\books.html:38
+#: .\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\edit_template.html:27
+#: .\cookbook\templates\generic\edit_template.html:28
 #: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
@@ -490,7 +587,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:154 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -572,7 +669,7 @@ msgstr ""
 "            ."
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:21
+#: .\cookbook\templates\generic\delete_template.html:22
 msgid "Confirm"
 msgstr "Conferma"
 
@@ -584,10 +681,10 @@ msgid ""
 "request</a>."
 msgstr ""
 "Questo link di conferma è scaduto o non è valido. Puoi\n"
-"            <a href=\"%(email_url)s\">richiedere un nuovo link di "
-"conferma</a>."
+"            <a href=\"%(email_url)s\">richiedere un nuovo link di conferma</"
+"a>."
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:189
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
 msgid "Login"
 msgstr "Login"
 
@@ -640,7 +737,7 @@ msgstr "Cambia Password"
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:52
+#: .\cookbook\templates\settings.html:64
 msgid "Password"
 msgstr "Password"
 
@@ -726,101 +823,86 @@ 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:179
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr "Documentazione API"
 
-#: .\cookbook\templates\base.html:85
-msgid "Utensils"
-msgstr "Strumenti"
-
-#: .\cookbook\templates\base.html:95
+#: .\cookbook\templates\base.html:86
 msgid "Shopping"
 msgstr "Spesa"
 
-#: .\cookbook\templates\base.html:101
+#: .\cookbook\templates\base.html:113
+msgid "Keyword"
+msgstr "Parola chiave"
+
+#: .\cookbook\templates\base.html:137
+#: .\cookbook\templates\forms\ingredients.html:24
+#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
+#: .\cookbook\views\lists.py:146
+msgid "Units"
+msgstr "Unità di misura"
+
+#: .\cookbook\templates\base.html:151
 #: .\cookbook\templates\shopping_list.html:230
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr "Supermercato"
 
-#: .\cookbook\templates\base.html:112 .\cookbook\views\delete.py:84
-#: .\cookbook\views\edit.py:102 .\cookbook\views\lists.py:26
-#: .\cookbook\views\new.py:78
-msgid "Keyword"
-msgstr "Parola chiave"
-
-#: .\cookbook\templates\base.html:114
+#: .\cookbook\templates\base.html:163
 msgid "Batch Edit"
 msgstr "Modifica in blocco"
 
-#: .\cookbook\templates\base.html:119
-msgid "Storage Data"
-msgstr "Dati e Archiviazione"
-
-#: .\cookbook\templates\base.html:123
-msgid "Storage Backends"
-msgstr "Backend Archiviazione"
-
-#: .\cookbook\templates\base.html:125
-msgid "Configure Sync"
-msgstr "Configura Sincronizzazione"
-
-#: .\cookbook\templates\base.html:127
-msgid "Discovered Recipes"
-msgstr "Ricette trovate"
-
-#: .\cookbook\templates\base.html:129
-msgid "Discovery Log"
-msgstr "Registro ricette trovate"
-
-#: .\cookbook\templates\base.html:131 .\cookbook\templates\stats.html:10
-msgid "Statistics"
-msgstr "Statistiche"
-
-#: .\cookbook\templates\base.html:133
-msgid "Units & Ingredients"
-msgstr "Unità di misura & Ingredienti"
-
-#: .\cookbook\templates\base.html:135 .\cookbook\templates\index.html:47
-msgid "Import Recipe"
-msgstr "Importa Ricetta"
-
-#: .\cookbook\templates\base.html:156 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr "Cronologia"
 
-#: .\cookbook\templates\base.html:159 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:191 .\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
+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:163 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr "Sistema"
 
-#: .\cookbook\templates\base.html:165 .\cookbook\templates\base.html:171
+#: .\cookbook\templates\base.html:214
 msgid "Admin"
 msgstr "Amministratore"
 
-#: .\cookbook\templates\base.html:175
+#: .\cookbook\templates\base.html:218
 msgid "Markdown Guide"
 msgstr "Informazioni su Markdown"
 
-#: .\cookbook\templates\base.html:177
+#: .\cookbook\templates\base.html:220
 msgid "GitHub"
 msgstr "GitHub"
 
-#: .\cookbook\templates\base.html:181
+#: .\cookbook\templates\base.html:224
 msgid "API Browser"
 msgstr "Browser API"
 
-#: .\cookbook\templates\base.html:184
+#: .\cookbook\templates\base.html:227
 msgid "Log out"
 msgstr "Esci"
 
+#: .\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 "Ricette esterne"
+
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
 msgstr "Modifica in blocco per categoria"
@@ -835,7 +917,7 @@ msgstr ""
 "Aggiungi le parole chiave che desideri a tutte le ricette che contengono una "
 "determinata stringa"
 
-#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:85
+#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:83
 msgid "Sync"
 msgstr "Sincronizza"
 
@@ -855,10 +937,26 @@ msgstr ""
 msgid "The path must be in the following format"
 msgstr "Il percorso deve essere nel formato seguente"
 
-#: .\cookbook\templates\batch\monitor.html:27
+#: .\cookbook\templates\batch\monitor.html:21
+msgid "Manage External Storage"
+msgstr ""
+
+#: .\cookbook\templates\batch\monitor.html:28
 msgid "Sync Now!"
 msgstr "Sincronizza Ora!"
 
+#: .\cookbook\templates\batch\monitor.html:29
+#, fuzzy
+#| msgid "Shopping Recipes"
+msgid "Show Recipes"
+msgstr "Ricette per la spesa"
+
+#: .\cookbook\templates\batch\monitor.html:30
+#, fuzzy
+#| msgid "Show Links"
+msgid "Show Log"
+msgstr "Mostra link"
+
 #: .\cookbook\templates\batch\waiting.html:4
 #: .\cookbook\templates\batch\waiting.html:10
 msgid "Importing Recipes"
@@ -872,32 +970,10 @@ msgstr ""
 "Questa operazione può richiedere alcuni minuti, a seconda del numero di "
 "ricette sincronizzate, attendere prego."
 
-#: .\cookbook\templates\books.html:5 .\cookbook\templates\books.html:11
+#: .\cookbook\templates\books.html:7
 msgid "Recipe Books"
 msgstr "Libri di Ricette"
 
-#: .\cookbook\templates\books.html:15
-msgid "New Book"
-msgstr "Nuovo Libro"
-
-#: .\cookbook\templates\books.html:27 .\cookbook\templates\recipe_view.html:26
-msgid "by"
-msgstr "di"
-
-#: .\cookbook\templates\books.html:34
-msgid "Toggle Recipes"
-msgstr "Attiva/Disattiva Ricette"
-
-#: .\cookbook\templates\books.html:54
-#: .\cookbook\templates\meal_plan_entry.html:48
-#: .\cookbook\templates\recipes_table.html:64
-msgid "Last cooked"
-msgstr "Cucinato ultimamente"
-
-#: .\cookbook\templates\books.html:71
-msgid "There are no recipes in this book yet."
-msgstr "Non ci sono ancora ricette in questo libro."
-
 #: .\cookbook\templates\export.html:6 .\cookbook\templates\test2.html:6
 msgid "Export Recipes"
 msgstr "Esporta Ricette"
@@ -918,211 +994,21 @@ msgid "Import new Recipe"
 msgstr "Importa nuova Ricetta"
 
 #: .\cookbook\templates\forms\edit_import_recipe.html:14
-#: .\cookbook\templates\forms\edit_internal_recipe.html:439
-#: .\cookbook\templates\forms\edit_internal_recipe.html:471
 #: .\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:46 .\cookbook\templates\settings.html:87
-#: .\cookbook\templates\settings.html:105
+#: .\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
 msgid "Save"
 msgstr "Salva"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:7
-#: .\cookbook\templates\forms\edit_internal_recipe.html:34
 msgid "Edit Recipe"
 msgstr "Modifica Ricetta"
 
-#: .\cookbook\templates\forms\edit_internal_recipe.html:56
-#: .\cookbook\templates\url_import.html:171
-msgid "Description"
-msgstr "Descrizione"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:76
-msgid "Waiting Time"
-msgstr "Tempo di cottura"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:82
-msgid "Servings Text"
-msgstr "Nome delle porzioni"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:93
-msgid "Select Keywords"
-msgstr "Seleziona parole chiave"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:94
-#: .\cookbook\templates\url_import.html:583
-msgid "Add Keyword"
-msgstr "Aggiungi parole chiave"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:112
-msgid "Nutrition"
-msgstr "Nutrienti"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:116
-#: .\cookbook\templates\forms\edit_internal_recipe.html:166
-msgid "Delete Step"
-msgstr "Elimina Step"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:120
-msgid "Calories"
-msgstr "Calorie"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:123
-msgid "Carbohydrates"
-msgstr "Carboidrati"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:126
-msgid "Fats"
-msgstr "Grassi"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:128
-msgid "Proteins"
-msgstr "Proteine"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:150
-#: .\cookbook\templates\forms\edit_internal_recipe.html:504
-msgid "Step"
-msgstr "Step"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:171
-msgid "Show as header"
-msgstr "Mostra come intestazione"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:177
-msgid "Hide as header"
-msgstr "Nascondi come intestazione"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:182
-msgid "Move Up"
-msgstr "Sposta Sopra"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:187
-msgid "Move Down"
-msgstr "Sposta Sotto"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:196
-msgid "Step Name"
-msgstr "Nome dello Step"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:200
-msgid "Step Type"
-msgstr "Tipo dello Step"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:213
-msgid "Step time in Minutes"
-msgstr "Tempo dello step in minuti"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:229
-msgid "Select File"
-msgstr "Seleziona file"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:230
-#: .\cookbook\templates\forms\edit_internal_recipe.html:252
-#: .\cookbook\templates\forms\edit_internal_recipe.html:313
-#: .\cookbook\templates\forms\edit_internal_recipe.html:337
-#: .\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
-msgid "Select"
-msgstr "Seleziona"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:251
-msgid "Select Recipe"
-msgstr "Seleziona ricetta"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:311
-#: .\cookbook\templates\shopping_list.html:187
-msgid "Select Unit"
-msgstr "Seleziona unità di misura"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:312
-#: .\cookbook\templates\forms\edit_internal_recipe.html:336
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
-msgid "Create"
-msgstr "Crea"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:335
-#: .\cookbook\templates\shopping_list.html:209
-msgid "Select Food"
-msgstr "Seleziona alimento"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:352
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr "Nota"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:369
-msgid "Delete Ingredient"
-msgstr "Elimina Ingredienti"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:375
-msgid "Make Header"
-msgstr "Crea Intestazione"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:381
-msgid "Make Ingredient"
-msgstr "Crea Ingrediente"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:387
-msgid "Disable Amount"
-msgstr "Disabilita Quantità"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:393
-msgid "Enable Amount"
-msgstr "Abilita Quantità"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:398
-msgid "Copy Template Reference"
-msgstr "Copia riferimento template"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:424
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
-msgid "Instructions"
-msgstr "Istruzioni"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:437
-#: .\cookbook\templates\forms\edit_internal_recipe.html:468
-msgid "Save & View"
-msgstr "Salva & Mostra"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:441
-#: .\cookbook\templates\forms\edit_internal_recipe.html:474
-msgid "Add Step"
-msgstr "Aggiungi Step"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:444
-#: .\cookbook\templates\forms\edit_internal_recipe.html:478
-msgid "Add Nutrition"
-msgstr "Aggiungi nutrienti"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:446
-#: .\cookbook\templates\forms\edit_internal_recipe.html:480
-msgid "Remove Nutrition"
-msgstr "Rimuovi nutrienti"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:448
-#: .\cookbook\templates\forms\edit_internal_recipe.html:483
-msgid "View Recipe"
-msgstr "Mostra ricetta"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:450
-#: .\cookbook\templates\forms\edit_internal_recipe.html:485
-msgid "Delete Recipe"
-msgstr "Elimina Ricetta"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:491
-msgid "Steps"
-msgstr "Step"
-
 #: .\cookbook\templates\forms\ingredients.html:15
 msgid "Edit Ingredients"
 msgstr "Modifica Ingredienti"
@@ -1144,11 +1030,6 @@ msgstr ""
 "Unisce due unità di misura o ingredienti e aggiorna tutte le ricette che li "
 "utilizzano."
 
-#: .\cookbook\templates\forms\ingredients.html:24
-#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
-msgid "Units"
-msgstr "Unità di misura"
-
 #: .\cookbook\templates\forms\ingredients.html:26
 msgid "Are you sure that you want to merge these two units?"
 msgstr "Sei sicuro di volere unire queste due unità di misura?"
@@ -1162,29 +1043,33 @@ 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:18
+#: .\cookbook\templates\generic\delete_template.html:19
 #, 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\edit_template.html:30
+#: .\cookbook\templates\generic\delete_template.html:23
+msgid "Cancel"
+msgstr ""
+
+#: .\cookbook\templates\generic\edit_template.html:32
 msgid "View"
 msgstr "Mostra"
 
-#: .\cookbook\templates\generic\edit_template.html:34
+#: .\cookbook\templates\generic\edit_template.html:36
 msgid "Delete original file"
 msgstr "Elimina il file originale"
 
 #: .\cookbook\templates\generic\list_template.html:6
-#: .\cookbook\templates\generic\list_template.html:12
+#: .\cookbook\templates\generic\list_template.html:21
 msgid "List"
 msgstr "Elenco"
 
-#: .\cookbook\templates\generic\list_template.html:25
+#: .\cookbook\templates\generic\list_template.html:34
 msgid "Filter"
 msgstr "Filtro"
 
-#: .\cookbook\templates\generic\list_template.html:30
+#: .\cookbook\templates\generic\list_template.html:39
 msgid "Import all"
 msgstr "Importa tutto"
 
@@ -1525,6 +1410,11 @@ msgstr "Mostra aiuto"
 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"
@@ -1612,6 +1502,11 @@ msgstr ""
 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"
+msgstr "Cucinato ultimamente"
+
 #: .\cookbook\templates\meal_plan_entry.html:50
 msgid "Never cooked before."
 msgstr "Mai cucinato."
@@ -1719,8 +1614,12 @@ msgstr ""
 msgid "Comments"
 msgstr "Commenti"
 
+#: .\cookbook\templates\recipe_view.html:26
+msgid "by"
+msgstr "di"
+
 #: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
-#: .\cookbook\views\edit.py:179
+#: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr "Commento"
 
@@ -1752,48 +1651,219 @@ msgstr "Registro ricette cucinate"
 msgid "Recipe Home"
 msgstr "Pagina iniziale ricette"
 
-#: .\cookbook\templates\settings.html:25
+#: .\cookbook\templates\search_info.html:5
+#: .\cookbook\templates\search_info.html:9
+#: .\cookbook\templates\settings.html:157
+#, fuzzy
+#| msgid "Search String"
+msgid "Search Settings"
+msgstr "Stringa di Ricerca"
+
+#: .\cookbook\templates\search_info.html:10
+msgid ""
+"\n"
+"        Creating the best search experience is complicated and weighs "
+"heavily on your personal configuration.  \n"
+"        Changing any of the search settings can have significant impact on "
+"the speed and quality of the results.\n"
+"        Search Methods, Trigrams and Full Text Search configurations are "
+"only available if you are using Postgres for your database.\n"
+"    "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:19
+#, fuzzy
+#| msgid "Search"
+msgid "Search Methods"
+msgstr "Cerca"
+
+#: .\cookbook\templates\search_info.html:23
+msgid ""
+" \n"
+"            Full text searches attempt to normalize the words provided to "
+"match common variants.  For example: 'forked', 'forking', 'forks' will all "
+"normalize to 'fork'.\n"
+"            There are several methods available, described below, that will "
+"control how the search behavior should react when multiple words are "
+"searched.\n"
+"            Full technical details on how these operate can be viewed on <a "
+"href=https://www.postgresql.org/docs/current/textsearch-controls."
+"html#TEXTSEARCH-PARSING-QUERIES>Postgresql's website.</a>\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:29
+msgid ""
+" \n"
+"            Simple searches ignore punctuation and common words such as "
+"'the', 'a', 'and'. And will treat seperate words as required.\n"
+"            Searching for 'apple or flour' will return any recipe that "
+"includes both 'apple' and 'flour' anywhere in the fields that have been "
+"selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:34
+msgid ""
+" \n"
+"            Phrase searches ignore punctuation, but will search for all of "
+"the words in the exact order provided.\n"
+"            Searching for 'apple or flour' will only return a recipe that "
+"includes the exact phrase 'apple or flour' in any of the fields that have "
+"been selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:39
+msgid ""
+" \n"
+"            Web searches simulate functionality found on many web search "
+"sites supporting special syntax.\n"
+"            Placing quotes around several words will convert those words "
+"into a phrase.\n"
+"            'or' is recongized as searching for the word (or phrase) "
+"immediately before 'or' OR the word (or phrase) directly after.\n"
+"            '-' is recognized as searching for recipes that do not include "
+"the word (or phrase) that comes immediately after. \n"
+"            For example searching for 'apple pie' or cherry -butter will "
+"return any recipe that includes the phrase 'apple pie' or the word "
+"'cherry' \n"
+"            in any field included in the full text search but exclude any "
+"recipe that has the word 'butter' in any field included.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:48
+msgid ""
+" \n"
+"            Raw search is similar to Web except will take puncuation "
+"operators such as '|', '&' and '()'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:59
+msgid ""
+" \n"
+"            Another approach to searching that also requires Postgresql is "
+"fuzzy search or trigram similarity. A trigram is a group of three "
+"consecutive characters.\n"
+"            For example searching for 'apple' will create x trigrams 'app', "
+"'ppl', 'ple' and will create a score of how closely words match the "
+"generated trigrams.\n"
+"            One benefit of searching trigams is that a search for 'sandwich' "
+"will find mispelled words such as 'sandwhich' that would be missed by other "
+"methods.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:69
+#, fuzzy
+#| msgid "Search Recipe"
+msgid "Search Fields"
+msgstr "Cerca Ricetta"
+
+#: .\cookbook\templates\search_info.html:73
+msgid ""
+" \n"
+"            Unaccent is a special case in that it enables searching a field "
+"'unaccented' for each search style attempting to ignore accented values. \n"
+"            For example when you enable unaccent for 'Name' any search "
+"(starts with, contains, trigram) will attempt the search ignoring accented "
+"characters.\n"
+"            \n"
+"            For the other options, you can enable search on any or all "
+"fields and they will be combined together with an assumed 'OR'.\n"
+"            For example enabling 'Name' for Starts With, 'Name' and "
+"'Description' for Partial Match and 'Ingredients' and 'Keywords' for Full "
+"Search\n"
+"            and searching for 'apple' will generate a search that will "
+"return recipes that have:\n"
+"            - A recipe name that starts with 'apple'\n"
+"            - OR a recipe name that contains 'apple'\n"
+"            - OR a recipe description that contains 'apple'\n"
+"            - OR a recipe that will have a full text search match ('apple' "
+"or 'apples') in ingredients\n"
+"            - OR a recipe that will have a full text search match in "
+"Keywords\n"
+"\n"
+"            Combining too many fields in too many types of search can have a "
+"negative impact on performance, create duplicate results or return "
+"unexpected results.\n"
+"            For example, enabling fuzzy search or partial matches will "
+"interfere with web search methods.  \n"
+"            Searching for 'apple -pie' with fuzzy search and full text "
+"search will return the recipe Apple Pie.  Though it is not included in the "
+"full text results, it does match the trigram results.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:95
+#, fuzzy
+#| msgid "Search"
+msgid "Search Index"
+msgstr "Cerca"
+
+#: .\cookbook\templates\search_info.html:99
+msgid ""
+" \n"
+"            Trigram search and Full Text Search both rely on database "
+"indexes to perform effectively.  \n"
+"            You can rebuild the indexes on all fields in the Admin page for "
+"Recipes and selecting all recipes and running 'rebuild index for selected "
+"recipes'\n"
+"            You can also rebuild indexes at the command line by executing "
+"the management command 'python manage.py rebuildindex'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\settings.html:27
 msgid "Account"
 msgstr "Account"
 
-#: .\cookbook\templates\settings.html:29
+#: .\cookbook\templates\settings.html:33
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:39
 msgid "API-Settings"
 msgstr "Impostazioni API"
 
-#: .\cookbook\templates\settings.html:41
+#: .\cookbook\templates\settings.html:45
+#, fuzzy
+#| msgid "Search String"
+msgid "Search-Settings"
+msgstr "Stringa di Ricerca"
+
+#: .\cookbook\templates\settings.html:53
 msgid "Name Settings"
 msgstr "Impostazioni Nome"
 
-#: .\cookbook\templates\settings.html:49
+#: .\cookbook\templates\settings.html:61
 msgid "Account Settings"
 msgstr "Impostazioni Account"
 
-#: .\cookbook\templates\settings.html:51
+#: .\cookbook\templates\settings.html:63
 msgid "Emails"
 msgstr "Email"
 
-#: .\cookbook\templates\settings.html:54
+#: .\cookbook\templates\settings.html:66
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr "Social"
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:78
 msgid "Language"
 msgstr "Lingua"
 
-#: .\cookbook\templates\settings.html:96
+#: .\cookbook\templates\settings.html:108
 msgid "Style"
 msgstr "Stile"
 
-#: .\cookbook\templates\settings.html:116
+#: .\cookbook\templates\settings.html:128
 msgid "API Token"
 msgstr "Token API"
 
-#: .\cookbook\templates\settings.html:117
+#: .\cookbook\templates\settings.html:129
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
@@ -1801,7 +1871,7 @@ msgstr ""
 "Per accedere alle API REST puoi usare sia l'autenticazione base sia quella "
 "tramite token."
 
-#: .\cookbook\templates\settings.html:134
+#: .\cookbook\templates\settings.html:146
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
@@ -1809,7 +1879,7 @@ msgstr ""
 "Usa il token come header Authorization preceduto dalla parola Token come "
 "negli esempi seguenti:"
 
-#: .\cookbook\templates\settings.html:136
+#: .\cookbook\templates\settings.html:148
 msgid "or"
 msgstr "o"
 
@@ -1851,6 +1921,23 @@ msgstr "Aggiungi voce"
 msgid "Amount"
 msgstr "Quantità"
 
+#: .\cookbook\templates\shopping_list.html:187
+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
+msgid "Select"
+msgstr "Seleziona"
+
+#: .\cookbook\templates\shopping_list.html:209
+msgid "Select Food"
+msgstr "Seleziona alimento"
+
 #: .\cookbook\templates\shopping_list.html:240
 msgid "Select Supermarket"
 msgstr "Seleziona supermercato"
@@ -1952,10 +2039,6 @@ msgstr "Statistiche degli oggetti"
 msgid "Recipes without Keywords"
 msgstr "Ricette senza parole chiave"
 
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr "Ricette esterne"
-
 #: .\cookbook\templates\space.html:60 .\cookbook\templates\stats.html:45
 msgid "Internal Recipes"
 msgstr "Ricette interne"
@@ -2005,7 +2088,7 @@ msgid "There are no members in your space yet!"
 msgstr "Non ci sono ancora ricette in questa istanza!"
 
 #: .\cookbook\templates\space.html:130 .\cookbook\templates\system.html:21
-#: .\cookbook\views\lists.py:115
+#: .\cookbook\views\lists.py:100
 msgid "Invite Links"
 msgstr "Link di invito"
 
@@ -2013,6 +2096,10 @@ msgstr "Link di invito"
 msgid "Stats"
 msgstr "Statistiche"
 
+#: .\cookbook\templates\stats.html:10
+msgid "Statistics"
+msgstr "Statistiche"
+
 #: .\cookbook\templates\system.html:22
 msgid "Show Links"
 msgstr "Mostra link"
@@ -2183,6 +2270,10 @@ msgstr "Cancella il contenuto"
 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
+msgid "Description"
+msgstr "Descrizione"
+
 #: .\cookbook\templates\url_import.html:175
 msgid "Text dragged here will be appended to the description."
 msgstr "Il testo trascinato qui sarà aggiunto alla descrizione."
@@ -2207,6 +2298,11 @@ msgstr "Tempo di cottura"
 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
+msgid "Instructions"
+msgstr "Istruzioni"
+
 #: .\cookbook\templates\url_import.html:302
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
@@ -2260,6 +2356,10 @@ msgstr "Descrizione ricetta"
 msgid "Select one"
 msgstr "Seleziona un elemento"
 
+#: .\cookbook\templates\url_import.html:583
+msgid "Add Keyword"
+msgstr "Aggiungi parole chiave"
+
 #: .\cookbook\templates\url_import.html:596
 msgid "All Keywords"
 msgstr "Tutte le parole chiave"
@@ -2302,37 +2402,96 @@ msgstr "Issues (Problemi aperti) su GitHub"
 msgid "Recipe Markup Specification"
 msgstr "Specifica di Markup della ricetta"
 
-#: .\cookbook\views\api.py:79
+#: .\cookbook\views\api.py:82 .\cookbook\views\api.py:131
 msgid "Parameter updated_at incorrectly formatted"
 msgstr "Il parametro updated_at non è formattato correttamente"
 
-#: .\cookbook\views\api.py:580 .\cookbook\views\views.py:303
+#: .\cookbook\views\api.py:151
+#, python-brace-format
+msgid "No {self.basename} with id {pk} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
+#: .\cookbook\views\edit.py:316
+msgid "Cannot merge with the same object!"
+msgstr "Non è possibile unirlo con lo stesso oggetto!"
+
+#: .\cookbook\views\api.py:162
+#, python-brace-format
+msgid "No {self.basename} with id {target} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:167
+#, fuzzy
+#| msgid "Cannot merge with the same object!"
+msgid "Cannot merge with child object!"
+msgstr "Non è possibile unirlo con lo stesso oggetto!"
+
+#: .\cookbook\views\api.py:195
+#, python-brace-format
+msgid "{source.name} was merged successfully with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:199
+#, python-brace-format
+msgid "An error occurred attempting to merge {source.name} with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:239
+#, python-brace-format
+msgid "No {self.basename} with id {child} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:248
+#, python-brace-format
+msgid "{child.name} was moved successfully to the root."
+msgstr ""
+
+#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+msgid "An error occurred attempting to move "
+msgstr ""
+
+#: .\cookbook\views\api.py:254
+msgid "Cannot move an object to itself!"
+msgstr ""
+
+#: .\cookbook\views\api.py:260
+#, python-brace-format
+msgid "No {self.basename} with id {parent} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:266
+#, python-brace-format
+msgid "{child.name} was moved successfully to parent {parent.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
 msgid "This feature is not available in the demo version!"
 msgstr "Questa funzione non è disponibile nella versione demo!"
 
-#: .\cookbook\views\api.py:603
+#: .\cookbook\views\api.py:727
 msgid "Sync successful!"
 msgstr "Sincronizzazione completata con successo!"
 
-#: .\cookbook\views\api.py:608
+#: .\cookbook\views\api.py:732
 msgid "Error synchronizing with Storage"
 msgstr "Errore di sincronizzazione con questo backend"
 
-#: .\cookbook\views\api.py:686
+#: .\cookbook\views\api.py:810
 msgid "Nothing to do."
 msgstr "Nulla da fare."
 
-#: .\cookbook\views\api.py:701
+#: .\cookbook\views\api.py:825
 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:708
+#: .\cookbook\views\api.py:832
 msgid "The requested page could not be found."
 msgstr "La pagina richiesta non è stata trovata."
 
-#: .\cookbook\views\api.py:717
+#: .\cookbook\views\api.py:841
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
@@ -2340,11 +2499,11 @@ msgstr ""
 "Il sito richiesto non fornisce un formato di dati riconosciuto da cui "
 "importare la ricetta."
 
-#: .\cookbook\views\api.py:731
+#: .\cookbook\views\api.py:855
 msgid "No useable data could be found."
 msgstr "Nessuna informazione utilizzabile è stata trovata."
 
-#: .\cookbook\views\api.py:747
+#: .\cookbook\views\api.py:871
 msgid "I couldn't find anything to do."
 msgstr "Non è stato trovato nulla da fare."
 
@@ -2372,8 +2531,8 @@ msgstr[1] ""
 msgid "Monitor"
 msgstr "Monitoraggio"
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:102
-#: .\cookbook\views\new.py:98
+#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr "Backend di archiviazione"
 
@@ -2384,8 +2543,8 @@ msgstr ""
 "Non è possibile eliminare questo backend di archiviazione perchè è usato in "
 "almeno un monitoraggio."
 
-#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:213
-#: .\cookbook\views\new.py:156
+#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
+#: .\cookbook\views\new.py:155
 msgid "Recipe Book"
 msgstr "Libro delle ricette"
 
@@ -2393,49 +2552,41 @@ msgstr "Libro delle ricette"
 msgid "Bookmarks"
 msgstr "Preferiti"
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:252
+#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
 msgid "Invite Link"
 msgstr "Link di invito"
 
-#: .\cookbook\views\edit.py:119
-msgid "Food"
-msgstr "Alimento"
-
-#: .\cookbook\views\edit.py:128
+#: .\cookbook\views\edit.py:126
 msgid "You cannot edit this storage!"
 msgstr "Non puoi modificare questo backend!"
 
-#: .\cookbook\views\edit.py:148
+#: .\cookbook\views\edit.py:146
 msgid "Storage saved!"
 msgstr "Backend salvato!"
 
-#: .\cookbook\views\edit.py:154
+#: .\cookbook\views\edit.py:152
 msgid "There was an error updating this storage backend!"
 msgstr ""
 "Si è verificato un errore durante l'aggiornamento di questo backend di "
 "archiviazione!"
 
-#: .\cookbook\views\edit.py:165
+#: .\cookbook\views\edit.py:163
 msgid "Storage"
 msgstr "Archiviazione"
 
-#: .\cookbook\views\edit.py:261
+#: .\cookbook\views\edit.py:259
 msgid "Changes saved!"
 msgstr "Modifiche salvate!"
 
-#: .\cookbook\views\edit.py:265
+#: .\cookbook\views\edit.py:263
 msgid "Error saving changes!"
 msgstr "Si è verificato un errore durante il salvataggio delle modifiche!"
 
-#: .\cookbook\views\edit.py:299
+#: .\cookbook\views\edit.py:298
 msgid "Units merged!"
 msgstr "Le unità sono state unite!"
 
-#: .\cookbook\views\edit.py:301 .\cookbook\views\edit.py:317
-msgid "Cannot merge with the same object!"
-msgstr "Non è possibile unirlo con lo stesso oggetto!"
-
-#: .\cookbook\views\edit.py:315
+#: .\cookbook\views\edit.py:314
 msgid "Foods merged!"
 msgstr "Gli alimenti sono stati uniti!"
 
@@ -2447,69 +2598,87 @@ msgstr "Questo provider non permette l'importazione"
 msgid "Exporting is not implemented for this provider"
 msgstr "Questo provider non permette l'esportazione"
 
-#: .\cookbook\views\lists.py:40
+#: .\cookbook\views\lists.py:26
 msgid "Import Log"
 msgstr "Registro importazioni"
 
-#: .\cookbook\views\lists.py:53
+#: .\cookbook\views\lists.py:39
 msgid "Discovery"
 msgstr "Trovate"
 
-#: .\cookbook\views\lists.py:85
+#: .\cookbook\views\lists.py:69
 msgid "Shopping Lists"
 msgstr "Liste della spesa"
 
-#: .\cookbook\views\new.py:123
+#: .\cookbook\views\lists.py:129
+#, fuzzy
+#| msgid "Food"
+msgid "Foods"
+msgstr "Alimento"
+
+#: .\cookbook\views\lists.py:163
+#, fuzzy
+#| msgid "Supermarket"
+msgid "Supermarkets"
+msgstr "Supermercato"
+
+#: .\cookbook\views\lists.py:179
+#, fuzzy
+#| msgid "Shopping Recipes"
+msgid "Shopping Categories"
+msgstr "Ricette per la spesa"
+
+#: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr "La nuova ricetta è stata importata!"
 
-#: .\cookbook\views\new.py:126
+#: .\cookbook\views\new.py:125
 msgid "There was an error importing this recipe!"
 msgstr "Si è verificato un errore durante l'importazione di questa ricetta!"
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "Hello"
 msgstr "Ciao"
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "You have been invited by "
 msgstr "Sei stato invitato da "
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:226
 msgid " to join their Tandoor Recipes space "
 msgstr " per entrare nella sua istanza di Tandoor Recipes "
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:227
 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:229
+#: .\cookbook\views\new.py:228
 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:230
+#: .\cookbook\views\new.py:229
 msgid "The invitation is valid until "
 msgstr "L'invito è valido fino al "
 
-#: .\cookbook\views\new.py:231
+#: .\cookbook\views\new.py:230
 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:234
+#: .\cookbook\views\new.py:233
 msgid "Tandoor Recipes Invite"
 msgstr "Invito per Tandoor Recipes"
 
-#: .\cookbook\views\new.py:241
+#: .\cookbook\views\new.py:240
 msgid "Invite link successfully send to user."
 msgstr "Link di invito inviato con successo all'utente."
 
-#: .\cookbook\views\new.py:244
+#: .\cookbook\views\new.py:243
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
@@ -2517,13 +2686,13 @@ msgstr ""
 "Hai mandato troppe email, condividi il link manualmente o aspetta qualche "
 "ora."
 
-#: .\cookbook\views\new.py:246
+#: .\cookbook\views\new.py:245
 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:129
+#: .\cookbook\views\views.py:128
 msgid ""
 "You have successfully created your own recipe space. Start by adding some "
 "recipes or invite other people to join you."
@@ -2531,15 +2700,29 @@ 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:177
+#: .\cookbook\views\views.py:176
 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:188
+#: .\cookbook\views\views.py:187
 msgid "Comment saved!"
 msgstr "Commento salvato!"
 
-#: .\cookbook\views\views.py:395
+#: .\cookbook\views\views.py:351
+msgid "You must select at least one field to search!"
+msgstr ""
+
+#: .\cookbook\views\views.py:354
+msgid ""
+"To use this search method you must select at least one full text search "
+"field!"
+msgstr ""
+
+#: .\cookbook\views\views.py:357
+msgid "Fuzzy search is not compatible with this search method!"
+msgstr ""
+
+#: .\cookbook\views\views.py:437
 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 "
@@ -2549,31 +2732,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:402
+#: .\cookbook\views\views.py:444
 msgid "Passwords dont match!"
 msgstr "Le password non combaciano!"
 
-#: .\cookbook\views\views.py:418
+#: .\cookbook\views\views.py:460
 msgid "User has been created, please login!"
 msgstr "L'utente è stato creato e ora può essere usato per il login!"
 
-#: .\cookbook\views\views.py:434
+#: .\cookbook\views\views.py:476
 msgid "Malformed Invite Link supplied!"
 msgstr "È stato fornito un link di invito non valido!"
 
-#: .\cookbook\views\views.py:441
+#: .\cookbook\views\views.py:483
 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."
+msgstr ""
+"Sei già membro di una istanza e quindi non puoi entrare in quest'altra."
 
-#: .\cookbook\views\views.py:452
+#: .\cookbook\views\views.py:494
 msgid "Successfully joined space."
 msgstr "Sei entrato a far parte di questa istanza."
 
-#: .\cookbook\views\views.py:458
+#: .\cookbook\views\views.py:500
 msgid "Invite Link not valid or already used!"
 msgstr "Il link di invito non è valido o è stato già usato!"
 
-#: .\cookbook\views\views.py:522
+#: .\cookbook\views\views.py:564
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
@@ -2581,7 +2765,7 @@ msgstr ""
 "La segnalazione dei link di condivisione non è abilitata per questa istanza. "
 "Notifica l'amministratore per segnalare i problemi."
 
-#: .\cookbook\views\views.py:528
+#: .\cookbook\views\views.py:570
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
@@ -2589,6 +2773,132 @@ msgstr ""
 "Il link per la condivisione delle ricette è stato disabilitato! Per maggiori "
 "informazioni contatta l'amministratore."
 
+#~ msgid "Utensils"
+#~ msgstr "Strumenti"
+
+#~ msgid "Storage Data"
+#~ msgstr "Dati e Archiviazione"
+
+#~ msgid "Storage Backends"
+#~ msgstr "Backend Archiviazione"
+
+#~ msgid "Configure Sync"
+#~ msgstr "Configura Sincronizzazione"
+
+#~ msgid "Discovered Recipes"
+#~ msgstr "Ricette trovate"
+
+#~ msgid "Discovery Log"
+#~ msgstr "Registro ricette trovate"
+
+#~ msgid "Units & Ingredients"
+#~ msgstr "Unità di misura & Ingredienti"
+
+#~ msgid "New Book"
+#~ msgstr "Nuovo Libro"
+
+#~ msgid "Toggle Recipes"
+#~ msgstr "Attiva/Disattiva Ricette"
+
+#~ msgid "There are no recipes in this book yet."
+#~ msgstr "Non ci sono ancora ricette in questo libro."
+
+#~ msgid "Waiting Time"
+#~ msgstr "Tempo di cottura"
+
+#~ msgid "Servings Text"
+#~ msgstr "Nome delle porzioni"
+
+#~ msgid "Select Keywords"
+#~ msgstr "Seleziona parole chiave"
+
+#~ msgid "Nutrition"
+#~ msgstr "Nutrienti"
+
+#~ msgid "Delete Step"
+#~ msgstr "Elimina Step"
+
+#~ msgid "Calories"
+#~ msgstr "Calorie"
+
+#~ msgid "Carbohydrates"
+#~ msgstr "Carboidrati"
+
+#~ msgid "Fats"
+#~ msgstr "Grassi"
+
+#~ msgid "Proteins"
+#~ msgstr "Proteine"
+
+#~ msgid "Step"
+#~ msgstr "Step"
+
+#~ msgid "Show as header"
+#~ msgstr "Mostra come intestazione"
+
+#~ msgid "Hide as header"
+#~ msgstr "Nascondi come intestazione"
+
+#~ msgid "Move Up"
+#~ msgstr "Sposta Sopra"
+
+#~ msgid "Move Down"
+#~ msgstr "Sposta Sotto"
+
+#~ msgid "Step Name"
+#~ msgstr "Nome dello Step"
+
+#~ msgid "Step Type"
+#~ msgstr "Tipo dello Step"
+
+#~ msgid "Step time in Minutes"
+#~ msgstr "Tempo dello step in minuti"
+
+#~ msgid "Select File"
+#~ msgstr "Seleziona file"
+
+#~ msgid "Select Recipe"
+#~ msgstr "Seleziona ricetta"
+
+#~ msgid "Delete Ingredient"
+#~ msgstr "Elimina Ingredienti"
+
+#~ msgid "Make Header"
+#~ msgstr "Crea Intestazione"
+
+#~ msgid "Make Ingredient"
+#~ msgstr "Crea Ingrediente"
+
+#~ msgid "Disable Amount"
+#~ msgstr "Disabilita Quantità"
+
+#~ msgid "Enable Amount"
+#~ msgstr "Abilita Quantità"
+
+#~ msgid "Copy Template Reference"
+#~ msgstr "Copia riferimento template"
+
+#~ msgid "Save & View"
+#~ msgstr "Salva & Mostra"
+
+#~ msgid "Add Step"
+#~ msgstr "Aggiungi Step"
+
+#~ msgid "Add Nutrition"
+#~ msgstr "Aggiungi nutrienti"
+
+#~ msgid "Remove Nutrition"
+#~ msgstr "Rimuovi nutrienti"
+
+#~ msgid "View Recipe"
+#~ msgstr "Mostra ricetta"
+
+#~ msgid "Delete Recipe"
+#~ msgstr "Elimina Ricetta"
+
+#~ msgid "Steps"
+#~ msgstr "Step"
+
 #, fuzzy
 #~| msgid "Password Reset"
 #~ msgid "Password Settings"
diff --git a/cookbook/locale/lv/LC_MESSAGES/django.po b/cookbook/locale/lv/LC_MESSAGES/django.po
index 30de1574..d41b7c87 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+0200\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/"
@@ -23,15 +23,14 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: .\cookbook\filters.py:23 .\cookbook\templates\base.html:98
-#: .\cookbook\templates\forms\edit_internal_recipe.html:269
+#: .\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\views\lists.py:67
+#: .\cookbook\templates\url_import.html:270
 msgid "Ingredients"
 msgstr "Sastāvdaļas"
 
-#: .\cookbook\forms.py:49
+#: .\cookbook\forms.py:50
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
@@ -39,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:51
+#: .\cookbook\forms.py:52
 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:53
+#: .\cookbook\forms.py:54
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
@@ -51,7 +50,7 @@ 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:56
+#: .\cookbook\forms.py:57
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
@@ -59,20 +58,20 @@ msgstr ""
 "Lietotāji, ar kuriem jaunizveidotie maltīšu saraksti/iepirkumu saraksti tiks "
 "kopīgoti pēc noklusējuma."
 
-#: .\cookbook\forms.py:58
+#: .\cookbook\forms.py:59
 msgid "Show recently viewed recipes on search page."
 msgstr "Parādīt nesen skatītās receptes meklēšanas lapā."
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:60
 msgid "Number of decimals to round ingredients."
 msgstr "Ciparu skaits pēc komata decimāldaļām sastāvdaļās."
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:61
 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:62
+#: .\cookbook\forms.py:63
 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 +85,11 @@ msgstr ""
 "Ja tas ir zemāks par instances ierobežojumu, tas tiek atiestatīts, "
 "saglabājot."
 
-#: .\cookbook\forms.py:65
+#: .\cookbook\forms.py:66
 msgid "Makes the navbar stick to the top of the page."
 msgstr ""
 
-#: .\cookbook\forms.py:81
+#: .\cookbook\forms.py:82
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
@@ -98,92 +97,89 @@ msgstr ""
 "Abi lauki nav obligāti. Ja neviens nav norādīts, tā vietā tiks parādīts "
 "lietotājvārds"
 
-#: .\cookbook\forms.py:102 .\cookbook\forms.py:331
-#: .\cookbook\templates\forms\edit_internal_recipe.html:49
+#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
 #: .\cookbook\templates\url_import.html:154
 msgid "Name"
 msgstr "Vārds"
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:332
-#: .\cookbook\templates\base.html:108 .\cookbook\templates\base.html:169
-#: .\cookbook\templates\forms\edit_internal_recipe.html:85
+#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
 #: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573
+#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr "Atslēgvārdi"
 
-#: .\cookbook\forms.py:104
+#: .\cookbook\forms.py:105
 msgid "Preparation time in minutes"
 msgstr "Pagatavošanas laiks minūtēs"
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:106
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "Gaidīšanas laiks (vārīšana / cepšana) minūtēs"
 
-#: .\cookbook\forms.py:106 .\cookbook\forms.py:333
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
 msgid "Path"
 msgstr "Ceļš"
 
-#: .\cookbook\forms.py:107
+#: .\cookbook\forms.py:108
 msgid "Storage UID"
 msgstr "Krātuves UID"
 
-#: .\cookbook\forms.py:133
+#: .\cookbook\forms.py:134
 msgid "Default"
 msgstr ""
 
-#: .\cookbook\forms.py:144 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
 
-#: .\cookbook\forms.py:164
+#: .\cookbook\forms.py:165
 msgid "New Unit"
 msgstr "Jaunā vienība"
 
-#: .\cookbook\forms.py:165
+#: .\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:170
+#: .\cookbook\forms.py:171
 msgid "Old Unit"
 msgstr "Vecā vienība"
 
-#: .\cookbook\forms.py:171
+#: .\cookbook\forms.py:172
 msgid "Unit that should be replaced."
 msgstr "Vienība, kas jāaizstāj."
 
-#: .\cookbook\forms.py:187
+#: .\cookbook\forms.py:189
 msgid "New Food"
 msgstr "Jauns ēdiens"
 
-#: .\cookbook\forms.py:188
+#: .\cookbook\forms.py:190
 msgid "New food that other gets replaced by."
 msgstr "Jauns ēdiens, ar kuru citi tiek aizstāti."
 
-#: .\cookbook\forms.py:193
+#: .\cookbook\forms.py:195
 msgid "Old Food"
 msgstr "Vecais ēdiens"
 
-#: .\cookbook\forms.py:194
+#: .\cookbook\forms.py:196
 msgid "Food that should be replaced."
 msgstr "Ēdiens, kas būtu jāaizstāj."
 
-#: .\cookbook\forms.py:212
+#: .\cookbook\forms.py:214
 msgid "Add your comment: "
 msgstr "Pievienot komentāru: "
 
-#: .\cookbook\forms.py:253
+#: .\cookbook\forms.py:256
 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:260
+#: .\cookbook\forms.py:263
 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:269
+#: .\cookbook\forms.py:272
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
@@ -191,26 +187,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:307
+#: .\cookbook\forms.py:310
 msgid "Search String"
 msgstr "Meklēšanas virkne"
 
-#: .\cookbook\forms.py:334
+#: .\cookbook\forms.py:337
 msgid "File ID"
 msgstr "Faila ID"
 
-#: .\cookbook\forms.py:370
+#: .\cookbook\forms.py:373
 msgid "You must provide at least a recipe or a title."
 msgstr "Jums jānorāda vismaz recepte vai nosaukums."
 
-#: .\cookbook\forms.py:383
+#: .\cookbook\forms.py:386
 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:384
-#: .\cookbook\templates\forms\edit_internal_recipe.html:427
+#: .\cookbook\forms.py:387
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
@@ -218,63 +213,139 @@ msgstr ""
 "Lai formatētu šo lauku, varat izmantot Markdown. Skatiet <a href=\"/docs/"
 "markdown/\"> dokumentus šeit </a>"
 
-#: .\cookbook\forms.py:409
+#: .\cookbook\forms.py:412
 msgid "Maximum number of users for this space reached."
 msgstr ""
 
-#: .\cookbook\forms.py:415
+#: .\cookbook\forms.py:418
 msgid "Email address already taken!"
 msgstr ""
 
-#: .\cookbook\forms.py:423
+#: .\cookbook\forms.py:426
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
 msgstr ""
 
-#: .\cookbook\forms.py:438
+#: .\cookbook\forms.py:441
 msgid "Name already taken."
 msgstr ""
 
-#: .\cookbook\forms.py:449
+#: .\cookbook\forms.py:452
 msgid "Accept Terms and Privacy"
 msgstr ""
 
+#: .\cookbook\forms.py:487
+msgid ""
+"Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
+"full desciption of choices."
+msgstr ""
+
+#: .\cookbook\forms.py:488
+msgid ""
+"Use fuzzy matching on units, keywords and ingredients when editing and "
+"importing recipes."
+msgstr ""
+
+#: .\cookbook\forms.py:489
+msgid ""
+"Fields to search ignoring accents.  Selecting this option can improve or "
+"degrade search quality depending on language"
+msgstr ""
+
+#: .\cookbook\forms.py:490
+msgid ""
+"Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
+"'pie' and 'piece' and 'soapie')"
+msgstr ""
+
+#: .\cookbook\forms.py:491
+msgid ""
+"Fields to search for beginning of word matches. (e.g. searching for 'sa' "
+"will return 'salad' and 'sandwich')"
+msgstr ""
+
+#: .\cookbook\forms.py:492
+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
+msgid ""
+"Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
+"only function with fulltext fields."
+msgstr ""
+
+#: .\cookbook\forms.py:497
+#, fuzzy
+#| msgid "Search"
+msgid "Search Method"
+msgstr "Meklēt"
+
+#: .\cookbook\forms.py:498
+msgid "Fuzzy Lookups"
+msgstr ""
+
+#: .\cookbook\forms.py:499
+msgid "Ignore Accent"
+msgstr ""
+
+#: .\cookbook\forms.py:500
+msgid "Partial Match"
+msgstr ""
+
+#: .\cookbook\forms.py:501
+msgid "Starts Wtih"
+msgstr ""
+
+#: .\cookbook\forms.py:502
+#, fuzzy
+#| msgid "Search"
+msgid "Fuzzy Search"
+msgstr "Meklēt"
+
+#: .\cookbook\forms.py:503
+#, fuzzy
+#| msgid "Text"
+msgid "Full Text"
+msgstr "Teskts"
+
 #: .\cookbook\helper\AllAuthCustomAdapter.py:36
 msgid ""
 "In order to prevent spam, the requested email was not send. Please wait a "
 "few minutes and try again."
 msgstr ""
 
-#: .\cookbook\helper\permission_helper.py:138
-#: .\cookbook\helper\permission_helper.py:161 .\cookbook\views\views.py:151
+#: .\cookbook\helper\permission_helper.py:136
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
 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!"
 
-#: .\cookbook\helper\permission_helper.py:142
-#: .\cookbook\helper\permission_helper.py:148
-#: .\cookbook\helper\permission_helper.py:173
-#: .\cookbook\helper\permission_helper.py:218
-#: .\cookbook\helper\permission_helper.py:232
-#: .\cookbook\helper\permission_helper.py:243
-#: .\cookbook\helper\permission_helper.py:254 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:162 .\cookbook\views\views.py:169
-#: .\cookbook\views\views.py:259
+#: .\cookbook\helper\permission_helper.py:140
+#: .\cookbook\helper\permission_helper.py:146
+#: .\cookbook\helper\permission_helper.py:171
+#: .\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
 msgid "You do not have the required permissions to view this page!"
 msgstr "Jums nav nepieciešamo atļauju, lai apskatītu šo lapu!"
 
-#: .\cookbook\helper\permission_helper.py:166
-#: .\cookbook\helper\permission_helper.py:189
-#: .\cookbook\helper\permission_helper.py:204
+#: .\cookbook\helper\permission_helper.py:164
+#: .\cookbook\helper\permission_helper.py:187
+#: .\cookbook\helper\permission_helper.py:202
 msgid "You cannot interact with this object as it is not owned by you!"
 msgstr "Jūs nevarat mainīt šo objektu, jo tas nepieder jums!"
 
-#: .\cookbook\helper\template_helper.py:60
-#: .\cookbook\helper\template_helper.py:62
+#: .\cookbook\helper\template_helper.py:61
+#: .\cookbook\helper\template_helper.py:63
 msgid "Could not parse template code."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:104
+#: .\cookbook\integration\integration.py:119
 #: .\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
@@ -283,27 +354,27 @@ msgstr ""
 #: .\cookbook\templates\url_import.html:123
 #: .\cookbook\templates\url_import.html:317
 #: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
-#: .\cookbook\views\edit.py:199
+#: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr "Importēt"
 
-#: .\cookbook\integration\integration.py:185
+#: .\cookbook\integration\integration.py:200
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:188
+#: .\cookbook\integration\integration.py:203
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:192
+#: .\cookbook\integration\integration.py:208
 msgid "The following recipes were ignored because they already existed:"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:196
+#: .\cookbook\integration\integration.py:212
 #, fuzzy, python-format
 #| msgid "Imported new recipe!"
 msgid "Imported %s recipes."
@@ -326,7 +397,6 @@ msgid "Source"
 msgstr ""
 
 #: .\cookbook\integration\safron.py:23
-#: .\cookbook\templates\forms\edit_internal_recipe.html:79
 #: .\cookbook\templates\include\log_cooking.html:16
 #: .\cookbook\templates\url_import.html:224
 #: .\cookbook\templates\url_import.html:455
@@ -338,7 +408,6 @@ msgid "Waiting time"
 msgstr ""
 
 #: .\cookbook\integration\safron.py:27
-#: .\cookbook\templates\forms\edit_internal_recipe.html:73
 msgid "Preparation Time"
 msgstr "Pagatavošanas laiks"
 
@@ -352,6 +421,22 @@ msgstr "Pavārgrāmata"
 msgid "Section"
 msgstr ""
 
+#: .\cookbook\management\commands\rebuildindex.py:14
+msgid "Rebuilds full text search index on Recipe"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:18
+msgid "Only Postgress databases use full text search, no index to rebuild"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:29
+msgid "Recipe index rebuild complete."
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:31
+msgid "Recipe index rebuild failed."
+msgstr ""
+
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:14
 msgid "Breakfast"
 msgstr "Brokastis"
@@ -368,78 +453,91 @@ msgstr "Vakariņas"
 msgid "Other"
 msgstr "Cits"
 
-#: .\cookbook\models.py:72
+#: .\cookbook\models.py:144
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr ""
 
-#: .\cookbook\models.py:123 .\cookbook\templates\search.html:7
+#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
 #: .\cookbook\templates\shopping_list.html:52
 msgid "Search"
 msgstr "Meklēt"
 
-#: .\cookbook\models.py:124 .\cookbook\templates\base.html:92
+#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
 #: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:233 .\cookbook\views\new.py:201
+#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
 msgid "Meal-Plan"
 msgstr "Maltīšu plāns"
 
-#: .\cookbook\models.py:125 .\cookbook\templates\base.html:89
+#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr "Grāmatas"
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Small"
 msgstr "Mazs"
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Large"
 msgstr "Liels"
 
-#: .\cookbook\models.py:133 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:206 .\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:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:202
+#: .\cookbook\models.py:389
+msgid " is part of a recipe step and cannot be deleted"
+msgstr ""
+
+#: .\cookbook\models.py:429
 msgid "Text"
 msgstr "Teskts"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:203
+#: .\cookbook\models.py:429
 msgid "Time"
 msgstr "Laiks"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:204
-#: .\cookbook\templates\forms\edit_internal_recipe.html:219
+#: .\cookbook\models.py:429
 #, fuzzy
 #| msgid "File ID"
 msgid "File"
 msgstr "Faila ID"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:205
-#: .\cookbook\templates\forms\edit_internal_recipe.html:241
+#: .\cookbook\models.py:429
 #: .\cookbook\templates\include\recipe_open_modal.html:7
 #: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:273 .\cookbook\views\new.py:52
+#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr "Recepte"
 
-#: .\cookbook\serializer.py:109
+#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+msgid "Simple"
+msgstr ""
+
+#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+msgid "Phrase"
+msgstr ""
+
+#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+msgid "Web"
+msgstr ""
+
+#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+msgid "Raw"
+msgstr ""
+
+#: .\cookbook\serializer.py:112
 msgid "File uploads are not enabled for this Space."
 msgstr ""
 
-#: .\cookbook\serializer.py:117
+#: .\cookbook\serializer.py:125
 msgid "You have reached your file upload limit."
 msgstr ""
 
-#: .\cookbook\tables.py:35 .\cookbook\templates\books.html:36
-#: .\cookbook\templates\generic\edit_template.html:6
+#: .\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
@@ -448,11 +546,10 @@ msgstr ""
 msgid "Edit"
 msgstr "Rediģēt"
 
-#: .\cookbook\tables.py:124 .\cookbook\tables.py:147
-#: .\cookbook\templates\books.html:38
+#: .\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\edit_template.html:27
+#: .\cookbook\templates\generic\edit_template.html:28
 #: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
@@ -482,7 +579,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:154 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -562,7 +659,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:21
+#: .\cookbook\templates\generic\delete_template.html:22
 msgid "Confirm"
 msgstr "Apstiprināt"
 
@@ -574,7 +671,7 @@ msgid ""
 "request</a>."
 msgstr ""
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:189
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
 msgid "Login"
 msgstr "Pieslēgties"
 
@@ -629,7 +726,7 @@ msgstr "Izmaiņas saglabātas!"
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:52
+#: .\cookbook\templates\settings.html:64
 #, fuzzy
 #| msgid "Settings"
 msgid "Password"
@@ -715,103 +812,88 @@ msgstr ""
 msgid "We are sorry, but the sign up is currently closed."
 msgstr ""
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:179
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr "API dokumentācija"
 
-#: .\cookbook\templates\base.html:85
-msgid "Utensils"
-msgstr "Piederumi"
-
-#: .\cookbook\templates\base.html:95
+#: .\cookbook\templates\base.html:86
 msgid "Shopping"
 msgstr "Iepirkšanās"
 
-#: .\cookbook\templates\base.html:101
+#: .\cookbook\templates\base.html:113
+msgid "Keyword"
+msgstr "Atslēgvārds"
+
+#: .\cookbook\templates\base.html:137
+#: .\cookbook\templates\forms\ingredients.html:24
+#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
+#: .\cookbook\views\lists.py:146
+msgid "Units"
+msgstr "Vienības"
+
+#: .\cookbook\templates\base.html:151
 #: .\cookbook\templates\shopping_list.html:230
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr ""
 
-#: .\cookbook\templates\base.html:112 .\cookbook\views\delete.py:84
-#: .\cookbook\views\edit.py:102 .\cookbook\views\lists.py:26
-#: .\cookbook\views\new.py:78
-msgid "Keyword"
-msgstr "Atslēgvārds"
-
-#: .\cookbook\templates\base.html:114
+#: .\cookbook\templates\base.html:163
 msgid "Batch Edit"
 msgstr "Rediģēt vairākus"
 
-#: .\cookbook\templates\base.html:119
-msgid "Storage Data"
-msgstr "Krātuves dati"
-
-#: .\cookbook\templates\base.html:123
-msgid "Storage Backends"
-msgstr "Krātuves backendi"
-
-#: .\cookbook\templates\base.html:125
-msgid "Configure Sync"
-msgstr "Konfigurēt sinhronizāciju"
-
-#: .\cookbook\templates\base.html:127
-msgid "Discovered Recipes"
-msgstr "Atrastās receptes"
-
-#: .\cookbook\templates\base.html:129
-msgid "Discovery Log"
-msgstr "Atrastās žurnāls"
-
-#: .\cookbook\templates\base.html:131 .\cookbook\templates\stats.html:10
-msgid "Statistics"
-msgstr "Statistika"
-
-#: .\cookbook\templates\base.html:133
-msgid "Units & Ingredients"
-msgstr "Vienības un sastāvdaļas"
-
-#: .\cookbook\templates\base.html:135 .\cookbook\templates\index.html:47
-msgid "Import Recipe"
-msgstr "Importēt recepti"
-
-#: .\cookbook\templates\base.html:156 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr "Vēsture"
 
-#: .\cookbook\templates\base.html:159 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:191 .\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
+msgid "Create"
+msgstr "Izveidot"
+
+#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
 #: .\cookbook\templates\space.html:19
 #, fuzzy
 #| msgid "Settings"
 msgid "Space Settings"
 msgstr "Iestatījumi"
 
-#: .\cookbook\templates\base.html:163 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr "Sistēma"
 
-#: .\cookbook\templates\base.html:165 .\cookbook\templates\base.html:171
+#: .\cookbook\templates\base.html:214
 msgid "Admin"
 msgstr "Administrators"
 
-#: .\cookbook\templates\base.html:175
+#: .\cookbook\templates\base.html:218
 msgid "Markdown Guide"
 msgstr "Markdown rokasgrāmata"
 
-#: .\cookbook\templates\base.html:177
+#: .\cookbook\templates\base.html:220
 msgid "GitHub"
 msgstr "Github"
 
-#: .\cookbook\templates\base.html:181
+#: .\cookbook\templates\base.html:224
 msgid "API Browser"
 msgstr "API pārlūks"
 
-#: .\cookbook\templates\base.html:184
+#: .\cookbook\templates\base.html:227
 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"
@@ -825,7 +907,7 @@ msgid "Add the specified keywords to all recipes containing a word"
 msgstr ""
 "Pievienojiet norādītos atslēgvārdus visām receptēm, kurās ir atrodams vārds"
 
-#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:85
+#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:83
 msgid "Sync"
 msgstr "Sinhronizēt"
 
@@ -845,10 +927,26 @@ msgstr ""
 msgid "The path must be in the following format"
 msgstr "Ceļam jābūt šādā formātā"
 
-#: .\cookbook\templates\batch\monitor.html:27
+#: .\cookbook\templates\batch\monitor.html:21
+msgid "Manage External Storage"
+msgstr ""
+
+#: .\cookbook\templates\batch\monitor.html:28
 msgid "Sync Now!"
 msgstr "Sinhronizēt tagad!"
 
+#: .\cookbook\templates\batch\monitor.html:29
+#, fuzzy
+#| msgid "Shopping Recipes"
+msgid "Show Recipes"
+msgstr "Iepirkšanās receptes"
+
+#: .\cookbook\templates\batch\monitor.html:30
+#, fuzzy
+#| msgid "Show Links"
+msgid "Show Log"
+msgstr "Rādīt saites"
+
 #: .\cookbook\templates\batch\waiting.html:4
 #: .\cookbook\templates\batch\waiting.html:10
 msgid "Importing Recipes"
@@ -862,32 +960,10 @@ msgstr ""
 "Tas var aizņemt dažas minūtes, atkarībā no sinhronizēto recepšu skaita, "
 "lūdzu, uzgaidiet."
 
-#: .\cookbook\templates\books.html:5 .\cookbook\templates\books.html:11
+#: .\cookbook\templates\books.html:7
 msgid "Recipe Books"
 msgstr "Recepšu grāmatas"
 
-#: .\cookbook\templates\books.html:15
-msgid "New Book"
-msgstr "Jauna grāmata"
-
-#: .\cookbook\templates\books.html:27 .\cookbook\templates\recipe_view.html:26
-msgid "by"
-msgstr "pēc"
-
-#: .\cookbook\templates\books.html:34
-msgid "Toggle Recipes"
-msgstr "Pārslēgt receptes"
-
-#: .\cookbook\templates\books.html:54
-#: .\cookbook\templates\meal_plan_entry.html:48
-#: .\cookbook\templates\recipes_table.html:64
-msgid "Last cooked"
-msgstr "Pēdējoreiz gatavots"
-
-#: .\cookbook\templates\books.html:71
-msgid "There are no recipes in this book yet."
-msgstr "Šajā grāmatā vēl nav receptes."
-
 #: .\cookbook\templates\export.html:6 .\cookbook\templates\test2.html:6
 msgid "Export Recipes"
 msgstr "Eksportēt receptes"
@@ -910,217 +986,21 @@ msgid "Import new Recipe"
 msgstr "Importēt jaunu recepti"
 
 #: .\cookbook\templates\forms\edit_import_recipe.html:14
-#: .\cookbook\templates\forms\edit_internal_recipe.html:439
-#: .\cookbook\templates\forms\edit_internal_recipe.html:471
 #: .\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:46 .\cookbook\templates\settings.html:87
-#: .\cookbook\templates\settings.html:105
+#: .\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
 msgid "Save"
 msgstr "Saglabāt"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:7
-#: .\cookbook\templates\forms\edit_internal_recipe.html:34
 msgid "Edit Recipe"
 msgstr "Rediģēt recepti"
 
-#: .\cookbook\templates\forms\edit_internal_recipe.html:56
-#: .\cookbook\templates\url_import.html:171
-msgid "Description"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:76
-msgid "Waiting Time"
-msgstr "Gaidīšanas laiks"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:82
-msgid "Servings Text"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:93
-msgid "Select Keywords"
-msgstr "Atlasīt atslēgvārdus"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:94
-#: .\cookbook\templates\url_import.html:583
-#, fuzzy
-#| msgid "All Keywords"
-msgid "Add Keyword"
-msgstr "Visi atslēgvārdi"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:112
-msgid "Nutrition"
-msgstr "Uzturs"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:116
-#: .\cookbook\templates\forms\edit_internal_recipe.html:166
-msgid "Delete Step"
-msgstr "Dzēst soli"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:120
-msgid "Calories"
-msgstr "Kalorijas"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:123
-msgid "Carbohydrates"
-msgstr "Ogļhidrāti"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:126
-msgid "Fats"
-msgstr "Tauki"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:128
-msgid "Proteins"
-msgstr "Olbaltumvielas"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:150
-#: .\cookbook\templates\forms\edit_internal_recipe.html:504
-msgid "Step"
-msgstr "Solis"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:171
-msgid "Show as header"
-msgstr "Rādīt kā galveni"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:177
-msgid "Hide as header"
-msgstr "Slēpt kā galveni"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:182
-msgid "Move Up"
-msgstr "Pārvietot uz augšu"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:187
-msgid "Move Down"
-msgstr "Pārvietot uz leju"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:196
-msgid "Step Name"
-msgstr "Soļa nosaukums"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:200
-msgid "Step Type"
-msgstr "Soļa tips"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:213
-msgid "Step time in Minutes"
-msgstr "Soļa laiks minūtēs"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:229
-#, fuzzy
-#| msgid "Select one"
-msgid "Select File"
-msgstr "Izvēlies vienu"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:230
-#: .\cookbook\templates\forms\edit_internal_recipe.html:252
-#: .\cookbook\templates\forms\edit_internal_recipe.html:313
-#: .\cookbook\templates\forms\edit_internal_recipe.html:337
-#: .\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
-msgid "Select"
-msgstr "Atlasīt"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:251
-#, fuzzy
-#| msgid "Delete Recipe"
-msgid "Select Recipe"
-msgstr "Dzēst recepti"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:311
-#: .\cookbook\templates\shopping_list.html:187
-msgid "Select Unit"
-msgstr "Atlasiet vienību"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:312
-#: .\cookbook\templates\forms\edit_internal_recipe.html:336
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
-msgid "Create"
-msgstr "Izveidot"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:335
-#: .\cookbook\templates\shopping_list.html:209
-msgid "Select Food"
-msgstr "Atlasīt ēdienu"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:352
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr "Piezīme"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:369
-msgid "Delete Ingredient"
-msgstr "Dzēst sastāvdaļu"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:375
-msgid "Make Header"
-msgstr "Izveidot galveni"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:381
-msgid "Make Ingredient"
-msgstr "Pagatavot sastāvdaļu"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:387
-msgid "Disable Amount"
-msgstr "Atspējot summu"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:393
-msgid "Enable Amount"
-msgstr "Iespējot summu"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:398
-msgid "Copy Template Reference"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:424
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
-msgid "Instructions"
-msgstr "Instrukcijas"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:437
-#: .\cookbook\templates\forms\edit_internal_recipe.html:468
-msgid "Save & View"
-msgstr "Saglabāt un skatīt"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:441
-#: .\cookbook\templates\forms\edit_internal_recipe.html:474
-msgid "Add Step"
-msgstr "Pievienot soli"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:444
-#: .\cookbook\templates\forms\edit_internal_recipe.html:478
-msgid "Add Nutrition"
-msgstr "Pievienot uzturu"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:446
-#: .\cookbook\templates\forms\edit_internal_recipe.html:480
-msgid "Remove Nutrition"
-msgstr "Noņemt uzturu"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:448
-#: .\cookbook\templates\forms\edit_internal_recipe.html:483
-msgid "View Recipe"
-msgstr "Skatīt recepti"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:450
-#: .\cookbook\templates\forms\edit_internal_recipe.html:485
-msgid "Delete Recipe"
-msgstr "Dzēst recepti"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:491
-msgid "Steps"
-msgstr "Soļi"
-
 #: .\cookbook\templates\forms\ingredients.html:15
 msgid "Edit Ingredients"
 msgstr "Rediģēt sastāvdaļas"
@@ -1143,11 +1023,6 @@ msgstr ""
 "receptes, kas izmanto tās.\n"
 "    "
 
-#: .\cookbook\templates\forms\ingredients.html:24
-#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
-msgid "Units"
-msgstr "Vienības"
-
 #: .\cookbook\templates\forms\ingredients.html:26
 msgid "Are you sure that you want to merge these two units?"
 msgstr "Vai tiešām vēlaties apvienot šīs divas vienības?"
@@ -1161,29 +1036,33 @@ 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:18
+#: .\cookbook\templates\generic\delete_template.html:19
 #, 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\edit_template.html:30
+#: .\cookbook\templates\generic\delete_template.html:23
+msgid "Cancel"
+msgstr ""
+
+#: .\cookbook\templates\generic\edit_template.html:32
 msgid "View"
 msgstr "Skatīt"
 
-#: .\cookbook\templates\generic\edit_template.html:34
+#: .\cookbook\templates\generic\edit_template.html:36
 msgid "Delete original file"
 msgstr "Dzēst sākotnējo failu"
 
 #: .\cookbook\templates\generic\list_template.html:6
-#: .\cookbook\templates\generic\list_template.html:12
+#: .\cookbook\templates\generic\list_template.html:21
 msgid "List"
 msgstr "Saraksts"
 
-#: .\cookbook\templates\generic\list_template.html:25
+#: .\cookbook\templates\generic\list_template.html:34
 msgid "Filter"
 msgstr "Filtrs"
 
-#: .\cookbook\templates\generic\list_template.html:30
+#: .\cookbook\templates\generic\list_template.html:39
 msgid "Import all"
 msgstr "Importēt visu"
 
@@ -1523,6 +1402,11 @@ msgstr "Parādīt palīdzību"
 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"
@@ -1586,6 +1470,11 @@ msgstr ""
 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"
+msgstr "Pēdējoreiz gatavots"
+
 #: .\cookbook\templates\meal_plan_entry.html:50
 msgid "Never cooked before."
 msgstr "Nekad nav gatavojis."
@@ -1688,8 +1577,12 @@ msgstr ""
 msgid "Comments"
 msgstr "Komentāri"
 
+#: .\cookbook\templates\recipe_view.html:26
+msgid "by"
+msgstr "pēc"
+
 #: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
-#: .\cookbook\views\edit.py:179
+#: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr "Komentēt"
 
@@ -1721,56 +1614,227 @@ msgstr "Veikt ierakstus pagatavošanas žurnālā"
 msgid "Recipe Home"
 msgstr "Recepšu Sākums"
 
-#: .\cookbook\templates\settings.html:25
+#: .\cookbook\templates\search_info.html:5
+#: .\cookbook\templates\search_info.html:9
+#: .\cookbook\templates\settings.html:157
+#, fuzzy
+#| msgid "Search String"
+msgid "Search Settings"
+msgstr "Meklēšanas virkne"
+
+#: .\cookbook\templates\search_info.html:10
+msgid ""
+"\n"
+"        Creating the best search experience is complicated and weighs "
+"heavily on your personal configuration.  \n"
+"        Changing any of the search settings can have significant impact on "
+"the speed and quality of the results.\n"
+"        Search Methods, Trigrams and Full Text Search configurations are "
+"only available if you are using Postgres for your database.\n"
+"    "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:19
+#, fuzzy
+#| msgid "Search"
+msgid "Search Methods"
+msgstr "Meklēt"
+
+#: .\cookbook\templates\search_info.html:23
+msgid ""
+" \n"
+"            Full text searches attempt to normalize the words provided to "
+"match common variants.  For example: 'forked', 'forking', 'forks' will all "
+"normalize to 'fork'.\n"
+"            There are several methods available, described below, that will "
+"control how the search behavior should react when multiple words are "
+"searched.\n"
+"            Full technical details on how these operate can be viewed on <a "
+"href=https://www.postgresql.org/docs/current/textsearch-controls."
+"html#TEXTSEARCH-PARSING-QUERIES>Postgresql's website.</a>\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:29
+msgid ""
+" \n"
+"            Simple searches ignore punctuation and common words such as "
+"'the', 'a', 'and'. And will treat seperate words as required.\n"
+"            Searching for 'apple or flour' will return any recipe that "
+"includes both 'apple' and 'flour' anywhere in the fields that have been "
+"selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:34
+msgid ""
+" \n"
+"            Phrase searches ignore punctuation, but will search for all of "
+"the words in the exact order provided.\n"
+"            Searching for 'apple or flour' will only return a recipe that "
+"includes the exact phrase 'apple or flour' in any of the fields that have "
+"been selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:39
+msgid ""
+" \n"
+"            Web searches simulate functionality found on many web search "
+"sites supporting special syntax.\n"
+"            Placing quotes around several words will convert those words "
+"into a phrase.\n"
+"            'or' is recongized as searching for the word (or phrase) "
+"immediately before 'or' OR the word (or phrase) directly after.\n"
+"            '-' is recognized as searching for recipes that do not include "
+"the word (or phrase) that comes immediately after. \n"
+"            For example searching for 'apple pie' or cherry -butter will "
+"return any recipe that includes the phrase 'apple pie' or the word "
+"'cherry' \n"
+"            in any field included in the full text search but exclude any "
+"recipe that has the word 'butter' in any field included.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:48
+msgid ""
+" \n"
+"            Raw search is similar to Web except will take puncuation "
+"operators such as '|', '&' and '()'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:59
+msgid ""
+" \n"
+"            Another approach to searching that also requires Postgresql is "
+"fuzzy search or trigram similarity. A trigram is a group of three "
+"consecutive characters.\n"
+"            For example searching for 'apple' will create x trigrams 'app', "
+"'ppl', 'ple' and will create a score of how closely words match the "
+"generated trigrams.\n"
+"            One benefit of searching trigams is that a search for 'sandwich' "
+"will find mispelled words such as 'sandwhich' that would be missed by other "
+"methods.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:69
+#, fuzzy
+#| msgid "Search Recipe"
+msgid "Search Fields"
+msgstr "Meklēt recepti"
+
+#: .\cookbook\templates\search_info.html:73
+msgid ""
+" \n"
+"            Unaccent is a special case in that it enables searching a field "
+"'unaccented' for each search style attempting to ignore accented values. \n"
+"            For example when you enable unaccent for 'Name' any search "
+"(starts with, contains, trigram) will attempt the search ignoring accented "
+"characters.\n"
+"            \n"
+"            For the other options, you can enable search on any or all "
+"fields and they will be combined together with an assumed 'OR'.\n"
+"            For example enabling 'Name' for Starts With, 'Name' and "
+"'Description' for Partial Match and 'Ingredients' and 'Keywords' for Full "
+"Search\n"
+"            and searching for 'apple' will generate a search that will "
+"return recipes that have:\n"
+"            - A recipe name that starts with 'apple'\n"
+"            - OR a recipe name that contains 'apple'\n"
+"            - OR a recipe description that contains 'apple'\n"
+"            - OR a recipe that will have a full text search match ('apple' "
+"or 'apples') in ingredients\n"
+"            - OR a recipe that will have a full text search match in "
+"Keywords\n"
+"\n"
+"            Combining too many fields in too many types of search can have a "
+"negative impact on performance, create duplicate results or return "
+"unexpected results.\n"
+"            For example, enabling fuzzy search or partial matches will "
+"interfere with web search methods.  \n"
+"            Searching for 'apple -pie' with fuzzy search and full text "
+"search will return the recipe Apple Pie.  Though it is not included in the "
+"full text results, it does match the trigram results.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:95
+#, fuzzy
+#| msgid "Search"
+msgid "Search Index"
+msgstr "Meklēt"
+
+#: .\cookbook\templates\search_info.html:99
+msgid ""
+" \n"
+"            Trigram search and Full Text Search both rely on database "
+"indexes to perform effectively.  \n"
+"            You can rebuild the indexes on all fields in the Admin page for "
+"Recipes and selecting all recipes and running 'rebuild index for selected "
+"recipes'\n"
+"            You can also rebuild indexes at the command line by executing "
+"the management command 'python manage.py rebuildindex'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\settings.html:27
 msgid "Account"
 msgstr "Konts"
 
-#: .\cookbook\templates\settings.html:29
+#: .\cookbook\templates\settings.html:33
 msgid "Preferences"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:39
 #, fuzzy
 #| msgid "Settings"
 msgid "API-Settings"
 msgstr "Iestatījumi"
 
-#: .\cookbook\templates\settings.html:41
+#: .\cookbook\templates\settings.html:45
+#, fuzzy
+#| msgid "Search String"
+msgid "Search-Settings"
+msgstr "Meklēšanas virkne"
+
+#: .\cookbook\templates\settings.html:53
 #, fuzzy
 #| msgid "Settings"
 msgid "Name Settings"
 msgstr "Iestatījumi"
 
-#: .\cookbook\templates\settings.html:49
+#: .\cookbook\templates\settings.html:61
 #, fuzzy
 #| msgid "Settings"
 msgid "Account Settings"
 msgstr "Iestatījumi"
 
-#: .\cookbook\templates\settings.html:51
+#: .\cookbook\templates\settings.html:63
 #, fuzzy
 #| msgid "Settings"
 msgid "Emails"
 msgstr "Iestatījumi"
 
-#: .\cookbook\templates\settings.html:54
+#: .\cookbook\templates\settings.html:66
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:78
 msgid "Language"
 msgstr "Valoda"
 
-#: .\cookbook\templates\settings.html:96
+#: .\cookbook\templates\settings.html:108
 msgid "Style"
 msgstr "Stils"
 
-#: .\cookbook\templates\settings.html:116
+#: .\cookbook\templates\settings.html:128
 msgid "API Token"
 msgstr "API Tokens"
 
-#: .\cookbook\templates\settings.html:117
+#: .\cookbook\templates\settings.html:129
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
@@ -1778,7 +1842,7 @@ msgstr ""
 "Lai piekļūtu REST API, varat izmantot gan pamata autentifikāciju, gan tokena "
 "autentifikāciju."
 
-#: .\cookbook\templates\settings.html:134
+#: .\cookbook\templates\settings.html:146
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
@@ -1786,7 +1850,7 @@ msgstr ""
 "Izmantojiet token, kā Authorization header, kas pievienota vārdam token, kā "
 "parādīts šajos piemēros:"
 
-#: .\cookbook\templates\settings.html:136
+#: .\cookbook\templates\settings.html:148
 msgid "or"
 msgstr "vai"
 
@@ -1829,6 +1893,23 @@ msgstr ""
 msgid "Amount"
 msgstr "Summa"
 
+#: .\cookbook\templates\shopping_list.html:187
+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
+msgid "Select"
+msgstr "Atlasīt"
+
+#: .\cookbook\templates\shopping_list.html:209
+msgid "Select Food"
+msgstr "Atlasīt ēdienu"
+
 #: .\cookbook\templates\shopping_list.html:240
 msgid "Select Supermarket"
 msgstr ""
@@ -1926,10 +2007,6 @@ msgstr "Objektu statistika"
 msgid "Recipes without Keywords"
 msgstr "Receptes bez atslēgas vārdiem"
 
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr "Ārējās receptes"
-
 #: .\cookbook\templates\space.html:60 .\cookbook\templates\stats.html:45
 msgid "Internal Recipes"
 msgstr "Iekšējās receptes"
@@ -1987,7 +2064,7 @@ msgid "There are no members in your space yet!"
 msgstr "Šajā grāmatā vēl nav receptes."
 
 #: .\cookbook\templates\space.html:130 .\cookbook\templates\system.html:21
-#: .\cookbook\views\lists.py:115
+#: .\cookbook\views\lists.py:100
 msgid "Invite Links"
 msgstr "Uzaicinājuma saites"
 
@@ -1995,6 +2072,10 @@ msgstr "Uzaicinājuma saites"
 msgid "Stats"
 msgstr "Statistika"
 
+#: .\cookbook\templates\stats.html:10
+msgid "Statistics"
+msgstr "Statistika"
+
 #: .\cookbook\templates\system.html:22
 msgid "Show Links"
 msgstr "Rādīt saites"
@@ -2179,6 +2260,10 @@ msgstr ""
 msgid "Text dragged here will be appended to the name."
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:171
+msgid "Description"
+msgstr ""
+
 #: .\cookbook\templates\url_import.html:175
 msgid "Text dragged here will be appended to the description."
 msgstr ""
@@ -2207,6 +2292,11 @@ msgstr "Laiks"
 msgid "Ingredients dragged here will be appended to current list."
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:297
+#: .\cookbook\templates\url_import.html:567
+msgid "Instructions"
+msgstr "Instrukcijas"
+
 #: .\cookbook\templates\url_import.html:302
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
@@ -2266,6 +2356,12 @@ msgstr "Recepšu Markup specifikācija"
 msgid "Select one"
 msgstr "Izvēlies vienu"
 
+#: .\cookbook\templates\url_import.html:583
+#, fuzzy
+#| msgid "All Keywords"
+msgid "Add Keyword"
+msgstr "Visi atslēgvārdi"
+
 #: .\cookbook\templates\url_import.html:596
 msgid "All Keywords"
 msgstr "Visi atslēgvārdi"
@@ -2309,37 +2405,94 @@ msgstr "GitHub Issues"
 msgid "Recipe Markup Specification"
 msgstr "Recepšu Markup specifikācija"
 
-#: .\cookbook\views\api.py:79
+#: .\cookbook\views\api.py:82 .\cookbook\views\api.py:131
 #, fuzzy
 #| msgid "Parameter filter_list incorrectly formatted"
 msgid "Parameter updated_at incorrectly formatted"
 msgstr "Parametrs filter_list ir nepareizi formatēts"
 
-#: .\cookbook\views\api.py:580 .\cookbook\views\views.py:303
+#: .\cookbook\views\api.py:151
+#, python-brace-format
+msgid "No {self.basename} with id {pk} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
+#: .\cookbook\views\edit.py:316
+msgid "Cannot merge with the same object!"
+msgstr ""
+
+#: .\cookbook\views\api.py:162
+#, python-brace-format
+msgid "No {self.basename} with id {target} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:167
+msgid "Cannot merge with child object!"
+msgstr ""
+
+#: .\cookbook\views\api.py:195
+#, python-brace-format
+msgid "{source.name} was merged successfully with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:199
+#, python-brace-format
+msgid "An error occurred attempting to merge {source.name} with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:239
+#, python-brace-format
+msgid "No {self.basename} with id {child} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:248
+#, python-brace-format
+msgid "{child.name} was moved successfully to the root."
+msgstr ""
+
+#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+msgid "An error occurred attempting to move "
+msgstr ""
+
+#: .\cookbook\views\api.py:254
+msgid "Cannot move an object to itself!"
+msgstr ""
+
+#: .\cookbook\views\api.py:260
+#, python-brace-format
+msgid "No {self.basename} with id {parent} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:266
+#, python-brace-format
+msgid "{child.name} was moved successfully to parent {parent.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
 msgid "This feature is not available in the demo version!"
 msgstr ""
 
-#: .\cookbook\views\api.py:603
+#: .\cookbook\views\api.py:727
 msgid "Sync successful!"
 msgstr "Sinhronizācija ir veiksmīga!"
 
-#: .\cookbook\views\api.py:608
+#: .\cookbook\views\api.py:732
 msgid "Error synchronizing with Storage"
 msgstr "Sinhronizējot ar krātuvi, radās kļūda"
 
-#: .\cookbook\views\api.py:686
+#: .\cookbook\views\api.py:810
 msgid "Nothing to do."
 msgstr ""
 
-#: .\cookbook\views\api.py:701
+#: .\cookbook\views\api.py:825
 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:708
+#: .\cookbook\views\api.py:832
 msgid "The requested page could not be found."
 msgstr "Pieprasīto lapu nevarēja atrast."
 
-#: .\cookbook\views\api.py:717
+#: .\cookbook\views\api.py:841
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
@@ -2347,13 +2500,13 @@ msgstr ""
 "Pieprasītajā vietnē nav norādīts atzīts datu formāts, no kura varētu "
 "importēt recepti."
 
-#: .\cookbook\views\api.py:731
+#: .\cookbook\views\api.py:855
 #, 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:747
+#: .\cookbook\views\api.py:871
 msgid "I couldn't find anything to do."
 msgstr ""
 
@@ -2381,8 +2534,8 @@ msgstr[2] "Partijas rediģēšana pabeigta. %(count)d receptes tika atjaunināta
 msgid "Monitor"
 msgstr "Uzraudzīt"
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:102
-#: .\cookbook\views\new.py:98
+#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr "Krātuves aizmugursistēma"
 
@@ -2393,8 +2546,8 @@ 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:213
-#: .\cookbook\views\new.py:156
+#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
+#: .\cookbook\views\new.py:155
 msgid "Recipe Book"
 msgstr "Recepšu grāmata"
 
@@ -2402,47 +2555,39 @@ msgstr "Recepšu grāmata"
 msgid "Bookmarks"
 msgstr "Grāmatzīmes"
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:252
+#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
 msgid "Invite Link"
 msgstr "Uzaicinājuma saite"
 
-#: .\cookbook\views\edit.py:119
-msgid "Food"
-msgstr "Ēdiens"
-
-#: .\cookbook\views\edit.py:128
+#: .\cookbook\views\edit.py:126
 msgid "You cannot edit this storage!"
 msgstr "Jūs nevarat rediģēt šo krātuvi!"
 
-#: .\cookbook\views\edit.py:148
+#: .\cookbook\views\edit.py:146
 msgid "Storage saved!"
 msgstr "Krātuve saglabāta!"
 
-#: .\cookbook\views\edit.py:154
+#: .\cookbook\views\edit.py:152
 msgid "There was an error updating this storage backend!"
 msgstr "Atjauninot šo krātuves aizmugursistēmu, radās kļūda!"
 
-#: .\cookbook\views\edit.py:165
+#: .\cookbook\views\edit.py:163
 msgid "Storage"
 msgstr "Krātuve"
 
-#: .\cookbook\views\edit.py:261
+#: .\cookbook\views\edit.py:259
 msgid "Changes saved!"
 msgstr "Izmaiņas saglabātas!"
 
-#: .\cookbook\views\edit.py:265
+#: .\cookbook\views\edit.py:263
 msgid "Error saving changes!"
 msgstr "Saglabājot izmaiņas, radās kļūda!"
 
-#: .\cookbook\views\edit.py:299
+#: .\cookbook\views\edit.py:298
 msgid "Units merged!"
 msgstr "Vienības ir apvienotas!"
 
-#: .\cookbook\views\edit.py:301 .\cookbook\views\edit.py:317
-msgid "Cannot merge with the same object!"
-msgstr ""
-
-#: .\cookbook\views\edit.py:315
+#: .\cookbook\views\edit.py:314
 msgid "Foods merged!"
 msgstr "Ēdieni apvienoti!"
 
@@ -2454,89 +2599,119 @@ msgstr ""
 msgid "Exporting is not implemented for this provider"
 msgstr ""
 
-#: .\cookbook\views\lists.py:40
+#: .\cookbook\views\lists.py:26
 msgid "Import Log"
 msgstr "Importēšanas žurnāls"
 
-#: .\cookbook\views\lists.py:53
+#: .\cookbook\views\lists.py:39
 msgid "Discovery"
 msgstr "Atklāšana"
 
-#: .\cookbook\views\lists.py:85
+#: .\cookbook\views\lists.py:69
 msgid "Shopping Lists"
 msgstr "Iepirkšanās saraksti"
 
-#: .\cookbook\views\new.py:123
+#: .\cookbook\views\lists.py:129
+#, fuzzy
+#| msgid "Food"
+msgid "Foods"
+msgstr "Ēdiens"
+
+#: .\cookbook\views\lists.py:163
+msgid "Supermarkets"
+msgstr ""
+
+#: .\cookbook\views\lists.py:179
+#, fuzzy
+#| msgid "Shopping Recipes"
+msgid "Shopping Categories"
+msgstr "Iepirkšanās receptes"
+
+#: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr "Importēta jauna recepte!"
 
-#: .\cookbook\views\new.py:126
+#: .\cookbook\views\new.py:125
 msgid "There was an error importing this recipe!"
 msgstr "Importējot šo recepti, radās kļūda!"
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "Hello"
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "You have been invited by "
 msgstr ""
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:226
 msgid " to join their Tandoor Recipes space "
 msgstr ""
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:227
 msgid "Click the following link to activate your account: "
 msgstr ""
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:228
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:229
 msgid "The invitation is valid until "
 msgstr ""
 
-#: .\cookbook\views\new.py:231
+#: .\cookbook\views\new.py:230
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 
-#: .\cookbook\views\new.py:234
+#: .\cookbook\views\new.py:233
 msgid "Tandoor Recipes Invite"
 msgstr ""
 
-#: .\cookbook\views\new.py:241
+#: .\cookbook\views\new.py:240
 msgid "Invite link successfully send to user."
 msgstr ""
 
-#: .\cookbook\views\new.py:244
+#: .\cookbook\views\new.py:243
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
 msgstr ""
 
-#: .\cookbook\views\new.py:246
+#: .\cookbook\views\new.py:245
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 
-#: .\cookbook\views\views.py:129
+#: .\cookbook\views\views.py:128
 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:177
+#: .\cookbook\views\views.py:176
 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:188
+#: .\cookbook\views\views.py:187
 msgid "Comment saved!"
 msgstr "Komentārs saglabāts!"
 
-#: .\cookbook\views\views.py:395
+#: .\cookbook\views\views.py:351
+msgid "You must select at least one field to search!"
+msgstr ""
+
+#: .\cookbook\views\views.py:354
+msgid ""
+"To use this search method you must select at least one full text search "
+"field!"
+msgstr ""
+
+#: .\cookbook\views\views.py:357
+msgid "Fuzzy search is not compatible with this search method!"
+msgstr ""
+
+#: .\cookbook\views\views.py:437
 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 "
@@ -2546,44 +2721,168 @@ msgstr ""
 "aizmirsis sava superlietotāja informāciju, lūdzu, skatiet Django "
 "dokumentāciju par paroļu atiestatīšanu."
 
-#: .\cookbook\views\views.py:402
+#: .\cookbook\views\views.py:444
 msgid "Passwords dont match!"
 msgstr "Paroles nesakrīt!"
 
-#: .\cookbook\views\views.py:418
+#: .\cookbook\views\views.py:460
 msgid "User has been created, please login!"
 msgstr "Lietotājs ir izveidots, lūdzu, piesakieties!"
 
-#: .\cookbook\views\views.py:434
+#: .\cookbook\views\views.py:476
 msgid "Malformed Invite Link supplied!"
 msgstr "Nepareiza uzaicinājuma saite!"
 
-#: .\cookbook\views\views.py:441
+#: .\cookbook\views\views.py:483
 #, 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:452
+#: .\cookbook\views\views.py:494
 msgid "Successfully joined space."
 msgstr ""
 
-#: .\cookbook\views\views.py:458
+#: .\cookbook\views\views.py:500
 msgid "Invite Link not valid or already used!"
 msgstr "Uzaicinājuma saite nav derīga vai jau izmantota!"
 
-#: .\cookbook\views\views.py:522
+#: .\cookbook\views\views.py:564
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
 msgstr ""
 
-#: .\cookbook\views\views.py:528
+#: .\cookbook\views\views.py:570
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
 msgstr ""
 
+#~ msgid "Utensils"
+#~ msgstr "Piederumi"
+
+#~ msgid "Storage Data"
+#~ msgstr "Krātuves dati"
+
+#~ msgid "Storage Backends"
+#~ msgstr "Krātuves backendi"
+
+#~ msgid "Configure Sync"
+#~ msgstr "Konfigurēt sinhronizāciju"
+
+#~ msgid "Discovered Recipes"
+#~ msgstr "Atrastās receptes"
+
+#~ msgid "Discovery Log"
+#~ msgstr "Atrastās žurnāls"
+
+#~ msgid "Units & Ingredients"
+#~ msgstr "Vienības un sastāvdaļas"
+
+#~ msgid "New Book"
+#~ msgstr "Jauna grāmata"
+
+#~ msgid "Toggle Recipes"
+#~ msgstr "Pārslēgt receptes"
+
+#~ msgid "There are no recipes in this book yet."
+#~ msgstr "Šajā grāmatā vēl nav receptes."
+
+#~ msgid "Waiting Time"
+#~ msgstr "Gaidīšanas laiks"
+
+#~ msgid "Select Keywords"
+#~ msgstr "Atlasīt atslēgvārdus"
+
+#~ msgid "Nutrition"
+#~ msgstr "Uzturs"
+
+#~ msgid "Delete Step"
+#~ msgstr "Dzēst soli"
+
+#~ msgid "Calories"
+#~ msgstr "Kalorijas"
+
+#~ msgid "Carbohydrates"
+#~ msgstr "Ogļhidrāti"
+
+#~ msgid "Fats"
+#~ msgstr "Tauki"
+
+#~ msgid "Proteins"
+#~ msgstr "Olbaltumvielas"
+
+#~ msgid "Step"
+#~ msgstr "Solis"
+
+#~ msgid "Show as header"
+#~ msgstr "Rādīt kā galveni"
+
+#~ msgid "Hide as header"
+#~ msgstr "Slēpt kā galveni"
+
+#~ msgid "Move Up"
+#~ msgstr "Pārvietot uz augšu"
+
+#~ msgid "Move Down"
+#~ msgstr "Pārvietot uz leju"
+
+#~ msgid "Step Name"
+#~ msgstr "Soļa nosaukums"
+
+#~ msgid "Step Type"
+#~ msgstr "Soļa tips"
+
+#~ msgid "Step time in Minutes"
+#~ msgstr "Soļa laiks minūtēs"
+
+#, fuzzy
+#~| msgid "Select one"
+#~ msgid "Select File"
+#~ msgstr "Izvēlies vienu"
+
+#, fuzzy
+#~| msgid "Delete Recipe"
+#~ msgid "Select Recipe"
+#~ msgstr "Dzēst recepti"
+
+#~ msgid "Delete Ingredient"
+#~ msgstr "Dzēst sastāvdaļu"
+
+#~ msgid "Make Header"
+#~ msgstr "Izveidot galveni"
+
+#~ msgid "Make Ingredient"
+#~ msgstr "Pagatavot sastāvdaļu"
+
+#~ msgid "Disable Amount"
+#~ msgstr "Atspējot summu"
+
+#~ msgid "Enable Amount"
+#~ msgstr "Iespējot summu"
+
+#~ msgid "Save & View"
+#~ msgstr "Saglabāt un skatīt"
+
+#~ msgid "Add Step"
+#~ msgstr "Pievienot soli"
+
+#~ msgid "Add Nutrition"
+#~ msgstr "Pievienot uzturu"
+
+#~ msgid "Remove Nutrition"
+#~ msgstr "Noņemt uzturu"
+
+#~ msgid "View Recipe"
+#~ msgstr "Skatīt recepti"
+
+#~ msgid "Delete Recipe"
+#~ msgstr "Dzēst recepti"
+
+#~ msgid "Steps"
+#~ msgstr "Soļi"
+
 #~ msgid ""
 #~ "A username is not required, if left blank the new user can choose one."
 #~ msgstr ""
diff --git a/cookbook/locale/nl/LC_MESSAGES/django.po b/cookbook/locale/nl/LC_MESSAGES/django.po
index ab4b1606..72febec8 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+0200\n"
 "PO-Revision-Date: 2021-08-24 18:28+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"
@@ -24,15 +24,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.7.2\n"
 
-#: .\cookbook\filters.py:23 .\cookbook\templates\base.html:98
-#: .\cookbook\templates\forms\edit_internal_recipe.html:269
+#: .\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\views\lists.py:67
+#: .\cookbook\templates\url_import.html:270
 msgid "Ingredients"
 msgstr "Ingrediënten"
 
-#: .\cookbook\forms.py:49
+#: .\cookbook\forms.py:50
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
@@ -40,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:51
+#: .\cookbook\forms.py:52
 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:53
+#: .\cookbook\forms.py:54
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
@@ -54,7 +53,7 @@ msgstr ""
 "Mogelijk maken van breuken bij ingrediënt aantallen (het automatisch "
 "converteren van decimalen naar breuken)"
 
-#: .\cookbook\forms.py:56
+#: .\cookbook\forms.py:57
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
@@ -62,19 +61,19 @@ msgstr ""
 "Gebruikers waarmee nieuwe maaltijdplannen/boodschappenlijstjes standaard "
 "gedeeld moeten worden."
 
-#: .\cookbook\forms.py:58
+#: .\cookbook\forms.py:59
 msgid "Show recently viewed recipes on search page."
 msgstr "Geef recent bekeken recepten op de zoekpagina weer."
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:60
 msgid "Number of decimals to round ingredients."
 msgstr "Aantal decimalen om ingrediënten op af te ronden."
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:61
 msgid "If you want to be able to create and see comments underneath recipes."
 msgstr "Als je opmerkingen bij recepten wil kunnen maken en zien."
 
-#: .\cookbook\forms.py:62
+#: .\cookbook\forms.py:63
 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 +86,11 @@ msgstr ""
 "gelijktijdig boodschappen doen maar verbruikt mogelijk extra mobiele data. "
 "Wordt gereset bij opslaan wanneer de limiet niet bereikt is."
 
-#: .\cookbook\forms.py:65
+#: .\cookbook\forms.py:66
 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:81
+#: .\cookbook\forms.py:82
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
@@ -99,42 +98,39 @@ msgstr ""
 "Beide velden zijn optioneel. Indien niks is opgegeven wordt de "
 "gebruikersnaam weergegeven"
 
-#: .\cookbook\forms.py:102 .\cookbook\forms.py:331
-#: .\cookbook\templates\forms\edit_internal_recipe.html:49
+#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
 #: .\cookbook\templates\url_import.html:154
 msgid "Name"
 msgstr "Naam"
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:332
-#: .\cookbook\templates\base.html:108 .\cookbook\templates\base.html:169
-#: .\cookbook\templates\forms\edit_internal_recipe.html:85
+#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
 #: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573
+#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr "Etiketten"
 
-#: .\cookbook\forms.py:104
+#: .\cookbook\forms.py:105
 msgid "Preparation time in minutes"
 msgstr "Voorbereidingstijd in minuten"
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:106
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "Wacht tijd in minuten (koken en bakken)"
 
-#: .\cookbook\forms.py:106 .\cookbook\forms.py:333
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
 msgid "Path"
 msgstr "Pad"
 
-#: .\cookbook\forms.py:107
+#: .\cookbook\forms.py:108
 msgid "Storage UID"
 msgstr "Opslag UID"
 
-#: .\cookbook\forms.py:133
+#: .\cookbook\forms.py:134
 msgid "Default"
 msgstr "Standaard waarde"
 
-#: .\cookbook\forms.py:144 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
@@ -142,51 +138,51 @@ msgstr ""
 "Om dubbelingen te voorkomen worden recepten met dezelfde naam als een "
 "bestaand recept genegeerd. Vink aan om alles te importeren."
 
-#: .\cookbook\forms.py:164
+#: .\cookbook\forms.py:165
 msgid "New Unit"
 msgstr "Nieuwe eenheid"
 
-#: .\cookbook\forms.py:165
+#: .\cookbook\forms.py:166
 msgid "New unit that other gets replaced by."
 msgstr "Nieuwe eenheid waarmee de andere wordt vervangen."
 
-#: .\cookbook\forms.py:170
+#: .\cookbook\forms.py:171
 msgid "Old Unit"
 msgstr "Oude eenheid"
 
-#: .\cookbook\forms.py:171
+#: .\cookbook\forms.py:172
 msgid "Unit that should be replaced."
 msgstr "Eenheid die vervangen dient te worden."
 
-#: .\cookbook\forms.py:187
+#: .\cookbook\forms.py:189
 msgid "New Food"
 msgstr "Nieuw Ingredïent"
 
-#: .\cookbook\forms.py:188
+#: .\cookbook\forms.py:190
 msgid "New food that other gets replaced by."
 msgstr "Nieuw Ingredïent dat Oud Ingrediënt vervangt."
 
-#: .\cookbook\forms.py:193
+#: .\cookbook\forms.py:195
 msgid "Old Food"
 msgstr "Oud Ingrediënt"
 
-#: .\cookbook\forms.py:194
+#: .\cookbook\forms.py:196
 msgid "Food that should be replaced."
 msgstr "Te vervangen Ingrediënt."
 
-#: .\cookbook\forms.py:212
+#: .\cookbook\forms.py:214
 msgid "Add your comment: "
 msgstr "Voeg een opmerking toe: "
 
-#: .\cookbook\forms.py:253
+#: .\cookbook\forms.py:256
 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:260
+#: .\cookbook\forms.py:263
 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:269
+#: .\cookbook\forms.py:272
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
@@ -194,26 +190,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:307
+#: .\cookbook\forms.py:310
 msgid "Search String"
 msgstr "Zoekopdracht"
 
-#: .\cookbook\forms.py:334
+#: .\cookbook\forms.py:337
 msgid "File ID"
 msgstr "Bestands ID"
 
-#: .\cookbook\forms.py:370
+#: .\cookbook\forms.py:373
 msgid "You must provide at least a recipe or a title."
 msgstr "Je moet minimaal één recept of titel te specificeren."
 
-#: .\cookbook\forms.py:383
+#: .\cookbook\forms.py:386
 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:384
-#: .\cookbook\templates\forms\edit_internal_recipe.html:427
+#: .\cookbook\forms.py:387
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
@@ -221,15 +216,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:409
+#: .\cookbook\forms.py:412
 msgid "Maximum number of users for this space reached."
 msgstr "Maximum aantal gebruikers voor deze ruimte bereikt."
 
-#: .\cookbook\forms.py:415
+#: .\cookbook\forms.py:418
 msgid "Email address already taken!"
 msgstr "E-mailadres reeds in gebruik!"
 
-#: .\cookbook\forms.py:423
+#: .\cookbook\forms.py:426
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
@@ -237,14 +232,90 @@ msgstr ""
 "Een e-mailadres is niet vereist, maar indien aanwezig zal de "
 "uitnodigingslink naar de gebruiker worden gestuurd."
 
-#: .\cookbook\forms.py:438
+#: .\cookbook\forms.py:441
 msgid "Name already taken."
 msgstr "Naam reeds in gebruik."
 
-#: .\cookbook\forms.py:449
+#: .\cookbook\forms.py:452
 msgid "Accept Terms and Privacy"
 msgstr "Accepteer voorwaarden"
 
+#: .\cookbook\forms.py:487
+msgid ""
+"Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
+"full desciption of choices."
+msgstr ""
+
+#: .\cookbook\forms.py:488
+msgid ""
+"Use fuzzy matching on units, keywords and ingredients when editing and "
+"importing recipes."
+msgstr ""
+
+#: .\cookbook\forms.py:489
+msgid ""
+"Fields to search ignoring accents.  Selecting this option can improve or "
+"degrade search quality depending on language"
+msgstr ""
+
+#: .\cookbook\forms.py:490
+msgid ""
+"Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
+"'pie' and 'piece' and 'soapie')"
+msgstr ""
+
+#: .\cookbook\forms.py:491
+msgid ""
+"Fields to search for beginning of word matches. (e.g. searching for 'sa' "
+"will return 'salad' and 'sandwich')"
+msgstr ""
+
+#: .\cookbook\forms.py:492
+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
+msgid ""
+"Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
+"only function with fulltext fields."
+msgstr ""
+
+#: .\cookbook\forms.py:497
+#, fuzzy
+#| msgid "Search"
+msgid "Search Method"
+msgstr "Zoeken"
+
+#: .\cookbook\forms.py:498
+msgid "Fuzzy Lookups"
+msgstr ""
+
+#: .\cookbook\forms.py:499
+msgid "Ignore Accent"
+msgstr ""
+
+#: .\cookbook\forms.py:500
+msgid "Partial Match"
+msgstr ""
+
+#: .\cookbook\forms.py:501
+msgid "Starts Wtih"
+msgstr ""
+
+#: .\cookbook\forms.py:502
+#, fuzzy
+#| msgid "Search"
+msgid "Fuzzy Search"
+msgstr "Zoeken"
+
+#: .\cookbook\forms.py:503
+#, fuzzy
+#| msgid "Text"
+msgid "Full Text"
+msgstr "Tekst"
+
 #: .\cookbook\helper\AllAuthCustomAdapter.py:36
 msgid ""
 "In order to prevent spam, the requested email was not send. Please wait a "
@@ -253,36 +324,36 @@ msgstr ""
 "Om spam te voorkomen werd de gevraagde e-mail niet verzonden. Wacht een paar "
 "minuten en probeer het opnieuw."
 
-#: .\cookbook\helper\permission_helper.py:138
-#: .\cookbook\helper\permission_helper.py:161 .\cookbook\views\views.py:151
+#: .\cookbook\helper\permission_helper.py:136
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr "Je bent niet ingelogd en kan deze pagina daarom niet bekijken!"
 
-#: .\cookbook\helper\permission_helper.py:142
-#: .\cookbook\helper\permission_helper.py:148
-#: .\cookbook\helper\permission_helper.py:173
-#: .\cookbook\helper\permission_helper.py:218
-#: .\cookbook\helper\permission_helper.py:232
-#: .\cookbook\helper\permission_helper.py:243
-#: .\cookbook\helper\permission_helper.py:254 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:162 .\cookbook\views\views.py:169
-#: .\cookbook\views\views.py:259
+#: .\cookbook\helper\permission_helper.py:140
+#: .\cookbook\helper\permission_helper.py:146
+#: .\cookbook\helper\permission_helper.py:171
+#: .\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
 msgid "You do not have the required permissions to view this page!"
 msgstr "Je hebt niet de benodigde machtigingen om deze pagina te bekijken!"
 
-#: .\cookbook\helper\permission_helper.py:166
-#: .\cookbook\helper\permission_helper.py:189
-#: .\cookbook\helper\permission_helper.py:204
+#: .\cookbook\helper\permission_helper.py:164
+#: .\cookbook\helper\permission_helper.py:187
+#: .\cookbook\helper\permission_helper.py:202
 msgid "You cannot interact with this object as it is not owned by you!"
 msgstr ""
 "Interactie met dit object is niet mogelijk omdat je niet de eigenaar bent!"
 
-#: .\cookbook\helper\template_helper.py:60
-#: .\cookbook\helper\template_helper.py:62
+#: .\cookbook\helper\template_helper.py:61
+#: .\cookbook\helper\template_helper.py:63
 msgid "Could not parse template code."
 msgstr "Sjablooncode kon niet verwerkt worden."
 
-#: .\cookbook\integration\integration.py:104
+#: .\cookbook\integration\integration.py:119
 #: .\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
@@ -291,18 +362,18 @@ msgstr "Sjablooncode kon niet verwerkt worden."
 #: .\cookbook\templates\url_import.html:123
 #: .\cookbook\templates\url_import.html:317
 #: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
-#: .\cookbook\views\edit.py:199
+#: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr "Importeer"
 
-#: .\cookbook\integration\integration.py:185
+#: .\cookbook\integration\integration.py:200
 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:188
+#: .\cookbook\integration\integration.py:203
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
@@ -310,11 +381,11 @@ msgstr ""
 "Er is een onverwachte fout opgetreden tijdens het importeren. Controleer of "
 "u een geldig bestand hebt geüpload."
 
-#: .\cookbook\integration\integration.py:192
+#: .\cookbook\integration\integration.py:208
 msgid "The following recipes were ignored because they already existed:"
 msgstr "De volgende recepten zijn genegeerd omdat ze al bestonden:"
 
-#: .\cookbook\integration\integration.py:196
+#: .\cookbook\integration\integration.py:212
 #, python-format
 msgid "Imported %s recipes."
 msgstr "%s recepten geïmporteerd."
@@ -332,7 +403,6 @@ msgid "Source"
 msgstr "Bron"
 
 #: .\cookbook\integration\safron.py:23
-#: .\cookbook\templates\forms\edit_internal_recipe.html:79
 #: .\cookbook\templates\include\log_cooking.html:16
 #: .\cookbook\templates\url_import.html:224
 #: .\cookbook\templates\url_import.html:455
@@ -344,7 +414,6 @@ msgid "Waiting time"
 msgstr "Wachttijd"
 
 #: .\cookbook\integration\safron.py:27
-#: .\cookbook\templates\forms\edit_internal_recipe.html:73
 msgid "Preparation Time"
 msgstr "Bereidingstijd"
 
@@ -358,6 +427,22 @@ msgstr "Kookboek"
 msgid "Section"
 msgstr "Sectie"
 
+#: .\cookbook\management\commands\rebuildindex.py:14
+msgid "Rebuilds full text search index on Recipe"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:18
+msgid "Only Postgress databases use full text search, no index to rebuild"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:29
+msgid "Recipe index rebuild complete."
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:31
+msgid "Recipe index rebuild failed."
+msgstr ""
+
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:14
 msgid "Breakfast"
 msgstr "Ontbijt"
@@ -374,7 +459,7 @@ msgstr "Avondeten"
 msgid "Other"
 msgstr "Overige"
 
-#: .\cookbook\models.py:72
+#: .\cookbook\models.py:144
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
@@ -382,70 +467,83 @@ msgstr ""
 "Maximale bestandsopslag voor ruimte in MB. 0 voor onbeperkt, -1 om uploaden "
 "van bestanden uit te schakelen."
 
-#: .\cookbook\models.py:123 .\cookbook\templates\search.html:7
+#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
 #: .\cookbook\templates\shopping_list.html:52
 msgid "Search"
 msgstr "Zoeken"
 
-#: .\cookbook\models.py:124 .\cookbook\templates\base.html:92
+#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
 #: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:233 .\cookbook\views\new.py:201
+#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
 msgid "Meal-Plan"
 msgstr "Maaltijdplan"
 
-#: .\cookbook\models.py:125 .\cookbook\templates\base.html:89
+#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr "Boeken"
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Small"
 msgstr "Klein"
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Large"
 msgstr "Groot"
 
-#: .\cookbook\models.py:133 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:206 .\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:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:202
+#: .\cookbook\models.py:389
+msgid " is part of a recipe step and cannot be deleted"
+msgstr ""
+
+#: .\cookbook\models.py:429
 msgid "Text"
 msgstr "Tekst"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:203
+#: .\cookbook\models.py:429
 msgid "Time"
 msgstr "Tijd"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:204
-#: .\cookbook\templates\forms\edit_internal_recipe.html:219
+#: .\cookbook\models.py:429
 msgid "File"
 msgstr "Bestand"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:205
-#: .\cookbook\templates\forms\edit_internal_recipe.html:241
+#: .\cookbook\models.py:429
 #: .\cookbook\templates\include\recipe_open_modal.html:7
 #: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:273 .\cookbook\views\new.py:52
+#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr "recept"
 
-#: .\cookbook\serializer.py:109
+#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+msgid "Simple"
+msgstr ""
+
+#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+msgid "Phrase"
+msgstr ""
+
+#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+msgid "Web"
+msgstr ""
+
+#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+msgid "Raw"
+msgstr ""
+
+#: .\cookbook\serializer.py:112
 msgid "File uploads are not enabled for this Space."
 msgstr "Bestandsuploads zijn niet ingeschakeld voor deze Ruimte."
 
-#: .\cookbook\serializer.py:117
+#: .\cookbook\serializer.py:125
 msgid "You have reached your file upload limit."
 msgstr "U heeft de uploadlimiet bereikt."
 
-#: .\cookbook\tables.py:35 .\cookbook\templates\books.html:36
-#: .\cookbook\templates\generic\edit_template.html:6
+#: .\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
@@ -454,11 +552,10 @@ msgstr "U heeft de uploadlimiet bereikt."
 msgid "Edit"
 msgstr "Bewerken"
 
-#: .\cookbook\tables.py:124 .\cookbook\tables.py:147
-#: .\cookbook\templates\books.html:38
+#: .\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\edit_template.html:27
+#: .\cookbook\templates\generic\edit_template.html:28
 #: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
@@ -488,7 +585,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:154 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -570,7 +667,7 @@ msgstr ""
 " ."
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:21
+#: .\cookbook\templates\generic\delete_template.html:22
 msgid "Confirm"
 msgstr "Bevestigen"
 
@@ -584,7 +681,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:189
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
 msgid "Login"
 msgstr "Inloggen"
 
@@ -637,7 +734,7 @@ msgstr "Wijzig wachtwoord"
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:52
+#: .\cookbook\templates\settings.html:64
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -723,101 +820,86 @@ 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:179
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr "API documentatie"
 
-#: .\cookbook\templates\base.html:85
-msgid "Utensils"
-msgstr "Kookgerei"
-
-#: .\cookbook\templates\base.html:95
+#: .\cookbook\templates\base.html:86
 msgid "Shopping"
 msgstr "Winkelen"
 
-#: .\cookbook\templates\base.html:101
+#: .\cookbook\templates\base.html:113
+msgid "Keyword"
+msgstr "Etiket"
+
+#: .\cookbook\templates\base.html:137
+#: .\cookbook\templates\forms\ingredients.html:24
+#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
+#: .\cookbook\views\lists.py:146
+msgid "Units"
+msgstr "Eenheden"
+
+#: .\cookbook\templates\base.html:151
 #: .\cookbook\templates\shopping_list.html:230
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr "Supermarkt"
 
-#: .\cookbook\templates\base.html:112 .\cookbook\views\delete.py:84
-#: .\cookbook\views\edit.py:102 .\cookbook\views\lists.py:26
-#: .\cookbook\views\new.py:78
-msgid "Keyword"
-msgstr "Etiket"
-
-#: .\cookbook\templates\base.html:114
+#: .\cookbook\templates\base.html:163
 msgid "Batch Edit"
 msgstr "Batchbewerking"
 
-#: .\cookbook\templates\base.html:119
-msgid "Storage Data"
-msgstr "Dataopslag"
-
-#: .\cookbook\templates\base.html:123
-msgid "Storage Backends"
-msgstr "Opslag Backends"
-
-#: .\cookbook\templates\base.html:125
-msgid "Configure Sync"
-msgstr "Synchronisatie configureren"
-
-#: .\cookbook\templates\base.html:127
-msgid "Discovered Recipes"
-msgstr "Ontdekte recepten"
-
-#: .\cookbook\templates\base.html:129
-msgid "Discovery Log"
-msgstr "Ontdekkingslogboek"
-
-#: .\cookbook\templates\base.html:131 .\cookbook\templates\stats.html:10
-msgid "Statistics"
-msgstr "Statistieken"
-
-#: .\cookbook\templates\base.html:133
-msgid "Units & Ingredients"
-msgstr "Eenheden & Ingrediënten"
-
-#: .\cookbook\templates\base.html:135 .\cookbook\templates\index.html:47
-msgid "Import Recipe"
-msgstr "Recept importeren"
-
-#: .\cookbook\templates\base.html:156 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr "Geschiedenis"
 
-#: .\cookbook\templates\base.html:159 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:191 .\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
+msgid "Create"
+msgstr "Maak"
+
+#: .\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:163 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr "Systeem"
 
-#: .\cookbook\templates\base.html:165 .\cookbook\templates\base.html:171
+#: .\cookbook\templates\base.html:214
 msgid "Admin"
 msgstr "Beheer"
 
-#: .\cookbook\templates\base.html:175
+#: .\cookbook\templates\base.html:218
 msgid "Markdown Guide"
 msgstr "Markdown gids"
 
-#: .\cookbook\templates\base.html:177
+#: .\cookbook\templates\base.html:220
 msgid "GitHub"
 msgstr "GitHub"
 
-#: .\cookbook\templates\base.html:181
+#: .\cookbook\templates\base.html:224
 msgid "API Browser"
 msgstr "API Browser"
 
-#: .\cookbook\templates\base.html:184
+#: .\cookbook\templates\base.html:227
 msgid "Log out"
 msgstr "Uitloggen"
 
+#: .\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 "Externe recepten"
+
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
 msgstr "Batch bewerking toepassen op categorie"
@@ -832,7 +914,7 @@ msgstr ""
 "Voeg de gespecificeerde etiketten toe aan alle recepten die een woord "
 "bevatten"
 
-#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:85
+#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:83
 msgid "Sync"
 msgstr "Synchroniseren"
 
@@ -852,10 +934,28 @@ msgstr ""
 msgid "The path must be in the following format"
 msgstr "Het pad dient het volgende format te hebben"
 
-#: .\cookbook\templates\batch\monitor.html:27
+#: .\cookbook\templates\batch\monitor.html:21
+#, fuzzy
+#| msgid "Manage Email Settings"
+msgid "Manage External Storage"
+msgstr "Beheer e-mail instellingen"
+
+#: .\cookbook\templates\batch\monitor.html:28
 msgid "Sync Now!"
 msgstr "Synchroniseer nu!"
 
+#: .\cookbook\templates\batch\monitor.html:29
+#, fuzzy
+#| msgid "Shopping Recipes"
+msgid "Show Recipes"
+msgstr "Boodschappen recepten"
+
+#: .\cookbook\templates\batch\monitor.html:30
+#, fuzzy
+#| msgid "Show Links"
+msgid "Show Log"
+msgstr "Toon links"
+
 #: .\cookbook\templates\batch\waiting.html:4
 #: .\cookbook\templates\batch\waiting.html:10
 msgid "Importing Recipes"
@@ -869,32 +969,10 @@ msgstr ""
 "Dit kan een aantal minuten duren, afhankelijk van het aantal documenten wat "
 "op het moment gesynchroniseerd worden. Een ogenblik geduld alstublieft."
 
-#: .\cookbook\templates\books.html:5 .\cookbook\templates\books.html:11
+#: .\cookbook\templates\books.html:7
 msgid "Recipe Books"
 msgstr "Kookboeken"
 
-#: .\cookbook\templates\books.html:15
-msgid "New Book"
-msgstr "Nieuw boek"
-
-#: .\cookbook\templates\books.html:27 .\cookbook\templates\recipe_view.html:26
-msgid "by"
-msgstr "door"
-
-#: .\cookbook\templates\books.html:34
-msgid "Toggle Recipes"
-msgstr "Recepten in/uitschakelen"
-
-#: .\cookbook\templates\books.html:54
-#: .\cookbook\templates\meal_plan_entry.html:48
-#: .\cookbook\templates\recipes_table.html:64
-msgid "Last cooked"
-msgstr "Laatst bereid"
-
-#: .\cookbook\templates\books.html:71
-msgid "There are no recipes in this book yet."
-msgstr "In dit boek bestaan nog geen recepten."
-
 #: .\cookbook\templates\export.html:6 .\cookbook\templates\test2.html:6
 msgid "Export Recipes"
 msgstr "Recepten exporteren"
@@ -915,211 +993,21 @@ msgid "Import new Recipe"
 msgstr "Nieuw recept importeren"
 
 #: .\cookbook\templates\forms\edit_import_recipe.html:14
-#: .\cookbook\templates\forms\edit_internal_recipe.html:439
-#: .\cookbook\templates\forms\edit_internal_recipe.html:471
 #: .\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:46 .\cookbook\templates\settings.html:87
-#: .\cookbook\templates\settings.html:105
+#: .\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
 msgid "Save"
 msgstr "Opslaan"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:7
-#: .\cookbook\templates\forms\edit_internal_recipe.html:34
 msgid "Edit Recipe"
 msgstr "Recept bewerken"
 
-#: .\cookbook\templates\forms\edit_internal_recipe.html:56
-#: .\cookbook\templates\url_import.html:171
-msgid "Description"
-msgstr "Beschrijving"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:76
-msgid "Waiting Time"
-msgstr "Wachttijd"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:82
-msgid "Servings Text"
-msgstr "Porties tekst"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:93
-msgid "Select Keywords"
-msgstr "Selecteer etiketten"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:94
-#: .\cookbook\templates\url_import.html:583
-msgid "Add Keyword"
-msgstr "Voeg Etiket toe"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:112
-msgid "Nutrition"
-msgstr "Voedingswaarde"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:116
-#: .\cookbook\templates\forms\edit_internal_recipe.html:166
-msgid "Delete Step"
-msgstr "Verwijder stap"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:120
-msgid "Calories"
-msgstr "Calorieën"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:123
-msgid "Carbohydrates"
-msgstr "Koolhydraten"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:126
-msgid "Fats"
-msgstr "Vetten"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:128
-msgid "Proteins"
-msgstr "Eiwitten"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:150
-#: .\cookbook\templates\forms\edit_internal_recipe.html:504
-msgid "Step"
-msgstr "Stap"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:171
-msgid "Show as header"
-msgstr "Laat als kop zien"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:177
-msgid "Hide as header"
-msgstr "Verbergen als kop"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:182
-msgid "Move Up"
-msgstr "Verplaats omhoog"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:187
-msgid "Move Down"
-msgstr "Verplaats omlaag"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:196
-msgid "Step Name"
-msgstr "Stap naam"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:200
-msgid "Step Type"
-msgstr "Stap type"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:213
-msgid "Step time in Minutes"
-msgstr "Tijdsduur stap in minuten"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:229
-msgid "Select File"
-msgstr "Selecteer bestand"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:230
-#: .\cookbook\templates\forms\edit_internal_recipe.html:252
-#: .\cookbook\templates\forms\edit_internal_recipe.html:313
-#: .\cookbook\templates\forms\edit_internal_recipe.html:337
-#: .\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
-msgid "Select"
-msgstr "Selecteer"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:251
-msgid "Select Recipe"
-msgstr "Selecteer recept"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:311
-#: .\cookbook\templates\shopping_list.html:187
-msgid "Select Unit"
-msgstr "Selecteer eenheid"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:312
-#: .\cookbook\templates\forms\edit_internal_recipe.html:336
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
-msgid "Create"
-msgstr "Maak"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:335
-#: .\cookbook\templates\shopping_list.html:209
-msgid "Select Food"
-msgstr "Selecteer ingrediënt"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:352
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr "Notitie"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:369
-msgid "Delete Ingredient"
-msgstr "Verwijder ingrediënt"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:375
-msgid "Make Header"
-msgstr "Stel in als kop"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:381
-msgid "Make Ingredient"
-msgstr "Maak ingrediënt"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:387
-msgid "Disable Amount"
-msgstr "Hoeveelheid uitschakelen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:393
-msgid "Enable Amount"
-msgstr "Hoeveelheid inschakelen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:398
-msgid "Copy Template Reference"
-msgstr "Kopieer sjabloon referentie"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:424
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
-msgid "Instructions"
-msgstr "Instructies"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:437
-#: .\cookbook\templates\forms\edit_internal_recipe.html:468
-msgid "Save & View"
-msgstr "Opslaan & bekijken"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:441
-#: .\cookbook\templates\forms\edit_internal_recipe.html:474
-msgid "Add Step"
-msgstr "Voeg stap toe"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:444
-#: .\cookbook\templates\forms\edit_internal_recipe.html:478
-msgid "Add Nutrition"
-msgstr "Voedingswaarde toevoegen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:446
-#: .\cookbook\templates\forms\edit_internal_recipe.html:480
-msgid "Remove Nutrition"
-msgstr "Voedingswaarde verwijderen"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:448
-#: .\cookbook\templates\forms\edit_internal_recipe.html:483
-msgid "View Recipe"
-msgstr "Bekijk recept"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:450
-#: .\cookbook\templates\forms\edit_internal_recipe.html:485
-msgid "Delete Recipe"
-msgstr "Verwijder recept"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:491
-msgid "Steps"
-msgstr "Stappen"
-
 #: .\cookbook\templates\forms\ingredients.html:15
 msgid "Edit Ingredients"
 msgstr "Ingrediënten bewerken"
@@ -1142,11 +1030,6 @@ msgstr ""
 "recepten aan.\n"
 "    "
 
-#: .\cookbook\templates\forms\ingredients.html:24
-#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
-msgid "Units"
-msgstr "Eenheden"
-
 #: .\cookbook\templates\forms\ingredients.html:26
 msgid "Are you sure that you want to merge these two units?"
 msgstr "Weet je zeker dat je deze twee eenheden wil samenvoegen?"
@@ -1160,29 +1043,33 @@ 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:18
+#: .\cookbook\templates\generic\delete_template.html:19
 #, 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\edit_template.html:30
+#: .\cookbook\templates\generic\delete_template.html:23
+msgid "Cancel"
+msgstr ""
+
+#: .\cookbook\templates\generic\edit_template.html:32
 msgid "View"
 msgstr "Bekijken"
 
-#: .\cookbook\templates\generic\edit_template.html:34
+#: .\cookbook\templates\generic\edit_template.html:36
 msgid "Delete original file"
 msgstr "Origineel bestand verwijderen"
 
 #: .\cookbook\templates\generic\list_template.html:6
-#: .\cookbook\templates\generic\list_template.html:12
+#: .\cookbook\templates\generic\list_template.html:21
 msgid "List"
 msgstr "Lijst"
 
-#: .\cookbook\templates\generic\list_template.html:25
+#: .\cookbook\templates\generic\list_template.html:34
 msgid "Filter"
 msgstr "Filtreren"
 
-#: .\cookbook\templates\generic\list_template.html:30
+#: .\cookbook\templates\generic\list_template.html:39
 msgid "Import all"
 msgstr "Alles importeren"
 
@@ -1523,6 +1410,11 @@ msgstr "Toon help"
 msgid "Week iCal export"
 msgstr "Week iCal export"
 
+#: .\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"
@@ -1609,6 +1501,11 @@ msgstr ""
 msgid "Meal Plan View"
 msgstr "Maaltijdenplan bekijken"
 
+#: .\cookbook\templates\meal_plan_entry.html:48
+#: .\cookbook\templates\recipes_table.html:64
+msgid "Last cooked"
+msgstr "Laatst bereid"
+
 #: .\cookbook\templates\meal_plan_entry.html:50
 msgid "Never cooked before."
 msgstr "Nog nooit bereid."
@@ -1715,8 +1612,12 @@ msgstr ""
 msgid "Comments"
 msgstr "Opmerkingen"
 
+#: .\cookbook\templates\recipe_view.html:26
+msgid "by"
+msgstr "door"
+
 #: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
-#: .\cookbook\views\edit.py:179
+#: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr "Opmerking"
 
@@ -1748,48 +1649,219 @@ msgstr "Bereiding loggen"
 msgid "Recipe Home"
 msgstr "Recept thuis"
 
-#: .\cookbook\templates\settings.html:25
+#: .\cookbook\templates\search_info.html:5
+#: .\cookbook\templates\search_info.html:9
+#: .\cookbook\templates\settings.html:157
+#, fuzzy
+#| msgid "Search String"
+msgid "Search Settings"
+msgstr "Zoekopdracht"
+
+#: .\cookbook\templates\search_info.html:10
+msgid ""
+"\n"
+"        Creating the best search experience is complicated and weighs "
+"heavily on your personal configuration.  \n"
+"        Changing any of the search settings can have significant impact on "
+"the speed and quality of the results.\n"
+"        Search Methods, Trigrams and Full Text Search configurations are "
+"only available if you are using Postgres for your database.\n"
+"    "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:19
+#, fuzzy
+#| msgid "Search"
+msgid "Search Methods"
+msgstr "Zoeken"
+
+#: .\cookbook\templates\search_info.html:23
+msgid ""
+" \n"
+"            Full text searches attempt to normalize the words provided to "
+"match common variants.  For example: 'forked', 'forking', 'forks' will all "
+"normalize to 'fork'.\n"
+"            There are several methods available, described below, that will "
+"control how the search behavior should react when multiple words are "
+"searched.\n"
+"            Full technical details on how these operate can be viewed on <a "
+"href=https://www.postgresql.org/docs/current/textsearch-controls."
+"html#TEXTSEARCH-PARSING-QUERIES>Postgresql's website.</a>\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:29
+msgid ""
+" \n"
+"            Simple searches ignore punctuation and common words such as "
+"'the', 'a', 'and'. And will treat seperate words as required.\n"
+"            Searching for 'apple or flour' will return any recipe that "
+"includes both 'apple' and 'flour' anywhere in the fields that have been "
+"selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:34
+msgid ""
+" \n"
+"            Phrase searches ignore punctuation, but will search for all of "
+"the words in the exact order provided.\n"
+"            Searching for 'apple or flour' will only return a recipe that "
+"includes the exact phrase 'apple or flour' in any of the fields that have "
+"been selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:39
+msgid ""
+" \n"
+"            Web searches simulate functionality found on many web search "
+"sites supporting special syntax.\n"
+"            Placing quotes around several words will convert those words "
+"into a phrase.\n"
+"            'or' is recongized as searching for the word (or phrase) "
+"immediately before 'or' OR the word (or phrase) directly after.\n"
+"            '-' is recognized as searching for recipes that do not include "
+"the word (or phrase) that comes immediately after. \n"
+"            For example searching for 'apple pie' or cherry -butter will "
+"return any recipe that includes the phrase 'apple pie' or the word "
+"'cherry' \n"
+"            in any field included in the full text search but exclude any "
+"recipe that has the word 'butter' in any field included.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:48
+msgid ""
+" \n"
+"            Raw search is similar to Web except will take puncuation "
+"operators such as '|', '&' and '()'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:59
+msgid ""
+" \n"
+"            Another approach to searching that also requires Postgresql is "
+"fuzzy search or trigram similarity. A trigram is a group of three "
+"consecutive characters.\n"
+"            For example searching for 'apple' will create x trigrams 'app', "
+"'ppl', 'ple' and will create a score of how closely words match the "
+"generated trigrams.\n"
+"            One benefit of searching trigams is that a search for 'sandwich' "
+"will find mispelled words such as 'sandwhich' that would be missed by other "
+"methods.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:69
+#, fuzzy
+#| msgid "Search Recipe"
+msgid "Search Fields"
+msgstr "Zoek recept"
+
+#: .\cookbook\templates\search_info.html:73
+msgid ""
+" \n"
+"            Unaccent is a special case in that it enables searching a field "
+"'unaccented' for each search style attempting to ignore accented values. \n"
+"            For example when you enable unaccent for 'Name' any search "
+"(starts with, contains, trigram) will attempt the search ignoring accented "
+"characters.\n"
+"            \n"
+"            For the other options, you can enable search on any or all "
+"fields and they will be combined together with an assumed 'OR'.\n"
+"            For example enabling 'Name' for Starts With, 'Name' and "
+"'Description' for Partial Match and 'Ingredients' and 'Keywords' for Full "
+"Search\n"
+"            and searching for 'apple' will generate a search that will "
+"return recipes that have:\n"
+"            - A recipe name that starts with 'apple'\n"
+"            - OR a recipe name that contains 'apple'\n"
+"            - OR a recipe description that contains 'apple'\n"
+"            - OR a recipe that will have a full text search match ('apple' "
+"or 'apples') in ingredients\n"
+"            - OR a recipe that will have a full text search match in "
+"Keywords\n"
+"\n"
+"            Combining too many fields in too many types of search can have a "
+"negative impact on performance, create duplicate results or return "
+"unexpected results.\n"
+"            For example, enabling fuzzy search or partial matches will "
+"interfere with web search methods.  \n"
+"            Searching for 'apple -pie' with fuzzy search and full text "
+"search will return the recipe Apple Pie.  Though it is not included in the "
+"full text results, it does match the trigram results.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:95
+#, fuzzy
+#| msgid "Search"
+msgid "Search Index"
+msgstr "Zoeken"
+
+#: .\cookbook\templates\search_info.html:99
+msgid ""
+" \n"
+"            Trigram search and Full Text Search both rely on database "
+"indexes to perform effectively.  \n"
+"            You can rebuild the indexes on all fields in the Admin page for "
+"Recipes and selecting all recipes and running 'rebuild index for selected "
+"recipes'\n"
+"            You can also rebuild indexes at the command line by executing "
+"the management command 'python manage.py rebuildindex'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\settings.html:27
 msgid "Account"
 msgstr "Account"
 
-#: .\cookbook\templates\settings.html:29
+#: .\cookbook\templates\settings.html:33
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:39
 msgid "API-Settings"
 msgstr "API-instellingen"
 
-#: .\cookbook\templates\settings.html:41
+#: .\cookbook\templates\settings.html:45
+#, fuzzy
+#| msgid "Search String"
+msgid "Search-Settings"
+msgstr "Zoekopdracht"
+
+#: .\cookbook\templates\settings.html:53
 msgid "Name Settings"
 msgstr "Naam instellingen"
 
-#: .\cookbook\templates\settings.html:49
+#: .\cookbook\templates\settings.html:61
 msgid "Account Settings"
 msgstr "Account instellingen"
 
-#: .\cookbook\templates\settings.html:51
+#: .\cookbook\templates\settings.html:63
 msgid "Emails"
 msgstr "E-mails"
 
-#: .\cookbook\templates\settings.html:54
+#: .\cookbook\templates\settings.html:66
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr "Socials"
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:78
 msgid "Language"
 msgstr "Taal"
 
-#: .\cookbook\templates\settings.html:96
+#: .\cookbook\templates\settings.html:108
 msgid "Style"
 msgstr "Stijl"
 
-#: .\cookbook\templates\settings.html:116
+#: .\cookbook\templates\settings.html:128
 msgid "API Token"
 msgstr "API Token"
 
-#: .\cookbook\templates\settings.html:117
+#: .\cookbook\templates\settings.html:129
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
@@ -1797,7 +1869,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:134
+#: .\cookbook\templates\settings.html:146
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
@@ -1805,7 +1877,7 @@ msgstr ""
 "Gebruik de token als een 'Authorization header'voorafgegaan door het woord "
 "token zoals in de volgende voorbeelden:"
 
-#: .\cookbook\templates\settings.html:136
+#: .\cookbook\templates\settings.html:148
 msgid "or"
 msgstr "of"
 
@@ -1847,6 +1919,23 @@ msgstr "Zet op lijst"
 msgid "Amount"
 msgstr "Hoeveelheid"
 
+#: .\cookbook\templates\shopping_list.html:187
+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
+msgid "Select"
+msgstr "Selecteer"
+
+#: .\cookbook\templates\shopping_list.html:209
+msgid "Select Food"
+msgstr "Selecteer ingrediënt"
+
 #: .\cookbook\templates\shopping_list.html:240
 msgid "Select Supermarket"
 msgstr "Selecteer supermarkt"
@@ -1950,10 +2039,6 @@ msgstr "Object statistieken"
 msgid "Recipes without Keywords"
 msgstr "Recepten zonder etiketten"
 
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr "Externe recepten"
-
 #: .\cookbook\templates\space.html:60 .\cookbook\templates\stats.html:45
 msgid "Internal Recipes"
 msgstr "Interne recepten"
@@ -2003,7 +2088,7 @@ msgid "There are no members in your space yet!"
 msgstr "Er zitten nog geen leden in jouw ruimte!"
 
 #: .\cookbook\templates\space.html:130 .\cookbook\templates\system.html:21
-#: .\cookbook\views\lists.py:115
+#: .\cookbook\views\lists.py:100
 msgid "Invite Links"
 msgstr "Uitnodigingslink"
 
@@ -2011,6 +2096,10 @@ msgstr "Uitnodigingslink"
 msgid "Stats"
 msgstr "Statistieken"
 
+#: .\cookbook\templates\stats.html:10
+msgid "Statistics"
+msgstr "Statistieken"
+
 #: .\cookbook\templates\system.html:22
 msgid "Show Links"
 msgstr "Toon links"
@@ -2191,6 +2280,10 @@ msgstr "Wis inhoud"
 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
+msgid "Description"
+msgstr "Beschrijving"
+
 #: .\cookbook\templates\url_import.html:175
 msgid "Text dragged here will be appended to the description."
 msgstr "Hierheen gesleepte tekst wordt aan de beschrijving toegevoegd."
@@ -2216,6 +2309,11 @@ 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
+msgid "Instructions"
+msgstr "Instructies"
+
 #: .\cookbook\templates\url_import.html:302
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
@@ -2268,6 +2366,10 @@ msgstr "Beschrijving recept"
 msgid "Select one"
 msgstr "Selecteer één"
 
+#: .\cookbook\templates\url_import.html:583
+msgid "Add Keyword"
+msgstr "Voeg Etiket toe"
+
 #: .\cookbook\templates\url_import.html:596
 msgid "All Keywords"
 msgstr "Alle etiketten"
@@ -2310,37 +2412,96 @@ msgstr "GitHub issues"
 msgid "Recipe Markup Specification"
 msgstr "Recept opmaak specificatie"
 
-#: .\cookbook\views\api.py:79
+#: .\cookbook\views\api.py:82 .\cookbook\views\api.py:131
 msgid "Parameter updated_at incorrectly formatted"
 msgstr "Parameter updatet_at is onjuist geformateerd"
 
-#: .\cookbook\views\api.py:580 .\cookbook\views\views.py:303
+#: .\cookbook\views\api.py:151
+#, python-brace-format
+msgid "No {self.basename} with id {pk} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
+#: .\cookbook\views\edit.py:316
+msgid "Cannot merge with the same object!"
+msgstr "Kan niet met hetzelfde object samenvoegen!"
+
+#: .\cookbook\views\api.py:162
+#, python-brace-format
+msgid "No {self.basename} with id {target} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:167
+#, fuzzy
+#| msgid "Cannot merge with the same object!"
+msgid "Cannot merge with child object!"
+msgstr "Kan niet met hetzelfde object samenvoegen!"
+
+#: .\cookbook\views\api.py:195
+#, python-brace-format
+msgid "{source.name} was merged successfully with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:199
+#, python-brace-format
+msgid "An error occurred attempting to merge {source.name} with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:239
+#, python-brace-format
+msgid "No {self.basename} with id {child} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:248
+#, python-brace-format
+msgid "{child.name} was moved successfully to the root."
+msgstr ""
+
+#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+msgid "An error occurred attempting to move "
+msgstr ""
+
+#: .\cookbook\views\api.py:254
+msgid "Cannot move an object to itself!"
+msgstr ""
+
+#: .\cookbook\views\api.py:260
+#, python-brace-format
+msgid "No {self.basename} with id {parent} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:266
+#, python-brace-format
+msgid "{child.name} was moved successfully to parent {parent.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
 msgid "This feature is not available in the demo version!"
 msgstr "Deze optie is niet beschikbaar in de demo versie!"
 
-#: .\cookbook\views\api.py:603
+#: .\cookbook\views\api.py:727
 msgid "Sync successful!"
 msgstr "Synchronisatie succesvol!"
 
-#: .\cookbook\views\api.py:608
+#: .\cookbook\views\api.py:732
 msgid "Error synchronizing with Storage"
 msgstr "Er is een fout opgetreden bij het synchroniseren met Opslag"
 
-#: .\cookbook\views\api.py:686
+#: .\cookbook\views\api.py:810
 msgid "Nothing to do."
 msgstr "Niks te doen."
 
-#: .\cookbook\views\api.py:701
+#: .\cookbook\views\api.py:825
 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:708
+#: .\cookbook\views\api.py:832
 msgid "The requested page could not be found."
 msgstr "De opgevraagde pagina kon niet gevonden worden."
 
-#: .\cookbook\views\api.py:717
+#: .\cookbook\views\api.py:841
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
@@ -2348,11 +2509,11 @@ msgstr ""
 "De opgevraagde site biedt geen bekend gegevensformaat aan om het recept van "
 "te importeren."
 
-#: .\cookbook\views\api.py:731
+#: .\cookbook\views\api.py:855
 msgid "No useable data could be found."
 msgstr "Er is geen bruikbare data gevonden."
 
-#: .\cookbook\views\api.py:747
+#: .\cookbook\views\api.py:871
 msgid "I couldn't find anything to do."
 msgstr "Ik kon niks vinden om te doen."
 
@@ -2379,8 +2540,8 @@ msgstr[1] "Batch bewerking voldaan. %(count)d Recepten zijn geupdatet."
 msgid "Monitor"
 msgstr "Bewaker"
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:102
-#: .\cookbook\views\new.py:98
+#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr "Opslag backend"
 
@@ -2391,8 +2552,8 @@ 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:213
-#: .\cookbook\views\new.py:156
+#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
+#: .\cookbook\views\new.py:155
 msgid "Recipe Book"
 msgstr "Kookboek"
 
@@ -2400,47 +2561,39 @@ msgstr "Kookboek"
 msgid "Bookmarks"
 msgstr "Bladwijzers"
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:252
+#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
 msgid "Invite Link"
 msgstr "Uitnodigingslink"
 
-#: .\cookbook\views\edit.py:119
-msgid "Food"
-msgstr "Ingrediënt"
-
-#: .\cookbook\views\edit.py:128
+#: .\cookbook\views\edit.py:126
 msgid "You cannot edit this storage!"
 msgstr "Je kan deze opslag niet bewerken!"
 
-#: .\cookbook\views\edit.py:148
+#: .\cookbook\views\edit.py:146
 msgid "Storage saved!"
 msgstr "Opslag opgeslagen!"
 
-#: .\cookbook\views\edit.py:154
+#: .\cookbook\views\edit.py:152
 msgid "There was an error updating this storage backend!"
 msgstr "Er is een fout opgetreden bij het updaten van deze opslag backend!"
 
-#: .\cookbook\views\edit.py:165
+#: .\cookbook\views\edit.py:163
 msgid "Storage"
 msgstr "Opslag"
 
-#: .\cookbook\views\edit.py:261
+#: .\cookbook\views\edit.py:259
 msgid "Changes saved!"
 msgstr "Wijzigingen opgeslagen!"
 
-#: .\cookbook\views\edit.py:265
+#: .\cookbook\views\edit.py:263
 msgid "Error saving changes!"
 msgstr "Fout bij het opslaan van de wijzigingen!"
 
-#: .\cookbook\views\edit.py:299
+#: .\cookbook\views\edit.py:298
 msgid "Units merged!"
 msgstr "Eenheden samengevoegd!"
 
-#: .\cookbook\views\edit.py:301 .\cookbook\views\edit.py:317
-msgid "Cannot merge with the same object!"
-msgstr "Kan niet met hetzelfde object samenvoegen!"
-
-#: .\cookbook\views\edit.py:315
+#: .\cookbook\views\edit.py:314
 msgid "Foods merged!"
 msgstr "Ingrediënten samengevoegd!"
 
@@ -2452,68 +2605,86 @@ msgstr "Importeren is voor deze provider niet geïmplementeerd"
 msgid "Exporting is not implemented for this provider"
 msgstr "Exporteren is voor deze provider niet geïmplementeerd"
 
-#: .\cookbook\views\lists.py:40
+#: .\cookbook\views\lists.py:26
 msgid "Import Log"
 msgstr "Import logboek"
 
-#: .\cookbook\views\lists.py:53
+#: .\cookbook\views\lists.py:39
 msgid "Discovery"
 msgstr "Ontdekken"
 
-#: .\cookbook\views\lists.py:85
+#: .\cookbook\views\lists.py:69
 msgid "Shopping Lists"
 msgstr "Boodschappenlijst"
 
-#: .\cookbook\views\new.py:123
+#: .\cookbook\views\lists.py:129
+#, fuzzy
+#| msgid "Food"
+msgid "Foods"
+msgstr "Ingrediënt"
+
+#: .\cookbook\views\lists.py:163
+#, fuzzy
+#| msgid "Supermarket"
+msgid "Supermarkets"
+msgstr "Supermarkt"
+
+#: .\cookbook\views\lists.py:179
+#, fuzzy
+#| msgid "Shopping Recipes"
+msgid "Shopping Categories"
+msgstr "Boodschappen recepten"
+
+#: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr "Nieuw recept geïmporteerd!"
 
-#: .\cookbook\views\new.py:126
+#: .\cookbook\views\new.py:125
 msgid "There was an error importing this recipe!"
 msgstr "Er is een fout opgetreden bij het importeren van dit recept!"
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "Hello"
 msgstr "Hallo"
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "You have been invited by "
 msgstr "Je bent uitgenodigd door "
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:226
 msgid " to join their Tandoor Recipes space "
 msgstr " om zijn/haar Tandoor Recepten ruimte "
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:227
 msgid "Click the following link to activate your account: "
 msgstr "Klik om de volgende link om je account te activeren: "
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:228
 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:230
+#: .\cookbook\views\new.py:229
 msgid "The invitation is valid until "
 msgstr "De uitnodiging is geldig tot "
 
-#: .\cookbook\views\new.py:231
+#: .\cookbook\views\new.py:230
 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:234
+#: .\cookbook\views\new.py:233
 msgid "Tandoor Recipes Invite"
 msgstr "Tandoor Recepten uitnodiging"
 
-#: .\cookbook\views\new.py:241
+#: .\cookbook\views\new.py:240
 msgid "Invite link successfully send to user."
 msgstr "Uitnodigingslink succesvol verstuurd naar gebruiker."
 
-#: .\cookbook\views\new.py:244
+#: .\cookbook\views\new.py:243
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
@@ -2521,12 +2692,12 @@ msgstr ""
 "Je hebt te veel e-mails verstuurd, deel de link handmatig of wacht enkele "
 "uren."
 
-#: .\cookbook\views\new.py:246
+#: .\cookbook\views\new.py:245
 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:129
+#: .\cookbook\views\views.py:128
 msgid ""
 "You have successfully created your own recipe space. Start by adding some "
 "recipes or invite other people to join you."
@@ -2534,15 +2705,29 @@ 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:177
+#: .\cookbook\views\views.py:176
 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:188
+#: .\cookbook\views\views.py:187
 msgid "Comment saved!"
 msgstr "Opmerking opgeslagen!"
 
-#: .\cookbook\views\views.py:395
+#: .\cookbook\views\views.py:351
+msgid "You must select at least one field to search!"
+msgstr ""
+
+#: .\cookbook\views\views.py:354
+msgid ""
+"To use this search method you must select at least one full text search "
+"field!"
+msgstr ""
+
+#: .\cookbook\views\views.py:357
+msgid "Fuzzy search is not compatible with this search method!"
+msgstr ""
+
+#: .\cookbook\views\views.py:437
 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 "
@@ -2553,31 +2738,31 @@ msgstr ""
 "documentatie raad moeten plegen voor een methode om je wachtwoord te "
 "resetten."
 
-#: .\cookbook\views\views.py:402
+#: .\cookbook\views\views.py:444
 msgid "Passwords dont match!"
 msgstr "Wachtwoorden komen niet overeen!"
 
-#: .\cookbook\views\views.py:418
+#: .\cookbook\views\views.py:460
 msgid "User has been created, please login!"
 msgstr "Gebruiker is gecreëerd, Log in alstublieft!"
 
-#: .\cookbook\views\views.py:434
+#: .\cookbook\views\views.py:476
 msgid "Malformed Invite Link supplied!"
 msgstr "Onjuiste uitnodigingslink opgegeven!"
 
-#: .\cookbook\views\views.py:441
+#: .\cookbook\views\views.py:483
 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:452
+#: .\cookbook\views\views.py:494
 msgid "Successfully joined space."
 msgstr "Succesvol toegetreden tot ruimte."
 
-#: .\cookbook\views\views.py:458
+#: .\cookbook\views\views.py:500
 msgid "Invite Link not valid or already used!"
 msgstr "De uitnodigingslink is niet valide of al gebruikt!"
 
-#: .\cookbook\views\views.py:522
+#: .\cookbook\views\views.py:564
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
@@ -2585,7 +2770,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:528
+#: .\cookbook\views\views.py:570
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
@@ -2593,15 +2778,138 @@ msgstr ""
 "Links voor het delen van recepten zijn gedeactiveerd. Neem contact op met de "
 "paginabeheerder voor aanvullende informatie."
 
+#~ msgid "Utensils"
+#~ msgstr "Kookgerei"
+
+#~ msgid "Storage Data"
+#~ msgstr "Dataopslag"
+
+#~ msgid "Storage Backends"
+#~ msgstr "Opslag Backends"
+
+#~ msgid "Configure Sync"
+#~ msgstr "Synchronisatie configureren"
+
+#~ msgid "Discovered Recipes"
+#~ msgstr "Ontdekte recepten"
+
+#~ msgid "Discovery Log"
+#~ msgstr "Ontdekkingslogboek"
+
+#~ msgid "Units & Ingredients"
+#~ msgstr "Eenheden & Ingrediënten"
+
+#~ msgid "New Book"
+#~ msgstr "Nieuw boek"
+
+#~ msgid "Toggle Recipes"
+#~ msgstr "Recepten in/uitschakelen"
+
+#~ msgid "There are no recipes in this book yet."
+#~ msgstr "In dit boek bestaan nog geen recepten."
+
+#~ msgid "Waiting Time"
+#~ msgstr "Wachttijd"
+
+#~ msgid "Servings Text"
+#~ msgstr "Porties tekst"
+
+#~ msgid "Select Keywords"
+#~ msgstr "Selecteer etiketten"
+
+#~ msgid "Nutrition"
+#~ msgstr "Voedingswaarde"
+
+#~ msgid "Delete Step"
+#~ msgstr "Verwijder stap"
+
+#~ msgid "Calories"
+#~ msgstr "Calorieën"
+
+#~ msgid "Carbohydrates"
+#~ msgstr "Koolhydraten"
+
+#~ msgid "Fats"
+#~ msgstr "Vetten"
+
+#~ msgid "Proteins"
+#~ msgstr "Eiwitten"
+
+#~ msgid "Step"
+#~ msgstr "Stap"
+
+#~ msgid "Show as header"
+#~ msgstr "Laat als kop zien"
+
+#~ msgid "Hide as header"
+#~ msgstr "Verbergen als kop"
+
+#~ msgid "Move Up"
+#~ msgstr "Verplaats omhoog"
+
+#~ msgid "Move Down"
+#~ msgstr "Verplaats omlaag"
+
+#~ msgid "Step Name"
+#~ msgstr "Stap naam"
+
+#~ msgid "Step Type"
+#~ msgstr "Stap type"
+
+#~ msgid "Step time in Minutes"
+#~ msgstr "Tijdsduur stap in minuten"
+
+#~ msgid "Select File"
+#~ msgstr "Selecteer bestand"
+
+#~ msgid "Select Recipe"
+#~ msgstr "Selecteer recept"
+
+#~ msgid "Delete Ingredient"
+#~ msgstr "Verwijder ingrediënt"
+
+#~ msgid "Make Header"
+#~ msgstr "Stel in als kop"
+
+#~ msgid "Make Ingredient"
+#~ msgstr "Maak ingrediënt"
+
+#~ msgid "Disable Amount"
+#~ msgstr "Hoeveelheid uitschakelen"
+
+#~ msgid "Enable Amount"
+#~ msgstr "Hoeveelheid inschakelen"
+
+#~ msgid "Copy Template Reference"
+#~ msgstr "Kopieer sjabloon referentie"
+
+#~ msgid "Save & View"
+#~ msgstr "Opslaan & bekijken"
+
+#~ msgid "Add Step"
+#~ msgstr "Voeg stap toe"
+
+#~ msgid "Add Nutrition"
+#~ msgstr "Voedingswaarde toevoegen"
+
+#~ msgid "Remove Nutrition"
+#~ msgstr "Voedingswaarde verwijderen"
+
+#~ msgid "View Recipe"
+#~ msgstr "Bekijk recept"
+
+#~ msgid "Delete Recipe"
+#~ msgstr "Verwijder recept"
+
+#~ msgid "Steps"
+#~ msgstr "Stappen"
+
 #~ msgid "Password Settings"
 #~ msgstr "Wachtwoord instellingen"
 
 #~ msgid "Email Settings"
 #~ msgstr "E-mail instellingen"
 
-#~ msgid "Manage Email Settings"
-#~ msgstr "Beheer e-mail instellingen"
-
 #~ msgid "Manage Social Accounts"
 #~ msgstr "Beheer sociale media accounts"
 
diff --git a/cookbook/locale/pt/LC_MESSAGES/django.po b/cookbook/locale/pt/LC_MESSAGES/django.po
index e2e889e7..0cfe8723 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+0200\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/"
@@ -23,49 +23,48 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\cookbook\filters.py:23 .\cookbook\templates\base.html:98
-#: .\cookbook\templates\forms\edit_internal_recipe.html:269
+#: .\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\views\lists.py:67
+#: .\cookbook\templates\url_import.html:270
 msgid "Ingredients"
 msgstr "Ingredientes"
 
-#: .\cookbook\forms.py:49
+#: .\cookbook\forms.py:50
 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:51
+#: .\cookbook\forms.py:52
 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:53
+#: .\cookbook\forms.py:54
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
 msgstr ""
 
-#: .\cookbook\forms.py:56
+#: .\cookbook\forms.py:57
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
 msgstr ""
 
-#: .\cookbook\forms.py:58
+#: .\cookbook\forms.py:59
 msgid "Show recently viewed recipes on search page."
 msgstr "Mostrar receitas recentes na página de pesquisa."
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:60
 msgid "Number of decimals to round ingredients."
 msgstr "Número de casas decimais para arredondamentos."
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:61
 msgid "If you want to be able to create and see comments underneath recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:62
+#: .\cookbook\forms.py:63
 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,11 +72,11 @@ msgid ""
 "mobile data. If lower than instance limit it is reset when saving."
 msgstr ""
 
-#: .\cookbook\forms.py:65
+#: .\cookbook\forms.py:66
 msgid "Makes the navbar stick to the top of the page."
 msgstr ""
 
-#: .\cookbook\forms.py:81
+#: .\cookbook\forms.py:82
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
@@ -85,94 +84,91 @@ msgstr ""
 "Ambos os campos são opcionais. Se nenhum for preenchido o nome de utilizador "
 "será apresentado."
 
-#: .\cookbook\forms.py:102 .\cookbook\forms.py:331
-#: .\cookbook\templates\forms\edit_internal_recipe.html:49
+#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
 #: .\cookbook\templates\url_import.html:154
 msgid "Name"
 msgstr "Nome"
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:332
-#: .\cookbook\templates\base.html:108 .\cookbook\templates\base.html:169
-#: .\cookbook\templates\forms\edit_internal_recipe.html:85
+#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
 #: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573
+#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr "Palavras-chave"
 
-#: .\cookbook\forms.py:104
+#: .\cookbook\forms.py:105
 msgid "Preparation time in minutes"
 msgstr "Tempo de preparação em minutos"
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:106
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "Tempo de espera (cozedura) em minutos"
 
-#: .\cookbook\forms.py:106 .\cookbook\forms.py:333
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
 msgid "Path"
 msgstr "Caminho"
 
-#: .\cookbook\forms.py:107
+#: .\cookbook\forms.py:108
 msgid "Storage UID"
 msgstr "UID de armazenamento"
 
-#: .\cookbook\forms.py:133
+#: .\cookbook\forms.py:134
 msgid "Default"
 msgstr ""
 
-#: .\cookbook\forms.py:144 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
 
-#: .\cookbook\forms.py:164
+#: .\cookbook\forms.py:165
 msgid "New Unit"
 msgstr "Nova Unidade"
 
-#: .\cookbook\forms.py:165
+#: .\cookbook\forms.py:166
 msgid "New unit that other gets replaced by."
 msgstr "Nova unidade substituta."
 
-#: .\cookbook\forms.py:170
+#: .\cookbook\forms.py:171
 msgid "Old Unit"
 msgstr "Unidade Anterior"
 
-#: .\cookbook\forms.py:171
+#: .\cookbook\forms.py:172
 msgid "Unit that should be replaced."
 msgstr "Unidade a ser alterada."
 
-#: .\cookbook\forms.py:187
+#: .\cookbook\forms.py:189
 msgid "New Food"
 msgstr "Novo Prato"
 
-#: .\cookbook\forms.py:188
+#: .\cookbook\forms.py:190
 msgid "New food that other gets replaced by."
 msgstr "Novo prato a ser alterado."
 
-#: .\cookbook\forms.py:193
+#: .\cookbook\forms.py:195
 msgid "Old Food"
 msgstr "Prato Anterior"
 
-#: .\cookbook\forms.py:194
+#: .\cookbook\forms.py:196
 msgid "Food that should be replaced."
 msgstr "Prato a ser alterado."
 
-#: .\cookbook\forms.py:212
+#: .\cookbook\forms.py:214
 msgid "Add your comment: "
 msgstr "Adicionar comentário:"
 
-#: .\cookbook\forms.py:253
+#: .\cookbook\forms.py:256
 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:260
+#: .\cookbook\forms.py:263
 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:269
+#: .\cookbook\forms.py:272
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
@@ -180,26 +176,25 @@ msgstr ""
 "Deixar vazio para Dropbox e inserir apenas url base para Nextcloud (<code>/"
 "remote.php/webdav/</code>é adicionado automaticamente). "
 
-#: .\cookbook\forms.py:307
+#: .\cookbook\forms.py:310
 msgid "Search String"
 msgstr "Procurar"
 
-#: .\cookbook\forms.py:334
+#: .\cookbook\forms.py:337
 msgid "File ID"
 msgstr "ID the ficheiro"
 
-#: .\cookbook\forms.py:370
+#: .\cookbook\forms.py:373
 msgid "You must provide at least a recipe or a title."
 msgstr "É necessário inserir uma receita ou um título."
 
-#: .\cookbook\forms.py:383
+#: .\cookbook\forms.py:386
 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:384
-#: .\cookbook\templates\forms\edit_internal_recipe.html:427
+#: .\cookbook\forms.py:387
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
@@ -207,63 +202,139 @@ msgstr ""
 "É possível utilizar markdown para editar este campo. Documentação <a href=\"/"
 "docs/markdown/\">disponível aqui</a>"
 
-#: .\cookbook\forms.py:409
+#: .\cookbook\forms.py:412
 msgid "Maximum number of users for this space reached."
 msgstr ""
 
-#: .\cookbook\forms.py:415
+#: .\cookbook\forms.py:418
 msgid "Email address already taken!"
 msgstr ""
 
-#: .\cookbook\forms.py:423
+#: .\cookbook\forms.py:426
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
 msgstr ""
 
-#: .\cookbook\forms.py:438
+#: .\cookbook\forms.py:441
 msgid "Name already taken."
 msgstr ""
 
-#: .\cookbook\forms.py:449
+#: .\cookbook\forms.py:452
 msgid "Accept Terms and Privacy"
 msgstr ""
 
+#: .\cookbook\forms.py:487
+msgid ""
+"Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
+"full desciption of choices."
+msgstr ""
+
+#: .\cookbook\forms.py:488
+msgid ""
+"Use fuzzy matching on units, keywords and ingredients when editing and "
+"importing recipes."
+msgstr ""
+
+#: .\cookbook\forms.py:489
+msgid ""
+"Fields to search ignoring accents.  Selecting this option can improve or "
+"degrade search quality depending on language"
+msgstr ""
+
+#: .\cookbook\forms.py:490
+msgid ""
+"Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
+"'pie' and 'piece' and 'soapie')"
+msgstr ""
+
+#: .\cookbook\forms.py:491
+msgid ""
+"Fields to search for beginning of word matches. (e.g. searching for 'sa' "
+"will return 'salad' and 'sandwich')"
+msgstr ""
+
+#: .\cookbook\forms.py:492
+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
+msgid ""
+"Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
+"only function with fulltext fields."
+msgstr ""
+
+#: .\cookbook\forms.py:497
+#, fuzzy
+#| msgid "Search"
+msgid "Search Method"
+msgstr "Procurar"
+
+#: .\cookbook\forms.py:498
+msgid "Fuzzy Lookups"
+msgstr ""
+
+#: .\cookbook\forms.py:499
+msgid "Ignore Accent"
+msgstr ""
+
+#: .\cookbook\forms.py:500
+msgid "Partial Match"
+msgstr ""
+
+#: .\cookbook\forms.py:501
+msgid "Starts Wtih"
+msgstr ""
+
+#: .\cookbook\forms.py:502
+#, fuzzy
+#| msgid "Search"
+msgid "Fuzzy Search"
+msgstr "Procurar"
+
+#: .\cookbook\forms.py:503
+#, fuzzy
+#| msgid "Text"
+msgid "Full Text"
+msgstr "Texto"
+
 #: .\cookbook\helper\AllAuthCustomAdapter.py:36
 msgid ""
 "In order to prevent spam, the requested email was not send. Please wait a "
 "few minutes and try again."
 msgstr ""
 
-#: .\cookbook\helper\permission_helper.py:138
-#: .\cookbook\helper\permission_helper.py:161 .\cookbook\views\views.py:151
+#: .\cookbook\helper\permission_helper.py:136
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr "Autenticação necessária para aceder a esta página!"
 
-#: .\cookbook\helper\permission_helper.py:142
-#: .\cookbook\helper\permission_helper.py:148
-#: .\cookbook\helper\permission_helper.py:173
-#: .\cookbook\helper\permission_helper.py:218
-#: .\cookbook\helper\permission_helper.py:232
-#: .\cookbook\helper\permission_helper.py:243
-#: .\cookbook\helper\permission_helper.py:254 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:162 .\cookbook\views\views.py:169
-#: .\cookbook\views\views.py:259
+#: .\cookbook\helper\permission_helper.py:140
+#: .\cookbook\helper\permission_helper.py:146
+#: .\cookbook\helper\permission_helper.py:171
+#: .\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
 msgid "You do not have the required permissions to view this page!"
 msgstr "Sem permissões para aceder a esta página!"
 
-#: .\cookbook\helper\permission_helper.py:166
-#: .\cookbook\helper\permission_helper.py:189
-#: .\cookbook\helper\permission_helper.py:204
+#: .\cookbook\helper\permission_helper.py:164
+#: .\cookbook\helper\permission_helper.py:187
+#: .\cookbook\helper\permission_helper.py:202
 msgid "You cannot interact with this object as it is not owned by you!"
 msgstr ""
 
-#: .\cookbook\helper\template_helper.py:60
-#: .\cookbook\helper\template_helper.py:62
+#: .\cookbook\helper\template_helper.py:61
+#: .\cookbook\helper\template_helper.py:63
 msgid "Could not parse template code."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:104
+#: .\cookbook\integration\integration.py:119
 #: .\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
@@ -272,27 +343,27 @@ msgstr ""
 #: .\cookbook\templates\url_import.html:123
 #: .\cookbook\templates\url_import.html:317
 #: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
-#: .\cookbook\views\edit.py:199
+#: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr "Importar"
 
-#: .\cookbook\integration\integration.py:185
+#: .\cookbook\integration\integration.py:200
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:188
+#: .\cookbook\integration\integration.py:203
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:192
+#: .\cookbook\integration\integration.py:208
 msgid "The following recipes were ignored because they already existed:"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:196
+#: .\cookbook\integration\integration.py:212
 #, fuzzy, python-format
 #| msgid "Import Recipes"
 msgid "Imported %s recipes."
@@ -313,7 +384,6 @@ msgid "Source"
 msgstr ""
 
 #: .\cookbook\integration\safron.py:23
-#: .\cookbook\templates\forms\edit_internal_recipe.html:79
 #: .\cookbook\templates\include\log_cooking.html:16
 #: .\cookbook\templates\url_import.html:224
 #: .\cookbook\templates\url_import.html:455
@@ -325,7 +395,6 @@ msgid "Waiting time"
 msgstr ""
 
 #: .\cookbook\integration\safron.py:27
-#: .\cookbook\templates\forms\edit_internal_recipe.html:73
 msgid "Preparation Time"
 msgstr ""
 
@@ -339,6 +408,22 @@ msgstr "Livro de refeições"
 msgid "Section"
 msgstr ""
 
+#: .\cookbook\management\commands\rebuildindex.py:14
+msgid "Rebuilds full text search index on Recipe"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:18
+msgid "Only Postgress databases use full text search, no index to rebuild"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:29
+msgid "Recipe index rebuild complete."
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:31
+msgid "Recipe index rebuild failed."
+msgstr ""
+
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:14
 msgid "Breakfast"
 msgstr "Pequeno-almoço"
@@ -355,78 +440,91 @@ msgstr "Jantar"
 msgid "Other"
 msgstr "Outro"
 
-#: .\cookbook\models.py:72
+#: .\cookbook\models.py:144
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr ""
 
-#: .\cookbook\models.py:123 .\cookbook\templates\search.html:7
+#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
 #: .\cookbook\templates\shopping_list.html:52
 msgid "Search"
 msgstr "Procurar"
 
-#: .\cookbook\models.py:124 .\cookbook\templates\base.html:92
+#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
 #: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:233 .\cookbook\views\new.py:201
+#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
 msgid "Meal-Plan"
 msgstr "Plano de refeição"
 
-#: .\cookbook\models.py:125 .\cookbook\templates\base.html:89
+#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr "Livros"
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Small"
 msgstr "Pequeno"
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Large"
 msgstr "Grande"
 
-#: .\cookbook\models.py:133 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:206 .\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:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:202
+#: .\cookbook\models.py:389
+msgid " is part of a recipe step and cannot be deleted"
+msgstr ""
+
+#: .\cookbook\models.py:429
 msgid "Text"
 msgstr "Texto"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:203
+#: .\cookbook\models.py:429
 msgid "Time"
 msgstr "Tempo"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:204
-#: .\cookbook\templates\forms\edit_internal_recipe.html:219
+#: .\cookbook\models.py:429
 #, fuzzy
 #| msgid "File ID"
 msgid "File"
 msgstr "ID the ficheiro"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:205
-#: .\cookbook\templates\forms\edit_internal_recipe.html:241
+#: .\cookbook\models.py:429
 #: .\cookbook\templates\include\recipe_open_modal.html:7
 #: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:273 .\cookbook\views\new.py:52
+#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr "Receita"
 
-#: .\cookbook\serializer.py:109
+#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+msgid "Simple"
+msgstr ""
+
+#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+msgid "Phrase"
+msgstr ""
+
+#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+msgid "Web"
+msgstr ""
+
+#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+msgid "Raw"
+msgstr ""
+
+#: .\cookbook\serializer.py:112
 msgid "File uploads are not enabled for this Space."
 msgstr ""
 
-#: .\cookbook\serializer.py:117
+#: .\cookbook\serializer.py:125
 msgid "You have reached your file upload limit."
 msgstr ""
 
-#: .\cookbook\tables.py:35 .\cookbook\templates\books.html:36
-#: .\cookbook\templates\generic\edit_template.html:6
+#: .\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
@@ -435,11 +533,10 @@ msgstr ""
 msgid "Edit"
 msgstr "Editar"
 
-#: .\cookbook\tables.py:124 .\cookbook\tables.py:147
-#: .\cookbook\templates\books.html:38
+#: .\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\edit_template.html:27
+#: .\cookbook\templates\generic\edit_template.html:28
 #: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
@@ -469,7 +566,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:154 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -547,7 +644,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:21
+#: .\cookbook\templates\generic\delete_template.html:22
 msgid "Confirm"
 msgstr "Confirme"
 
@@ -559,7 +656,7 @@ msgid ""
 "request</a>."
 msgstr ""
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:189
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
 msgid "Login"
 msgstr "Iniciar sessão"
 
@@ -612,7 +709,7 @@ msgstr ""
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:52
+#: .\cookbook\templates\settings.html:64
 #, fuzzy
 #| msgid "Settings"
 msgid "Password"
@@ -696,103 +793,88 @@ msgstr ""
 msgid "We are sorry, but the sign up is currently closed."
 msgstr ""
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:179
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr "Documentação API"
 
-#: .\cookbook\templates\base.html:85
-msgid "Utensils"
-msgstr "Utensílios"
-
-#: .\cookbook\templates\base.html:95
+#: .\cookbook\templates\base.html:86
 msgid "Shopping"
 msgstr "Compras"
 
-#: .\cookbook\templates\base.html:101
+#: .\cookbook\templates\base.html:113
+msgid "Keyword"
+msgstr "Palavra-chave"
+
+#: .\cookbook\templates\base.html:137
+#: .\cookbook\templates\forms\ingredients.html:24
+#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
+#: .\cookbook\views\lists.py:146
+msgid "Units"
+msgstr "Unidades"
+
+#: .\cookbook\templates\base.html:151
 #: .\cookbook\templates\shopping_list.html:230
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr ""
 
-#: .\cookbook\templates\base.html:112 .\cookbook\views\delete.py:84
-#: .\cookbook\views\edit.py:102 .\cookbook\views\lists.py:26
-#: .\cookbook\views\new.py:78
-msgid "Keyword"
-msgstr "Palavra-chave"
-
-#: .\cookbook\templates\base.html:114
+#: .\cookbook\templates\base.html:163
 msgid "Batch Edit"
 msgstr "Editor em massa"
 
-#: .\cookbook\templates\base.html:119
-msgid "Storage Data"
-msgstr "Dados de armazenamento"
-
-#: .\cookbook\templates\base.html:123
-msgid "Storage Backends"
-msgstr ""
-
-#: .\cookbook\templates\base.html:125
-msgid "Configure Sync"
-msgstr "Configurar sincronização"
-
-#: .\cookbook\templates\base.html:127
-msgid "Discovered Recipes"
-msgstr "Descobrir Receitas"
-
-#: .\cookbook\templates\base.html:129
-msgid "Discovery Log"
-msgstr ""
-
-#: .\cookbook\templates\base.html:131 .\cookbook\templates\stats.html:10
-msgid "Statistics"
-msgstr "Estatísticas"
-
-#: .\cookbook\templates\base.html:133
-msgid "Units & Ingredients"
-msgstr "Unidades e Ingredientes"
-
-#: .\cookbook\templates\base.html:135 .\cookbook\templates\index.html:47
-msgid "Import Recipe"
-msgstr "Importar Receita"
-
-#: .\cookbook\templates\base.html:156 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr "Histórico"
 
-#: .\cookbook\templates\base.html:159 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:191 .\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
+msgid "Create"
+msgstr "Criar"
+
+#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
 #: .\cookbook\templates\space.html:19
 #, fuzzy
 #| msgid "Settings"
 msgid "Space Settings"
 msgstr "Definições"
 
-#: .\cookbook\templates\base.html:163 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr "Sistema"
 
-#: .\cookbook\templates\base.html:165 .\cookbook\templates\base.html:171
+#: .\cookbook\templates\base.html:214
 msgid "Admin"
 msgstr "Administração"
 
-#: .\cookbook\templates\base.html:175
+#: .\cookbook\templates\base.html:218
 msgid "Markdown Guide"
 msgstr ""
 
-#: .\cookbook\templates\base.html:177
+#: .\cookbook\templates\base.html:220
 msgid "GitHub"
 msgstr "GitHub"
 
-#: .\cookbook\templates\base.html:181
+#: .\cookbook\templates\base.html:224
 msgid "API Browser"
 msgstr "Navegador de API"
 
-#: .\cookbook\templates\base.html:184
+#: .\cookbook\templates\base.html:227
 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"
@@ -805,7 +887,7 @@ msgstr "Editar Receitas em massa"
 msgid "Add the specified keywords to all recipes containing a word"
 msgstr "Adicionar palavras-chave a todas as receitas que contenham uma palavra"
 
-#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:85
+#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:83
 msgid "Sync"
 msgstr "Sincronizar"
 
@@ -823,10 +905,26 @@ msgstr ""
 msgid "The path must be in the following format"
 msgstr "O caminho deve estar no seguinte formato"
 
-#: .\cookbook\templates\batch\monitor.html:27
+#: .\cookbook\templates\batch\monitor.html:21
+msgid "Manage External Storage"
+msgstr ""
+
+#: .\cookbook\templates\batch\monitor.html:28
 msgid "Sync Now!"
 msgstr "Sincronizar"
 
+#: .\cookbook\templates\batch\monitor.html:29
+#, fuzzy
+#| msgid "Recipes"
+msgid "Show Recipes"
+msgstr "Receitas"
+
+#: .\cookbook\templates\batch\monitor.html:30
+#, fuzzy
+#| msgid "View Log"
+msgid "Show Log"
+msgstr "Ver Registro"
+
 #: .\cookbook\templates\batch\waiting.html:4
 #: .\cookbook\templates\batch\waiting.html:10
 msgid "Importing Recipes"
@@ -840,32 +938,10 @@ msgstr ""
 "Este processo pode demorar alguns minutos, dependendo do número de receitas "
 "a ser importadas."
 
-#: .\cookbook\templates\books.html:5 .\cookbook\templates\books.html:11
+#: .\cookbook\templates\books.html:7
 msgid "Recipe Books"
 msgstr "Livros de Receitas"
 
-#: .\cookbook\templates\books.html:15
-msgid "New Book"
-msgstr "Novo Livro"
-
-#: .\cookbook\templates\books.html:27 .\cookbook\templates\recipe_view.html:26
-msgid "by"
-msgstr "por"
-
-#: .\cookbook\templates\books.html:34
-msgid "Toggle Recipes"
-msgstr ""
-
-#: .\cookbook\templates\books.html:54
-#: .\cookbook\templates\meal_plan_entry.html:48
-#: .\cookbook\templates\recipes_table.html:64
-msgid "Last cooked"
-msgstr "Última cozinhada"
-
-#: .\cookbook\templates\books.html:71
-msgid "There are no recipes in this book yet."
-msgstr "Ainda não há receitas neste livro."
-
 #: .\cookbook\templates\export.html:6 .\cookbook\templates\test2.html:6
 msgid "Export Recipes"
 msgstr "Exportar Receitas"
@@ -888,217 +964,21 @@ msgid "Import new Recipe"
 msgstr "Importar nova Receita"
 
 #: .\cookbook\templates\forms\edit_import_recipe.html:14
-#: .\cookbook\templates\forms\edit_internal_recipe.html:439
-#: .\cookbook\templates\forms\edit_internal_recipe.html:471
 #: .\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:46 .\cookbook\templates\settings.html:87
-#: .\cookbook\templates\settings.html:105
+#: .\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
 msgid "Save"
 msgstr "Gravar"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:7
-#: .\cookbook\templates\forms\edit_internal_recipe.html:34
 msgid "Edit Recipe"
 msgstr "Editar Receita"
 
-#: .\cookbook\templates\forms\edit_internal_recipe.html:56
-#: .\cookbook\templates\url_import.html:171
-msgid "Description"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:76
-msgid "Waiting Time"
-msgstr "Tempo de Espera"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:82
-msgid "Servings Text"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:93
-msgid "Select Keywords"
-msgstr "Escolher Palavras-chave"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:94
-#: .\cookbook\templates\url_import.html:583
-#, fuzzy
-#| msgid "Keyword"
-msgid "Add Keyword"
-msgstr "Palavra-chave"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:112
-msgid "Nutrition"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:116
-#: .\cookbook\templates\forms\edit_internal_recipe.html:166
-msgid "Delete Step"
-msgstr "Apagar Passo"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:120
-msgid "Calories"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:123
-msgid "Carbohydrates"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:126
-msgid "Fats"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:128
-msgid "Proteins"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:150
-#: .\cookbook\templates\forms\edit_internal_recipe.html:504
-msgid "Step"
-msgstr "Passo"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:171
-msgid "Show as header"
-msgstr "Mostrar como cabeçalho"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:177
-msgid "Hide as header"
-msgstr "Esconder como cabeçalho"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:182
-msgid "Move Up"
-msgstr "Mover para cima"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:187
-msgid "Move Down"
-msgstr "Mover para baixo"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:196
-msgid "Step Name"
-msgstr "Nome do passo"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:200
-msgid "Step Type"
-msgstr "Tipo de passo"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:213
-msgid "Step time in Minutes"
-msgstr "Tempo de passo em minutos"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:229
-#, fuzzy
-#| msgid "Select Unit"
-msgid "Select File"
-msgstr "Selecionar Unidade"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:230
-#: .\cookbook\templates\forms\edit_internal_recipe.html:252
-#: .\cookbook\templates\forms\edit_internal_recipe.html:313
-#: .\cookbook\templates\forms\edit_internal_recipe.html:337
-#: .\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
-msgid "Select"
-msgstr "Selecionar"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:251
-#, fuzzy
-#| msgid "Delete Recipe"
-msgid "Select Recipe"
-msgstr "Apagar Receita"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:311
-#: .\cookbook\templates\shopping_list.html:187
-msgid "Select Unit"
-msgstr "Selecionar Unidade"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:312
-#: .\cookbook\templates\forms\edit_internal_recipe.html:336
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
-msgid "Create"
-msgstr "Criar"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:335
-#: .\cookbook\templates\shopping_list.html:209
-msgid "Select Food"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:352
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr "Nota"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:369
-msgid "Delete Ingredient"
-msgstr "Apagar Ingrediente"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:375
-msgid "Make Header"
-msgstr "Adicionar Cabeçalho"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:381
-msgid "Make Ingredient"
-msgstr "Adicionar Ingrediente"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:387
-msgid "Disable Amount"
-msgstr "Desativar Quantidade"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:393
-msgid "Enable Amount"
-msgstr "Ativar Quantidade"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:398
-msgid "Copy Template Reference"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:424
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
-msgid "Instructions"
-msgstr "Instruções"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:437
-#: .\cookbook\templates\forms\edit_internal_recipe.html:468
-msgid "Save & View"
-msgstr "Gravar e Ver"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:441
-#: .\cookbook\templates\forms\edit_internal_recipe.html:474
-msgid "Add Step"
-msgstr "Adicionar Passo"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:444
-#: .\cookbook\templates\forms\edit_internal_recipe.html:478
-msgid "Add Nutrition"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:446
-#: .\cookbook\templates\forms\edit_internal_recipe.html:480
-msgid "Remove Nutrition"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:448
-#: .\cookbook\templates\forms\edit_internal_recipe.html:483
-msgid "View Recipe"
-msgstr "Ver Receita"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:450
-#: .\cookbook\templates\forms\edit_internal_recipe.html:485
-msgid "Delete Recipe"
-msgstr "Apagar Receita"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:491
-msgid "Steps"
-msgstr "Passos"
-
 #: .\cookbook\templates\forms\ingredients.html:15
 msgid "Edit Ingredients"
 msgstr "Editar ingredientes"
@@ -1119,11 +999,6 @@ msgstr ""
 "Junta duas unidades ou ingredientes e atualiza todas as receitas que as "
 "estejam a usar. "
 
-#: .\cookbook\templates\forms\ingredients.html:24
-#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
-msgid "Units"
-msgstr "Unidades"
-
 #: .\cookbook\templates\forms\ingredients.html:26
 msgid "Are you sure that you want to merge these two units?"
 msgstr ""
@@ -1137,29 +1012,33 @@ msgstr "Juntar"
 msgid "Are you sure that you want to merge these two ingredients?"
 msgstr ""
 
-#: .\cookbook\templates\generic\delete_template.html:18
+#: .\cookbook\templates\generic\delete_template.html:19
 #, 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\edit_template.html:30
+#: .\cookbook\templates\generic\delete_template.html:23
+msgid "Cancel"
+msgstr ""
+
+#: .\cookbook\templates\generic\edit_template.html:32
 msgid "View"
 msgstr "Ver"
 
-#: .\cookbook\templates\generic\edit_template.html:34
+#: .\cookbook\templates\generic\edit_template.html:36
 msgid "Delete original file"
 msgstr "Apagar ficheiro original"
 
 #: .\cookbook\templates\generic\list_template.html:6
-#: .\cookbook\templates\generic\list_template.html:12
+#: .\cookbook\templates\generic\list_template.html:21
 msgid "List"
 msgstr "Listar "
 
-#: .\cookbook\templates\generic\list_template.html:25
+#: .\cookbook\templates\generic\list_template.html:34
 msgid "Filter"
 msgstr "Filtrar"
 
-#: .\cookbook\templates\generic\list_template.html:30
+#: .\cookbook\templates\generic\list_template.html:39
 msgid "Import all"
 msgstr "Importar tudo"
 
@@ -1482,6 +1361,11 @@ msgstr ""
 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"
@@ -1545,6 +1429,11 @@ msgstr ""
 msgid "Meal Plan View"
 msgstr ""
 
+#: .\cookbook\templates\meal_plan_entry.html:48
+#: .\cookbook\templates\recipes_table.html:64
+msgid "Last cooked"
+msgstr "Última cozinhada"
+
 #: .\cookbook\templates\meal_plan_entry.html:50
 msgid "Never cooked before."
 msgstr ""
@@ -1647,8 +1536,12 @@ msgstr ""
 msgid "Comments"
 msgstr ""
 
+#: .\cookbook\templates\recipe_view.html:26
+msgid "by"
+msgstr "por"
+
 #: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
-#: .\cookbook\views\edit.py:179
+#: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr ""
 
@@ -1680,68 +1573,239 @@ msgstr ""
 msgid "Recipe Home"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:25
+#: .\cookbook\templates\search_info.html:5
+#: .\cookbook\templates\search_info.html:9
+#: .\cookbook\templates\settings.html:157
+#, fuzzy
+#| msgid "Search String"
+msgid "Search Settings"
+msgstr "Procurar"
+
+#: .\cookbook\templates\search_info.html:10
+msgid ""
+"\n"
+"        Creating the best search experience is complicated and weighs "
+"heavily on your personal configuration.  \n"
+"        Changing any of the search settings can have significant impact on "
+"the speed and quality of the results.\n"
+"        Search Methods, Trigrams and Full Text Search configurations are "
+"only available if you are using Postgres for your database.\n"
+"    "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:19
+#, fuzzy
+#| msgid "Search"
+msgid "Search Methods"
+msgstr "Procurar"
+
+#: .\cookbook\templates\search_info.html:23
+msgid ""
+" \n"
+"            Full text searches attempt to normalize the words provided to "
+"match common variants.  For example: 'forked', 'forking', 'forks' will all "
+"normalize to 'fork'.\n"
+"            There are several methods available, described below, that will "
+"control how the search behavior should react when multiple words are "
+"searched.\n"
+"            Full technical details on how these operate can be viewed on <a "
+"href=https://www.postgresql.org/docs/current/textsearch-controls."
+"html#TEXTSEARCH-PARSING-QUERIES>Postgresql's website.</a>\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:29
+msgid ""
+" \n"
+"            Simple searches ignore punctuation and common words such as "
+"'the', 'a', 'and'. And will treat seperate words as required.\n"
+"            Searching for 'apple or flour' will return any recipe that "
+"includes both 'apple' and 'flour' anywhere in the fields that have been "
+"selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:34
+msgid ""
+" \n"
+"            Phrase searches ignore punctuation, but will search for all of "
+"the words in the exact order provided.\n"
+"            Searching for 'apple or flour' will only return a recipe that "
+"includes the exact phrase 'apple or flour' in any of the fields that have "
+"been selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:39
+msgid ""
+" \n"
+"            Web searches simulate functionality found on many web search "
+"sites supporting special syntax.\n"
+"            Placing quotes around several words will convert those words "
+"into a phrase.\n"
+"            'or' is recongized as searching for the word (or phrase) "
+"immediately before 'or' OR the word (or phrase) directly after.\n"
+"            '-' is recognized as searching for recipes that do not include "
+"the word (or phrase) that comes immediately after. \n"
+"            For example searching for 'apple pie' or cherry -butter will "
+"return any recipe that includes the phrase 'apple pie' or the word "
+"'cherry' \n"
+"            in any field included in the full text search but exclude any "
+"recipe that has the word 'butter' in any field included.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:48
+msgid ""
+" \n"
+"            Raw search is similar to Web except will take puncuation "
+"operators such as '|', '&' and '()'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:59
+msgid ""
+" \n"
+"            Another approach to searching that also requires Postgresql is "
+"fuzzy search or trigram similarity. A trigram is a group of three "
+"consecutive characters.\n"
+"            For example searching for 'apple' will create x trigrams 'app', "
+"'ppl', 'ple' and will create a score of how closely words match the "
+"generated trigrams.\n"
+"            One benefit of searching trigams is that a search for 'sandwich' "
+"will find mispelled words such as 'sandwhich' that would be missed by other "
+"methods.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:69
+#, fuzzy
+#| msgid "Search Recipe"
+msgid "Search Fields"
+msgstr "Procure Receita"
+
+#: .\cookbook\templates\search_info.html:73
+msgid ""
+" \n"
+"            Unaccent is a special case in that it enables searching a field "
+"'unaccented' for each search style attempting to ignore accented values. \n"
+"            For example when you enable unaccent for 'Name' any search "
+"(starts with, contains, trigram) will attempt the search ignoring accented "
+"characters.\n"
+"            \n"
+"            For the other options, you can enable search on any or all "
+"fields and they will be combined together with an assumed 'OR'.\n"
+"            For example enabling 'Name' for Starts With, 'Name' and "
+"'Description' for Partial Match and 'Ingredients' and 'Keywords' for Full "
+"Search\n"
+"            and searching for 'apple' will generate a search that will "
+"return recipes that have:\n"
+"            - A recipe name that starts with 'apple'\n"
+"            - OR a recipe name that contains 'apple'\n"
+"            - OR a recipe description that contains 'apple'\n"
+"            - OR a recipe that will have a full text search match ('apple' "
+"or 'apples') in ingredients\n"
+"            - OR a recipe that will have a full text search match in "
+"Keywords\n"
+"\n"
+"            Combining too many fields in too many types of search can have a "
+"negative impact on performance, create duplicate results or return "
+"unexpected results.\n"
+"            For example, enabling fuzzy search or partial matches will "
+"interfere with web search methods.  \n"
+"            Searching for 'apple -pie' with fuzzy search and full text "
+"search will return the recipe Apple Pie.  Though it is not included in the "
+"full text results, it does match the trigram results.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:95
+#, fuzzy
+#| msgid "Search"
+msgid "Search Index"
+msgstr "Procurar"
+
+#: .\cookbook\templates\search_info.html:99
+msgid ""
+" \n"
+"            Trigram search and Full Text Search both rely on database "
+"indexes to perform effectively.  \n"
+"            You can rebuild the indexes on all fields in the Admin page for "
+"Recipes and selecting all recipes and running 'rebuild index for selected "
+"recipes'\n"
+"            You can also rebuild indexes at the command line by executing "
+"the management command 'python manage.py rebuildindex'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\settings.html:27
 msgid "Account"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:29
+#: .\cookbook\templates\settings.html:33
 msgid "Preferences"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:39
 #, fuzzy
 #| msgid "Settings"
 msgid "API-Settings"
 msgstr "Definições"
 
-#: .\cookbook\templates\settings.html:41
+#: .\cookbook\templates\settings.html:45
+#, fuzzy
+#| msgid "Search String"
+msgid "Search-Settings"
+msgstr "Procurar"
+
+#: .\cookbook\templates\settings.html:53
 #, fuzzy
 #| msgid "Settings"
 msgid "Name Settings"
 msgstr "Definições"
 
-#: .\cookbook\templates\settings.html:49
+#: .\cookbook\templates\settings.html:61
 #, fuzzy
 #| msgid "Settings"
 msgid "Account Settings"
 msgstr "Definições"
 
-#: .\cookbook\templates\settings.html:51
+#: .\cookbook\templates\settings.html:63
 #, fuzzy
 #| msgid "Settings"
 msgid "Emails"
 msgstr "Definições"
 
-#: .\cookbook\templates\settings.html:54
+#: .\cookbook\templates\settings.html:66
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:78
 msgid "Language"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:96
+#: .\cookbook\templates\settings.html:108
 msgid "Style"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:116
+#: .\cookbook\templates\settings.html:128
 msgid "API Token"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:117
+#: .\cookbook\templates\settings.html:129
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
 msgstr ""
 
-#: .\cookbook\templates\settings.html:134
+#: .\cookbook\templates\settings.html:146
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:136
+#: .\cookbook\templates\settings.html:148
 msgid "or"
 msgstr ""
 
@@ -1782,6 +1846,23 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#: .\cookbook\templates\shopping_list.html:187
+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
+msgid "Select"
+msgstr "Selecionar"
+
+#: .\cookbook\templates\shopping_list.html:209
+msgid "Select Food"
+msgstr ""
+
 #: .\cookbook\templates\shopping_list.html:240
 msgid "Select Supermarket"
 msgstr ""
@@ -1879,10 +1960,6 @@ msgstr ""
 msgid "Recipes without Keywords"
 msgstr ""
 
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr ""
-
 #: .\cookbook\templates\space.html:60 .\cookbook\templates\stats.html:45
 msgid "Internal Recipes"
 msgstr ""
@@ -1936,7 +2013,7 @@ msgid "There are no members in your space yet!"
 msgstr "Ainda não há receitas neste livro."
 
 #: .\cookbook\templates\space.html:130 .\cookbook\templates\system.html:21
-#: .\cookbook\views\lists.py:115
+#: .\cookbook\views\lists.py:100
 msgid "Invite Links"
 msgstr ""
 
@@ -1944,6 +2021,10 @@ msgstr ""
 msgid "Stats"
 msgstr ""
 
+#: .\cookbook\templates\stats.html:10
+msgid "Statistics"
+msgstr "Estatísticas"
+
 #: .\cookbook\templates\system.html:22
 msgid "Show Links"
 msgstr ""
@@ -2092,6 +2173,10 @@ msgstr ""
 msgid "Text dragged here will be appended to the name."
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:171
+msgid "Description"
+msgstr ""
+
 #: .\cookbook\templates\url_import.html:175
 msgid "Text dragged here will be appended to the description."
 msgstr ""
@@ -2120,6 +2205,11 @@ msgstr "Tempo"
 msgid "Ingredients dragged here will be appended to current list."
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:297
+#: .\cookbook\templates\url_import.html:567
+msgid "Instructions"
+msgstr "Instruções"
+
 #: .\cookbook\templates\url_import.html:302
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
@@ -2177,6 +2267,12 @@ msgstr ""
 msgid "Select one"
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:583
+#, fuzzy
+#| msgid "Keyword"
+msgid "Add Keyword"
+msgstr "Palavra-chave"
+
 #: .\cookbook\templates\url_import.html:596
 msgid "All Keywords"
 msgstr ""
@@ -2212,45 +2308,102 @@ msgstr ""
 msgid "Recipe Markup Specification"
 msgstr ""
 
-#: .\cookbook\views\api.py:79
+#: .\cookbook\views\api.py:82 .\cookbook\views\api.py:131
 msgid "Parameter updated_at incorrectly formatted"
 msgstr ""
 
-#: .\cookbook\views\api.py:580 .\cookbook\views\views.py:303
+#: .\cookbook\views\api.py:151
+#, python-brace-format
+msgid "No {self.basename} with id {pk} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
+#: .\cookbook\views\edit.py:316
+msgid "Cannot merge with the same object!"
+msgstr ""
+
+#: .\cookbook\views\api.py:162
+#, python-brace-format
+msgid "No {self.basename} with id {target} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:167
+msgid "Cannot merge with child object!"
+msgstr ""
+
+#: .\cookbook\views\api.py:195
+#, python-brace-format
+msgid "{source.name} was merged successfully with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:199
+#, python-brace-format
+msgid "An error occurred attempting to merge {source.name} with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:239
+#, python-brace-format
+msgid "No {self.basename} with id {child} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:248
+#, python-brace-format
+msgid "{child.name} was moved successfully to the root."
+msgstr ""
+
+#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+msgid "An error occurred attempting to move "
+msgstr ""
+
+#: .\cookbook\views\api.py:254
+msgid "Cannot move an object to itself!"
+msgstr ""
+
+#: .\cookbook\views\api.py:260
+#, python-brace-format
+msgid "No {self.basename} with id {parent} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:266
+#, python-brace-format
+msgid "{child.name} was moved successfully to parent {parent.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
 msgid "This feature is not available in the demo version!"
 msgstr ""
 
-#: .\cookbook\views\api.py:603
+#: .\cookbook\views\api.py:727
 msgid "Sync successful!"
 msgstr ""
 
-#: .\cookbook\views\api.py:608
+#: .\cookbook\views\api.py:732
 msgid "Error synchronizing with Storage"
 msgstr ""
 
-#: .\cookbook\views\api.py:686
+#: .\cookbook\views\api.py:810
 msgid "Nothing to do."
 msgstr ""
 
-#: .\cookbook\views\api.py:701
+#: .\cookbook\views\api.py:825
 msgid "The requested site provided malformed data and cannot be read."
 msgstr ""
 
-#: .\cookbook\views\api.py:708
+#: .\cookbook\views\api.py:832
 msgid "The requested page could not be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:717
+#: .\cookbook\views\api.py:841
 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:731
+#: .\cookbook\views\api.py:855
 msgid "No useable data could be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:747
+#: .\cookbook\views\api.py:871
 msgid "I couldn't find anything to do."
 msgstr ""
 
@@ -2277,8 +2430,8 @@ msgstr[1] ""
 msgid "Monitor"
 msgstr ""
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:102
-#: .\cookbook\views\new.py:98
+#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr ""
 
@@ -2287,8 +2440,8 @@ 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:213
-#: .\cookbook\views\new.py:156
+#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
+#: .\cookbook\views\new.py:155
 msgid "Recipe Book"
 msgstr ""
 
@@ -2296,47 +2449,39 @@ msgstr ""
 msgid "Bookmarks"
 msgstr ""
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:252
+#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
 msgid "Invite Link"
 msgstr ""
 
-#: .\cookbook\views\edit.py:119
-msgid "Food"
-msgstr ""
-
-#: .\cookbook\views\edit.py:128
+#: .\cookbook\views\edit.py:126
 msgid "You cannot edit this storage!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:148
+#: .\cookbook\views\edit.py:146
 msgid "Storage saved!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:154
+#: .\cookbook\views\edit.py:152
 msgid "There was an error updating this storage backend!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:165
+#: .\cookbook\views\edit.py:163
 msgid "Storage"
 msgstr ""
 
-#: .\cookbook\views\edit.py:261
+#: .\cookbook\views\edit.py:259
 msgid "Changes saved!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:265
+#: .\cookbook\views\edit.py:263
 msgid "Error saving changes!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:299
+#: .\cookbook\views\edit.py:298
 msgid "Units merged!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:301 .\cookbook\views\edit.py:317
-msgid "Cannot merge with the same object!"
-msgstr ""
-
-#: .\cookbook\views\edit.py:315
+#: .\cookbook\views\edit.py:314
 msgid "Foods merged!"
 msgstr ""
 
@@ -2348,133 +2493,255 @@ msgstr ""
 msgid "Exporting is not implemented for this provider"
 msgstr ""
 
-#: .\cookbook\views\lists.py:40
+#: .\cookbook\views\lists.py:26
 msgid "Import Log"
 msgstr ""
 
-#: .\cookbook\views\lists.py:53
+#: .\cookbook\views\lists.py:39
 msgid "Discovery"
 msgstr ""
 
-#: .\cookbook\views\lists.py:85
+#: .\cookbook\views\lists.py:69
 msgid "Shopping Lists"
 msgstr ""
 
-#: .\cookbook\views\new.py:123
+#: .\cookbook\views\lists.py:129
+#, fuzzy
+#| msgid "New Food"
+msgid "Foods"
+msgstr "Novo Prato"
+
+#: .\cookbook\views\lists.py:163
+msgid "Supermarkets"
+msgstr ""
+
+#: .\cookbook\views\lists.py:179
+msgid "Shopping Categories"
+msgstr ""
+
+#: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr ""
 
-#: .\cookbook\views\new.py:126
+#: .\cookbook\views\new.py:125
 msgid "There was an error importing this recipe!"
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "Hello"
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "You have been invited by "
 msgstr ""
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:226
 msgid " to join their Tandoor Recipes space "
 msgstr ""
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:227
 msgid "Click the following link to activate your account: "
 msgstr ""
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:228
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:229
 msgid "The invitation is valid until "
 msgstr ""
 
-#: .\cookbook\views\new.py:231
+#: .\cookbook\views\new.py:230
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 
-#: .\cookbook\views\new.py:234
+#: .\cookbook\views\new.py:233
 msgid "Tandoor Recipes Invite"
 msgstr ""
 
-#: .\cookbook\views\new.py:241
+#: .\cookbook\views\new.py:240
 msgid "Invite link successfully send to user."
 msgstr ""
 
-#: .\cookbook\views\new.py:244
+#: .\cookbook\views\new.py:243
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
 msgstr ""
 
-#: .\cookbook\views\new.py:246
+#: .\cookbook\views\new.py:245
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 
-#: .\cookbook\views\views.py:129
+#: .\cookbook\views\views.py:128
 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:177
+#: .\cookbook\views\views.py:176
 msgid "You do not have the required permissions to perform this action!"
 msgstr ""
 
-#: .\cookbook\views\views.py:188
+#: .\cookbook\views\views.py:187
 msgid "Comment saved!"
 msgstr ""
 
-#: .\cookbook\views\views.py:395
+#: .\cookbook\views\views.py:351
+msgid "You must select at least one field to search!"
+msgstr ""
+
+#: .\cookbook\views\views.py:354
+msgid ""
+"To use this search method you must select at least one full text search "
+"field!"
+msgstr ""
+
+#: .\cookbook\views\views.py:357
+msgid "Fuzzy search is not compatible with this search method!"
+msgstr ""
+
+#: .\cookbook\views\views.py:437
 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:402
+#: .\cookbook\views\views.py:444
 msgid "Passwords dont match!"
 msgstr ""
 
-#: .\cookbook\views\views.py:418
+#: .\cookbook\views\views.py:460
 msgid "User has been created, please login!"
 msgstr ""
 
-#: .\cookbook\views\views.py:434
+#: .\cookbook\views\views.py:476
 msgid "Malformed Invite Link supplied!"
 msgstr ""
 
-#: .\cookbook\views\views.py:441
+#: .\cookbook\views\views.py:483
 #, 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:452
+#: .\cookbook\views\views.py:494
 msgid "Successfully joined space."
 msgstr ""
 
-#: .\cookbook\views\views.py:458
+#: .\cookbook\views\views.py:500
 msgid "Invite Link not valid or already used!"
 msgstr ""
 
-#: .\cookbook\views\views.py:522
+#: .\cookbook\views\views.py:564
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
 msgstr ""
 
-#: .\cookbook\views\views.py:528
+#: .\cookbook\views\views.py:570
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
 msgstr ""
 
+#~ msgid "Utensils"
+#~ msgstr "Utensílios"
+
+#~ msgid "Storage Data"
+#~ msgstr "Dados de armazenamento"
+
+#~ msgid "Configure Sync"
+#~ msgstr "Configurar sincronização"
+
+#~ msgid "Discovered Recipes"
+#~ msgstr "Descobrir Receitas"
+
+#~ msgid "Units & Ingredients"
+#~ msgstr "Unidades e Ingredientes"
+
+#~ msgid "New Book"
+#~ msgstr "Novo Livro"
+
+#~ msgid "There are no recipes in this book yet."
+#~ msgstr "Ainda não há receitas neste livro."
+
+#~ msgid "Waiting Time"
+#~ msgstr "Tempo de Espera"
+
+#~ msgid "Select Keywords"
+#~ msgstr "Escolher Palavras-chave"
+
+#~ msgid "Delete Step"
+#~ msgstr "Apagar Passo"
+
+#~ msgid "Step"
+#~ msgstr "Passo"
+
+#~ msgid "Show as header"
+#~ msgstr "Mostrar como cabeçalho"
+
+#~ msgid "Hide as header"
+#~ msgstr "Esconder como cabeçalho"
+
+#~ msgid "Move Up"
+#~ msgstr "Mover para cima"
+
+#~ msgid "Move Down"
+#~ msgstr "Mover para baixo"
+
+#~ msgid "Step Name"
+#~ msgstr "Nome do passo"
+
+#~ msgid "Step Type"
+#~ msgstr "Tipo de passo"
+
+#~ msgid "Step time in Minutes"
+#~ msgstr "Tempo de passo em minutos"
+
+#, fuzzy
+#~| msgid "Select Unit"
+#~ msgid "Select File"
+#~ msgstr "Selecionar Unidade"
+
+#, fuzzy
+#~| msgid "Delete Recipe"
+#~ msgid "Select Recipe"
+#~ msgstr "Apagar Receita"
+
+#~ msgid "Delete Ingredient"
+#~ msgstr "Apagar Ingrediente"
+
+#~ msgid "Make Header"
+#~ msgstr "Adicionar Cabeçalho"
+
+#~ msgid "Make Ingredient"
+#~ msgstr "Adicionar Ingrediente"
+
+#~ msgid "Disable Amount"
+#~ msgstr "Desativar Quantidade"
+
+#~ msgid "Enable Amount"
+#~ msgstr "Ativar Quantidade"
+
+#~ msgid "Save & View"
+#~ msgstr "Gravar e Ver"
+
+#~ msgid "Add Step"
+#~ msgstr "Adicionar Passo"
+
+#~ msgid "View Recipe"
+#~ msgstr "Ver Receita"
+
+#~ msgid "Delete Recipe"
+#~ msgstr "Apagar Receita"
+
+#~ msgid "Steps"
+#~ msgstr "Passos"
+
 #~ msgid ""
 #~ "A username is not required, if left blank the new user can choose one."
 #~ msgstr ""
diff --git a/cookbook/locale/rn/LC_MESSAGES/django.po b/cookbook/locale/rn/LC_MESSAGES/django.po
index 4aa893a4..2ac21231 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+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,49 +18,48 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: .\cookbook\filters.py:23 .\cookbook\templates\base.html:98
-#: .\cookbook\templates\forms\edit_internal_recipe.html:269
+#: .\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\views\lists.py:67
+#: .\cookbook\templates\url_import.html:270
 msgid "Ingredients"
 msgstr ""
 
-#: .\cookbook\forms.py:49
+#: .\cookbook\forms.py:50
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
 msgstr ""
 
-#: .\cookbook\forms.py:51
+#: .\cookbook\forms.py:52
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
 msgstr ""
 
-#: .\cookbook\forms.py:53
+#: .\cookbook\forms.py:54
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
 msgstr ""
 
-#: .\cookbook\forms.py:56
+#: .\cookbook\forms.py:57
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
 msgstr ""
 
-#: .\cookbook\forms.py:58
+#: .\cookbook\forms.py:59
 msgid "Show recently viewed recipes on search page."
 msgstr ""
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:60
 msgid "Number of decimals to round ingredients."
 msgstr ""
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:61
 msgid "If you want to be able to create and see comments underneath recipes."
 msgstr ""
 
-#: .\cookbook\forms.py:62
+#: .\cookbook\forms.py:63
 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. "
@@ -68,187 +67,253 @@ msgid ""
 "mobile data. If lower than instance limit it is reset when saving."
 msgstr ""
 
-#: .\cookbook\forms.py:65
+#: .\cookbook\forms.py:66
 msgid "Makes the navbar stick to the top of the page."
 msgstr ""
 
-#: .\cookbook\forms.py:81
+#: .\cookbook\forms.py:82
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
 msgstr ""
 
-#: .\cookbook\forms.py:102 .\cookbook\forms.py:331
-#: .\cookbook\templates\forms\edit_internal_recipe.html:49
+#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
 #: .\cookbook\templates\url_import.html:154
 msgid "Name"
 msgstr ""
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:332
-#: .\cookbook\templates\base.html:108 .\cookbook\templates\base.html:169
-#: .\cookbook\templates\forms\edit_internal_recipe.html:85
+#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
 #: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573
+#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr ""
 
-#: .\cookbook\forms.py:104
+#: .\cookbook\forms.py:105
 msgid "Preparation time in minutes"
 msgstr ""
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:106
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr ""
 
-#: .\cookbook\forms.py:106 .\cookbook\forms.py:333
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
 msgid "Path"
 msgstr ""
 
-#: .\cookbook\forms.py:107
+#: .\cookbook\forms.py:108
 msgid "Storage UID"
 msgstr ""
 
-#: .\cookbook\forms.py:133
+#: .\cookbook\forms.py:134
 msgid "Default"
 msgstr ""
 
-#: .\cookbook\forms.py:144 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
 
-#: .\cookbook\forms.py:164
+#: .\cookbook\forms.py:165
 msgid "New Unit"
 msgstr ""
 
-#: .\cookbook\forms.py:165
+#: .\cookbook\forms.py:166
 msgid "New unit that other gets replaced by."
 msgstr ""
 
-#: .\cookbook\forms.py:170
+#: .\cookbook\forms.py:171
 msgid "Old Unit"
 msgstr ""
 
-#: .\cookbook\forms.py:171
+#: .\cookbook\forms.py:172
 msgid "Unit that should be replaced."
 msgstr ""
 
-#: .\cookbook\forms.py:187
+#: .\cookbook\forms.py:189
 msgid "New Food"
 msgstr ""
 
-#: .\cookbook\forms.py:188
+#: .\cookbook\forms.py:190
 msgid "New food that other gets replaced by."
 msgstr ""
 
-#: .\cookbook\forms.py:193
+#: .\cookbook\forms.py:195
 msgid "Old Food"
 msgstr ""
 
-#: .\cookbook\forms.py:194
+#: .\cookbook\forms.py:196
 msgid "Food that should be replaced."
 msgstr ""
 
-#: .\cookbook\forms.py:212
+#: .\cookbook\forms.py:214
 msgid "Add your comment: "
 msgstr ""
 
-#: .\cookbook\forms.py:253
+#: .\cookbook\forms.py:256
 msgid "Leave empty for dropbox and enter app password for nextcloud."
 msgstr ""
 
-#: .\cookbook\forms.py:260
+#: .\cookbook\forms.py:263
 msgid "Leave empty for nextcloud and enter api token for dropbox."
 msgstr ""
 
-#: .\cookbook\forms.py:269
+#: .\cookbook\forms.py:272
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
 msgstr ""
 
-#: .\cookbook\forms.py:307
+#: .\cookbook\forms.py:310
 msgid "Search String"
 msgstr ""
 
-#: .\cookbook\forms.py:334
+#: .\cookbook\forms.py:337
 msgid "File ID"
 msgstr ""
 
-#: .\cookbook\forms.py:370
+#: .\cookbook\forms.py:373
 msgid "You must provide at least a recipe or a title."
 msgstr ""
 
-#: .\cookbook\forms.py:383
+#: .\cookbook\forms.py:386
 msgid "You can list default users to share recipes with in the settings."
 msgstr ""
 
-#: .\cookbook\forms.py:384
-#: .\cookbook\templates\forms\edit_internal_recipe.html:427
+#: .\cookbook\forms.py:387
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
 msgstr ""
 
-#: .\cookbook\forms.py:409
+#: .\cookbook\forms.py:412
 msgid "Maximum number of users for this space reached."
 msgstr ""
 
-#: .\cookbook\forms.py:415
+#: .\cookbook\forms.py:418
 msgid "Email address already taken!"
 msgstr ""
 
-#: .\cookbook\forms.py:423
+#: .\cookbook\forms.py:426
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
 msgstr ""
 
-#: .\cookbook\forms.py:438
+#: .\cookbook\forms.py:441
 msgid "Name already taken."
 msgstr ""
 
-#: .\cookbook\forms.py:449
+#: .\cookbook\forms.py:452
 msgid "Accept Terms and Privacy"
 msgstr ""
 
+#: .\cookbook\forms.py:487
+msgid ""
+"Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
+"full desciption of choices."
+msgstr ""
+
+#: .\cookbook\forms.py:488
+msgid ""
+"Use fuzzy matching on units, keywords and ingredients when editing and "
+"importing recipes."
+msgstr ""
+
+#: .\cookbook\forms.py:489
+msgid ""
+"Fields to search ignoring accents.  Selecting this option can improve or "
+"degrade search quality depending on language"
+msgstr ""
+
+#: .\cookbook\forms.py:490
+msgid ""
+"Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
+"'pie' and 'piece' and 'soapie')"
+msgstr ""
+
+#: .\cookbook\forms.py:491
+msgid ""
+"Fields to search for beginning of word matches. (e.g. searching for 'sa' "
+"will return 'salad' and 'sandwich')"
+msgstr ""
+
+#: .\cookbook\forms.py:492
+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
+msgid ""
+"Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
+"only function with fulltext fields."
+msgstr ""
+
+#: .\cookbook\forms.py:497
+msgid "Search Method"
+msgstr ""
+
+#: .\cookbook\forms.py:498
+msgid "Fuzzy Lookups"
+msgstr ""
+
+#: .\cookbook\forms.py:499
+msgid "Ignore Accent"
+msgstr ""
+
+#: .\cookbook\forms.py:500
+msgid "Partial Match"
+msgstr ""
+
+#: .\cookbook\forms.py:501
+msgid "Starts Wtih"
+msgstr ""
+
+#: .\cookbook\forms.py:502
+msgid "Fuzzy Search"
+msgstr ""
+
+#: .\cookbook\forms.py:503
+msgid "Full Text"
+msgstr ""
+
 #: .\cookbook\helper\AllAuthCustomAdapter.py:36
 msgid ""
 "In order to prevent spam, the requested email was not send. Please wait a "
 "few minutes and try again."
 msgstr ""
 
-#: .\cookbook\helper\permission_helper.py:138
-#: .\cookbook\helper\permission_helper.py:161 .\cookbook\views\views.py:151
+#: .\cookbook\helper\permission_helper.py:136
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr ""
 
-#: .\cookbook\helper\permission_helper.py:142
-#: .\cookbook\helper\permission_helper.py:148
-#: .\cookbook\helper\permission_helper.py:173
-#: .\cookbook\helper\permission_helper.py:218
-#: .\cookbook\helper\permission_helper.py:232
-#: .\cookbook\helper\permission_helper.py:243
-#: .\cookbook\helper\permission_helper.py:254 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:162 .\cookbook\views\views.py:169
-#: .\cookbook\views\views.py:259
+#: .\cookbook\helper\permission_helper.py:140
+#: .\cookbook\helper\permission_helper.py:146
+#: .\cookbook\helper\permission_helper.py:171
+#: .\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
 msgid "You do not have the required permissions to view this page!"
 msgstr ""
 
-#: .\cookbook\helper\permission_helper.py:166
-#: .\cookbook\helper\permission_helper.py:189
-#: .\cookbook\helper\permission_helper.py:204
+#: .\cookbook\helper\permission_helper.py:164
+#: .\cookbook\helper\permission_helper.py:187
+#: .\cookbook\helper\permission_helper.py:202
 msgid "You cannot interact with this object as it is not owned by you!"
 msgstr ""
 
-#: .\cookbook\helper\template_helper.py:60
-#: .\cookbook\helper\template_helper.py:62
+#: .\cookbook\helper\template_helper.py:61
+#: .\cookbook\helper\template_helper.py:63
 msgid "Could not parse template code."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:104
+#: .\cookbook\integration\integration.py:119
 #: .\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
@@ -257,27 +322,27 @@ msgstr ""
 #: .\cookbook\templates\url_import.html:123
 #: .\cookbook\templates\url_import.html:317
 #: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
-#: .\cookbook\views\edit.py:199
+#: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:185
+#: .\cookbook\integration\integration.py:200
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:188
+#: .\cookbook\integration\integration.py:203
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:192
+#: .\cookbook\integration\integration.py:208
 msgid "The following recipes were ignored because they already existed:"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:196
+#: .\cookbook\integration\integration.py:212
 #, python-format
 msgid "Imported %s recipes."
 msgstr ""
@@ -295,7 +360,6 @@ msgid "Source"
 msgstr ""
 
 #: .\cookbook\integration\safron.py:23
-#: .\cookbook\templates\forms\edit_internal_recipe.html:79
 #: .\cookbook\templates\include\log_cooking.html:16
 #: .\cookbook\templates\url_import.html:224
 #: .\cookbook\templates\url_import.html:455
@@ -307,7 +371,6 @@ msgid "Waiting time"
 msgstr ""
 
 #: .\cookbook\integration\safron.py:27
-#: .\cookbook\templates\forms\edit_internal_recipe.html:73
 msgid "Preparation Time"
 msgstr ""
 
@@ -321,6 +384,22 @@ msgstr ""
 msgid "Section"
 msgstr ""
 
+#: .\cookbook\management\commands\rebuildindex.py:14
+msgid "Rebuilds full text search index on Recipe"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:18
+msgid "Only Postgress databases use full text search, no index to rebuild"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:29
+msgid "Recipe index rebuild complete."
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:31
+msgid "Recipe index rebuild failed."
+msgstr ""
+
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:14
 msgid "Breakfast"
 msgstr ""
@@ -337,76 +416,89 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: .\cookbook\models.py:72
+#: .\cookbook\models.py:144
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr ""
 
-#: .\cookbook\models.py:123 .\cookbook\templates\search.html:7
+#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
 #: .\cookbook\templates\shopping_list.html:52
 msgid "Search"
 msgstr ""
 
-#: .\cookbook\models.py:124 .\cookbook\templates\base.html:92
+#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
 #: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:233 .\cookbook\views\new.py:201
+#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
 msgid "Meal-Plan"
 msgstr ""
 
-#: .\cookbook\models.py:125 .\cookbook\templates\base.html:89
+#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr ""
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Small"
 msgstr ""
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Large"
 msgstr ""
 
-#: .\cookbook\models.py:133 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:206 .\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:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:202
+#: .\cookbook\models.py:389
+msgid " is part of a recipe step and cannot be deleted"
+msgstr ""
+
+#: .\cookbook\models.py:429
 msgid "Text"
 msgstr ""
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:203
+#: .\cookbook\models.py:429
 msgid "Time"
 msgstr ""
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:204
-#: .\cookbook\templates\forms\edit_internal_recipe.html:219
+#: .\cookbook\models.py:429
 msgid "File"
 msgstr ""
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:205
-#: .\cookbook\templates\forms\edit_internal_recipe.html:241
+#: .\cookbook\models.py:429
 #: .\cookbook\templates\include\recipe_open_modal.html:7
 #: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:273 .\cookbook\views\new.py:52
+#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr ""
 
-#: .\cookbook\serializer.py:109
+#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+msgid "Simple"
+msgstr ""
+
+#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+msgid "Phrase"
+msgstr ""
+
+#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+msgid "Web"
+msgstr ""
+
+#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+msgid "Raw"
+msgstr ""
+
+#: .\cookbook\serializer.py:112
 msgid "File uploads are not enabled for this Space."
 msgstr ""
 
-#: .\cookbook\serializer.py:117
+#: .\cookbook\serializer.py:125
 msgid "You have reached your file upload limit."
 msgstr ""
 
-#: .\cookbook\tables.py:35 .\cookbook\templates\books.html:36
-#: .\cookbook\templates\generic\edit_template.html:6
+#: .\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
@@ -415,11 +507,10 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: .\cookbook\tables.py:124 .\cookbook\tables.py:147
-#: .\cookbook\templates\books.html:38
+#: .\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\edit_template.html:27
+#: .\cookbook\templates\generic\edit_template.html:28
 #: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
@@ -449,7 +540,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:154 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -525,7 +616,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:21
+#: .\cookbook\templates\generic\delete_template.html:22
 msgid "Confirm"
 msgstr ""
 
@@ -537,7 +628,7 @@ msgid ""
 "request</a>."
 msgstr ""
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:189
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
 msgid "Login"
 msgstr ""
 
@@ -590,7 +681,7 @@ msgstr ""
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:52
+#: .\cookbook\templates\settings.html:64
 msgid "Password"
 msgstr ""
 
@@ -672,101 +763,86 @@ msgstr ""
 msgid "We are sorry, but the sign up is currently closed."
 msgstr ""
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:179
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr ""
 
-#: .\cookbook\templates\base.html:85
-msgid "Utensils"
-msgstr ""
-
-#: .\cookbook\templates\base.html:95
+#: .\cookbook\templates\base.html:86
 msgid "Shopping"
 msgstr ""
 
-#: .\cookbook\templates\base.html:101
+#: .\cookbook\templates\base.html:113
+msgid "Keyword"
+msgstr ""
+
+#: .\cookbook\templates\base.html:137
+#: .\cookbook\templates\forms\ingredients.html:24
+#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
+#: .\cookbook\views\lists.py:146
+msgid "Units"
+msgstr ""
+
+#: .\cookbook\templates\base.html:151
 #: .\cookbook\templates\shopping_list.html:230
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr ""
 
-#: .\cookbook\templates\base.html:112 .\cookbook\views\delete.py:84
-#: .\cookbook\views\edit.py:102 .\cookbook\views\lists.py:26
-#: .\cookbook\views\new.py:78
-msgid "Keyword"
-msgstr ""
-
-#: .\cookbook\templates\base.html:114
+#: .\cookbook\templates\base.html:163
 msgid "Batch Edit"
 msgstr ""
 
-#: .\cookbook\templates\base.html:119
-msgid "Storage Data"
-msgstr ""
-
-#: .\cookbook\templates\base.html:123
-msgid "Storage Backends"
-msgstr ""
-
-#: .\cookbook\templates\base.html:125
-msgid "Configure Sync"
-msgstr ""
-
-#: .\cookbook\templates\base.html:127
-msgid "Discovered Recipes"
-msgstr ""
-
-#: .\cookbook\templates\base.html:129
-msgid "Discovery Log"
-msgstr ""
-
-#: .\cookbook\templates\base.html:131 .\cookbook\templates\stats.html:10
-msgid "Statistics"
-msgstr ""
-
-#: .\cookbook\templates\base.html:133
-msgid "Units & Ingredients"
-msgstr ""
-
-#: .\cookbook\templates\base.html:135 .\cookbook\templates\index.html:47
-msgid "Import Recipe"
-msgstr ""
-
-#: .\cookbook\templates\base.html:156 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr ""
 
-#: .\cookbook\templates\base.html:159 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:191 .\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
+msgid "Create"
+msgstr ""
+
+#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
 #: .\cookbook\templates\space.html:19
 msgid "Space Settings"
 msgstr ""
 
-#: .\cookbook\templates\base.html:163 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr ""
 
-#: .\cookbook\templates\base.html:165 .\cookbook\templates\base.html:171
+#: .\cookbook\templates\base.html:214
 msgid "Admin"
 msgstr ""
 
-#: .\cookbook\templates\base.html:175
+#: .\cookbook\templates\base.html:218
 msgid "Markdown Guide"
 msgstr ""
 
-#: .\cookbook\templates\base.html:177
+#: .\cookbook\templates\base.html:220
 msgid "GitHub"
 msgstr ""
 
-#: .\cookbook\templates\base.html:181
+#: .\cookbook\templates\base.html:224
 msgid "API Browser"
 msgstr ""
 
-#: .\cookbook\templates\base.html:184
+#: .\cookbook\templates\base.html:227
 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 ""
@@ -779,7 +855,7 @@ msgstr ""
 msgid "Add the specified keywords to all recipes containing a word"
 msgstr ""
 
-#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:85
+#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:83
 msgid "Sync"
 msgstr ""
 
@@ -797,10 +873,22 @@ msgstr ""
 msgid "The path must be in the following format"
 msgstr ""
 
-#: .\cookbook\templates\batch\monitor.html:27
+#: .\cookbook\templates\batch\monitor.html:21
+msgid "Manage External Storage"
+msgstr ""
+
+#: .\cookbook\templates\batch\monitor.html:28
 msgid "Sync Now!"
 msgstr ""
 
+#: .\cookbook\templates\batch\monitor.html:29
+msgid "Show Recipes"
+msgstr ""
+
+#: .\cookbook\templates\batch\monitor.html:30
+msgid "Show Log"
+msgstr ""
+
 #: .\cookbook\templates\batch\waiting.html:4
 #: .\cookbook\templates\batch\waiting.html:10
 msgid "Importing Recipes"
@@ -812,32 +900,10 @@ msgid ""
 "please wait."
 msgstr ""
 
-#: .\cookbook\templates\books.html:5 .\cookbook\templates\books.html:11
+#: .\cookbook\templates\books.html:7
 msgid "Recipe Books"
 msgstr ""
 
-#: .\cookbook\templates\books.html:15
-msgid "New Book"
-msgstr ""
-
-#: .\cookbook\templates\books.html:27 .\cookbook\templates\recipe_view.html:26
-msgid "by"
-msgstr ""
-
-#: .\cookbook\templates\books.html:34
-msgid "Toggle Recipes"
-msgstr ""
-
-#: .\cookbook\templates\books.html:54
-#: .\cookbook\templates\meal_plan_entry.html:48
-#: .\cookbook\templates\recipes_table.html:64
-msgid "Last cooked"
-msgstr ""
-
-#: .\cookbook\templates\books.html:71
-msgid "There are no recipes in this book yet."
-msgstr ""
-
 #: .\cookbook\templates\export.html:6 .\cookbook\templates\test2.html:6
 msgid "Export Recipes"
 msgstr ""
@@ -858,211 +924,21 @@ msgid "Import new Recipe"
 msgstr ""
 
 #: .\cookbook\templates\forms\edit_import_recipe.html:14
-#: .\cookbook\templates\forms\edit_internal_recipe.html:439
-#: .\cookbook\templates\forms\edit_internal_recipe.html:471
 #: .\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:46 .\cookbook\templates\settings.html:87
-#: .\cookbook\templates\settings.html:105
+#: .\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
 msgid "Save"
 msgstr ""
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:7
-#: .\cookbook\templates\forms\edit_internal_recipe.html:34
 msgid "Edit Recipe"
 msgstr ""
 
-#: .\cookbook\templates\forms\edit_internal_recipe.html:56
-#: .\cookbook\templates\url_import.html:171
-msgid "Description"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:76
-msgid "Waiting Time"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:82
-msgid "Servings Text"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:93
-msgid "Select Keywords"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:94
-#: .\cookbook\templates\url_import.html:583
-msgid "Add Keyword"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:112
-msgid "Nutrition"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:116
-#: .\cookbook\templates\forms\edit_internal_recipe.html:166
-msgid "Delete Step"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:120
-msgid "Calories"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:123
-msgid "Carbohydrates"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:126
-msgid "Fats"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:128
-msgid "Proteins"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:150
-#: .\cookbook\templates\forms\edit_internal_recipe.html:504
-msgid "Step"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:171
-msgid "Show as header"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:177
-msgid "Hide as header"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:182
-msgid "Move Up"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:187
-msgid "Move Down"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:196
-msgid "Step Name"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:200
-msgid "Step Type"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:213
-msgid "Step time in Minutes"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:229
-msgid "Select File"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:230
-#: .\cookbook\templates\forms\edit_internal_recipe.html:252
-#: .\cookbook\templates\forms\edit_internal_recipe.html:313
-#: .\cookbook\templates\forms\edit_internal_recipe.html:337
-#: .\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
-msgid "Select"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:251
-msgid "Select Recipe"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:311
-#: .\cookbook\templates\shopping_list.html:187
-msgid "Select Unit"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:312
-#: .\cookbook\templates\forms\edit_internal_recipe.html:336
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
-msgid "Create"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:335
-#: .\cookbook\templates\shopping_list.html:209
-msgid "Select Food"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:352
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:369
-msgid "Delete Ingredient"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:375
-msgid "Make Header"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:381
-msgid "Make Ingredient"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:387
-msgid "Disable Amount"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:393
-msgid "Enable Amount"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:398
-msgid "Copy Template Reference"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:424
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
-msgid "Instructions"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:437
-#: .\cookbook\templates\forms\edit_internal_recipe.html:468
-msgid "Save & View"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:441
-#: .\cookbook\templates\forms\edit_internal_recipe.html:474
-msgid "Add Step"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:444
-#: .\cookbook\templates\forms\edit_internal_recipe.html:478
-msgid "Add Nutrition"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:446
-#: .\cookbook\templates\forms\edit_internal_recipe.html:480
-msgid "Remove Nutrition"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:448
-#: .\cookbook\templates\forms\edit_internal_recipe.html:483
-msgid "View Recipe"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:450
-#: .\cookbook\templates\forms\edit_internal_recipe.html:485
-msgid "Delete Recipe"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:491
-msgid "Steps"
-msgstr ""
-
 #: .\cookbook\templates\forms\ingredients.html:15
 msgid "Edit Ingredients"
 msgstr ""
@@ -1078,11 +954,6 @@ msgid ""
 "    "
 msgstr ""
 
-#: .\cookbook\templates\forms\ingredients.html:24
-#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
-msgid "Units"
-msgstr ""
-
 #: .\cookbook\templates\forms\ingredients.html:26
 msgid "Are you sure that you want to merge these two units?"
 msgstr ""
@@ -1096,29 +967,33 @@ msgstr ""
 msgid "Are you sure that you want to merge these two ingredients?"
 msgstr ""
 
-#: .\cookbook\templates\generic\delete_template.html:18
+#: .\cookbook\templates\generic\delete_template.html:19
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
 msgstr ""
 
-#: .\cookbook\templates\generic\edit_template.html:30
+#: .\cookbook\templates\generic\delete_template.html:23
+msgid "Cancel"
+msgstr ""
+
+#: .\cookbook\templates\generic\edit_template.html:32
 msgid "View"
 msgstr ""
 
-#: .\cookbook\templates\generic\edit_template.html:34
+#: .\cookbook\templates\generic\edit_template.html:36
 msgid "Delete original file"
 msgstr ""
 
 #: .\cookbook\templates\generic\list_template.html:6
-#: .\cookbook\templates\generic\list_template.html:12
+#: .\cookbook\templates\generic\list_template.html:21
 msgid "List"
 msgstr ""
 
-#: .\cookbook\templates\generic\list_template.html:25
+#: .\cookbook\templates\generic\list_template.html:34
 msgid "Filter"
 msgstr ""
 
-#: .\cookbook\templates\generic\list_template.html:30
+#: .\cookbook\templates\generic\list_template.html:39
 msgid "Import all"
 msgstr ""
 
@@ -1427,6 +1302,11 @@ msgstr ""
 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"
@@ -1490,6 +1370,11 @@ msgstr ""
 msgid "Meal Plan View"
 msgstr ""
 
+#: .\cookbook\templates\meal_plan_entry.html:48
+#: .\cookbook\templates\recipes_table.html:64
+msgid "Last cooked"
+msgstr ""
+
 #: .\cookbook\templates\meal_plan_entry.html:50
 msgid "Never cooked before."
 msgstr ""
@@ -1586,8 +1471,12 @@ msgstr ""
 msgid "Comments"
 msgstr ""
 
+#: .\cookbook\templates\recipe_view.html:26
+msgid "by"
+msgstr ""
+
 #: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
-#: .\cookbook\views\edit.py:179
+#: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr ""
 
@@ -1619,60 +1508,221 @@ msgstr ""
 msgid "Recipe Home"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:25
+#: .\cookbook\templates\search_info.html:5
+#: .\cookbook\templates\search_info.html:9
+#: .\cookbook\templates\settings.html:157
+msgid "Search Settings"
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:10
+msgid ""
+"\n"
+"        Creating the best search experience is complicated and weighs "
+"heavily on your personal configuration.  \n"
+"        Changing any of the search settings can have significant impact on "
+"the speed and quality of the results.\n"
+"        Search Methods, Trigrams and Full Text Search configurations are "
+"only available if you are using Postgres for your database.\n"
+"    "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:19
+msgid "Search Methods"
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:23
+msgid ""
+" \n"
+"            Full text searches attempt to normalize the words provided to "
+"match common variants.  For example: 'forked', 'forking', 'forks' will all "
+"normalize to 'fork'.\n"
+"            There are several methods available, described below, that will "
+"control how the search behavior should react when multiple words are "
+"searched.\n"
+"            Full technical details on how these operate can be viewed on <a "
+"href=https://www.postgresql.org/docs/current/textsearch-controls."
+"html#TEXTSEARCH-PARSING-QUERIES>Postgresql's website.</a>\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:29
+msgid ""
+" \n"
+"            Simple searches ignore punctuation and common words such as "
+"'the', 'a', 'and'. And will treat seperate words as required.\n"
+"            Searching for 'apple or flour' will return any recipe that "
+"includes both 'apple' and 'flour' anywhere in the fields that have been "
+"selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:34
+msgid ""
+" \n"
+"            Phrase searches ignore punctuation, but will search for all of "
+"the words in the exact order provided.\n"
+"            Searching for 'apple or flour' will only return a recipe that "
+"includes the exact phrase 'apple or flour' in any of the fields that have "
+"been selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:39
+msgid ""
+" \n"
+"            Web searches simulate functionality found on many web search "
+"sites supporting special syntax.\n"
+"            Placing quotes around several words will convert those words "
+"into a phrase.\n"
+"            'or' is recongized as searching for the word (or phrase) "
+"immediately before 'or' OR the word (or phrase) directly after.\n"
+"            '-' is recognized as searching for recipes that do not include "
+"the word (or phrase) that comes immediately after. \n"
+"            For example searching for 'apple pie' or cherry -butter will "
+"return any recipe that includes the phrase 'apple pie' or the word "
+"'cherry' \n"
+"            in any field included in the full text search but exclude any "
+"recipe that has the word 'butter' in any field included.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:48
+msgid ""
+" \n"
+"            Raw search is similar to Web except will take puncuation "
+"operators such as '|', '&' and '()'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:59
+msgid ""
+" \n"
+"            Another approach to searching that also requires Postgresql is "
+"fuzzy search or trigram similarity. A trigram is a group of three "
+"consecutive characters.\n"
+"            For example searching for 'apple' will create x trigrams 'app', "
+"'ppl', 'ple' and will create a score of how closely words match the "
+"generated trigrams.\n"
+"            One benefit of searching trigams is that a search for 'sandwich' "
+"will find mispelled words such as 'sandwhich' that would be missed by other "
+"methods.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:69
+msgid "Search Fields"
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:73
+msgid ""
+" \n"
+"            Unaccent is a special case in that it enables searching a field "
+"'unaccented' for each search style attempting to ignore accented values. \n"
+"            For example when you enable unaccent for 'Name' any search "
+"(starts with, contains, trigram) will attempt the search ignoring accented "
+"characters.\n"
+"            \n"
+"            For the other options, you can enable search on any or all "
+"fields and they will be combined together with an assumed 'OR'.\n"
+"            For example enabling 'Name' for Starts With, 'Name' and "
+"'Description' for Partial Match and 'Ingredients' and 'Keywords' for Full "
+"Search\n"
+"            and searching for 'apple' will generate a search that will "
+"return recipes that have:\n"
+"            - A recipe name that starts with 'apple'\n"
+"            - OR a recipe name that contains 'apple'\n"
+"            - OR a recipe description that contains 'apple'\n"
+"            - OR a recipe that will have a full text search match ('apple' "
+"or 'apples') in ingredients\n"
+"            - OR a recipe that will have a full text search match in "
+"Keywords\n"
+"\n"
+"            Combining too many fields in too many types of search can have a "
+"negative impact on performance, create duplicate results or return "
+"unexpected results.\n"
+"            For example, enabling fuzzy search or partial matches will "
+"interfere with web search methods.  \n"
+"            Searching for 'apple -pie' with fuzzy search and full text "
+"search will return the recipe Apple Pie.  Though it is not included in the "
+"full text results, it does match the trigram results.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:95
+msgid "Search Index"
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:99
+msgid ""
+" \n"
+"            Trigram search and Full Text Search both rely on database "
+"indexes to perform effectively.  \n"
+"            You can rebuild the indexes on all fields in the Admin page for "
+"Recipes and selecting all recipes and running 'rebuild index for selected "
+"recipes'\n"
+"            You can also rebuild indexes at the command line by executing "
+"the management command 'python manage.py rebuildindex'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\settings.html:27
 msgid "Account"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:29
+#: .\cookbook\templates\settings.html:33
 msgid "Preferences"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:39
 msgid "API-Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:41
+#: .\cookbook\templates\settings.html:45
+msgid "Search-Settings"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:53
 msgid "Name Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:49
+#: .\cookbook\templates\settings.html:61
 msgid "Account Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:51
+#: .\cookbook\templates\settings.html:63
 msgid "Emails"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:54
+#: .\cookbook\templates\settings.html:66
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:78
 msgid "Language"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:96
+#: .\cookbook\templates\settings.html:108
 msgid "Style"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:116
+#: .\cookbook\templates\settings.html:128
 msgid "API Token"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:117
+#: .\cookbook\templates\settings.html:129
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
 msgstr ""
 
-#: .\cookbook\templates\settings.html:134
+#: .\cookbook\templates\settings.html:146
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:136
+#: .\cookbook\templates\settings.html:148
 msgid "or"
 msgstr ""
 
@@ -1713,6 +1763,23 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#: .\cookbook\templates\shopping_list.html:187
+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
+msgid "Select"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:209
+msgid "Select Food"
+msgstr ""
+
 #: .\cookbook\templates\shopping_list.html:240
 msgid "Select Supermarket"
 msgstr ""
@@ -1810,10 +1877,6 @@ msgstr ""
 msgid "Recipes without Keywords"
 msgstr ""
 
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr ""
-
 #: .\cookbook\templates\space.html:60 .\cookbook\templates\stats.html:45
 msgid "Internal Recipes"
 msgstr ""
@@ -1863,7 +1926,7 @@ msgid "There are no members in your space yet!"
 msgstr ""
 
 #: .\cookbook\templates\space.html:130 .\cookbook\templates\system.html:21
-#: .\cookbook\views\lists.py:115
+#: .\cookbook\views\lists.py:100
 msgid "Invite Links"
 msgstr ""
 
@@ -1871,6 +1934,10 @@ msgstr ""
 msgid "Stats"
 msgstr ""
 
+#: .\cookbook\templates\stats.html:10
+msgid "Statistics"
+msgstr ""
+
 #: .\cookbook\templates\system.html:22
 msgid "Show Links"
 msgstr ""
@@ -2017,6 +2084,10 @@ msgstr ""
 msgid "Text dragged here will be appended to the name."
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:171
+msgid "Description"
+msgstr ""
+
 #: .\cookbook\templates\url_import.html:175
 msgid "Text dragged here will be appended to the description."
 msgstr ""
@@ -2041,6 +2112,11 @@ msgstr ""
 msgid "Ingredients dragged here will be appended to current list."
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:297
+#: .\cookbook\templates\url_import.html:567
+msgid "Instructions"
+msgstr ""
+
 #: .\cookbook\templates\url_import.html:302
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
@@ -2090,6 +2166,10 @@ msgstr ""
 msgid "Select one"
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:583
+msgid "Add Keyword"
+msgstr ""
+
 #: .\cookbook\templates\url_import.html:596
 msgid "All Keywords"
 msgstr ""
@@ -2125,45 +2205,102 @@ msgstr ""
 msgid "Recipe Markup Specification"
 msgstr ""
 
-#: .\cookbook\views\api.py:79
+#: .\cookbook\views\api.py:82 .\cookbook\views\api.py:131
 msgid "Parameter updated_at incorrectly formatted"
 msgstr ""
 
-#: .\cookbook\views\api.py:580 .\cookbook\views\views.py:303
+#: .\cookbook\views\api.py:151
+#, python-brace-format
+msgid "No {self.basename} with id {pk} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
+#: .\cookbook\views\edit.py:316
+msgid "Cannot merge with the same object!"
+msgstr ""
+
+#: .\cookbook\views\api.py:162
+#, python-brace-format
+msgid "No {self.basename} with id {target} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:167
+msgid "Cannot merge with child object!"
+msgstr ""
+
+#: .\cookbook\views\api.py:195
+#, python-brace-format
+msgid "{source.name} was merged successfully with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:199
+#, python-brace-format
+msgid "An error occurred attempting to merge {source.name} with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:239
+#, python-brace-format
+msgid "No {self.basename} with id {child} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:248
+#, python-brace-format
+msgid "{child.name} was moved successfully to the root."
+msgstr ""
+
+#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+msgid "An error occurred attempting to move "
+msgstr ""
+
+#: .\cookbook\views\api.py:254
+msgid "Cannot move an object to itself!"
+msgstr ""
+
+#: .\cookbook\views\api.py:260
+#, python-brace-format
+msgid "No {self.basename} with id {parent} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:266
+#, python-brace-format
+msgid "{child.name} was moved successfully to parent {parent.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
 msgid "This feature is not available in the demo version!"
 msgstr ""
 
-#: .\cookbook\views\api.py:603
+#: .\cookbook\views\api.py:727
 msgid "Sync successful!"
 msgstr ""
 
-#: .\cookbook\views\api.py:608
+#: .\cookbook\views\api.py:732
 msgid "Error synchronizing with Storage"
 msgstr ""
 
-#: .\cookbook\views\api.py:686
+#: .\cookbook\views\api.py:810
 msgid "Nothing to do."
 msgstr ""
 
-#: .\cookbook\views\api.py:701
+#: .\cookbook\views\api.py:825
 msgid "The requested site provided malformed data and cannot be read."
 msgstr ""
 
-#: .\cookbook\views\api.py:708
+#: .\cookbook\views\api.py:832
 msgid "The requested page could not be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:717
+#: .\cookbook\views\api.py:841
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
 msgstr ""
 
-#: .\cookbook\views\api.py:731
+#: .\cookbook\views\api.py:855
 msgid "No useable data could be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:747
+#: .\cookbook\views\api.py:871
 msgid "I couldn't find anything to do."
 msgstr ""
 
@@ -2190,8 +2327,8 @@ msgstr[1] ""
 msgid "Monitor"
 msgstr ""
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:102
-#: .\cookbook\views\new.py:98
+#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr ""
 
@@ -2200,8 +2337,8 @@ 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:213
-#: .\cookbook\views\new.py:156
+#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
+#: .\cookbook\views\new.py:155
 msgid "Recipe Book"
 msgstr ""
 
@@ -2209,47 +2346,39 @@ msgstr ""
 msgid "Bookmarks"
 msgstr ""
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:252
+#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
 msgid "Invite Link"
 msgstr ""
 
-#: .\cookbook\views\edit.py:119
-msgid "Food"
-msgstr ""
-
-#: .\cookbook\views\edit.py:128
+#: .\cookbook\views\edit.py:126
 msgid "You cannot edit this storage!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:148
+#: .\cookbook\views\edit.py:146
 msgid "Storage saved!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:154
+#: .\cookbook\views\edit.py:152
 msgid "There was an error updating this storage backend!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:165
+#: .\cookbook\views\edit.py:163
 msgid "Storage"
 msgstr ""
 
-#: .\cookbook\views\edit.py:261
+#: .\cookbook\views\edit.py:259
 msgid "Changes saved!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:265
+#: .\cookbook\views\edit.py:263
 msgid "Error saving changes!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:299
+#: .\cookbook\views\edit.py:298
 msgid "Units merged!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:301 .\cookbook\views\edit.py:317
-msgid "Cannot merge with the same object!"
-msgstr ""
-
-#: .\cookbook\views\edit.py:315
+#: .\cookbook\views\edit.py:314
 msgid "Foods merged!"
 msgstr ""
 
@@ -2261,126 +2390,152 @@ msgstr ""
 msgid "Exporting is not implemented for this provider"
 msgstr ""
 
-#: .\cookbook\views\lists.py:40
+#: .\cookbook\views\lists.py:26
 msgid "Import Log"
 msgstr ""
 
-#: .\cookbook\views\lists.py:53
+#: .\cookbook\views\lists.py:39
 msgid "Discovery"
 msgstr ""
 
-#: .\cookbook\views\lists.py:85
+#: .\cookbook\views\lists.py:69
 msgid "Shopping Lists"
 msgstr ""
 
-#: .\cookbook\views\new.py:123
+#: .\cookbook\views\lists.py:129
+msgid "Foods"
+msgstr ""
+
+#: .\cookbook\views\lists.py:163
+msgid "Supermarkets"
+msgstr ""
+
+#: .\cookbook\views\lists.py:179
+msgid "Shopping Categories"
+msgstr ""
+
+#: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr ""
 
-#: .\cookbook\views\new.py:126
+#: .\cookbook\views\new.py:125
 msgid "There was an error importing this recipe!"
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "Hello"
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "You have been invited by "
 msgstr ""
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:226
 msgid " to join their Tandoor Recipes space "
 msgstr ""
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:227
 msgid "Click the following link to activate your account: "
 msgstr ""
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:228
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:229
 msgid "The invitation is valid until "
 msgstr ""
 
-#: .\cookbook\views\new.py:231
+#: .\cookbook\views\new.py:230
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 
-#: .\cookbook\views\new.py:234
+#: .\cookbook\views\new.py:233
 msgid "Tandoor Recipes Invite"
 msgstr ""
 
-#: .\cookbook\views\new.py:241
+#: .\cookbook\views\new.py:240
 msgid "Invite link successfully send to user."
 msgstr ""
 
-#: .\cookbook\views\new.py:244
+#: .\cookbook\views\new.py:243
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
 msgstr ""
 
-#: .\cookbook\views\new.py:246
+#: .\cookbook\views\new.py:245
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 
-#: .\cookbook\views\views.py:129
+#: .\cookbook\views\views.py:128
 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:177
+#: .\cookbook\views\views.py:176
 msgid "You do not have the required permissions to perform this action!"
 msgstr ""
 
-#: .\cookbook\views\views.py:188
+#: .\cookbook\views\views.py:187
 msgid "Comment saved!"
 msgstr ""
 
-#: .\cookbook\views\views.py:395
+#: .\cookbook\views\views.py:351
+msgid "You must select at least one field to search!"
+msgstr ""
+
+#: .\cookbook\views\views.py:354
+msgid ""
+"To use this search method you must select at least one full text search "
+"field!"
+msgstr ""
+
+#: .\cookbook\views\views.py:357
+msgid "Fuzzy search is not compatible with this search method!"
+msgstr ""
+
+#: .\cookbook\views\views.py:437
 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:402
+#: .\cookbook\views\views.py:444
 msgid "Passwords dont match!"
 msgstr ""
 
-#: .\cookbook\views\views.py:418
+#: .\cookbook\views\views.py:460
 msgid "User has been created, please login!"
 msgstr ""
 
-#: .\cookbook\views\views.py:434
+#: .\cookbook\views\views.py:476
 msgid "Malformed Invite Link supplied!"
 msgstr ""
 
-#: .\cookbook\views\views.py:441
+#: .\cookbook\views\views.py:483
 msgid "You are already member of a space and therefore cannot join this one."
 msgstr ""
 
-#: .\cookbook\views\views.py:452
+#: .\cookbook\views\views.py:494
 msgid "Successfully joined space."
 msgstr ""
 
-#: .\cookbook\views\views.py:458
+#: .\cookbook\views\views.py:500
 msgid "Invite Link not valid or already used!"
 msgstr ""
 
-#: .\cookbook\views\views.py:522
+#: .\cookbook\views\views.py:564
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
 msgstr ""
 
-#: .\cookbook\views\views.py:528
+#: .\cookbook\views\views.py:570
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
diff --git a/cookbook/locale/tr/LC_MESSAGES/django.po b/cookbook/locale/tr/LC_MESSAGES/django.po
index ea5e41e7..9528169c 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+0200\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/"
@@ -22,15 +22,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: .\cookbook\filters.py:23 .\cookbook\templates\base.html:98
-#: .\cookbook\templates\forms\edit_internal_recipe.html:269
+#: .\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\views\lists.py:67
+#: .\cookbook\templates\url_import.html:270
 msgid "Ingredients"
 msgstr "Malzemeler"
 
-#: .\cookbook\forms.py:49
+#: .\cookbook\forms.py:50
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
@@ -38,35 +37,35 @@ msgstr ""
 "Gezinti çubuğunun rengi. Bütün renkeler bütün temalarla çalışmayabilir, önce "
 "deneyin!"
 
-#: .\cookbook\forms.py:51
+#: .\cookbook\forms.py:52
 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:53
+#: .\cookbook\forms.py:54
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
 msgstr ""
 
-#: .\cookbook\forms.py:56
+#: .\cookbook\forms.py:57
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
 msgstr ""
 
-#: .\cookbook\forms.py:58
+#: .\cookbook\forms.py:59
 msgid "Show recently viewed recipes on search page."
 msgstr "Son görüntülenen tarifleri arama sayfasında göster."
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:60
 msgid "Number of decimals to round ingredients."
 msgstr "Malzeme birimleri için yuvarlanma basamağı."
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:61
 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:62
+#: .\cookbook\forms.py:63
 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. "
@@ -79,187 +78,253 @@ 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:65
+#: .\cookbook\forms.py:66
 msgid "Makes the navbar stick to the top of the page."
 msgstr ""
 
-#: .\cookbook\forms.py:81
+#: .\cookbook\forms.py:82
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
 msgstr ""
 
-#: .\cookbook\forms.py:102 .\cookbook\forms.py:331
-#: .\cookbook\templates\forms\edit_internal_recipe.html:49
+#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
 #: .\cookbook\templates\url_import.html:154
 msgid "Name"
 msgstr "İsim"
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:332
-#: .\cookbook\templates\base.html:108 .\cookbook\templates\base.html:169
-#: .\cookbook\templates\forms\edit_internal_recipe.html:85
+#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
 #: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573
+#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr ""
 
-#: .\cookbook\forms.py:104
+#: .\cookbook\forms.py:105
 msgid "Preparation time in minutes"
 msgstr ""
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:106
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr ""
 
-#: .\cookbook\forms.py:106 .\cookbook\forms.py:333
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
 msgid "Path"
 msgstr ""
 
-#: .\cookbook\forms.py:107
+#: .\cookbook\forms.py:108
 msgid "Storage UID"
 msgstr ""
 
-#: .\cookbook\forms.py:133
+#: .\cookbook\forms.py:134
 msgid "Default"
 msgstr ""
 
-#: .\cookbook\forms.py:144 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
 
-#: .\cookbook\forms.py:164
+#: .\cookbook\forms.py:165
 msgid "New Unit"
 msgstr ""
 
-#: .\cookbook\forms.py:165
+#: .\cookbook\forms.py:166
 msgid "New unit that other gets replaced by."
 msgstr ""
 
-#: .\cookbook\forms.py:170
+#: .\cookbook\forms.py:171
 msgid "Old Unit"
 msgstr ""
 
-#: .\cookbook\forms.py:171
+#: .\cookbook\forms.py:172
 msgid "Unit that should be replaced."
 msgstr ""
 
-#: .\cookbook\forms.py:187
+#: .\cookbook\forms.py:189
 msgid "New Food"
 msgstr ""
 
-#: .\cookbook\forms.py:188
+#: .\cookbook\forms.py:190
 msgid "New food that other gets replaced by."
 msgstr ""
 
-#: .\cookbook\forms.py:193
+#: .\cookbook\forms.py:195
 msgid "Old Food"
 msgstr ""
 
-#: .\cookbook\forms.py:194
+#: .\cookbook\forms.py:196
 msgid "Food that should be replaced."
 msgstr ""
 
-#: .\cookbook\forms.py:212
+#: .\cookbook\forms.py:214
 msgid "Add your comment: "
 msgstr ""
 
-#: .\cookbook\forms.py:253
+#: .\cookbook\forms.py:256
 msgid "Leave empty for dropbox and enter app password for nextcloud."
 msgstr ""
 
-#: .\cookbook\forms.py:260
+#: .\cookbook\forms.py:263
 msgid "Leave empty for nextcloud and enter api token for dropbox."
 msgstr ""
 
-#: .\cookbook\forms.py:269
+#: .\cookbook\forms.py:272
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
 msgstr ""
 
-#: .\cookbook\forms.py:307
+#: .\cookbook\forms.py:310
 msgid "Search String"
 msgstr ""
 
-#: .\cookbook\forms.py:334
+#: .\cookbook\forms.py:337
 msgid "File ID"
 msgstr ""
 
-#: .\cookbook\forms.py:370
+#: .\cookbook\forms.py:373
 msgid "You must provide at least a recipe or a title."
 msgstr ""
 
-#: .\cookbook\forms.py:383
+#: .\cookbook\forms.py:386
 msgid "You can list default users to share recipes with in the settings."
 msgstr ""
 
-#: .\cookbook\forms.py:384
-#: .\cookbook\templates\forms\edit_internal_recipe.html:427
+#: .\cookbook\forms.py:387
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
 msgstr ""
 
-#: .\cookbook\forms.py:409
+#: .\cookbook\forms.py:412
 msgid "Maximum number of users for this space reached."
 msgstr ""
 
-#: .\cookbook\forms.py:415
+#: .\cookbook\forms.py:418
 msgid "Email address already taken!"
 msgstr ""
 
-#: .\cookbook\forms.py:423
+#: .\cookbook\forms.py:426
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
 msgstr ""
 
-#: .\cookbook\forms.py:438
+#: .\cookbook\forms.py:441
 msgid "Name already taken."
 msgstr ""
 
-#: .\cookbook\forms.py:449
+#: .\cookbook\forms.py:452
 msgid "Accept Terms and Privacy"
 msgstr ""
 
+#: .\cookbook\forms.py:487
+msgid ""
+"Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
+"full desciption of choices."
+msgstr ""
+
+#: .\cookbook\forms.py:488
+msgid ""
+"Use fuzzy matching on units, keywords and ingredients when editing and "
+"importing recipes."
+msgstr ""
+
+#: .\cookbook\forms.py:489
+msgid ""
+"Fields to search ignoring accents.  Selecting this option can improve or "
+"degrade search quality depending on language"
+msgstr ""
+
+#: .\cookbook\forms.py:490
+msgid ""
+"Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
+"'pie' and 'piece' and 'soapie')"
+msgstr ""
+
+#: .\cookbook\forms.py:491
+msgid ""
+"Fields to search for beginning of word matches. (e.g. searching for 'sa' "
+"will return 'salad' and 'sandwich')"
+msgstr ""
+
+#: .\cookbook\forms.py:492
+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
+msgid ""
+"Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
+"only function with fulltext fields."
+msgstr ""
+
+#: .\cookbook\forms.py:497
+msgid "Search Method"
+msgstr ""
+
+#: .\cookbook\forms.py:498
+msgid "Fuzzy Lookups"
+msgstr ""
+
+#: .\cookbook\forms.py:499
+msgid "Ignore Accent"
+msgstr ""
+
+#: .\cookbook\forms.py:500
+msgid "Partial Match"
+msgstr ""
+
+#: .\cookbook\forms.py:501
+msgid "Starts Wtih"
+msgstr ""
+
+#: .\cookbook\forms.py:502
+msgid "Fuzzy Search"
+msgstr ""
+
+#: .\cookbook\forms.py:503
+msgid "Full Text"
+msgstr ""
+
 #: .\cookbook\helper\AllAuthCustomAdapter.py:36
 msgid ""
 "In order to prevent spam, the requested email was not send. Please wait a "
 "few minutes and try again."
 msgstr ""
 
-#: .\cookbook\helper\permission_helper.py:138
-#: .\cookbook\helper\permission_helper.py:161 .\cookbook\views\views.py:151
+#: .\cookbook\helper\permission_helper.py:136
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr ""
 
-#: .\cookbook\helper\permission_helper.py:142
-#: .\cookbook\helper\permission_helper.py:148
-#: .\cookbook\helper\permission_helper.py:173
-#: .\cookbook\helper\permission_helper.py:218
-#: .\cookbook\helper\permission_helper.py:232
-#: .\cookbook\helper\permission_helper.py:243
-#: .\cookbook\helper\permission_helper.py:254 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:162 .\cookbook\views\views.py:169
-#: .\cookbook\views\views.py:259
+#: .\cookbook\helper\permission_helper.py:140
+#: .\cookbook\helper\permission_helper.py:146
+#: .\cookbook\helper\permission_helper.py:171
+#: .\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
 msgid "You do not have the required permissions to view this page!"
 msgstr ""
 
-#: .\cookbook\helper\permission_helper.py:166
-#: .\cookbook\helper\permission_helper.py:189
-#: .\cookbook\helper\permission_helper.py:204
+#: .\cookbook\helper\permission_helper.py:164
+#: .\cookbook\helper\permission_helper.py:187
+#: .\cookbook\helper\permission_helper.py:202
 msgid "You cannot interact with this object as it is not owned by you!"
 msgstr ""
 
-#: .\cookbook\helper\template_helper.py:60
-#: .\cookbook\helper\template_helper.py:62
+#: .\cookbook\helper\template_helper.py:61
+#: .\cookbook\helper\template_helper.py:63
 msgid "Could not parse template code."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:104
+#: .\cookbook\integration\integration.py:119
 #: .\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
@@ -268,27 +333,27 @@ msgstr ""
 #: .\cookbook\templates\url_import.html:123
 #: .\cookbook\templates\url_import.html:317
 #: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
-#: .\cookbook\views\edit.py:199
+#: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:185
+#: .\cookbook\integration\integration.py:200
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:188
+#: .\cookbook\integration\integration.py:203
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
 msgstr ""
 
-#: .\cookbook\integration\integration.py:192
+#: .\cookbook\integration\integration.py:208
 msgid "The following recipes were ignored because they already existed:"
 msgstr ""
 
-#: .\cookbook\integration\integration.py:196
+#: .\cookbook\integration\integration.py:212
 #, python-format
 msgid "Imported %s recipes."
 msgstr ""
@@ -306,7 +371,6 @@ msgid "Source"
 msgstr ""
 
 #: .\cookbook\integration\safron.py:23
-#: .\cookbook\templates\forms\edit_internal_recipe.html:79
 #: .\cookbook\templates\include\log_cooking.html:16
 #: .\cookbook\templates\url_import.html:224
 #: .\cookbook\templates\url_import.html:455
@@ -318,7 +382,6 @@ msgid "Waiting time"
 msgstr ""
 
 #: .\cookbook\integration\safron.py:27
-#: .\cookbook\templates\forms\edit_internal_recipe.html:73
 msgid "Preparation Time"
 msgstr ""
 
@@ -332,6 +395,22 @@ msgstr ""
 msgid "Section"
 msgstr ""
 
+#: .\cookbook\management\commands\rebuildindex.py:14
+msgid "Rebuilds full text search index on Recipe"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:18
+msgid "Only Postgress databases use full text search, no index to rebuild"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:29
+msgid "Recipe index rebuild complete."
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:31
+msgid "Recipe index rebuild failed."
+msgstr ""
+
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:14
 msgid "Breakfast"
 msgstr ""
@@ -348,76 +427,89 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: .\cookbook\models.py:72
+#: .\cookbook\models.py:144
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr ""
 
-#: .\cookbook\models.py:123 .\cookbook\templates\search.html:7
+#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
 #: .\cookbook\templates\shopping_list.html:52
 msgid "Search"
 msgstr ""
 
-#: .\cookbook\models.py:124 .\cookbook\templates\base.html:92
+#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
 #: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:233 .\cookbook\views\new.py:201
+#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
 msgid "Meal-Plan"
 msgstr ""
 
-#: .\cookbook\models.py:125 .\cookbook\templates\base.html:89
+#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr ""
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Small"
 msgstr ""
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Large"
 msgstr ""
 
-#: .\cookbook\models.py:133 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:206 .\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:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:202
+#: .\cookbook\models.py:389
+msgid " is part of a recipe step and cannot be deleted"
+msgstr ""
+
+#: .\cookbook\models.py:429
 msgid "Text"
 msgstr ""
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:203
+#: .\cookbook\models.py:429
 msgid "Time"
 msgstr ""
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:204
-#: .\cookbook\templates\forms\edit_internal_recipe.html:219
+#: .\cookbook\models.py:429
 msgid "File"
 msgstr ""
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:205
-#: .\cookbook\templates\forms\edit_internal_recipe.html:241
+#: .\cookbook\models.py:429
 #: .\cookbook\templates\include\recipe_open_modal.html:7
 #: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:273 .\cookbook\views\new.py:52
+#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr ""
 
-#: .\cookbook\serializer.py:109
+#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+msgid "Simple"
+msgstr ""
+
+#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+msgid "Phrase"
+msgstr ""
+
+#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+msgid "Web"
+msgstr ""
+
+#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+msgid "Raw"
+msgstr ""
+
+#: .\cookbook\serializer.py:112
 msgid "File uploads are not enabled for this Space."
 msgstr ""
 
-#: .\cookbook\serializer.py:117
+#: .\cookbook\serializer.py:125
 msgid "You have reached your file upload limit."
 msgstr ""
 
-#: .\cookbook\tables.py:35 .\cookbook\templates\books.html:36
-#: .\cookbook\templates\generic\edit_template.html:6
+#: .\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
@@ -426,11 +518,10 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: .\cookbook\tables.py:124 .\cookbook\tables.py:147
-#: .\cookbook\templates\books.html:38
+#: .\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\edit_template.html:27
+#: .\cookbook\templates\generic\edit_template.html:28
 #: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
@@ -460,7 +551,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:154 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -536,7 +627,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:21
+#: .\cookbook\templates\generic\delete_template.html:22
 msgid "Confirm"
 msgstr ""
 
@@ -548,7 +639,7 @@ msgid ""
 "request</a>."
 msgstr ""
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:189
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
 msgid "Login"
 msgstr ""
 
@@ -601,7 +692,7 @@ msgstr ""
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:52
+#: .\cookbook\templates\settings.html:64
 msgid "Password"
 msgstr ""
 
@@ -683,101 +774,86 @@ msgstr ""
 msgid "We are sorry, but the sign up is currently closed."
 msgstr ""
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:179
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr ""
 
-#: .\cookbook\templates\base.html:85
-msgid "Utensils"
-msgstr ""
-
-#: .\cookbook\templates\base.html:95
+#: .\cookbook\templates\base.html:86
 msgid "Shopping"
 msgstr ""
 
-#: .\cookbook\templates\base.html:101
+#: .\cookbook\templates\base.html:113
+msgid "Keyword"
+msgstr ""
+
+#: .\cookbook\templates\base.html:137
+#: .\cookbook\templates\forms\ingredients.html:24
+#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
+#: .\cookbook\views\lists.py:146
+msgid "Units"
+msgstr ""
+
+#: .\cookbook\templates\base.html:151
 #: .\cookbook\templates\shopping_list.html:230
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr ""
 
-#: .\cookbook\templates\base.html:112 .\cookbook\views\delete.py:84
-#: .\cookbook\views\edit.py:102 .\cookbook\views\lists.py:26
-#: .\cookbook\views\new.py:78
-msgid "Keyword"
-msgstr ""
-
-#: .\cookbook\templates\base.html:114
+#: .\cookbook\templates\base.html:163
 msgid "Batch Edit"
 msgstr ""
 
-#: .\cookbook\templates\base.html:119
-msgid "Storage Data"
-msgstr ""
-
-#: .\cookbook\templates\base.html:123
-msgid "Storage Backends"
-msgstr ""
-
-#: .\cookbook\templates\base.html:125
-msgid "Configure Sync"
-msgstr ""
-
-#: .\cookbook\templates\base.html:127
-msgid "Discovered Recipes"
-msgstr ""
-
-#: .\cookbook\templates\base.html:129
-msgid "Discovery Log"
-msgstr ""
-
-#: .\cookbook\templates\base.html:131 .\cookbook\templates\stats.html:10
-msgid "Statistics"
-msgstr ""
-
-#: .\cookbook\templates\base.html:133
-msgid "Units & Ingredients"
-msgstr ""
-
-#: .\cookbook\templates\base.html:135 .\cookbook\templates\index.html:47
-msgid "Import Recipe"
-msgstr ""
-
-#: .\cookbook\templates\base.html:156 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr ""
 
-#: .\cookbook\templates\base.html:159 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:191 .\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
+msgid "Create"
+msgstr ""
+
+#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
 #: .\cookbook\templates\space.html:19
 msgid "Space Settings"
 msgstr ""
 
-#: .\cookbook\templates\base.html:163 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr ""
 
-#: .\cookbook\templates\base.html:165 .\cookbook\templates\base.html:171
+#: .\cookbook\templates\base.html:214
 msgid "Admin"
 msgstr ""
 
-#: .\cookbook\templates\base.html:175
+#: .\cookbook\templates\base.html:218
 msgid "Markdown Guide"
 msgstr ""
 
-#: .\cookbook\templates\base.html:177
+#: .\cookbook\templates\base.html:220
 msgid "GitHub"
 msgstr ""
 
-#: .\cookbook\templates\base.html:181
+#: .\cookbook\templates\base.html:224
 msgid "API Browser"
 msgstr ""
 
-#: .\cookbook\templates\base.html:184
+#: .\cookbook\templates\base.html:227
 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 ""
@@ -790,7 +866,7 @@ msgstr ""
 msgid "Add the specified keywords to all recipes containing a word"
 msgstr ""
 
-#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:85
+#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:83
 msgid "Sync"
 msgstr ""
 
@@ -808,10 +884,22 @@ msgstr ""
 msgid "The path must be in the following format"
 msgstr ""
 
-#: .\cookbook\templates\batch\monitor.html:27
+#: .\cookbook\templates\batch\monitor.html:21
+msgid "Manage External Storage"
+msgstr ""
+
+#: .\cookbook\templates\batch\monitor.html:28
 msgid "Sync Now!"
 msgstr ""
 
+#: .\cookbook\templates\batch\monitor.html:29
+msgid "Show Recipes"
+msgstr ""
+
+#: .\cookbook\templates\batch\monitor.html:30
+msgid "Show Log"
+msgstr ""
+
 #: .\cookbook\templates\batch\waiting.html:4
 #: .\cookbook\templates\batch\waiting.html:10
 msgid "Importing Recipes"
@@ -823,32 +911,10 @@ msgid ""
 "please wait."
 msgstr ""
 
-#: .\cookbook\templates\books.html:5 .\cookbook\templates\books.html:11
+#: .\cookbook\templates\books.html:7
 msgid "Recipe Books"
 msgstr ""
 
-#: .\cookbook\templates\books.html:15
-msgid "New Book"
-msgstr ""
-
-#: .\cookbook\templates\books.html:27 .\cookbook\templates\recipe_view.html:26
-msgid "by"
-msgstr ""
-
-#: .\cookbook\templates\books.html:34
-msgid "Toggle Recipes"
-msgstr ""
-
-#: .\cookbook\templates\books.html:54
-#: .\cookbook\templates\meal_plan_entry.html:48
-#: .\cookbook\templates\recipes_table.html:64
-msgid "Last cooked"
-msgstr ""
-
-#: .\cookbook\templates\books.html:71
-msgid "There are no recipes in this book yet."
-msgstr ""
-
 #: .\cookbook\templates\export.html:6 .\cookbook\templates\test2.html:6
 msgid "Export Recipes"
 msgstr ""
@@ -869,211 +935,21 @@ msgid "Import new Recipe"
 msgstr ""
 
 #: .\cookbook\templates\forms\edit_import_recipe.html:14
-#: .\cookbook\templates\forms\edit_internal_recipe.html:439
-#: .\cookbook\templates\forms\edit_internal_recipe.html:471
 #: .\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:46 .\cookbook\templates\settings.html:87
-#: .\cookbook\templates\settings.html:105
+#: .\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
 msgid "Save"
 msgstr ""
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:7
-#: .\cookbook\templates\forms\edit_internal_recipe.html:34
 msgid "Edit Recipe"
 msgstr ""
 
-#: .\cookbook\templates\forms\edit_internal_recipe.html:56
-#: .\cookbook\templates\url_import.html:171
-msgid "Description"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:76
-msgid "Waiting Time"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:82
-msgid "Servings Text"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:93
-msgid "Select Keywords"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:94
-#: .\cookbook\templates\url_import.html:583
-msgid "Add Keyword"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:112
-msgid "Nutrition"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:116
-#: .\cookbook\templates\forms\edit_internal_recipe.html:166
-msgid "Delete Step"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:120
-msgid "Calories"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:123
-msgid "Carbohydrates"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:126
-msgid "Fats"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:128
-msgid "Proteins"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:150
-#: .\cookbook\templates\forms\edit_internal_recipe.html:504
-msgid "Step"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:171
-msgid "Show as header"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:177
-msgid "Hide as header"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:182
-msgid "Move Up"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:187
-msgid "Move Down"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:196
-msgid "Step Name"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:200
-msgid "Step Type"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:213
-msgid "Step time in Minutes"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:229
-msgid "Select File"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:230
-#: .\cookbook\templates\forms\edit_internal_recipe.html:252
-#: .\cookbook\templates\forms\edit_internal_recipe.html:313
-#: .\cookbook\templates\forms\edit_internal_recipe.html:337
-#: .\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
-msgid "Select"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:251
-msgid "Select Recipe"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:311
-#: .\cookbook\templates\shopping_list.html:187
-msgid "Select Unit"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:312
-#: .\cookbook\templates\forms\edit_internal_recipe.html:336
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
-msgid "Create"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:335
-#: .\cookbook\templates\shopping_list.html:209
-msgid "Select Food"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:352
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:369
-msgid "Delete Ingredient"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:375
-msgid "Make Header"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:381
-msgid "Make Ingredient"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:387
-msgid "Disable Amount"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:393
-msgid "Enable Amount"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:398
-msgid "Copy Template Reference"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:424
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
-msgid "Instructions"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:437
-#: .\cookbook\templates\forms\edit_internal_recipe.html:468
-msgid "Save & View"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:441
-#: .\cookbook\templates\forms\edit_internal_recipe.html:474
-msgid "Add Step"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:444
-#: .\cookbook\templates\forms\edit_internal_recipe.html:478
-msgid "Add Nutrition"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:446
-#: .\cookbook\templates\forms\edit_internal_recipe.html:480
-msgid "Remove Nutrition"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:448
-#: .\cookbook\templates\forms\edit_internal_recipe.html:483
-msgid "View Recipe"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:450
-#: .\cookbook\templates\forms\edit_internal_recipe.html:485
-msgid "Delete Recipe"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:491
-msgid "Steps"
-msgstr ""
-
 #: .\cookbook\templates\forms\ingredients.html:15
 msgid "Edit Ingredients"
 msgstr ""
@@ -1089,11 +965,6 @@ msgid ""
 "    "
 msgstr ""
 
-#: .\cookbook\templates\forms\ingredients.html:24
-#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
-msgid "Units"
-msgstr ""
-
 #: .\cookbook\templates\forms\ingredients.html:26
 msgid "Are you sure that you want to merge these two units?"
 msgstr ""
@@ -1107,29 +978,33 @@ msgstr ""
 msgid "Are you sure that you want to merge these two ingredients?"
 msgstr ""
 
-#: .\cookbook\templates\generic\delete_template.html:18
+#: .\cookbook\templates\generic\delete_template.html:19
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
 msgstr ""
 
-#: .\cookbook\templates\generic\edit_template.html:30
+#: .\cookbook\templates\generic\delete_template.html:23
+msgid "Cancel"
+msgstr ""
+
+#: .\cookbook\templates\generic\edit_template.html:32
 msgid "View"
 msgstr ""
 
-#: .\cookbook\templates\generic\edit_template.html:34
+#: .\cookbook\templates\generic\edit_template.html:36
 msgid "Delete original file"
 msgstr ""
 
 #: .\cookbook\templates\generic\list_template.html:6
-#: .\cookbook\templates\generic\list_template.html:12
+#: .\cookbook\templates\generic\list_template.html:21
 msgid "List"
 msgstr ""
 
-#: .\cookbook\templates\generic\list_template.html:25
+#: .\cookbook\templates\generic\list_template.html:34
 msgid "Filter"
 msgstr ""
 
-#: .\cookbook\templates\generic\list_template.html:30
+#: .\cookbook\templates\generic\list_template.html:39
 msgid "Import all"
 msgstr ""
 
@@ -1438,6 +1313,11 @@ msgstr ""
 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"
@@ -1501,6 +1381,11 @@ msgstr ""
 msgid "Meal Plan View"
 msgstr ""
 
+#: .\cookbook\templates\meal_plan_entry.html:48
+#: .\cookbook\templates\recipes_table.html:64
+msgid "Last cooked"
+msgstr ""
+
 #: .\cookbook\templates\meal_plan_entry.html:50
 msgid "Never cooked before."
 msgstr ""
@@ -1597,8 +1482,12 @@ msgstr ""
 msgid "Comments"
 msgstr ""
 
+#: .\cookbook\templates\recipe_view.html:26
+msgid "by"
+msgstr ""
+
 #: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
-#: .\cookbook\views\edit.py:179
+#: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr ""
 
@@ -1630,60 +1519,221 @@ msgstr ""
 msgid "Recipe Home"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:25
+#: .\cookbook\templates\search_info.html:5
+#: .\cookbook\templates\search_info.html:9
+#: .\cookbook\templates\settings.html:157
+msgid "Search Settings"
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:10
+msgid ""
+"\n"
+"        Creating the best search experience is complicated and weighs "
+"heavily on your personal configuration.  \n"
+"        Changing any of the search settings can have significant impact on "
+"the speed and quality of the results.\n"
+"        Search Methods, Trigrams and Full Text Search configurations are "
+"only available if you are using Postgres for your database.\n"
+"    "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:19
+msgid "Search Methods"
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:23
+msgid ""
+" \n"
+"            Full text searches attempt to normalize the words provided to "
+"match common variants.  For example: 'forked', 'forking', 'forks' will all "
+"normalize to 'fork'.\n"
+"            There are several methods available, described below, that will "
+"control how the search behavior should react when multiple words are "
+"searched.\n"
+"            Full technical details on how these operate can be viewed on <a "
+"href=https://www.postgresql.org/docs/current/textsearch-controls."
+"html#TEXTSEARCH-PARSING-QUERIES>Postgresql's website.</a>\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:29
+msgid ""
+" \n"
+"            Simple searches ignore punctuation and common words such as "
+"'the', 'a', 'and'. And will treat seperate words as required.\n"
+"            Searching for 'apple or flour' will return any recipe that "
+"includes both 'apple' and 'flour' anywhere in the fields that have been "
+"selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:34
+msgid ""
+" \n"
+"            Phrase searches ignore punctuation, but will search for all of "
+"the words in the exact order provided.\n"
+"            Searching for 'apple or flour' will only return a recipe that "
+"includes the exact phrase 'apple or flour' in any of the fields that have "
+"been selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:39
+msgid ""
+" \n"
+"            Web searches simulate functionality found on many web search "
+"sites supporting special syntax.\n"
+"            Placing quotes around several words will convert those words "
+"into a phrase.\n"
+"            'or' is recongized as searching for the word (or phrase) "
+"immediately before 'or' OR the word (or phrase) directly after.\n"
+"            '-' is recognized as searching for recipes that do not include "
+"the word (or phrase) that comes immediately after. \n"
+"            For example searching for 'apple pie' or cherry -butter will "
+"return any recipe that includes the phrase 'apple pie' or the word "
+"'cherry' \n"
+"            in any field included in the full text search but exclude any "
+"recipe that has the word 'butter' in any field included.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:48
+msgid ""
+" \n"
+"            Raw search is similar to Web except will take puncuation "
+"operators such as '|', '&' and '()'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:59
+msgid ""
+" \n"
+"            Another approach to searching that also requires Postgresql is "
+"fuzzy search or trigram similarity. A trigram is a group of three "
+"consecutive characters.\n"
+"            For example searching for 'apple' will create x trigrams 'app', "
+"'ppl', 'ple' and will create a score of how closely words match the "
+"generated trigrams.\n"
+"            One benefit of searching trigams is that a search for 'sandwich' "
+"will find mispelled words such as 'sandwhich' that would be missed by other "
+"methods.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:69
+msgid "Search Fields"
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:73
+msgid ""
+" \n"
+"            Unaccent is a special case in that it enables searching a field "
+"'unaccented' for each search style attempting to ignore accented values. \n"
+"            For example when you enable unaccent for 'Name' any search "
+"(starts with, contains, trigram) will attempt the search ignoring accented "
+"characters.\n"
+"            \n"
+"            For the other options, you can enable search on any or all "
+"fields and they will be combined together with an assumed 'OR'.\n"
+"            For example enabling 'Name' for Starts With, 'Name' and "
+"'Description' for Partial Match and 'Ingredients' and 'Keywords' for Full "
+"Search\n"
+"            and searching for 'apple' will generate a search that will "
+"return recipes that have:\n"
+"            - A recipe name that starts with 'apple'\n"
+"            - OR a recipe name that contains 'apple'\n"
+"            - OR a recipe description that contains 'apple'\n"
+"            - OR a recipe that will have a full text search match ('apple' "
+"or 'apples') in ingredients\n"
+"            - OR a recipe that will have a full text search match in "
+"Keywords\n"
+"\n"
+"            Combining too many fields in too many types of search can have a "
+"negative impact on performance, create duplicate results or return "
+"unexpected results.\n"
+"            For example, enabling fuzzy search or partial matches will "
+"interfere with web search methods.  \n"
+"            Searching for 'apple -pie' with fuzzy search and full text "
+"search will return the recipe Apple Pie.  Though it is not included in the "
+"full text results, it does match the trigram results.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:95
+msgid "Search Index"
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:99
+msgid ""
+" \n"
+"            Trigram search and Full Text Search both rely on database "
+"indexes to perform effectively.  \n"
+"            You can rebuild the indexes on all fields in the Admin page for "
+"Recipes and selecting all recipes and running 'rebuild index for selected "
+"recipes'\n"
+"            You can also rebuild indexes at the command line by executing "
+"the management command 'python manage.py rebuildindex'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\settings.html:27
 msgid "Account"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:29
+#: .\cookbook\templates\settings.html:33
 msgid "Preferences"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:39
 msgid "API-Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:41
+#: .\cookbook\templates\settings.html:45
+msgid "Search-Settings"
+msgstr ""
+
+#: .\cookbook\templates\settings.html:53
 msgid "Name Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:49
+#: .\cookbook\templates\settings.html:61
 msgid "Account Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:51
+#: .\cookbook\templates\settings.html:63
 msgid "Emails"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:54
+#: .\cookbook\templates\settings.html:66
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:78
 msgid "Language"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:96
+#: .\cookbook\templates\settings.html:108
 msgid "Style"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:116
+#: .\cookbook\templates\settings.html:128
 msgid "API Token"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:117
+#: .\cookbook\templates\settings.html:129
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
 msgstr ""
 
-#: .\cookbook\templates\settings.html:134
+#: .\cookbook\templates\settings.html:146
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:136
+#: .\cookbook\templates\settings.html:148
 msgid "or"
 msgstr ""
 
@@ -1724,6 +1774,23 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#: .\cookbook\templates\shopping_list.html:187
+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
+msgid "Select"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:209
+msgid "Select Food"
+msgstr ""
+
 #: .\cookbook\templates\shopping_list.html:240
 msgid "Select Supermarket"
 msgstr ""
@@ -1821,10 +1888,6 @@ msgstr ""
 msgid "Recipes without Keywords"
 msgstr ""
 
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr ""
-
 #: .\cookbook\templates\space.html:60 .\cookbook\templates\stats.html:45
 msgid "Internal Recipes"
 msgstr ""
@@ -1874,7 +1937,7 @@ msgid "There are no members in your space yet!"
 msgstr ""
 
 #: .\cookbook\templates\space.html:130 .\cookbook\templates\system.html:21
-#: .\cookbook\views\lists.py:115
+#: .\cookbook\views\lists.py:100
 msgid "Invite Links"
 msgstr ""
 
@@ -1882,6 +1945,10 @@ msgstr ""
 msgid "Stats"
 msgstr ""
 
+#: .\cookbook\templates\stats.html:10
+msgid "Statistics"
+msgstr ""
+
 #: .\cookbook\templates\system.html:22
 msgid "Show Links"
 msgstr ""
@@ -2028,6 +2095,10 @@ msgstr ""
 msgid "Text dragged here will be appended to the name."
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:171
+msgid "Description"
+msgstr ""
+
 #: .\cookbook\templates\url_import.html:175
 msgid "Text dragged here will be appended to the description."
 msgstr ""
@@ -2052,6 +2123,11 @@ msgstr ""
 msgid "Ingredients dragged here will be appended to current list."
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:297
+#: .\cookbook\templates\url_import.html:567
+msgid "Instructions"
+msgstr ""
+
 #: .\cookbook\templates\url_import.html:302
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
@@ -2101,6 +2177,10 @@ msgstr ""
 msgid "Select one"
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:583
+msgid "Add Keyword"
+msgstr ""
+
 #: .\cookbook\templates\url_import.html:596
 msgid "All Keywords"
 msgstr ""
@@ -2136,45 +2216,102 @@ msgstr ""
 msgid "Recipe Markup Specification"
 msgstr ""
 
-#: .\cookbook\views\api.py:79
+#: .\cookbook\views\api.py:82 .\cookbook\views\api.py:131
 msgid "Parameter updated_at incorrectly formatted"
 msgstr ""
 
-#: .\cookbook\views\api.py:580 .\cookbook\views\views.py:303
+#: .\cookbook\views\api.py:151
+#, python-brace-format
+msgid "No {self.basename} with id {pk} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
+#: .\cookbook\views\edit.py:316
+msgid "Cannot merge with the same object!"
+msgstr ""
+
+#: .\cookbook\views\api.py:162
+#, python-brace-format
+msgid "No {self.basename} with id {target} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:167
+msgid "Cannot merge with child object!"
+msgstr ""
+
+#: .\cookbook\views\api.py:195
+#, python-brace-format
+msgid "{source.name} was merged successfully with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:199
+#, python-brace-format
+msgid "An error occurred attempting to merge {source.name} with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:239
+#, python-brace-format
+msgid "No {self.basename} with id {child} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:248
+#, python-brace-format
+msgid "{child.name} was moved successfully to the root."
+msgstr ""
+
+#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+msgid "An error occurred attempting to move "
+msgstr ""
+
+#: .\cookbook\views\api.py:254
+msgid "Cannot move an object to itself!"
+msgstr ""
+
+#: .\cookbook\views\api.py:260
+#, python-brace-format
+msgid "No {self.basename} with id {parent} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:266
+#, python-brace-format
+msgid "{child.name} was moved successfully to parent {parent.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
 msgid "This feature is not available in the demo version!"
 msgstr ""
 
-#: .\cookbook\views\api.py:603
+#: .\cookbook\views\api.py:727
 msgid "Sync successful!"
 msgstr ""
 
-#: .\cookbook\views\api.py:608
+#: .\cookbook\views\api.py:732
 msgid "Error synchronizing with Storage"
 msgstr ""
 
-#: .\cookbook\views\api.py:686
+#: .\cookbook\views\api.py:810
 msgid "Nothing to do."
 msgstr ""
 
-#: .\cookbook\views\api.py:701
+#: .\cookbook\views\api.py:825
 msgid "The requested site provided malformed data and cannot be read."
 msgstr ""
 
-#: .\cookbook\views\api.py:708
+#: .\cookbook\views\api.py:832
 msgid "The requested page could not be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:717
+#: .\cookbook\views\api.py:841
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
 msgstr ""
 
-#: .\cookbook\views\api.py:731
+#: .\cookbook\views\api.py:855
 msgid "No useable data could be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:747
+#: .\cookbook\views\api.py:871
 msgid "I couldn't find anything to do."
 msgstr ""
 
@@ -2201,8 +2338,8 @@ msgstr[1] ""
 msgid "Monitor"
 msgstr ""
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:102
-#: .\cookbook\views\new.py:98
+#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr ""
 
@@ -2211,8 +2348,8 @@ 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:213
-#: .\cookbook\views\new.py:156
+#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
+#: .\cookbook\views\new.py:155
 msgid "Recipe Book"
 msgstr ""
 
@@ -2220,47 +2357,39 @@ msgstr ""
 msgid "Bookmarks"
 msgstr ""
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:252
+#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
 msgid "Invite Link"
 msgstr ""
 
-#: .\cookbook\views\edit.py:119
-msgid "Food"
-msgstr ""
-
-#: .\cookbook\views\edit.py:128
+#: .\cookbook\views\edit.py:126
 msgid "You cannot edit this storage!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:148
+#: .\cookbook\views\edit.py:146
 msgid "Storage saved!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:154
+#: .\cookbook\views\edit.py:152
 msgid "There was an error updating this storage backend!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:165
+#: .\cookbook\views\edit.py:163
 msgid "Storage"
 msgstr ""
 
-#: .\cookbook\views\edit.py:261
+#: .\cookbook\views\edit.py:259
 msgid "Changes saved!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:265
+#: .\cookbook\views\edit.py:263
 msgid "Error saving changes!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:299
+#: .\cookbook\views\edit.py:298
 msgid "Units merged!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:301 .\cookbook\views\edit.py:317
-msgid "Cannot merge with the same object!"
-msgstr ""
-
-#: .\cookbook\views\edit.py:315
+#: .\cookbook\views\edit.py:314
 msgid "Foods merged!"
 msgstr ""
 
@@ -2272,126 +2401,152 @@ msgstr ""
 msgid "Exporting is not implemented for this provider"
 msgstr ""
 
-#: .\cookbook\views\lists.py:40
+#: .\cookbook\views\lists.py:26
 msgid "Import Log"
 msgstr ""
 
-#: .\cookbook\views\lists.py:53
+#: .\cookbook\views\lists.py:39
 msgid "Discovery"
 msgstr ""
 
-#: .\cookbook\views\lists.py:85
+#: .\cookbook\views\lists.py:69
 msgid "Shopping Lists"
 msgstr ""
 
-#: .\cookbook\views\new.py:123
+#: .\cookbook\views\lists.py:129
+msgid "Foods"
+msgstr ""
+
+#: .\cookbook\views\lists.py:163
+msgid "Supermarkets"
+msgstr ""
+
+#: .\cookbook\views\lists.py:179
+msgid "Shopping Categories"
+msgstr ""
+
+#: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr ""
 
-#: .\cookbook\views\new.py:126
+#: .\cookbook\views\new.py:125
 msgid "There was an error importing this recipe!"
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "Hello"
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "You have been invited by "
 msgstr ""
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:226
 msgid " to join their Tandoor Recipes space "
 msgstr ""
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:227
 msgid "Click the following link to activate your account: "
 msgstr ""
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:228
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:229
 msgid "The invitation is valid until "
 msgstr ""
 
-#: .\cookbook\views\new.py:231
+#: .\cookbook\views\new.py:230
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 
-#: .\cookbook\views\new.py:234
+#: .\cookbook\views\new.py:233
 msgid "Tandoor Recipes Invite"
 msgstr ""
 
-#: .\cookbook\views\new.py:241
+#: .\cookbook\views\new.py:240
 msgid "Invite link successfully send to user."
 msgstr ""
 
-#: .\cookbook\views\new.py:244
+#: .\cookbook\views\new.py:243
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
 msgstr ""
 
-#: .\cookbook\views\new.py:246
+#: .\cookbook\views\new.py:245
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 
-#: .\cookbook\views\views.py:129
+#: .\cookbook\views\views.py:128
 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:177
+#: .\cookbook\views\views.py:176
 msgid "You do not have the required permissions to perform this action!"
 msgstr ""
 
-#: .\cookbook\views\views.py:188
+#: .\cookbook\views\views.py:187
 msgid "Comment saved!"
 msgstr ""
 
-#: .\cookbook\views\views.py:395
+#: .\cookbook\views\views.py:351
+msgid "You must select at least one field to search!"
+msgstr ""
+
+#: .\cookbook\views\views.py:354
+msgid ""
+"To use this search method you must select at least one full text search "
+"field!"
+msgstr ""
+
+#: .\cookbook\views\views.py:357
+msgid "Fuzzy search is not compatible with this search method!"
+msgstr ""
+
+#: .\cookbook\views\views.py:437
 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:402
+#: .\cookbook\views\views.py:444
 msgid "Passwords dont match!"
 msgstr ""
 
-#: .\cookbook\views\views.py:418
+#: .\cookbook\views\views.py:460
 msgid "User has been created, please login!"
 msgstr ""
 
-#: .\cookbook\views\views.py:434
+#: .\cookbook\views\views.py:476
 msgid "Malformed Invite Link supplied!"
 msgstr ""
 
-#: .\cookbook\views\views.py:441
+#: .\cookbook\views\views.py:483
 msgid "You are already member of a space and therefore cannot join this one."
 msgstr ""
 
-#: .\cookbook\views\views.py:452
+#: .\cookbook\views\views.py:494
 msgid "Successfully joined space."
 msgstr ""
 
-#: .\cookbook\views\views.py:458
+#: .\cookbook\views\views.py:500
 msgid "Invite Link not valid or already used!"
 msgstr ""
 
-#: .\cookbook\views\views.py:522
+#: .\cookbook\views\views.py:564
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
 msgstr ""
 
-#: .\cookbook\views\views.py:528
+#: .\cookbook\views\views.py:570
 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.po b/cookbook/locale/zh_CN/LC_MESSAGES/django.po
index f45bbf7e..891d17d2 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+0200\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/"
@@ -19,243 +19,316 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.7.2\n"
 
-#: .\cookbook\filters.py:23 .\cookbook\templates\base.html:98
-#: .\cookbook\templates\forms\edit_internal_recipe.html:269
+#: .\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\views\lists.py:67
+#: .\cookbook\templates\url_import.html:270
 msgid "Ingredients"
 msgstr "材料"
 
-#: .\cookbook\forms.py:49
+#: .\cookbook\forms.py:50
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
-msgstr "顶部导航栏的颜色。并非所有的颜色都适用于所有的主题，只要试一试就可以了!"
+msgstr ""
+"顶部导航栏的颜色。并非所有的颜色都适用于所有的主题，只要试一试就可以了!"
 
-#: .\cookbook\forms.py:51
+#: .\cookbook\forms.py:52
 msgid "Default Unit to be used when inserting a new ingredient into a recipe."
 msgstr "在配方中插入新原料时使用的默认单位。"
 
-#: .\cookbook\forms.py:53
+#: .\cookbook\forms.py:54
 msgid ""
 "Enables support for fractions in ingredient amounts (e.g. convert decimals "
 "to fractions automatically)"
 msgstr "启用对原料数量的分数支持（例如自动将小数转换为分数）"
 
-#: .\cookbook\forms.py:56
+#: .\cookbook\forms.py:57
 #, fuzzy
 msgid ""
 "Users with whom newly created meal plan/shopping list entries should be "
 "shared by default."
 msgstr "默认情况下，新创建的膳食计划/购物清单条目应与之共享的用户。"
 
-#: .\cookbook\forms.py:58
+#: .\cookbook\forms.py:59
 msgid "Show recently viewed recipes on search page."
 msgstr "在搜索页面上显示最近查看的菜谱。"
 
-#: .\cookbook\forms.py:59
+#: .\cookbook\forms.py:60
 msgid "Number of decimals to round ingredients."
 msgstr "四舍五入成分的小数点数目。"
 
-#: .\cookbook\forms.py:60
+#: .\cookbook\forms.py:61
 msgid "If you want to be able to create and see comments underneath recipes."
 msgstr "如果你希望能够在菜谱下面创建并看到评论。"
 
-#: .\cookbook\forms.py:62
+#: .\cookbook\forms.py:63
 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. "
 "Useful when shopping with multiple people but might use a little bit of "
 "mobile data. If lower than instance limit it is reset when saving."
 msgstr ""
-"设置为0将禁用自动同步。当查看购物清单时，清单会每隔几秒钟更新一次，以同步其他人可能做出的改变。在与多人一起购物时很有用，但可能会消耗一点移动数据。如果低"
+"设置为0将禁用自动同步。当查看购物清单时，清单会每隔几秒钟更新一次，以同步其他"
+"人可能做出的改变。在与多人一起购物时很有用，但可能会消耗一点移动数据。如果低"
 "于实例限制，它将在保存时被重置。"
 
-#: .\cookbook\forms.py:65
+#: .\cookbook\forms.py:66
 msgid "Makes the navbar stick to the top of the page."
 msgstr "使导航条粘在页面的顶部。"
 
-#: .\cookbook\forms.py:81
+#: .\cookbook\forms.py:82
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
 msgstr "这两个字段都是可选的。如果没有给出,将显示用户名"
 
-#: .\cookbook\forms.py:102 .\cookbook\forms.py:331
-#: .\cookbook\templates\forms\edit_internal_recipe.html:49
+#: .\cookbook\forms.py:103 .\cookbook\forms.py:334
 #: .\cookbook\templates\url_import.html:154
 msgid "Name"
 msgstr "名称"
 
-#: .\cookbook\forms.py:103 .\cookbook\forms.py:332
-#: .\cookbook\templates\base.html:108 .\cookbook\templates\base.html:169
-#: .\cookbook\templates\forms\edit_internal_recipe.html:85
+#: .\cookbook\forms.py:104 .\cookbook\forms.py:335
 #: .\cookbook\templates\space.html:39 .\cookbook\templates\stats.html:24
 #: .\cookbook\templates\url_import.html:188
-#: .\cookbook\templates\url_import.html:573
+#: .\cookbook\templates\url_import.html:573 .\cookbook\views\lists.py:112
 msgid "Keywords"
 msgstr "关键字"
 
-#: .\cookbook\forms.py:104
+#: .\cookbook\forms.py:105
 msgid "Preparation time in minutes"
 msgstr "准备时间(分钟)"
 
-#: .\cookbook\forms.py:105
+#: .\cookbook\forms.py:106
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "等候时间(分钟)"
 
-#: .\cookbook\forms.py:106 .\cookbook\forms.py:333
+#: .\cookbook\forms.py:107 .\cookbook\forms.py:336
 msgid "Path"
 msgstr "路径"
 
-#: .\cookbook\forms.py:107
+#: .\cookbook\forms.py:108
 msgid "Storage UID"
 msgstr "存储 UID"
 
-#: .\cookbook\forms.py:133
+#: .\cookbook\forms.py:134
 msgid "Default"
 msgstr "预置"
 
-#: .\cookbook\forms.py:144 .\cookbook\templates\url_import.html:90
+#: .\cookbook\forms.py:145 .\cookbook\templates\url_import.html:90
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr "為了防止與現有菜谱同名的重複菜谱被忽略。勾选此框以导入所有内容。"
 
-#: .\cookbook\forms.py:164
+#: .\cookbook\forms.py:165
 msgid "New Unit"
 msgstr "新单位"
 
-#: .\cookbook\forms.py:165
+#: .\cookbook\forms.py:166
 #, fuzzy
 msgid "New unit that other gets replaced by."
 msgstr "新的单位被其他取代."
 
-#: .\cookbook\forms.py:170
+#: .\cookbook\forms.py:171
 msgid "Old Unit"
 msgstr "旧单位"
 
-#: .\cookbook\forms.py:171
+#: .\cookbook\forms.py:172
 msgid "Unit that should be replaced."
 msgstr "单位应被取代."
 
-#: .\cookbook\forms.py:187
+#: .\cookbook\forms.py:189
 msgid "New Food"
 msgstr "新的食品"
 
-#: .\cookbook\forms.py:188
+#: .\cookbook\forms.py:190
 #, fuzzy
 msgid "New food that other gets replaced by."
 msgstr "新食品被其他取代."
 
-#: .\cookbook\forms.py:193
+#: .\cookbook\forms.py:195
 msgid "Old Food"
 msgstr "旧的食品"
 
-#: .\cookbook\forms.py:194
+#: .\cookbook\forms.py:196
 msgid "Food that should be replaced."
 msgstr "食品应被取代."
 
-#: .\cookbook\forms.py:212
+#: .\cookbook\forms.py:214
 msgid "Add your comment: "
 msgstr "发表评论: "
 
-#: .\cookbook\forms.py:253
+#: .\cookbook\forms.py:256
 msgid "Leave empty for dropbox and enter app password for nextcloud."
 msgstr "dropbox留空和为nextcloud输入应用密码。"
 
-#: .\cookbook\forms.py:260
+#: .\cookbook\forms.py:263
 msgid "Leave empty for nextcloud and enter api token for dropbox."
 msgstr ""
 
-#: .\cookbook\forms.py:269
+#: .\cookbook\forms.py:272
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
 msgstr ""
 
-#: .\cookbook\forms.py:307
+#: .\cookbook\forms.py:310
 msgid "Search String"
 msgstr "搜索字符串"
 
-#: .\cookbook\forms.py:334
+#: .\cookbook\forms.py:337
 msgid "File ID"
 msgstr "文件编号"
 
-#: .\cookbook\forms.py:370
+#: .\cookbook\forms.py:373
 msgid "You must provide at least a recipe or a title."
 msgstr "你必须至少提供一份菜谱或一个标题。"
 
-#: .\cookbook\forms.py:383
+#: .\cookbook\forms.py:386
 msgid "You can list default users to share recipes with in the settings."
 msgstr "你可以在设置中列出默认用户来分享食谱。"
 
-#: .\cookbook\forms.py:384
-#: .\cookbook\templates\forms\edit_internal_recipe.html:427
+#: .\cookbook\forms.py:387
 msgid ""
 "You can use markdown to format this field. See the <a href=\"/docs/markdown/"
 "\">docs here</a>"
 msgstr ""
 
-#: .\cookbook\forms.py:409
+#: .\cookbook\forms.py:412
 msgid "Maximum number of users for this space reached."
 msgstr "已达到该空间的最大用户数。"
 
-#: .\cookbook\forms.py:415
+#: .\cookbook\forms.py:418
 msgid "Email address already taken!"
 msgstr "电子邮件地址已被注册!"
 
-#: .\cookbook\forms.py:423
+#: .\cookbook\forms.py:426
 msgid ""
 "An email address is not required but if present the invite link will be send "
 "to the user."
 msgstr "电子邮件地址不是必需的，但如果存在，邀请链接将被发送给用户。"
 
-#: .\cookbook\forms.py:438
+#: .\cookbook\forms.py:441
 msgid "Name already taken."
 msgstr "名字已被占用。"
 
-#: .\cookbook\forms.py:449
+#: .\cookbook\forms.py:452
 msgid "Accept Terms and Privacy"
 msgstr "接受条款细则及私隐政策"
 
+#: .\cookbook\forms.py:487
+msgid ""
+"Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
+"full desciption of choices."
+msgstr ""
+
+#: .\cookbook\forms.py:488
+msgid ""
+"Use fuzzy matching on units, keywords and ingredients when editing and "
+"importing recipes."
+msgstr ""
+
+#: .\cookbook\forms.py:489
+msgid ""
+"Fields to search ignoring accents.  Selecting this option can improve or "
+"degrade search quality depending on language"
+msgstr ""
+
+#: .\cookbook\forms.py:490
+msgid ""
+"Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
+"'pie' and 'piece' and 'soapie')"
+msgstr ""
+
+#: .\cookbook\forms.py:491
+msgid ""
+"Fields to search for beginning of word matches. (e.g. searching for 'sa' "
+"will return 'salad' and 'sandwich')"
+msgstr ""
+
+#: .\cookbook\forms.py:492
+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
+msgid ""
+"Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
+"only function with fulltext fields."
+msgstr ""
+
+#: .\cookbook\forms.py:497
+#, fuzzy
+#| msgid "Search"
+msgid "Search Method"
+msgstr "搜索"
+
+#: .\cookbook\forms.py:498
+msgid "Fuzzy Lookups"
+msgstr ""
+
+#: .\cookbook\forms.py:499
+msgid "Ignore Accent"
+msgstr ""
+
+#: .\cookbook\forms.py:500
+msgid "Partial Match"
+msgstr ""
+
+#: .\cookbook\forms.py:501
+msgid "Starts Wtih"
+msgstr ""
+
+#: .\cookbook\forms.py:502
+#, fuzzy
+#| msgid "Search"
+msgid "Fuzzy Search"
+msgstr "搜索"
+
+#: .\cookbook\forms.py:503
+#, fuzzy
+#| msgid "Text"
+msgid "Full Text"
+msgstr "文本"
+
 #: .\cookbook\helper\AllAuthCustomAdapter.py:36
 msgid ""
 "In order to prevent spam, the requested email was not send. Please wait a "
 "few minutes and try again."
 msgstr "为了防止垃圾邮件，所要求的电子邮件没有被发送。请等待几分钟后再试。"
 
-#: .\cookbook\helper\permission_helper.py:138
-#: .\cookbook\helper\permission_helper.py:161 .\cookbook\views\views.py:151
+#: .\cookbook\helper\permission_helper.py:136
+#: .\cookbook\helper\permission_helper.py:159 .\cookbook\views\views.py:150
 msgid "You are not logged in and therefore cannot view this page!"
 msgstr "你没有登录，因此不能查看这个页面!"
 
-#: .\cookbook\helper\permission_helper.py:142
-#: .\cookbook\helper\permission_helper.py:148
-#: .\cookbook\helper\permission_helper.py:173
-#: .\cookbook\helper\permission_helper.py:218
-#: .\cookbook\helper\permission_helper.py:232
-#: .\cookbook\helper\permission_helper.py:243
-#: .\cookbook\helper\permission_helper.py:254 .\cookbook\views\data.py:40
-#: .\cookbook\views\views.py:162 .\cookbook\views\views.py:169
-#: .\cookbook\views\views.py:259
+#: .\cookbook\helper\permission_helper.py:140
+#: .\cookbook\helper\permission_helper.py:146
+#: .\cookbook\helper\permission_helper.py:171
+#: .\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
 msgid "You do not have the required permissions to view this page!"
 msgstr "你没有必要的权限来查看这个页面!"
 
-#: .\cookbook\helper\permission_helper.py:166
-#: .\cookbook\helper\permission_helper.py:189
-#: .\cookbook\helper\permission_helper.py:204
+#: .\cookbook\helper\permission_helper.py:164
+#: .\cookbook\helper\permission_helper.py:187
+#: .\cookbook\helper\permission_helper.py:202
 #, fuzzy
 msgid "You cannot interact with this object as it is not owned by you!"
 msgstr "你不能与这个对象进行互动，因为它不属于你！"
 
-#: .\cookbook\helper\template_helper.py:60
-#: .\cookbook\helper\template_helper.py:62
+#: .\cookbook\helper\template_helper.py:61
+#: .\cookbook\helper\template_helper.py:63
 msgid "Could not parse template code."
 msgstr "无法解析模板代码。"
 
-#: .\cookbook\integration\integration.py:104
+#: .\cookbook\integration\integration.py:119
 #: .\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
@@ -264,27 +337,27 @@ msgstr "无法解析模板代码。"
 #: .\cookbook\templates\url_import.html:123
 #: .\cookbook\templates\url_import.html:317
 #: .\cookbook\templates\url_import.html:604 .\cookbook\views\delete.py:60
-#: .\cookbook\views\edit.py:199
+#: .\cookbook\views\edit.py:197
 msgid "Import"
 msgstr "导入"
 
-#: .\cookbook\integration\integration.py:185
+#: .\cookbook\integration\integration.py:200
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
 msgstr "输入者需要一个.zip文件。你为你的数据选择了正确的导入器类型吗？"
 
-#: .\cookbook\integration\integration.py:188
+#: .\cookbook\integration\integration.py:203
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
 msgstr "在导入过程中发生了一个意外的错误。请确认你已经上传了一个有效的文件。"
 
-#: .\cookbook\integration\integration.py:192
+#: .\cookbook\integration\integration.py:208
 msgid "The following recipes were ignored because they already existed:"
 msgstr "以下菜谱被忽略了，因为它们已经存在了："
 
-#: .\cookbook\integration\integration.py:196
+#: .\cookbook\integration\integration.py:212
 #, python-format
 msgid "Imported %s recipes."
 msgstr "导入了%s菜谱。"
@@ -302,7 +375,6 @@ msgid "Source"
 msgstr "来源"
 
 #: .\cookbook\integration\safron.py:23
-#: .\cookbook\templates\forms\edit_internal_recipe.html:79
 #: .\cookbook\templates\include\log_cooking.html:16
 #: .\cookbook\templates\url_import.html:224
 #: .\cookbook\templates\url_import.html:455
@@ -314,7 +386,6 @@ msgid "Waiting time"
 msgstr "等待时间"
 
 #: .\cookbook\integration\safron.py:27
-#: .\cookbook\templates\forms\edit_internal_recipe.html:73
 msgid "Preparation Time"
 msgstr "准备时间"
 
@@ -328,6 +399,22 @@ msgstr "食谱"
 msgid "Section"
 msgstr "节"
 
+#: .\cookbook\management\commands\rebuildindex.py:14
+msgid "Rebuilds full text search index on Recipe"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:18
+msgid "Only Postgress databases use full text search, no index to rebuild"
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:29
+msgid "Recipe index rebuild complete."
+msgstr ""
+
+#: .\cookbook\management\commands\rebuildindex.py:31
+msgid "Recipe index rebuild failed."
+msgstr ""
+
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:14
 msgid "Breakfast"
 msgstr "早餐"
@@ -344,76 +431,89 @@ msgstr "晚餐"
 msgid "Other"
 msgstr "其他"
 
-#: .\cookbook\models.py:72
+#: .\cookbook\models.py:144
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr "空间的最大文件存储量，单位为MB。0表示无限制，-1表示禁止文件上传。"
 
-#: .\cookbook\models.py:123 .\cookbook\templates\search.html:7
+#: .\cookbook\models.py:196 .\cookbook\templates\search.html:7
 #: .\cookbook\templates\shopping_list.html:52
 msgid "Search"
 msgstr "搜索"
 
-#: .\cookbook\models.py:124 .\cookbook\templates\base.html:92
+#: .\cookbook\models.py:197 .\cookbook\templates\base.html:82
 #: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:152
-#: .\cookbook\views\edit.py:233 .\cookbook\views\new.py:201
+#: .\cookbook\views\edit.py:231 .\cookbook\views\new.py:200
 msgid "Meal-Plan"
 msgstr "餐单"
 
-#: .\cookbook\models.py:125 .\cookbook\templates\base.html:89
+#: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
 msgid "Books"
 msgstr "书籍"
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Small"
 msgstr "小"
 
-#: .\cookbook\models.py:133
+#: .\cookbook\models.py:206
 msgid "Large"
 msgstr "大"
 
-#: .\cookbook\models.py:133 .\cookbook\templates\generic\new_template.html:6
+#: .\cookbook\models.py:206 .\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:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:202
+#: .\cookbook\models.py:389
+msgid " is part of a recipe step and cannot be deleted"
+msgstr ""
+
+#: .\cookbook\models.py:429
 msgid "Text"
 msgstr "文本"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:203
+#: .\cookbook\models.py:429
 msgid "Time"
 msgstr "时间"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:204
-#: .\cookbook\templates\forms\edit_internal_recipe.html:219
+#: .\cookbook\models.py:429
 msgid "File"
 msgstr "文件"
 
-#: .\cookbook\models.py:338
-#: .\cookbook\templates\forms\edit_internal_recipe.html:205
-#: .\cookbook\templates\forms\edit_internal_recipe.html:241
+#: .\cookbook\models.py:429
 #: .\cookbook\templates\include\recipe_open_modal.html:7
 #: .\cookbook\templates\meal_plan.html:247 .\cookbook\views\delete.py:28
-#: .\cookbook\views\edit.py:273 .\cookbook\views\new.py:52
+#: .\cookbook\views\edit.py:271 .\cookbook\views\new.py:52
 msgid "Recipe"
 msgstr "菜谱"
 
-#: .\cookbook\serializer.py:109
+#: .\cookbook\models.py:836 .\cookbook\templates\search_info.html:28
+msgid "Simple"
+msgstr ""
+
+#: .\cookbook\models.py:837 .\cookbook\templates\search_info.html:33
+msgid "Phrase"
+msgstr ""
+
+#: .\cookbook\models.py:838 .\cookbook\templates\search_info.html:38
+msgid "Web"
+msgstr ""
+
+#: .\cookbook\models.py:839 .\cookbook\templates\search_info.html:47
+msgid "Raw"
+msgstr ""
+
+#: .\cookbook\serializer.py:112
 msgid "File uploads are not enabled for this Space."
 msgstr "文件不能上载此空间。"
 
-#: .\cookbook\serializer.py:117
+#: .\cookbook\serializer.py:125
 msgid "You have reached your file upload limit."
 msgstr "你已达到文件上载的上限。"
 
-#: .\cookbook\tables.py:35 .\cookbook\templates\books.html:36
-#: .\cookbook\templates\generic\edit_template.html:6
+#: .\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
@@ -422,11 +522,10 @@ msgstr "你已达到文件上载的上限。"
 msgid "Edit"
 msgstr "编辑"
 
-#: .\cookbook\tables.py:124 .\cookbook\tables.py:147
-#: .\cookbook\templates\books.html:38
+#: .\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\edit_template.html:27
+#: .\cookbook\templates\generic\edit_template.html:28
 #: .\cookbook\templates\meal_plan.html:277
 #: .\cookbook\templates\recipes_table.html:90
 msgid "Delete"
@@ -456,7 +555,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:154 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:204 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:17
 #: .\cookbook\templates\socialaccount\connections.html:10
 msgid "Settings"
@@ -505,7 +604,9 @@ msgstr "警告:"
 msgid ""
 "You currently do not have any e-mail address set up. You should really add "
 "an e-mail address so you can receive notifications, reset your password, etc."
-msgstr "你目前没有设置任何电子邮件地址。你真的应该添加一个电子邮件地址，这样你就可以收到通知，重置你的密码，等等。"
+msgstr ""
+"你目前没有设置任何电子邮件地址。你真的应该添加一个电子邮件地址，这样你就可以"
+"收到通知，重置你的密码，等等。"
 
 #: .\cookbook\templates\account\email.html:64
 msgid "Add E-mail Address"
@@ -534,7 +635,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\templates\account\email_confirm.html:22
-#: .\cookbook\templates\generic\delete_template.html:21
+#: .\cookbook\templates\generic\delete_template.html:22
 msgid "Confirm"
 msgstr "确认"
 
@@ -546,7 +647,7 @@ msgid ""
 "request</a>."
 msgstr ""
 
-#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:189
+#: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:234
 msgid "Login"
 msgstr "登录"
 
@@ -599,7 +700,7 @@ msgstr "更改密码"
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
-#: .\cookbook\templates\settings.html:52
+#: .\cookbook\templates\settings.html:64
 msgid "Password"
 msgstr "密码"
 
@@ -618,7 +719,9 @@ msgstr "密码重置"
 msgid ""
 "Forgotten your password? Enter your e-mail address below, and we'll send you "
 "an e-mail allowing you to reset it."
-msgstr "忘记密码了吗？请在下面输入你的电子邮件地址，我们将向你发送一封电子邮件，允许你重新设置密码。"
+msgstr ""
+"忘记密码了吗？请在下面输入你的电子邮件地址，我们将向你发送一封电子邮件，允许"
+"你重新设置密码。"
 
 #: .\cookbook\templates\account\password_reset.html:32
 msgid "Password reset is disabled on this instance."
@@ -681,101 +784,86 @@ msgstr "注册关闭"
 msgid "We are sorry, but the sign up is currently closed."
 msgstr "我们很抱歉，但目前注册已经结束。"
 
-#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:179
+#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:222
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
 msgstr "API文档"
 
-#: .\cookbook\templates\base.html:85
-msgid "Utensils"
-msgstr "厨具"
-
-#: .\cookbook\templates\base.html:95
+#: .\cookbook\templates\base.html:86
 msgid "Shopping"
 msgstr "购物"
 
-#: .\cookbook\templates\base.html:101
+#: .\cookbook\templates\base.html:113
+msgid "Keyword"
+msgstr "关键词"
+
+#: .\cookbook\templates\base.html:137
+#: .\cookbook\templates\forms\ingredients.html:24
+#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
+#: .\cookbook\views\lists.py:146
+msgid "Units"
+msgstr ""
+
+#: .\cookbook\templates\base.html:151
 #: .\cookbook\templates\shopping_list.html:230
 #: .\cookbook\templates\supermarket.html:7
 msgid "Supermarket"
 msgstr "超市"
 
-#: .\cookbook\templates\base.html:112 .\cookbook\views\delete.py:84
-#: .\cookbook\views\edit.py:102 .\cookbook\views\lists.py:26
-#: .\cookbook\views\new.py:78
-msgid "Keyword"
-msgstr "关键词"
-
-#: .\cookbook\templates\base.html:114
+#: .\cookbook\templates\base.html:163
 msgid "Batch Edit"
 msgstr "批量编辑"
 
-#: .\cookbook\templates\base.html:119
-msgid "Storage Data"
-msgstr "存储数据"
-
-#: .\cookbook\templates\base.html:123
-msgid "Storage Backends"
-msgstr "存储后端"
-
-#: .\cookbook\templates\base.html:125
-msgid "Configure Sync"
-msgstr "配置同步"
-
-#: .\cookbook\templates\base.html:127
-msgid "Discovered Recipes"
-msgstr ""
-
-#: .\cookbook\templates\base.html:129
-msgid "Discovery Log"
-msgstr ""
-
-#: .\cookbook\templates\base.html:131 .\cookbook\templates\stats.html:10
-msgid "Statistics"
-msgstr ""
-
-#: .\cookbook\templates\base.html:133
-msgid "Units & Ingredients"
-msgstr ""
-
-#: .\cookbook\templates\base.html:135 .\cookbook\templates\index.html:47
-msgid "Import Recipe"
-msgstr ""
-
-#: .\cookbook\templates\base.html:156 .\cookbook\templates\history.html:6
+#: .\cookbook\templates\base.html:175 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
 msgstr ""
 
-#: .\cookbook\templates\base.html:159 .\cookbook\templates\space.html:7
+#: .\cookbook\templates\base.html:191 .\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
+msgid "Create"
+msgstr ""
+
+#: .\cookbook\templates\base.html:207 .\cookbook\templates\space.html:7
 #: .\cookbook\templates\space.html:19
 msgid "Space Settings"
 msgstr ""
 
-#: .\cookbook\templates\base.html:163 .\cookbook\templates\system.html:13
+#: .\cookbook\templates\base.html:212 .\cookbook\templates\system.html:13
 msgid "System"
 msgstr ""
 
-#: .\cookbook\templates\base.html:165 .\cookbook\templates\base.html:171
+#: .\cookbook\templates\base.html:214
 msgid "Admin"
 msgstr ""
 
-#: .\cookbook\templates\base.html:175
+#: .\cookbook\templates\base.html:218
 msgid "Markdown Guide"
 msgstr ""
 
-#: .\cookbook\templates\base.html:177
+#: .\cookbook\templates\base.html:220
 msgid "GitHub"
 msgstr ""
 
-#: .\cookbook\templates\base.html:181
+#: .\cookbook\templates\base.html:224
 msgid "API Browser"
 msgstr ""
 
-#: .\cookbook\templates\base.html:184
+#: .\cookbook\templates\base.html:227
 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 ""
@@ -788,7 +876,7 @@ msgstr ""
 msgid "Add the specified keywords to all recipes containing a word"
 msgstr ""
 
-#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:85
+#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:83
 msgid "Sync"
 msgstr ""
 
@@ -806,10 +894,26 @@ msgstr ""
 msgid "The path must be in the following format"
 msgstr ""
 
-#: .\cookbook\templates\batch\monitor.html:27
+#: .\cookbook\templates\batch\monitor.html:21
+msgid "Manage External Storage"
+msgstr ""
+
+#: .\cookbook\templates\batch\monitor.html:28
 msgid "Sync Now!"
 msgstr ""
 
+#: .\cookbook\templates\batch\monitor.html:29
+#, fuzzy
+#| msgid "Recipe"
+msgid "Show Recipes"
+msgstr "菜谱"
+
+#: .\cookbook\templates\batch\monitor.html:30
+#, fuzzy
+#| msgid "Social Login"
+msgid "Show Log"
+msgstr "社交登录"
+
 #: .\cookbook\templates\batch\waiting.html:4
 #: .\cookbook\templates\batch\waiting.html:10
 msgid "Importing Recipes"
@@ -821,32 +925,10 @@ msgid ""
 "please wait."
 msgstr ""
 
-#: .\cookbook\templates\books.html:5 .\cookbook\templates\books.html:11
+#: .\cookbook\templates\books.html:7
 msgid "Recipe Books"
 msgstr ""
 
-#: .\cookbook\templates\books.html:15
-msgid "New Book"
-msgstr ""
-
-#: .\cookbook\templates\books.html:27 .\cookbook\templates\recipe_view.html:26
-msgid "by"
-msgstr ""
-
-#: .\cookbook\templates\books.html:34
-msgid "Toggle Recipes"
-msgstr ""
-
-#: .\cookbook\templates\books.html:54
-#: .\cookbook\templates\meal_plan_entry.html:48
-#: .\cookbook\templates\recipes_table.html:64
-msgid "Last cooked"
-msgstr ""
-
-#: .\cookbook\templates\books.html:71
-msgid "There are no recipes in this book yet."
-msgstr ""
-
 #: .\cookbook\templates\export.html:6 .\cookbook\templates\test2.html:6
 msgid "Export Recipes"
 msgstr ""
@@ -867,213 +949,21 @@ msgid "Import new Recipe"
 msgstr ""
 
 #: .\cookbook\templates\forms\edit_import_recipe.html:14
-#: .\cookbook\templates\forms\edit_internal_recipe.html:439
-#: .\cookbook\templates\forms\edit_internal_recipe.html:471
 #: .\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:46 .\cookbook\templates\settings.html:87
-#: .\cookbook\templates\settings.html:105
+#: .\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
 msgid "Save"
 msgstr ""
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:7
-#: .\cookbook\templates\forms\edit_internal_recipe.html:34
 msgid "Edit Recipe"
 msgstr ""
 
-#: .\cookbook\templates\forms\edit_internal_recipe.html:56
-#: .\cookbook\templates\url_import.html:171
-msgid "Description"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:76
-msgid "Waiting Time"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:82
-msgid "Servings Text"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:93
-msgid "Select Keywords"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:94
-#: .\cookbook\templates\url_import.html:583
-msgid "Add Keyword"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:112
-msgid "Nutrition"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:116
-#: .\cookbook\templates\forms\edit_internal_recipe.html:166
-msgid "Delete Step"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:120
-msgid "Calories"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:123
-msgid "Carbohydrates"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:126
-msgid "Fats"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:128
-msgid "Proteins"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:150
-#: .\cookbook\templates\forms\edit_internal_recipe.html:504
-msgid "Step"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:171
-msgid "Show as header"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:177
-msgid "Hide as header"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:182
-msgid "Move Up"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:187
-msgid "Move Down"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:196
-msgid "Step Name"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:200
-msgid "Step Type"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:213
-msgid "Step time in Minutes"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:229
-msgid "Select File"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:230
-#: .\cookbook\templates\forms\edit_internal_recipe.html:252
-#: .\cookbook\templates\forms\edit_internal_recipe.html:313
-#: .\cookbook\templates\forms\edit_internal_recipe.html:337
-#: .\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
-msgid "Select"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:251
-#, fuzzy
-#| msgid "Select one"
-msgid "Select Recipe"
-msgstr "选择一项"
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:311
-#: .\cookbook\templates\shopping_list.html:187
-msgid "Select Unit"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:312
-#: .\cookbook\templates\forms\edit_internal_recipe.html:336
-#: .\cookbook\templates\shopping_list.html:188
-#: .\cookbook\templates\shopping_list.html:210
-msgid "Create"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:335
-#: .\cookbook\templates\shopping_list.html:209
-msgid "Select Food"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:352
-#: .\cookbook\templates\meal_plan.html:256
-#: .\cookbook\templates\url_import.html:542
-msgid "Note"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:369
-msgid "Delete Ingredient"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:375
-msgid "Make Header"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:381
-msgid "Make Ingredient"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:387
-msgid "Disable Amount"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:393
-msgid "Enable Amount"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:398
-msgid "Copy Template Reference"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:424
-#: .\cookbook\templates\url_import.html:297
-#: .\cookbook\templates\url_import.html:567
-msgid "Instructions"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:437
-#: .\cookbook\templates\forms\edit_internal_recipe.html:468
-msgid "Save & View"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:441
-#: .\cookbook\templates\forms\edit_internal_recipe.html:474
-msgid "Add Step"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:444
-#: .\cookbook\templates\forms\edit_internal_recipe.html:478
-msgid "Add Nutrition"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:446
-#: .\cookbook\templates\forms\edit_internal_recipe.html:480
-msgid "Remove Nutrition"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:448
-#: .\cookbook\templates\forms\edit_internal_recipe.html:483
-msgid "View Recipe"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:450
-#: .\cookbook\templates\forms\edit_internal_recipe.html:485
-msgid "Delete Recipe"
-msgstr ""
-
-#: .\cookbook\templates\forms\edit_internal_recipe.html:491
-msgid "Steps"
-msgstr ""
-
 #: .\cookbook\templates\forms\ingredients.html:15
 msgid "Edit Ingredients"
 msgstr ""
@@ -1089,11 +979,6 @@ msgid ""
 "    "
 msgstr ""
 
-#: .\cookbook\templates\forms\ingredients.html:24
-#: .\cookbook\templates\space.html:41 .\cookbook\templates\stats.html:26
-msgid "Units"
-msgstr ""
-
 #: .\cookbook\templates\forms\ingredients.html:26
 msgid "Are you sure that you want to merge these two units?"
 msgstr ""
@@ -1107,29 +992,33 @@ msgstr ""
 msgid "Are you sure that you want to merge these two ingredients?"
 msgstr ""
 
-#: .\cookbook\templates\generic\delete_template.html:18
+#: .\cookbook\templates\generic\delete_template.html:19
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
 msgstr ""
 
-#: .\cookbook\templates\generic\edit_template.html:30
+#: .\cookbook\templates\generic\delete_template.html:23
+msgid "Cancel"
+msgstr ""
+
+#: .\cookbook\templates\generic\edit_template.html:32
 msgid "View"
 msgstr ""
 
-#: .\cookbook\templates\generic\edit_template.html:34
+#: .\cookbook\templates\generic\edit_template.html:36
 msgid "Delete original file"
 msgstr ""
 
 #: .\cookbook\templates\generic\list_template.html:6
-#: .\cookbook\templates\generic\list_template.html:12
+#: .\cookbook\templates\generic\list_template.html:21
 msgid "List"
 msgstr ""
 
-#: .\cookbook\templates\generic\list_template.html:25
+#: .\cookbook\templates\generic\list_template.html:34
 msgid "Filter"
 msgstr ""
 
-#: .\cookbook\templates\generic\list_template.html:30
+#: .\cookbook\templates\generic\list_template.html:39
 msgid "Import all"
 msgstr ""
 
@@ -1438,6 +1327,11 @@ msgstr ""
 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"
@@ -1501,6 +1395,11 @@ msgstr ""
 msgid "Meal Plan View"
 msgstr ""
 
+#: .\cookbook\templates\meal_plan_entry.html:48
+#: .\cookbook\templates\recipes_table.html:64
+msgid "Last cooked"
+msgstr ""
+
 #: .\cookbook\templates\meal_plan_entry.html:50
 msgid "Never cooked before."
 msgstr ""
@@ -1597,8 +1496,12 @@ msgstr ""
 msgid "Comments"
 msgstr ""
 
+#: .\cookbook\templates\recipe_view.html:26
+msgid "by"
+msgstr ""
+
 #: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:118
-#: .\cookbook\views\edit.py:179
+#: .\cookbook\views\edit.py:177
 msgid "Comment"
 msgstr ""
 
@@ -1630,60 +1533,231 @@ msgstr ""
 msgid "Recipe Home"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:25
+#: .\cookbook\templates\search_info.html:5
+#: .\cookbook\templates\search_info.html:9
+#: .\cookbook\templates\settings.html:157
+#, fuzzy
+#| msgid "Search String"
+msgid "Search Settings"
+msgstr "搜索字符串"
+
+#: .\cookbook\templates\search_info.html:10
+msgid ""
+"\n"
+"        Creating the best search experience is complicated and weighs "
+"heavily on your personal configuration.  \n"
+"        Changing any of the search settings can have significant impact on "
+"the speed and quality of the results.\n"
+"        Search Methods, Trigrams and Full Text Search configurations are "
+"only available if you are using Postgres for your database.\n"
+"    "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:19
+#, fuzzy
+#| msgid "Search"
+msgid "Search Methods"
+msgstr "搜索"
+
+#: .\cookbook\templates\search_info.html:23
+msgid ""
+" \n"
+"            Full text searches attempt to normalize the words provided to "
+"match common variants.  For example: 'forked', 'forking', 'forks' will all "
+"normalize to 'fork'.\n"
+"            There are several methods available, described below, that will "
+"control how the search behavior should react when multiple words are "
+"searched.\n"
+"            Full technical details on how these operate can be viewed on <a "
+"href=https://www.postgresql.org/docs/current/textsearch-controls."
+"html#TEXTSEARCH-PARSING-QUERIES>Postgresql's website.</a>\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:29
+msgid ""
+" \n"
+"            Simple searches ignore punctuation and common words such as "
+"'the', 'a', 'and'. And will treat seperate words as required.\n"
+"            Searching for 'apple or flour' will return any recipe that "
+"includes both 'apple' and 'flour' anywhere in the fields that have been "
+"selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:34
+msgid ""
+" \n"
+"            Phrase searches ignore punctuation, but will search for all of "
+"the words in the exact order provided.\n"
+"            Searching for 'apple or flour' will only return a recipe that "
+"includes the exact phrase 'apple or flour' in any of the fields that have "
+"been selected for a full text search.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:39
+msgid ""
+" \n"
+"            Web searches simulate functionality found on many web search "
+"sites supporting special syntax.\n"
+"            Placing quotes around several words will convert those words "
+"into a phrase.\n"
+"            'or' is recongized as searching for the word (or phrase) "
+"immediately before 'or' OR the word (or phrase) directly after.\n"
+"            '-' is recognized as searching for recipes that do not include "
+"the word (or phrase) that comes immediately after. \n"
+"            For example searching for 'apple pie' or cherry -butter will "
+"return any recipe that includes the phrase 'apple pie' or the word "
+"'cherry' \n"
+"            in any field included in the full text search but exclude any "
+"recipe that has the word 'butter' in any field included.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:48
+msgid ""
+" \n"
+"            Raw search is similar to Web except will take puncuation "
+"operators such as '|', '&' and '()'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:59
+msgid ""
+" \n"
+"            Another approach to searching that also requires Postgresql is "
+"fuzzy search or trigram similarity. A trigram is a group of three "
+"consecutive characters.\n"
+"            For example searching for 'apple' will create x trigrams 'app', "
+"'ppl', 'ple' and will create a score of how closely words match the "
+"generated trigrams.\n"
+"            One benefit of searching trigams is that a search for 'sandwich' "
+"will find mispelled words such as 'sandwhich' that would be missed by other "
+"methods.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:69
+#, fuzzy
+#| msgid "Search"
+msgid "Search Fields"
+msgstr "搜索"
+
+#: .\cookbook\templates\search_info.html:73
+msgid ""
+" \n"
+"            Unaccent is a special case in that it enables searching a field "
+"'unaccented' for each search style attempting to ignore accented values. \n"
+"            For example when you enable unaccent for 'Name' any search "
+"(starts with, contains, trigram) will attempt the search ignoring accented "
+"characters.\n"
+"            \n"
+"            For the other options, you can enable search on any or all "
+"fields and they will be combined together with an assumed 'OR'.\n"
+"            For example enabling 'Name' for Starts With, 'Name' and "
+"'Description' for Partial Match and 'Ingredients' and 'Keywords' for Full "
+"Search\n"
+"            and searching for 'apple' will generate a search that will "
+"return recipes that have:\n"
+"            - A recipe name that starts with 'apple'\n"
+"            - OR a recipe name that contains 'apple'\n"
+"            - OR a recipe description that contains 'apple'\n"
+"            - OR a recipe that will have a full text search match ('apple' "
+"or 'apples') in ingredients\n"
+"            - OR a recipe that will have a full text search match in "
+"Keywords\n"
+"\n"
+"            Combining too many fields in too many types of search can have a "
+"negative impact on performance, create duplicate results or return "
+"unexpected results.\n"
+"            For example, enabling fuzzy search or partial matches will "
+"interfere with web search methods.  \n"
+"            Searching for 'apple -pie' with fuzzy search and full text "
+"search will return the recipe Apple Pie.  Though it is not included in the "
+"full text results, it does match the trigram results.\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\search_info.html:95
+#, fuzzy
+#| msgid "Search"
+msgid "Search Index"
+msgstr "搜索"
+
+#: .\cookbook\templates\search_info.html:99
+msgid ""
+" \n"
+"            Trigram search and Full Text Search both rely on database "
+"indexes to perform effectively.  \n"
+"            You can rebuild the indexes on all fields in the Admin page for "
+"Recipes and selecting all recipes and running 'rebuild index for selected "
+"recipes'\n"
+"            You can also rebuild indexes at the command line by executing "
+"the management command 'python manage.py rebuildindex'\n"
+"            "
+msgstr ""
+
+#: .\cookbook\templates\settings.html:27
 msgid "Account"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:29
+#: .\cookbook\templates\settings.html:33
 msgid "Preferences"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:33
+#: .\cookbook\templates\settings.html:39
 msgid "API-Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:41
+#: .\cookbook\templates\settings.html:45
+#, fuzzy
+#| msgid "Search String"
+msgid "Search-Settings"
+msgstr "搜索字符串"
+
+#: .\cookbook\templates\settings.html:53
 msgid "Name Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:49
+#: .\cookbook\templates\settings.html:61
 msgid "Account Settings"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:51
+#: .\cookbook\templates\settings.html:63
 msgid "Emails"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:54
+#: .\cookbook\templates\settings.html:66
 #: .\cookbook\templates\socialaccount\connections.html:11
 msgid "Social"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:66
+#: .\cookbook\templates\settings.html:78
 msgid "Language"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:96
+#: .\cookbook\templates\settings.html:108
 msgid "Style"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:116
+#: .\cookbook\templates\settings.html:128
 msgid "API Token"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:117
+#: .\cookbook\templates\settings.html:129
 msgid ""
 "You can use both basic authentication and token based authentication to "
 "access the REST API."
 msgstr ""
 
-#: .\cookbook\templates\settings.html:134
+#: .\cookbook\templates\settings.html:146
 msgid ""
 "Use the token as an Authorization header prefixed by the word token as shown "
 "in the following examples:"
 msgstr ""
 
-#: .\cookbook\templates\settings.html:136
+#: .\cookbook\templates\settings.html:148
 msgid "or"
 msgstr ""
 
@@ -1724,6 +1798,23 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#: .\cookbook\templates\shopping_list.html:187
+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
+msgid "Select"
+msgstr ""
+
+#: .\cookbook\templates\shopping_list.html:209
+msgid "Select Food"
+msgstr ""
+
 #: .\cookbook\templates\shopping_list.html:240
 msgid "Select Supermarket"
 msgstr ""
@@ -1821,10 +1912,6 @@ msgstr ""
 msgid "Recipes without Keywords"
 msgstr ""
 
-#: .\cookbook\templates\space.html:58 .\cookbook\templates\stats.html:43
-msgid "External Recipes"
-msgstr ""
-
 #: .\cookbook\templates\space.html:60 .\cookbook\templates\stats.html:45
 msgid "Internal Recipes"
 msgstr ""
@@ -1874,7 +1961,7 @@ msgid "There are no members in your space yet!"
 msgstr ""
 
 #: .\cookbook\templates\space.html:130 .\cookbook\templates\system.html:21
-#: .\cookbook\views\lists.py:115
+#: .\cookbook\views\lists.py:100
 msgid "Invite Links"
 msgstr ""
 
@@ -1882,6 +1969,10 @@ msgstr ""
 msgid "Stats"
 msgstr ""
 
+#: .\cookbook\templates\stats.html:10
+msgid "Statistics"
+msgstr ""
+
 #: .\cookbook\templates\system.html:22
 msgid "Show Links"
 msgstr ""
@@ -2028,6 +2119,10 @@ msgstr "清除内容"
 msgid "Text dragged here will be appended to the name."
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:171
+msgid "Description"
+msgstr ""
+
 #: .\cookbook\templates\url_import.html:175
 msgid "Text dragged here will be appended to the description."
 msgstr ""
@@ -2052,6 +2147,11 @@ msgstr "烹调时间"
 msgid "Ingredients dragged here will be appended to current list."
 msgstr ""
 
+#: .\cookbook\templates\url_import.html:297
+#: .\cookbook\templates\url_import.html:567
+msgid "Instructions"
+msgstr ""
+
 #: .\cookbook\templates\url_import.html:302
 msgid ""
 "Recipe instructions dragged here will be appended to current instructions."
@@ -2101,6 +2201,10 @@ msgstr "菜谱描述"
 msgid "Select one"
 msgstr "选择一项"
 
+#: .\cookbook\templates\url_import.html:583
+msgid "Add Keyword"
+msgstr ""
+
 #: .\cookbook\templates\url_import.html:596
 msgid "All Keywords"
 msgstr "所有关键字"
@@ -2136,45 +2240,102 @@ msgstr "GitHub问题"
 msgid "Recipe Markup Specification"
 msgstr ""
 
-#: .\cookbook\views\api.py:79
+#: .\cookbook\views\api.py:82 .\cookbook\views\api.py:131
 msgid "Parameter updated_at incorrectly formatted"
 msgstr ""
 
-#: .\cookbook\views\api.py:580 .\cookbook\views\views.py:303
+#: .\cookbook\views\api.py:151
+#, python-brace-format
+msgid "No {self.basename} with id {pk} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:155 .\cookbook\views\edit.py:300
+#: .\cookbook\views\edit.py:316
+msgid "Cannot merge with the same object!"
+msgstr ""
+
+#: .\cookbook\views\api.py:162
+#, python-brace-format
+msgid "No {self.basename} with id {target} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:167
+msgid "Cannot merge with child object!"
+msgstr ""
+
+#: .\cookbook\views\api.py:195
+#, python-brace-format
+msgid "{source.name} was merged successfully with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:199
+#, python-brace-format
+msgid "An error occurred attempting to merge {source.name} with {target.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:239
+#, python-brace-format
+msgid "No {self.basename} with id {child} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:248
+#, python-brace-format
+msgid "{child.name} was moved successfully to the root."
+msgstr ""
+
+#: .\cookbook\views\api.py:251 .\cookbook\views\api.py:269
+msgid "An error occurred attempting to move "
+msgstr ""
+
+#: .\cookbook\views\api.py:254
+msgid "Cannot move an object to itself!"
+msgstr ""
+
+#: .\cookbook\views\api.py:260
+#, python-brace-format
+msgid "No {self.basename} with id {parent} exists"
+msgstr ""
+
+#: .\cookbook\views\api.py:266
+#, python-brace-format
+msgid "{child.name} was moved successfully to parent {parent.name}"
+msgstr ""
+
+#: .\cookbook\views\api.py:704 .\cookbook\views\views.py:289
 msgid "This feature is not available in the demo version!"
 msgstr ""
 
-#: .\cookbook\views\api.py:603
+#: .\cookbook\views\api.py:727
 msgid "Sync successful!"
 msgstr ""
 
-#: .\cookbook\views\api.py:608
+#: .\cookbook\views\api.py:732
 msgid "Error synchronizing with Storage"
 msgstr ""
 
-#: .\cookbook\views\api.py:686
+#: .\cookbook\views\api.py:810
 msgid "Nothing to do."
 msgstr ""
 
-#: .\cookbook\views\api.py:701
+#: .\cookbook\views\api.py:825
 msgid "The requested site provided malformed data and cannot be read."
 msgstr ""
 
-#: .\cookbook\views\api.py:708
+#: .\cookbook\views\api.py:832
 msgid "The requested page could not be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:717
+#: .\cookbook\views\api.py:841
 msgid ""
 "The requested site does not provide any recognized data format to import the "
 "recipe from."
 msgstr ""
 
-#: .\cookbook\views\api.py:731
+#: .\cookbook\views\api.py:855
 msgid "No useable data could be found."
 msgstr ""
 
-#: .\cookbook\views\api.py:747
+#: .\cookbook\views\api.py:871
 msgid "I couldn't find anything to do."
 msgstr ""
 
@@ -2201,8 +2362,8 @@ msgstr[1] ""
 msgid "Monitor"
 msgstr "监测"
 
-#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:102
-#: .\cookbook\views\new.py:98
+#: .\cookbook\views\delete.py:96 .\cookbook\views\lists.py:86
+#: .\cookbook\views\new.py:97
 msgid "Storage Backend"
 msgstr "存储后端"
 
@@ -2211,8 +2372,8 @@ 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:213
-#: .\cookbook\views\new.py:156
+#: .\cookbook\views\delete.py:129 .\cookbook\views\edit.py:211
+#: .\cookbook\views\new.py:155
 msgid "Recipe Book"
 msgstr ""
 
@@ -2220,47 +2381,39 @@ msgstr ""
 msgid "Bookmarks"
 msgstr "书签"
 
-#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:252
+#: .\cookbook\views\delete.py:163 .\cookbook\views\new.py:251
 msgid "Invite Link"
 msgstr ""
 
-#: .\cookbook\views\edit.py:119
-msgid "Food"
-msgstr "食物"
-
-#: .\cookbook\views\edit.py:128
+#: .\cookbook\views\edit.py:126
 msgid "You cannot edit this storage!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:148
+#: .\cookbook\views\edit.py:146
 msgid "Storage saved!"
 msgstr "存储已存储！"
 
-#: .\cookbook\views\edit.py:154
+#: .\cookbook\views\edit.py:152
 msgid "There was an error updating this storage backend!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:165
+#: .\cookbook\views\edit.py:163
 msgid "Storage"
 msgstr ""
 
-#: .\cookbook\views\edit.py:261
+#: .\cookbook\views\edit.py:259
 msgid "Changes saved!"
 msgstr "更改已保存!"
 
-#: .\cookbook\views\edit.py:265
+#: .\cookbook\views\edit.py:263
 msgid "Error saving changes!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:299
+#: .\cookbook\views\edit.py:298
 msgid "Units merged!"
 msgstr ""
 
-#: .\cookbook\views\edit.py:301 .\cookbook\views\edit.py:317
-msgid "Cannot merge with the same object!"
-msgstr ""
-
-#: .\cookbook\views\edit.py:315
+#: .\cookbook\views\edit.py:314
 msgid "Foods merged!"
 msgstr ""
 
@@ -2272,127 +2425,176 @@ msgstr ""
 msgid "Exporting is not implemented for this provider"
 msgstr ""
 
-#: .\cookbook\views\lists.py:40
+#: .\cookbook\views\lists.py:26
 msgid "Import Log"
 msgstr ""
 
-#: .\cookbook\views\lists.py:53
+#: .\cookbook\views\lists.py:39
 msgid "Discovery"
 msgstr "探索"
 
-#: .\cookbook\views\lists.py:85
+#: .\cookbook\views\lists.py:69
 msgid "Shopping Lists"
 msgstr "购物清单"
 
-#: .\cookbook\views\new.py:123
+#: .\cookbook\views\lists.py:129
+#, fuzzy
+#| msgid "Food"
+msgid "Foods"
+msgstr "食物"
+
+#: .\cookbook\views\lists.py:163
+#, fuzzy
+#| msgid "Supermarket"
+msgid "Supermarkets"
+msgstr "超市"
+
+#: .\cookbook\views\lists.py:179
+#, fuzzy
+#| msgid "Shopping Lists"
+msgid "Shopping Categories"
+msgstr "购物清单"
+
+#: .\cookbook\views\new.py:122
 msgid "Imported new recipe!"
 msgstr ""
 
-#: .\cookbook\views\new.py:126
+#: .\cookbook\views\new.py:125
 msgid "There was an error importing this recipe!"
 msgstr ""
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "Hello"
 msgstr "你好"
 
-#: .\cookbook\views\new.py:226
+#: .\cookbook\views\new.py:225
 msgid "You have been invited by "
 msgstr ""
 
-#: .\cookbook\views\new.py:227
+#: .\cookbook\views\new.py:226
 msgid " to join their Tandoor Recipes space "
 msgstr ""
 
-#: .\cookbook\views\new.py:228
+#: .\cookbook\views\new.py:227
 msgid "Click the following link to activate your account: "
 msgstr ""
 
-#: .\cookbook\views\new.py:229
+#: .\cookbook\views\new.py:228
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
 
-#: .\cookbook\views\new.py:230
+#: .\cookbook\views\new.py:229
 msgid "The invitation is valid until "
 msgstr "邀请有效期至 "
 
-#: .\cookbook\views\new.py:231
+#: .\cookbook\views\new.py:230
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
 
-#: .\cookbook\views\new.py:234
+#: .\cookbook\views\new.py:233
 msgid "Tandoor Recipes Invite"
 msgstr ""
 
-#: .\cookbook\views\new.py:241
+#: .\cookbook\views\new.py:240
 msgid "Invite link successfully send to user."
 msgstr ""
 
-#: .\cookbook\views\new.py:244
+#: .\cookbook\views\new.py:243
 msgid ""
 "You have send to many emails, please share the link manually or wait a few "
 "hours."
 msgstr ""
 
-#: .\cookbook\views\new.py:246
+#: .\cookbook\views\new.py:245
 msgid "Email to user could not be send, please share link manually."
 msgstr ""
 
-#: .\cookbook\views\views.py:129
+#: .\cookbook\views\views.py:128
 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:177
+#: .\cookbook\views\views.py:176
 msgid "You do not have the required permissions to perform this action!"
 msgstr ""
 
-#: .\cookbook\views\views.py:188
+#: .\cookbook\views\views.py:187
 msgid "Comment saved!"
 msgstr "评论已保存!"
 
-#: .\cookbook\views\views.py:395
+#: .\cookbook\views\views.py:351
+msgid "You must select at least one field to search!"
+msgstr ""
+
+#: .\cookbook\views\views.py:354
+msgid ""
+"To use this search method you must select at least one full text search "
+"field!"
+msgstr ""
+
+#: .\cookbook\views\views.py:357
+msgid "Fuzzy search is not compatible with this search method!"
+msgstr ""
+
+#: .\cookbook\views\views.py:437
 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:402
+#: .\cookbook\views\views.py:444
 msgid "Passwords dont match!"
 msgstr "密码不匹配!"
 
-#: .\cookbook\views\views.py:418
+#: .\cookbook\views\views.py:460
 msgid "User has been created, please login!"
 msgstr "用户已创建，請登录！"
 
-#: .\cookbook\views\views.py:434
+#: .\cookbook\views\views.py:476
 msgid "Malformed Invite Link supplied!"
 msgstr ""
 
-#: .\cookbook\views\views.py:441
+#: .\cookbook\views\views.py:483
 msgid "You are already member of a space and therefore cannot join this one."
 msgstr "你已是空间的成员，因此未能加入。"
 
-#: .\cookbook\views\views.py:452
+#: .\cookbook\views\views.py:494
 msgid "Successfully joined space."
 msgstr "成功加入空间。"
 
-#: .\cookbook\views\views.py:458
+#: .\cookbook\views\views.py:500
 msgid "Invite Link not valid or already used!"
 msgstr "邀请连结无效或已使用!"
 
-#: .\cookbook\views\views.py:522
+#: .\cookbook\views\views.py:564
 msgid ""
 "Reporting share links is not enabled for this instance. Please notify the "
 "page administrator to report problems."
 msgstr ""
 
-#: .\cookbook\views\views.py:528
+#: .\cookbook\views\views.py:570
 msgid ""
 "Recipe sharing link has been disabled! For additional information please "
 "contact the page administrator."
 msgstr ""
+
+#~ msgid "Utensils"
+#~ msgstr "厨具"
+
+#~ msgid "Storage Data"
+#~ msgstr "存储数据"
+
+#~ msgid "Storage Backends"
+#~ msgstr "存储后端"
+
+#~ msgid "Configure Sync"
+#~ msgstr "配置同步"
+
+#, fuzzy
+#~| msgid "Select one"
+#~ msgid "Select Recipe"
+#~ msgstr "选择一项"
diff --git a/recipes/locale/ca/LC_MESSAGES/django.po b/recipes/locale/ca/LC_MESSAGES/django.po
index 52a13feb..bdb3e9f0 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+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,42 +18,42 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\recipes\settings.py:317
+#: .\recipes\settings.py:324
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:318
+#: .\recipes\settings.py:325
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:319
+#: .\recipes\settings.py:326
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:320
+#: .\recipes\settings.py:327
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:321
+#: .\recipes\settings.py:328
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:322
+#: .\recipes\settings.py:329
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:323
+#: .\recipes\settings.py:330
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:331
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:332
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:333
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/de/LC_MESSAGES/django.po b/recipes/locale/de/LC_MESSAGES/django.po
index f3fc347c..1a74c3e1 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+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,42 +18,42 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\recipes\settings.py:317
+#: .\recipes\settings.py:324
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:318
+#: .\recipes\settings.py:325
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:319
+#: .\recipes\settings.py:326
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:320
+#: .\recipes\settings.py:327
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:321
+#: .\recipes\settings.py:328
 msgid "English"
 msgstr "Englisch"
 
-#: .\recipes\settings.py:322
+#: .\recipes\settings.py:329
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:323
+#: .\recipes\settings.py:330
 msgid "German"
 msgstr "Deutsch"
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:331
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:332
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:333
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/en/LC_MESSAGES/django.po b/recipes/locale/en/LC_MESSAGES/django.po
index 52a13feb..bdb3e9f0 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+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,42 +18,42 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\recipes\settings.py:317
+#: .\recipes\settings.py:324
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:318
+#: .\recipes\settings.py:325
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:319
+#: .\recipes\settings.py:326
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:320
+#: .\recipes\settings.py:327
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:321
+#: .\recipes\settings.py:328
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:322
+#: .\recipes\settings.py:329
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:323
+#: .\recipes\settings.py:330
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:331
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:332
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:333
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/es/LC_MESSAGES/django.po b/recipes/locale/es/LC_MESSAGES/django.po
index 52a13feb..bdb3e9f0 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+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,42 +18,42 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\recipes\settings.py:317
+#: .\recipes\settings.py:324
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:318
+#: .\recipes\settings.py:325
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:319
+#: .\recipes\settings.py:326
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:320
+#: .\recipes\settings.py:327
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:321
+#: .\recipes\settings.py:328
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:322
+#: .\recipes\settings.py:329
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:323
+#: .\recipes\settings.py:330
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:331
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:332
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:333
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/fr/LC_MESSAGES/django.po b/recipes/locale/fr/LC_MESSAGES/django.po
index 4ca2a775..9c61c04a 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+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,42 +18,42 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: .\recipes\settings.py:317
+#: .\recipes\settings.py:324
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:318
+#: .\recipes\settings.py:325
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:319
+#: .\recipes\settings.py:326
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:320
+#: .\recipes\settings.py:327
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:321
+#: .\recipes\settings.py:328
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:322
+#: .\recipes\settings.py:329
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:323
+#: .\recipes\settings.py:330
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:331
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:332
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:333
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/hu_HU/LC_MESSAGES/django.po b/recipes/locale/hu_HU/LC_MESSAGES/django.po
index e37e3955..167fb8ea 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+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"
@@ -17,42 +17,42 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: .\recipes\settings.py:317
+#: .\recipes\settings.py:324
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:318
+#: .\recipes\settings.py:325
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:319
+#: .\recipes\settings.py:326
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:320
+#: .\recipes\settings.py:327
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:321
+#: .\recipes\settings.py:328
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:322
+#: .\recipes\settings.py:329
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:323
+#: .\recipes\settings.py:330
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:331
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:332
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:333
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/it/LC_MESSAGES/django.po b/recipes/locale/it/LC_MESSAGES/django.po
index 52a13feb..bdb3e9f0 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+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,42 +18,42 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\recipes\settings.py:317
+#: .\recipes\settings.py:324
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:318
+#: .\recipes\settings.py:325
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:319
+#: .\recipes\settings.py:326
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:320
+#: .\recipes\settings.py:327
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:321
+#: .\recipes\settings.py:328
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:322
+#: .\recipes\settings.py:329
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:323
+#: .\recipes\settings.py:330
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:331
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:332
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:333
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/lv/LC_MESSAGES/django.po b/recipes/locale/lv/LC_MESSAGES/django.po
index 73030634..4bd91882 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+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"
@@ -19,42 +19,42 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: .\recipes\settings.py:317
+#: .\recipes\settings.py:324
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:318
+#: .\recipes\settings.py:325
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:319
+#: .\recipes\settings.py:326
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:320
+#: .\recipes\settings.py:327
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:321
+#: .\recipes\settings.py:328
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:322
+#: .\recipes\settings.py:329
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:323
+#: .\recipes\settings.py:330
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:331
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:332
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:333
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/nl/LC_MESSAGES/django.po b/recipes/locale/nl/LC_MESSAGES/django.po
index 52a13feb..bdb3e9f0 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+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,42 +18,42 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\recipes\settings.py:317
+#: .\recipes\settings.py:324
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:318
+#: .\recipes\settings.py:325
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:319
+#: .\recipes\settings.py:326
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:320
+#: .\recipes\settings.py:327
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:321
+#: .\recipes\settings.py:328
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:322
+#: .\recipes\settings.py:329
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:323
+#: .\recipes\settings.py:330
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:331
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:332
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:333
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/pt/LC_MESSAGES/django.po b/recipes/locale/pt/LC_MESSAGES/django.po
index 52a13feb..bdb3e9f0 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+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,42 +18,42 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\recipes\settings.py:317
+#: .\recipes\settings.py:324
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:318
+#: .\recipes\settings.py:325
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:319
+#: .\recipes\settings.py:326
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:320
+#: .\recipes\settings.py:327
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:321
+#: .\recipes\settings.py:328
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:322
+#: .\recipes\settings.py:329
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:323
+#: .\recipes\settings.py:330
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:331
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:332
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:333
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/rn/LC_MESSAGES/django.po b/recipes/locale/rn/LC_MESSAGES/django.po
index e37e3955..167fb8ea 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+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"
@@ -17,42 +17,42 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: .\recipes\settings.py:317
+#: .\recipes\settings.py:324
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:318
+#: .\recipes\settings.py:325
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:319
+#: .\recipes\settings.py:326
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:320
+#: .\recipes\settings.py:327
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:321
+#: .\recipes\settings.py:328
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:322
+#: .\recipes\settings.py:329
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:323
+#: .\recipes\settings.py:330
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:331
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:332
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:333
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/tr/LC_MESSAGES/django.po b/recipes/locale/tr/LC_MESSAGES/django.po
index 4ca2a775..9c61c04a 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+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,42 +18,42 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: .\recipes\settings.py:317
+#: .\recipes\settings.py:324
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:318
+#: .\recipes\settings.py:325
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:319
+#: .\recipes\settings.py:326
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:320
+#: .\recipes\settings.py:327
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:321
+#: .\recipes\settings.py:328
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:322
+#: .\recipes\settings.py:329
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:323
+#: .\recipes\settings.py:330
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:331
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:332
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:333
 msgid "Spanish"
 msgstr ""
diff --git a/recipes/locale/zh_CN/LC_MESSAGES/django.po b/recipes/locale/zh_CN/LC_MESSAGES/django.po
index e37e3955..167fb8ea 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-08-17 08:44+0200\n"
+"POT-Creation-Date: 2021-09-13 22:40+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"
@@ -17,42 +17,42 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: .\recipes\settings.py:317
+#: .\recipes\settings.py:324
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:318
+#: .\recipes\settings.py:325
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:319
+#: .\recipes\settings.py:326
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:320
+#: .\recipes\settings.py:327
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:321
+#: .\recipes\settings.py:328
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:322
+#: .\recipes\settings.py:329
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:323
+#: .\recipes\settings.py:330
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:324
+#: .\recipes\settings.py:331
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:325
+#: .\recipes\settings.py:332
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:326
+#: .\recipes\settings.py:333
 msgid "Spanish"
 msgstr ""