updated translations

cookbook/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: 2020-01-13 12:08+0100\n"
+"POT-Creation-Date: 2020-02-17 23:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,152 +18,209 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cookbook/forms.py:24 cookbook/forms.py:40 cookbook/forms.py:122
+#: .\cookbook\forms.py:35
+msgid ""
+"Color of the top navigation bar. Not all colors work with all themes, just "
+"try them out!"
+msgstr ""
+
+#: .\cookbook\forms.py:49 .\cookbook\forms.py:67 .\cookbook\forms.py:167
 msgid "Name"
 msgstr "Name"
 
-#: cookbook/forms.py:25 cookbook/forms.py:41 cookbook/forms.py:123
+#: .\cookbook\forms.py:50 .\cookbook\forms.py:68 .\cookbook\forms.py:168
-#: cookbook/templates/stats.html:22
+#: .\cookbook\templates\stats.html:22
 msgid "Keywords"
 msgstr "Schlagwörter"
 
-#: cookbook/forms.py:26 cookbook/forms.py:43
+#: .\cookbook\forms.py:51 .\cookbook\forms.py:70
 msgid "Preparation time in minutes"
 msgstr "Zubereitungszeit in Minuten"
 
-#: cookbook/forms.py:27 cookbook/forms.py:44
+#: .\cookbook\forms.py:52 .\cookbook\forms.py:71
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "Wartezeit (kochen/backen) in Minuten"
 
-#: cookbook/forms.py:28 cookbook/forms.py:124
+#: .\cookbook\forms.py:53 .\cookbook\forms.py:169
 msgid "Path"
 msgstr "Pfad"
 
-#: cookbook/forms.py:29
+#: .\cookbook\forms.py:54
 msgid "Storage UID"
 msgstr "Speicher ID"
 
-#: cookbook/forms.py:42
+#: .\cookbook\forms.py:69
 msgid "Instructions"
 msgstr "Anleitung"
 
-#: cookbook/forms.py:57
+#: .\cookbook\forms.py:89
+msgid "New Unit"
+msgstr "Neue Einheit"
+
+#: .\cookbook\forms.py:90
+msgid "New unit that other gets replaced by."
+msgstr "Neue Einheit die die alte ersetzt."
+
+#: .\cookbook\forms.py:95
+msgid "Old Unit"
+msgstr "Alte Einheit"
+
+#: .\cookbook\forms.py:96
+msgid "Unit that should be replaced."
+msgstr "Einheit die ersetzt werden soll."
+
+#: .\cookbook\forms.py:108
 msgid "Add your comment: "
 msgstr "Schreibe einen Kommentar:"
 
-#: cookbook/forms.py:75
+#: .\cookbook\forms.py:126
 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:78
+#: .\cookbook\forms.py:129
 msgid "Leave empty for nextcloud and enter api token for dropbox."
 msgstr "Bei Nextcloud leer lassen, bei Dropbox API Token eingeben"
 
-#: cookbook/forms.py:86
+#: .\cookbook\forms.py:137
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
-msgstr "Bei Dropbox leer lassen, bei Nextcloud Server URL angeben (<code>/remote."
+msgstr ""
-"php/webdav/</code> wird automatisch hinzugefügt)"
+"Bei Dropbox leer lassen, bei Nextcloud Server URL angeben (<code>/remote.php/"
+"webdav/</code> wird automatisch hinzugefügt)"
 
-#: cookbook/forms.py:111
+#: .\cookbook\forms.py:156
 msgid "Search String"
 msgstr "Such Wort"
 
-#: cookbook/forms.py:125
+#: .\cookbook\forms.py:170
 msgid "File ID"
 msgstr "Datei ID"
 
-#: cookbook/tables.py:75 cookbook/templates/forms/edit_internal_recipe.html:39
+#: .\cookbook\models.py:172
-#: cookbook/templates/forms/edit_internal_recipe.html:98
+msgid "Breakfast"
-#: cookbook/templates/generic/delete_template.html:5
+msgstr "Frühstück"
-#: cookbook/templates/generic/delete_template.html:13
+
-#: cookbook/templates/generic/edit_template.html:25
+#: .\cookbook\models.py:172
+msgid "Lunch"
+msgstr "Mittagessen"
+
+#: .\cookbook\models.py:172
+msgid "Dinner"
+msgstr "Abendessen"
+
+#: .\cookbook\models.py:172
+msgid "Other"
+msgstr "Andere"
+
+#: .\cookbook\tables.py:75
+#: .\cookbook\templates\forms\edit_internal_recipe.html:49
+#: .\cookbook\templates\forms\edit_internal_recipe.html:176
+#: .\cookbook\templates\generic\delete_template.html:5
+#: .\cookbook\templates\generic\delete_template.html:13
+#: .\cookbook\templates\generic\edit_template.html:25
 msgid "Delete"
 msgstr "Löschen"
 
-#: cookbook/templates/base.html:64 cookbook/templates/base.html:72
+#: .\cookbook\templates\base.html:70 .\cookbook\templates\base.html:78
-#: cookbook/templates/index.html:7
+#: .\cookbook\templates\forms\ingredients.html:7
+#: .\cookbook\templates\index.html:7 .\cookbook\templates\shopping_list.html:7
 msgid "Cookbook"
 msgstr "Kochbuch"
 
-#: cookbook/templates/base.html:76
+#: .\cookbook\templates\base.html:82
 msgid "Books"
 msgstr "Bücher"
 
-#: cookbook/templates/base.html:81
+#: .\cookbook\templates\base.html:86 .\cookbook\templates\meal_plan.html:4
+#: .\cookbook\templates\meal_plan.html:13 .\cookbook\views\edit.py:261
+#: .\cookbook\views\edit.py:444 .\cookbook\views\new.py:130
+msgid "Meal-Plan"
+msgstr "Plan"
+
+#: .\cookbook\templates\base.html:92
 msgid "Tags"
 msgstr "Schlagwörter"
 
-#: cookbook/templates/base.html:85 cookbook/views/edit.py:130
+#: .\cookbook\templates\base.html:96 .\cookbook\views\edit.py:151
-#: cookbook/views/edit.py:331 cookbook/views/lists.py:17
+#: .\cookbook\views\edit.py:389 .\cookbook\views\lists.py:17
-#: cookbook/views/new.py:44
+#: .\cookbook\views\new.py:46
 msgid "Keyword"
 msgstr "Schlagwort"
 
-#: cookbook/templates/base.html:87
+#: .\cookbook\templates\base.html:98
 msgid "Batch Edit"
 msgstr "Massenbearbeitung"
 
-#: cookbook/templates/base.html:92
+#: .\cookbook\templates\base.html:103
 msgid "Storage Data"
 msgstr "Datenquellen"
 
-#: cookbook/templates/base.html:96
+#: .\cookbook\templates\base.html:107
 msgid "Storage Backends"
 msgstr "Speicher Quellen"
 
-#: cookbook/templates/base.html:98
+#: .\cookbook\templates\base.html:109
 msgid "Configure Sync"
 msgstr "Sync Einstellen"
 
-#: cookbook/templates/base.html:100
+#: .\cookbook\templates\base.html:111
 msgid "Import Recipes"
 msgstr "Importierte Rezepte"
 
-#: cookbook/templates/base.html:102 cookbook/views/lists.py:25
+#: .\cookbook\templates\base.html:113 .\cookbook\views\lists.py:25
 msgid "Import Log"
 msgstr "Import Log"
 
-#: cookbook/templates/base.html:104 cookbook/templates/stats.html:10
+#: .\cookbook\templates\base.html:115 .\cookbook\templates\stats.html:10
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: cookbook/templates/base.html:112
+#: .\cookbook\templates\base.html:117
+msgid "Units & Ingredients"
+msgstr "Einheiten & Zutaten"
+
+#: .\cookbook\templates\base.html:126 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\settings.html:11
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: .\cookbook\templates\base.html:131
 msgid "Admin"
 msgstr "Admin"
 
-#: cookbook/templates/base.html:116
+#: .\cookbook\templates\base.html:136
 msgid "Logout"
 msgstr "Ausloggen"
 
-#: cookbook/templates/base.html:119
+#: .\cookbook\templates\base.html:139
+#: .\cookbook\templates\registration\login.html:44
 msgid "Login"
 msgstr "Einloggen"
 
-#: cookbook/templates/batch/edit.html:6
+#: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
 msgstr "Kategorie massenbearbeitung"
 
-#: cookbook/templates/batch/edit.html:15
+#: .\cookbook\templates\batch\edit.html:15
 msgid "Batch edit Recipes"
 msgstr "Rezept massenbearbeitung"
 
-#: cookbook/templates/batch/edit.html:20
+#: .\cookbook\templates\batch\edit.html:20
 msgid "Add the specified keywords to all recipes containing a word"
 msgstr ""
 "Ausgewählte Schlagwörter zu allen Rezepten die das Suchwort enthalten "
 "hinzufügen"
 
-#: cookbook/templates/batch/monitor.html:6 cookbook/views/edit.py:114
+#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:135
 msgid "Sync"
 msgstr "Synchronisieren"
 
-#: cookbook/templates/batch/monitor.html:10
+#: .\cookbook\templates\batch\monitor.html:10
 msgid "Manage watched Folders"
 msgstr "Überwachte Ordner verwalten"
 
-#: cookbook/templates/batch/monitor.html:14
+#: .\cookbook\templates\batch\monitor.html:14
 msgid ""
 "On this Page you can manage all storage folder locations that should be "
 "monitored and synced"
@@ -171,20 +228,20 @@ msgstr ""
 "Auf dieser Seite kannst du alle Ordner verwalten die überwacht und "
 "synchronisiert werden sollen"
 
-#: cookbook/templates/batch/monitor.html:16
+#: .\cookbook\templates\batch\monitor.html:16
 msgid "The path must be in the following format"
 msgstr "Der Pfad muss in folgendem Format sein"
 
-#: cookbook/templates/batch/monitor.html:27
+#: .\cookbook\templates\batch\monitor.html:27
 msgid "Sync Now!"
 msgstr "Jetzt Synchronisieren!"
 
-#: cookbook/templates/batch/waiting.html:4
+#: .\cookbook\templates\batch\waiting.html:4
-#: cookbook/templates/batch/waiting.html:10
+#: .\cookbook\templates\batch\waiting.html:10
 msgid "Importing Recipes"
 msgstr "Rezept werden importiert"
 
-#: cookbook/templates/batch/waiting.html:23
+#: .\cookbook\templates\batch\waiting.html:23
 msgid ""
 "This can take a few minutes, depending on the number of recipes in sync, "
 "please wait."
@@ -192,120 +249,160 @@ msgstr ""
 "Abhängig von der Anzahl der Rezepte kann dieser Vorgang einige Minuten "
 "dauern, bitte warten."
 
-#: cookbook/templates/books.html:4 cookbook/templates/books.html:10
+#: .\cookbook\templates\books.html:4 .\cookbook\templates\books.html:10
 msgid "Recipe Books"
 msgstr "Rezept Bücher"
 
-#: cookbook/templates/books.html:14
+#: .\cookbook\templates\books.html:14
 msgid "New Book"
 msgstr "Neues Buch"
 
-#: cookbook/templates/books.html:53
+#: .\cookbook\templates\books.html:53
 msgid "There are no recipes in this book yet."
 msgstr "In diesem Buch sind bisher keine Rezepte."
 
-#: cookbook/templates/forms/edit_import_recipe.html:5
+#: .\cookbook\templates\forms\edit_import_recipe.html:5
-#: cookbook/templates/forms/edit_import_recipe.html:9
+#: .\cookbook\templates\forms\edit_import_recipe.html:9
 msgid "Import new Recipe"
 msgstr "Rezept Importieren"
 
-#: cookbook/templates/forms/edit_import_recipe.html:14
+#: .\cookbook\templates\forms\edit_import_recipe.html:14
-#: cookbook/templates/forms/edit_internal_recipe.html:37
+#: .\cookbook\templates\forms\edit_internal_recipe.html:47
-#: cookbook/templates/generic/edit_template.html:23
+#: .\cookbook\templates\generic\edit_template.html:23
-#: cookbook/templates/generic/new_template.html:23
+#: .\cookbook\templates\generic\new_template.html:23
-#: cookbook/templates/recipe_view.html:207
+#: .\cookbook\templates\recipe_view.html:214
+#: .\cookbook\templates\settings.html:33 .\cookbook\templates\settings.html:47
 msgid "Save"
 msgstr "Speichern"
 
-#: cookbook/templates/forms/edit_internal_recipe.html:7
+#: .\cookbook\templates\forms\edit_internal_recipe.html:8
-#: cookbook/templates/forms/edit_internal_recipe.html:16
+#: .\cookbook\templates\forms\edit_internal_recipe.html:18
 msgid "Edit Recipe"
 msgstr "Rezept bearbeiten"
 
-#: cookbook/templates/forms/edit_internal_recipe.html:26
+#: .\cookbook\templates\forms\edit_internal_recipe.html:28
-#: cookbook/templates/recipe_view.html:63
+#: .\cookbook\templates\recipe_view.html:67
 msgid "Ingredients"
 msgstr "Zutaten"
 
-#: cookbook/templates/forms/edit_internal_recipe.html:41
+#: .\cookbook\templates\forms\edit_internal_recipe.html:37
-#: cookbook/templates/generic/edit_template.html:27
+msgid ""
-#: cookbook/templates/recipe_view.html:7
+"Use <b>Ctrl</b>+<b>Space</b> to insert new Ingredient!<br/>You can also save "
+"the recipe using <b>Ctrl</b>+<b>Shift</b>+<b>S</b>."
+msgstr ""
+
+#: .\cookbook\templates\forms\edit_internal_recipe.html:51
+#: .\cookbook\templates\generic\edit_template.html:27
+#: .\cookbook\templates\recipe_view.html:7
 msgid "View"
 msgstr "Angucken"
 
-#: cookbook/templates/forms/edit_internal_recipe.html:45
+#: .\cookbook\templates\forms\edit_internal_recipe.html:55
-#: cookbook/templates/generic/edit_template.html:30
+#: .\cookbook\templates\generic\edit_template.html:30
 msgid "Delete original file"
 msgstr "Original löschen"
 
-#: cookbook/templates/forms/edit_internal_recipe.html:90
+#: .\cookbook\templates\forms\edit_internal_recipe.html:159
-#: cookbook/templates/forms/edit_internal_recipe.html:127
+#: .\cookbook\templates\forms\edit_internal_recipe.html:208
 msgid "Ingredient"
 msgstr "Zutat"
 
-#: cookbook/templates/forms/edit_internal_recipe.html:95
+#: .\cookbook\templates\forms\edit_internal_recipe.html:164
 msgid "Amount"
 msgstr "Menge"
 
-#: cookbook/templates/forms/edit_internal_recipe.html:96
+#: .\cookbook\templates\forms\edit_internal_recipe.html:166
 msgid "Unit"
 msgstr "Einheit"
 
-#: cookbook/templates/generic/delete_template.html:18
+#: .\cookbook\templates\forms\edit_internal_recipe.html:179
+#, fuzzy
+#| msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
+msgid "Are you sure that you want to delete this ingredient?"
+msgstr "Bist du sicher das %(title)s: <b>%(object)s</b> gelöscht werden soll"
+
+#: .\cookbook\templates\forms\ingredients.html:15
+msgid "Edit Ingredients"
+msgstr "Zutaten Bearbeiten"
+
+#: .\cookbook\templates\forms\ingredients.html:16
+msgid ""
+"\n"
+"        The following form can be used if, accidentally, two (or more) units "
+"or ingredients where created that should be\n"
+"        the same.\n"
+"        It merges two units or ingredients and updates all recipes using "
+"them.\n"
+"    "
+msgstr ""
+
+#: .\cookbook\templates\forms\ingredients.html:24
+msgid "Units"
+msgstr "Einheiten"
+
+#: .\cookbook\templates\forms\ingredients.html:29
+msgid "Are you sure that you want to merge these two units ?"
+msgstr "Bist du sicher diese beiden Einheiten zusammengeführt werden sollen ?"
+
+#: .\cookbook\templates\forms\ingredients.html:30
+msgid "Merge"
+msgstr "Zusammenführen"
+
+#: .\cookbook\templates\generic\delete_template.html:18
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
 msgstr "Bist du sicher das %(title)s: <b>%(object)s</b> gelöscht werden soll"
 
-#: cookbook/templates/generic/delete_template.html:21
+#: .\cookbook\templates\generic\delete_template.html:21
 msgid "Confirm"
-msgstr ""
+msgstr "Bestätigen"
 
-#: cookbook/templates/generic/edit_template.html:6
+#: .\cookbook\templates\generic\edit_template.html:6
-#: cookbook/templates/generic/edit_template.html:14
+#: .\cookbook\templates\generic\edit_template.html:14
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: cookbook/templates/generic/list_template.html:6
+#: .\cookbook\templates\generic\list_template.html:6
-#: cookbook/templates/generic/list_template.html:12
+#: .\cookbook\templates\generic\list_template.html:12
 msgid "List"
 msgstr "Liste"
 
-#: cookbook/templates/generic/list_template.html:19
+#: .\cookbook\templates\generic\list_template.html:19
 msgid "Import all"
 msgstr "Alle importieren"
 
-#: cookbook/templates/generic/new_template.html:6
+#: .\cookbook\templates\generic\new_template.html:6
-#: cookbook/templates/generic/new_template.html:14
+#: .\cookbook\templates\generic\new_template.html:14
 msgid "New"
 msgstr "Neu"
 
-#: cookbook/templates/generic/table_template.html:76
+#: .\cookbook\templates\generic\table_template.html:76
 msgid "previous"
 msgstr "vorherige"
 
-#: cookbook/templates/generic/table_template.html:98
+#: .\cookbook\templates\generic\table_template.html:98
 msgid "next"
 msgstr "nächste"
 
-#: cookbook/templates/include/recipe_open_modal.html:28
+#: .\cookbook\templates\include\recipe_open_modal.html:28
-#: cookbook/views/edit.py:258 cookbook/views/edit.py:278
+#: .\cookbook\views\edit.py:295 .\cookbook\views\edit.py:336
-#: cookbook/views/edit.py:298 cookbook/views/new.py:32
+#: .\cookbook\views\edit.py:356 .\cookbook\views\new.py:34
 msgid "Recipe"
 msgstr "Rezept"
 
-#: cookbook/templates/include/recipe_open_modal.html:39
+#: .\cookbook\templates\include\recipe_open_modal.html:39
 msgid "Close"
 msgstr "Schließen"
 
-#: cookbook/templates/include/recipe_open_modal.html:56
+#: .\cookbook\templates\include\recipe_open_modal.html:56
 msgid "Open Recipe"
 msgstr "Rezept öffnen"
 
-#: cookbook/templates/include/storage_backend_warning.html:4
+#: .\cookbook\templates\include\storage_backend_warning.html:4
 msgid "Security Warning"
 msgstr "Sicherheitswarnung"
 
-#: cookbook/templates/include/storage_backend_warning.html:5
+#: .\cookbook\templates\include\storage_backend_warning.html:5
 msgid ""
 "\n"
 "        The <b>Password and Token</b> field are stored as <b>plain text</b> "
@@ -327,48 +424,52 @@ msgstr ""
 "oder Accounts mit limitiertem Zugriff verwendet werden.\n"
 "    "
 
-#: cookbook/templates/index.html:21
+#: .\cookbook\templates\index.html:21
 msgid "Search recipe ..."
 msgstr "Suche Rezept ..."
 
-#: cookbook/templates/index.html:40
+#: .\cookbook\templates\index.html:40
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
-#: cookbook/templates/index.html:59
+#: .\cookbook\templates\index.html:59
 msgid "Log in to view Recipies"
 msgstr "Bitte einloggen um Rezepte zu sehen"
 
-#: cookbook/templates/recipe_view.html:27
+#: .\cookbook\templates\meal_plan.html:20
+msgid "Week"
+msgstr ""
+
+#: .\cookbook\templates\recipe_view.html:31
 msgid "in"
 msgstr "in"
 
-#: cookbook/templates/recipe_view.html:32
+#: .\cookbook\templates\recipe_view.html:36
-#: cookbook/templates/recipe_view.html:174
+#: .\cookbook\templates\recipe_view.html:181
 msgid "by"
 msgstr "von"
 
-#: cookbook/templates/recipe_view.html:43
+#: .\cookbook\templates\recipe_view.html:47
 msgid "Preparation time ca."
 msgstr "Zubereitungszeit ca."
 
-#: cookbook/templates/recipe_view.html:48
+#: .\cookbook\templates\recipe_view.html:52
 msgid "Waiting time ca."
 msgstr "Zubereitungszeit ca."
 
-#: cookbook/templates/recipe_view.html:110
+#: .\cookbook\templates\recipe_view.html:114
 msgid "Recipe Image"
 msgstr "Rezept Bild"
 
-#: cookbook/templates/recipe_view.html:126
+#: .\cookbook\templates\recipe_view.html:133
 msgid "View external recipe"
 msgstr "Externes Rezept ansehen"
 
-#: cookbook/templates/recipe_view.html:137
+#: .\cookbook\templates\recipe_view.html:144
 msgid "External recipe"
 msgstr "Externes Rezept"
 
-#: cookbook/templates/recipe_view.html:139
+#: .\cookbook\templates\recipe_view.html:146
 msgid ""
 "\n"
 "                        This is an external recipe, which means you can only "
@@ -386,56 +487,72 @@ msgstr ""
 "bleibt weiterhin verfügbar.\n"
 "                    "
 
-#: cookbook/templates/recipe_view.html:147
+#: .\cookbook\templates\recipe_view.html:154
 msgid "Convert now!"
 msgstr "Jetzt umwandeln!"
 
-#: cookbook/templates/recipe_view.html:156
+#: .\cookbook\templates\recipe_view.html:163
 msgid "Comments"
 msgstr "Kommentare"
 
-#: cookbook/templates/recipe_view.html:165 cookbook/views/edit.py:191
+#: .\cookbook\templates\recipe_view.html:172 .\cookbook\views\edit.py:212
-#: cookbook/views/edit.py:353
+#: .\cookbook\views\edit.py:411
 msgid "Comment"
 msgstr "Kommentar"
 
-#: cookbook/templates/registration/login.html:8
+#: .\cookbook\templates\registration\login.html:8
 msgid "Your username and password didn't match. Please try again."
 msgstr "Nutzername oder Passwort falsch. Bitte versuch es erneut."
 
-#: cookbook/templates/stats.html:4
+#: .\cookbook\templates\settings.html:17
+msgid "Language"
+msgstr "Sprache"
+
+#: .\cookbook\templates\settings.html:42
+msgid "Style"
+msgstr "Stil"
+
+#: .\cookbook\templates\shopping_list.html:15
+msgid "Shopping List"
+msgstr "Einkaufsliste"
+
+#: .\cookbook\templates\shopping_list.html:20
+msgid "Load"
+msgstr "Laden"
+
+#: .\cookbook\templates\stats.html:4
 msgid "Stats"
 msgstr "Statistiken"
 
-#: cookbook/templates/stats.html:17
+#: .\cookbook\templates\stats.html:17
 msgid "Number of objects"
 msgstr "Anzahl der Objekte"
 
-#: cookbook/templates/stats.html:20
+#: .\cookbook\templates\stats.html:20
 msgid "Recipes"
 msgstr "Rezepte"
 
-#: cookbook/templates/stats.html:24
+#: .\cookbook\templates\stats.html:24
 msgid "Recipe Imports"
 msgstr "Rezept Importe"
 
-#: cookbook/templates/stats.html:32
+#: .\cookbook\templates\stats.html:32
 msgid "Objects stats"
 msgstr "Objekt Statistiken"
 
-#: cookbook/templates/stats.html:35
+#: .\cookbook\templates\stats.html:35
 msgid "Recipes without Keywords"
 msgstr "Rezepte ohne Schlagwort"
 
-#: cookbook/views/api.py:63
+#: .\cookbook\views\api.py:63
 msgid "Sync successful!"
 msgstr "Synchronisation erfolgreich!"
 
-#: cookbook/views/api.py:66
+#: .\cookbook\views\api.py:66
 msgid "Error synchronizing with Storage"
 msgstr "Fehler beim Synchronisieren"
 
-#: cookbook/views/data.py:71
+#: .\cookbook\views\data.py:71
 #, python-format
 msgid "Batch edit done. %(count)d recipe was updated."
 msgid_plural "Batch edit done. %(count)d Recipes where updated."
@@ -443,65 +560,77 @@ msgstr[0] "Massenbearbeitung erfolgreich. %(count)d Rezept wurde aktualisiert."
 msgstr[1] ""
 "Massenbearbeitung erfolgreich. %(count)d Rezepte wurden aktualisiert."
 
-#: cookbook/views/edit.py:88
+#: .\cookbook\views\edit.py:109
 msgid "Recipe saved!"
 msgstr "Rezept gespeichert"
 
-#: cookbook/views/edit.py:91 cookbook/views/new.py:87
+#: .\cookbook\views\edit.py:111
-msgid "There was an error importing this recipe!"
+msgid "There was an error saving this recipe!"
-msgstr "Beim importieren des Rezeptes ist ein Fehler aufgetreten"
+msgstr "Es gab einen Fehler beim Speichern des Rezepts"
 
-#: cookbook/views/edit.py:139 cookbook/views/edit.py:182
+#: .\cookbook\views\edit.py:160 .\cookbook\views\edit.py:203
 msgid "You cannot edit this comment!"
 msgstr "Du kannst diesen Kommentar nicht bearbeiten!"
 
-#: cookbook/views/edit.py:158
+#: .\cookbook\views\edit.py:179
 msgid "Storage saved!"
 msgstr "Speicherquelle gespeichert"
 
-#: cookbook/views/edit.py:161
+#: .\cookbook\views\edit.py:182
 msgid "There was an error updating this storage backend.!"
 msgstr "Es gab einen Fehler beim aktualisierung dieser Speicher Quelle"
 
-#: cookbook/views/edit.py:208 cookbook/views/edit.py:309
+#: .\cookbook\views\edit.py:229 .\cookbook\views\edit.py:367
-#: cookbook/views/lists.py:34
+#: .\cookbook\views\lists.py:34
 msgid "Import"
 msgstr "Rezept Importieren"
 
-#: cookbook/views/edit.py:224 cookbook/views/edit.py:364
+#: .\cookbook\views\edit.py:245 .\cookbook\views\edit.py:422
-#: cookbook/views/new.py:110
+#: .\cookbook\views\new.py:112
 msgid "Recipe Book"
 msgstr "Rezeptbuch"
 
-#: cookbook/views/edit.py:246
+#: .\cookbook\views\edit.py:283
 msgid "Changes saved!"
 msgstr "Änderungen gespeichert"
 
-#: cookbook/views/edit.py:250
+#: .\cookbook\views\edit.py:287
 msgid "Error saving changes!"
 msgstr "Fehler beim Speichern der Daten."
 
-#: cookbook/views/edit.py:320
+#: .\cookbook\views\edit.py:315
+msgid "Units merged!"
+msgstr ""
+
+#: .\cookbook\views\edit.py:317
+msgid "There was an error in your form."
+msgstr "Es gab einen Fehler im Formular."
+
+#: .\cookbook\views\edit.py:378
 msgid "Monitor"
 msgstr "Monitor"
 
-#: cookbook/views/edit.py:342 cookbook/views/lists.py:42
+#: .\cookbook\views\edit.py:400 .\cookbook\views\lists.py:42
-#: cookbook/views/new.py:62
+#: .\cookbook\views\new.py:64
 msgid "Storage Backend"
 msgstr "Speicher Quelle"
 
-#: cookbook/views/edit.py:375
+#: .\cookbook\views\edit.py:433
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
-#: cookbook/views/new.py:84
+#: .\cookbook\views\new.py:86
 msgid "Imported new recipe!"
 msgstr "Importier neue Rezepte"
 
-#: cookbook/views/views.py:42
+#: .\cookbook\views\new.py:89
+msgid "There was an error importing this recipe!"
+msgstr "Beim importieren des Rezeptes ist ein Fehler aufgetreten"
+
+#: .\cookbook\views\views.py:44
 msgid "Comment saved!"
 msgstr "Kommentar gespeichert"
 
-#: cookbook/views/views.py:52
+#: .\cookbook\views\views.py:54
 msgid "Bookmark saved!"
 msgstr "Lesezeichen gespeichert"

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: 2020-01-13 12:08+0100\n"
+"POT-Creation-Date: 2020-02-17 23:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,10 +18,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: recipes/settings.py:136
+#: .\recipes\settings.py:136
 msgid "German"
 msgstr "Deutsch"
 
-#: recipes/settings.py:137
+#: .\recipes\settings.py:137
 msgid "English"
 msgstr "Englisch"