From 42e09fcae9ff8ca72f41c611feb554a35d31f96f Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Tue, 18 Feb 2020 23:26:14 +0100
Subject: [PATCH] updated translations

---
 cookbook/locale/de/LC_MESSAGES/django.mo | Bin 9503 -> 11191 bytes
 cookbook/locale/de/LC_MESSAGES/django.po | 160 +++++++++++++++--------
 recipes/locale/de/LC_MESSAGES/django.mo  | Bin 493 -> 493 bytes
 recipes/locale/de/LC_MESSAGES/django.po  |   2 +-
 4 files changed, 107 insertions(+), 55 deletions(-)

diff --git a/cookbook/locale/de/LC_MESSAGES/django.mo b/cookbook/locale/de/LC_MESSAGES/django.mo
index bc4eaae553dff723ce661111dd74e0214acdf8bc..56fd9a3a24d1da4a6def122695982bd798279093 100644
GIT binary patch
delta 4420
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
RR?pl$Vq1X>RgTWQ_y74t_D}!-

delta 2888
zcmXxmd2EzL7{~G1o&t-#FT{4YK%o>1T`WjZ5KD{DB1Kzn3WXM^bQdix1r!z%D*=L0
z-WrU^;U7YbXwW4RB_>u3F)2hbDvAbCVx#}yL1IF|<NJHxVbbUQ%)HmkJTvdY>4it;
zM6aYLylg1X62pnx@x~m-ACfsxHV-ytyw8{|Sc`8CF=i^~|MnY`j-jE(Bw`h&U=1eW
zQY^<+I0IinUSTd{2L6IPA2m0rtmK6MZtn$Q97KB?>czWkdmr*=4%qX@P-8q{&!57(
zXrHz1^Y;4p$XLxad;Jg80B>R@{ky&DL>9wOz~PvRL1eNfgjqNZ16YsznNAKGKsW07
zeW)4sAn!IuZ2KKdqx}J9VxMha)phm%7Zr8%4{D@?=v^<)M$IVSIvO9MJpsEgf)&`0
z8hDUiWD(|I2`Yn?r~%Hl?K;e+y#S+1b=Y3$LUp_i^`dTMJD5GFfxKWnfTL(1MgGh=
z4y>a27Ij}gF2mnZ6RTyRHIPN9_co$3u{xdn-$P|HCp5wy)B^`mnK*7eg-U5Js-rJZ
z1HFQ|*pGVgfA)F;JB+?fI+7eS5;d@L)brC&OI4de{x!0NoFMyVIqHEhY5?0&1KNuk
zzyZ|#$50)fKxOb<)N^O-`SUo2_C+kh0W8KK(+*$_>U>+2N{EVs4R{Xq;^FMLdohUW
za60l1Q-!*|7`fFnqB`1$8o+C)=iWx`jXsRSBo<r_LOt(CWh9zLWj){ZFs#Ps**V+s
z0(pIc8)}CclZQu91Njiu(Z{xZ5vyrm!Ya&XJ(c=q)Y5L^pe5RmyYVg5<}ByOhRjCI
zTq;`2#oh_igt{S&TBB}MieE$~V_voAPokFW3~Gt`Py@S!n%S?`KT!i3K)ugTdSni2
z|CvH6x}h8cI14rMb*K)WL%pyE*<a=m>IElJOL7L)@#psXRV10_25RPm^S#WCKuxq5
zHK8(ezyGOJv@5Ia4fQyU_A=ax2XP8!7kDqKvo639x)1fj9o9XljPxLrHb+rw{t;?I
zpP&ZvB}R4OG8KL2KcZ%K4Ym8PV<Fx`%{)KgS%$hk6IbGV)YtJI>ND;|z4tTJCcS{l
z=+CI@|DyUy43d96m>Tp(T!3nqpgOETjdU(*Pc)!r8n$+!Qoj>*|9(^^->}9|ndr4%
zKxN=N)N{WDquxvg><!6GmyK*PP%|h+Junfqrj@9aE<ttFg+<tn#drcAz;7^sDXdQ^
zPCzZ`3S5qdQ4_lzr4pc$Fw&dZDAcAJkJ@yVsF~Lyf2Ns(Qo0+*;bGL?=)-tS9A&?A
z)boB+#<I|dDjIl*s3W2g4poG{02MZ^X?1JfL9^A&7Za0-X9%T^{@gX3geoN-?*9$i
zsB4h={ZMK4Fw?E0aSbt7-@n#7j;JN-30A@_N~e}$4l#>(ifAYJ7~Fpa!7XIkG!k9J
zCSn1h6l+<u=~UJe^N3Z%5`tv7r9j_*1=TUcGVh#OjaoycO(~pDs4VnwH&msqYpEKD
zmA0+jJ=WG&SV!PiVm6_@w3(<Owh;03@0PV3^9XGgm4JKnHjUQ#F+w|BrNhJh1XX>6
zc+j3pz_6`1;W}HNX<dYg#6;pr;!gkW|NpenatW3Dhz)Mdn1`+6X+j%L<$j`*n4ktl
zJ9?vA^M0z!sFxFu+jC+D@hCB#sMgOx3zem@*N1e+IY}vdoO3CuvGmk@pR+ry#<`Jp
zD|2moOLJ>Wq{GaP+^KGi?agp}2@R3f4rh5*P3&}5N8HfXNMOr`&i25X4ejAlCnxv1
zlaW{NwB>!8JUI}WSP_~Mn>_5RcqhH!pmVjrA1ezS@;T!Qn_}-5hI~Vpbapg#828u`
ziM=%PtS`B$HL|XS4t5pIi~Uq|InLi24pj5*&bFrZ(%7-$OrP`h*rm>-lAZqp0OT1J

diff --git a/cookbook/locale/de/LC_MESSAGES/django.po b/cookbook/locale/de/LC_MESSAGES/django.po
index 84b98cd5..92253d09 100644
--- a/cookbook/locale/de/LC_MESSAGES/django.po
+++ b/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-02-17 23:29+0100\n"
+"POT-Creation-Date: 2020-02-18 23:20+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,17 +18,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: .\cookbook\filters.py:15
+#: .\cookbook\templates\forms\edit_internal_recipe.html:28
+#: .\cookbook\templates\forms\ingredients.html:33
+#: .\cookbook\templates\recipe_view.html:67
+msgid "Ingredients"
+msgstr "Zutaten"
+
 #: .\cookbook\forms.py:35
 msgid ""
 "Color of the top navigation bar. Not all colors work with all themes, just "
 "try them out!"
 msgstr ""
+"Farbe der oberen Navigationsleiste. Nicht alle Farben passen, daher einfach mal ausprobieren!"
 
-#: .\cookbook\forms.py:49 .\cookbook\forms.py:67 .\cookbook\forms.py:167
+#: .\cookbook\forms.py:49 .\cookbook\forms.py:67 .\cookbook\forms.py:189
 msgid "Name"
 msgstr "Name"
 
-#: .\cookbook\forms.py:50 .\cookbook\forms.py:68 .\cookbook\forms.py:168
+#: .\cookbook\forms.py:50 .\cookbook\forms.py:68 .\cookbook\forms.py:190
 #: .\cookbook\templates\stats.html:22
 msgid "Keywords"
 msgstr "Schlagwörter"
@@ -41,7 +49,7 @@ msgstr "Zubereitungszeit in Minuten"
 msgid "Waiting time (cooking/baking) in minutes"
 msgstr "Wartezeit (kochen/backen) in Minuten"
 
-#: .\cookbook\forms.py:53 .\cookbook\forms.py:169
+#: .\cookbook\forms.py:53 .\cookbook\forms.py:191
 msgid "Path"
 msgstr "Pfad"
 
@@ -53,35 +61,59 @@ msgstr "Speicher ID"
 msgid "Instructions"
 msgstr "Anleitung"
 
-#: .\cookbook\forms.py:89
+#: .\cookbook\forms.py:82
+msgid ""
+"Include <code>- [ ]</code> in list for easier usage in markdown based "
+"documents."
+msgstr ""
+"Füge <code>- [ ]</code> vor den Zutaten ein um sie besser in einem Markdown Dokument "
+"zu verwenden."
+
+#: .\cookbook\forms.py:94
 msgid "New Unit"
 msgstr "Neue Einheit"
 
-#: .\cookbook\forms.py:90
+#: .\cookbook\forms.py:95
 msgid "New unit that other gets replaced by."
 msgstr "Neue Einheit die die alte ersetzt."
 
-#: .\cookbook\forms.py:95
+#: .\cookbook\forms.py:100
 msgid "Old Unit"
 msgstr "Alte Einheit"
 
-#: .\cookbook\forms.py:96
+#: .\cookbook\forms.py:101
 msgid "Unit that should be replaced."
 msgstr "Einheit die ersetzt werden soll."
 
-#: .\cookbook\forms.py:108
+#: .\cookbook\forms.py:111
+msgid "New Ingredient"
+msgstr "Neue Zutat"
+
+#: .\cookbook\forms.py:112
+msgid "New ingredient that other gets replaced by."
+msgstr "Neue Zutat die die alte ersetzt."
+
+#: .\cookbook\forms.py:117
+msgid "Old Ingredient"
+msgstr "Alte Zutat"
+
+#: .\cookbook\forms.py:118
+msgid "Ingredient that should be replaced."
+msgstr "Zutat die ersetzt werden soll."
+
+#: .\cookbook\forms.py:130
 msgid "Add your comment: "
 msgstr "Schreibe einen Kommentar:"
 
-#: .\cookbook\forms.py:126
+#: .\cookbook\forms.py:148
 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:129
+#: .\cookbook\forms.py:151
 msgid "Leave empty for nextcloud and enter api token for dropbox."
 msgstr "Bei Nextcloud leer lassen, bei Dropbox API Token eingeben"
 
-#: .\cookbook\forms.py:137
+#: .\cookbook\forms.py:159
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
@@ -89,11 +121,11 @@ msgstr ""
 "Bei Dropbox leer lassen, bei Nextcloud Server URL angeben (<code>/remote.php/"
 "webdav/</code> wird automatisch hinzugefügt)"
 
-#: .\cookbook\forms.py:156
+#: .\cookbook\forms.py:178
 msgid "Search String"
 msgstr "Such Wort"
 
-#: .\cookbook\forms.py:170
+#: .\cookbook\forms.py:192
 msgid "File ID"
 msgstr "Datei ID"
 
@@ -134,66 +166,72 @@ msgstr "Bücher"
 
 #: .\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
+#: .\cookbook\views\edit.py:462 .\cookbook\views\new.py:130
 msgid "Meal-Plan"
 msgstr "Plan"
 
-#: .\cookbook\templates\base.html:92
+#: .\cookbook\templates\base.html:90
+#, fuzzy
+#| msgid "Shopping List"
+msgid "Shopping"
+msgstr "Einkaufsliste"
+
+#: .\cookbook\templates\base.html:96
 msgid "Tags"
 msgstr "Schlagwörter"
 
-#: .\cookbook\templates\base.html:96 .\cookbook\views\edit.py:151
-#: .\cookbook\views\edit.py:389 .\cookbook\views\lists.py:17
+#: .\cookbook\templates\base.html:100 .\cookbook\views\edit.py:151
+#: .\cookbook\views\edit.py:407 .\cookbook\views\lists.py:17
 #: .\cookbook\views\new.py:46
 msgid "Keyword"
 msgstr "Schlagwort"
 
-#: .\cookbook\templates\base.html:98
+#: .\cookbook\templates\base.html:102
 msgid "Batch Edit"
 msgstr "Massenbearbeitung"
 
-#: .\cookbook\templates\base.html:103
+#: .\cookbook\templates\base.html:107
 msgid "Storage Data"
 msgstr "Datenquellen"
 
-#: .\cookbook\templates\base.html:107
+#: .\cookbook\templates\base.html:111
 msgid "Storage Backends"
 msgstr "Speicher Quellen"
 
-#: .\cookbook\templates\base.html:109
+#: .\cookbook\templates\base.html:113
 msgid "Configure Sync"
 msgstr "Sync Einstellen"
 
-#: .\cookbook\templates\base.html:111
+#: .\cookbook\templates\base.html:115
 msgid "Import Recipes"
 msgstr "Importierte Rezepte"
 
-#: .\cookbook\templates\base.html:113 .\cookbook\views\lists.py:25
+#: .\cookbook\templates\base.html:117 .\cookbook\views\lists.py:25
 msgid "Import Log"
 msgstr "Import Log"
 
-#: .\cookbook\templates\base.html:115 .\cookbook\templates\stats.html:10
+#: .\cookbook\templates\base.html:119 .\cookbook\templates\stats.html:10
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: .\cookbook\templates\base.html:117
+#: .\cookbook\templates\base.html:121
 msgid "Units & Ingredients"
 msgstr "Einheiten & Zutaten"
 
-#: .\cookbook\templates\base.html:126 .\cookbook\templates\settings.html:6
+#: .\cookbook\templates\base.html:130 .\cookbook\templates\settings.html:6
 #: .\cookbook\templates\settings.html:11
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: .\cookbook\templates\base.html:131
+#: .\cookbook\templates\base.html:135
 msgid "Admin"
 msgstr "Admin"
 
-#: .\cookbook\templates\base.html:136
+#: .\cookbook\templates\base.html:140
 msgid "Logout"
 msgstr "Ausloggen"
 
-#: .\cookbook\templates\base.html:139
+#: .\cookbook\templates\base.html:143
 #: .\cookbook\templates\registration\login.html:44
 msgid "Login"
 msgstr "Einloggen"
@@ -280,11 +318,6 @@ msgstr "Speichern"
 msgid "Edit Recipe"
 msgstr "Rezept bearbeiten"
 
-#: .\cookbook\templates\forms\edit_internal_recipe.html:28
-#: .\cookbook\templates\recipe_view.html:67
-msgid "Ingredients"
-msgstr "Zutaten"
-
 #: .\cookbook\templates\forms\edit_internal_recipe.html:37
 msgid ""
 "Use <b>Ctrl</b>+<b>Space</b> to insert new Ingredient!<br/>You can also save "
@@ -316,10 +349,8 @@ msgid "Unit"
 msgstr "Einheit"
 
 #: .\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"
+msgstr "Bist du sicher das du diese Zutat löschen willst?"
 
 #: .\cookbook\templates\forms\ingredients.html:15
 msgid "Edit Ingredients"
@@ -335,6 +366,13 @@ msgid ""
 "them.\n"
 "    "
 msgstr ""
+"\n"
+"        Dieses Formular kann genutzt werden wenn versehentlich zwei (oder mehr) Einheiten"
+"oder Zutaten erstellt wurden die eigentlich identisch\n"
+"        sein sollen.\n"
+"        Es vereint zwei Zutaten oder Einheiten und aktualisiert alle entsprechenden "
+"Rezepte.\n"
+"    "
 
 #: .\cookbook\templates\forms\ingredients.html:24
 msgid "Units"
@@ -345,9 +383,14 @@ 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
+#: .\cookbook\templates\forms\ingredients.html:39
 msgid "Merge"
 msgstr "Zusammenführen"
 
+#: .\cookbook\templates\forms\ingredients.html:38
+msgid "Are you sure that you want to merge these two ingredients ?"
+msgstr "Bist du sicher diese beiden Zutaten zusammengeführt werden sollen ?"
+
 #: .\cookbook\templates\generic\delete_template.html:18
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
@@ -385,8 +428,8 @@ msgid "next"
 msgstr "nächste"
 
 #: .\cookbook\templates\include\recipe_open_modal.html:28
-#: .\cookbook\views\edit.py:295 .\cookbook\views\edit.py:336
-#: .\cookbook\views\edit.py:356 .\cookbook\views\new.py:34
+#: .\cookbook\views\edit.py:295 .\cookbook\views\edit.py:354
+#: .\cookbook\views\edit.py:374 .\cookbook\views\new.py:34
 msgid "Recipe"
 msgstr "Rezept"
 
@@ -432,13 +475,13 @@ msgstr "Suche Rezept ..."
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
-#: .\cookbook\templates\index.html:59
+#: .\cookbook\templates\index.html:62
 msgid "Log in to view Recipies"
 msgstr "Bitte einloggen um Rezepte zu sehen"
 
 #: .\cookbook\templates\meal_plan.html:20
 msgid "Week"
-msgstr ""
+msgstr "Woche"
 
 #: .\cookbook\templates\recipe_view.html:31
 msgid "in"
@@ -496,7 +539,7 @@ msgid "Comments"
 msgstr "Kommentare"
 
 #: .\cookbook\templates\recipe_view.html:172 .\cookbook\views\edit.py:212
-#: .\cookbook\views\edit.py:411
+#: .\cookbook\views\edit.py:429
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -520,6 +563,15 @@ msgstr "Einkaufsliste"
 msgid "Load"
 msgstr "Laden"
 
+#: .\cookbook\templates\shopping_list.html:37
+#: .\cookbook\templates\shopping_list.html:55
+msgid "Copy list to clipboard"
+msgstr "Kopiere Liste in Zwischenablage"
+
+#: .\cookbook\templates\shopping_list.html:48
+msgid "Copied!"
+msgstr "Kopiert!"
+
 #: .\cookbook\templates\stats.html:4
 msgid "Stats"
 msgstr "Statistiken"
@@ -580,12 +632,12 @@ msgstr "Speicherquelle gespeichert"
 msgid "There was an error updating this storage backend.!"
 msgstr "Es gab einen Fehler beim aktualisierung dieser Speicher Quelle"
 
-#: .\cookbook\views\edit.py:229 .\cookbook\views\edit.py:367
+#: .\cookbook\views\edit.py:229 .\cookbook\views\edit.py:385
 #: .\cookbook\views\lists.py:34
 msgid "Import"
 msgstr "Rezept Importieren"
 
-#: .\cookbook\views\edit.py:245 .\cookbook\views\edit.py:422
+#: .\cookbook\views\edit.py:245 .\cookbook\views\edit.py:440
 #: .\cookbook\views\new.py:112
 msgid "Recipe Book"
 msgstr "Rezeptbuch"
@@ -598,24 +650,24 @@ msgstr "Änderungen gespeichert"
 msgid "Error saving changes!"
 msgstr "Fehler beim Speichern der Daten."
 
-#: .\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."
+msgid "Units merged!"
+msgstr "Einheiten zusammengeführt"
 
-#: .\cookbook\views\edit.py:378
+#: .\cookbook\views\edit.py:330
+msgid "Ingredients merged!"
+msgstr "Zutaten zusammengeführt"
+
+#: .\cookbook\views\edit.py:396
 msgid "Monitor"
 msgstr "Monitor"
 
-#: .\cookbook\views\edit.py:400 .\cookbook\views\lists.py:42
+#: .\cookbook\views\edit.py:418 .\cookbook\views\lists.py:42
 #: .\cookbook\views\new.py:64
 msgid "Storage Backend"
 msgstr "Speicher Quelle"
 
-#: .\cookbook\views\edit.py:433
+#: .\cookbook\views\edit.py:451
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
diff --git a/recipes/locale/de/LC_MESSAGES/django.mo b/recipes/locale/de/LC_MESSAGES/django.mo
index 1e514e3f9de442e54aa1b05da7e560b0b05ea0f2..8782534568fb7894b51be814e18563719c3f4dfe 100644
GIT binary patch
delta 18
ZcmaFM{FZsbadry@BV#KggN^6p8396E1~&iz

delta 18
ZcmaFM{FZsbadvYBBV#Kg%Z=yc8396m20s7*

diff --git a/recipes/locale/de/LC_MESSAGES/django.po b/recipes/locale/de/LC_MESSAGES/django.po
index 943424d1..fa4b0fca 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: 2020-02-17 23:29+0100\n"
+"POT-Creation-Date: 2020-02-18 23:20+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"