diff --git a/po/documentation.de.po b/po/documentation.de.po
index 146cd89ecd6eab2764d7fe28fcb39beaac340cc3..8ed50f7fbce7b761e1cdc5d2a25328fa6825a1f3 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -4095,7 +4095,7 @@ msgstr ""
 #: en/diff-options.txt:246
 #, no-wrap, priority:280
 msgid "--submodule[=<format>]"
-msgstr ""
+msgstr "--submodule[=<Format>]"
 
 #. type: Plain text
 #: en/diff-options.txt:257
@@ -9571,7 +9571,7 @@ msgstr "Der neu erzeugte Branch wird auf diesen Commit verweisen, wobei es sich
 #: en/git-branch.txt:274
 #, no-wrap, priority:240
 msgid "<oldbranch>"
-msgstr "<oldbranch>"
+msgstr "<Alter-Branch>"
 
 #. type: Plain text
 #: en/git-branch.txt:276
@@ -9583,7 +9583,7 @@ msgstr "Der Name eines existierenden Entwicklungszweiges (branch) der umbenannt
 #: en/git-branch.txt:277
 #, no-wrap, priority:240
 msgid "<newbranch>"
-msgstr "<newbranch>"
+msgstr "<Neuer-Branch>"
 
 #. type: Plain text
 #: en/git-branch.txt:280
@@ -9605,9 +9605,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-branch.txt:293 en/git-tag.txt:158
-#, fuzzy, no-wrap, priority:240
+#, no-wrap, priority:240
 msgid "--points-at <object>"
-msgstr "--contains <commit>"
+msgstr "--points-at <Objekt>"
 
 #. type: Plain text
 #: en/git-branch.txt:295
@@ -9619,7 +9619,7 @@ msgstr "Zeige nur Branches des angegebenen Objekts an."
 #: en/git-branch.txt:296
 #, no-wrap, priority:240
 msgid "--format <format>"
-msgstr ""
+msgstr "--format <Format>"
 
 #. type: Plain text
 #: en/git-branch.txt:300
@@ -10179,9 +10179,9 @@ msgstr "--batch"
 
 #. type: Labeled list
 #: en/git-cat-file.txt:78
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
 msgid "--batch=<format>"
-msgstr "--patch-format"
+msgstr "--batch=<Format>"
 
 #. type: Plain text
 #: en/git-cat-file.txt:84
@@ -10199,7 +10199,7 @@ msgstr "--batch-check"
 #: en/git-cat-file.txt:86
 #, no-wrap, priority:100
 msgid "--batch-check=<format>"
-msgstr ""
+msgstr "--batch-check=<Format>"
 
 #. type: Plain text
 #: en/git-cat-file.txt:92
@@ -11573,10 +11573,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-checkout.txt:148
-#, fuzzy, no-wrap, priority:240
-#| msgid "<new_branch>"
+#, no-wrap, priority:240
 msgid "-b <new_branch>"
-msgstr "<new_branch>"
+msgstr "-b <Neuer-Branch>"
 
 #. type: Plain text
 #: en/git-checkout.txt:151
@@ -11586,10 +11585,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-checkout.txt:152
-#, fuzzy, no-wrap, priority:240
-#| msgid "<new_branch>"
+#, no-wrap, priority:240
 msgid "-B <new_branch>"
-msgstr "<new_branch>"
+msgstr "-B <Neuer-Branch>"
 
 #. type: Plain text
 #: en/git-checkout.txt:157
@@ -11665,10 +11663,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-checkout.txt:209
-#, fuzzy, no-wrap, priority:240
-#| msgid "<new_branch>"
+#, no-wrap, priority:240
 msgid "--orphan <new_branch>"
-msgstr "<new_branch>"
+msgstr "--orphan <Neuer-Branch>"
 
 #. type: Plain text
 #: en/git-checkout.txt:215
@@ -11855,7 +11852,7 @@ msgstr ""
 #: en/git-checkout.txt:327
 #, no-wrap, priority:240
 msgid "<new_branch>"
-msgstr "<new_branch>"
+msgstr "<Neuer-Branch>"
 
 #. type: Plain text
 #: en/git-checkout.txt:329 en/git-switch.txt:41
@@ -12184,10 +12181,10 @@ msgstr "$ git checkout mytopic\n"
 msgid "However, your \"wrong\" branch and correct `mytopic` branch may differ in files that you have modified locally, in which case the above checkout would fail like this:"
 msgstr "Der \"falsche\" Branch und der korrekte Branch \"mytopic\" k철nnen sich in lokal ge채nderten Dateien unterscheiden, was daz f체hrt, dass der obige Checkout folgenderma횩en fehlschl채gt:"
 
+#. type: delimited block -
 # git-checkout.txt is not up to date. The fuzzy msgid is the message prior to 142183d0 2010-07-09 "checkout: accord documentation to what git does", the msgid is the message in the documentation afterwards.
 # At that time there weren't even po files in the git tree. This message does not exist since 23cbf11b 2010-08-11 "merge-recursive: porcelain messages for checkout".
 # The current message is "Your local changes to the following files would be overwritten by merge:\n%%s" as of 2e3926b9 2016-05-13 "i18n: unpack-trees: avoid substituting only a verb in sentences"
-#. type: delimited block -
 #: en/git-checkout.txt:543
 #, fuzzy, no-wrap, priority:240
 #| msgid ""
@@ -12692,9 +12689,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-cherry-pick.txt:151 en/git-revert.txt:107
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
 msgid "-X<option>"
-msgstr "`option`"
+msgstr "-X<Option>"
 
 #. type: Labeled list
 #: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:125
@@ -24296,7 +24293,7 @@ msgstr ""
 #: en/git-for-each-ref.txt:47 en/git-replace.txt:106 en/git-tag.txt:197 en/pretty-options.txt:2
 #, no-wrap, priority:260
 msgid "--format=<format>"
-msgstr ""
+msgstr "--format=<Format>"
 
 #. type: Plain text
 #: en/git-for-each-ref.txt:59
@@ -24342,10 +24339,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-for-each-ref.txt:74
-#, fuzzy, no-wrap, priority:100
-#| msgid "--contains <commit>"
+#, no-wrap, priority:100
 msgid "--points-at=<object>"
-msgstr "--contains <commit>"
+msgstr "--points-at=<Objekt>"
 
 #. type: Plain text
 #: en/git-for-each-ref.txt:76
@@ -24356,10 +24352,9 @@ msgstr "Zeige nur jene Entwicklungszweige (branches) an, welche die angegebene E
 
 #. type: Labeled list
 #: en/git-for-each-ref.txt:77
-#, fuzzy, no-wrap, priority:100
-#| msgid "--no-merged"
+#, no-wrap, priority:100
 msgid "--merged[=<object>]"
-msgstr "--no-merged"
+msgstr "--merged[=<Objekt>]"
 
 #. type: Plain text
 #: en/git-for-each-ref.txt:81
@@ -24370,10 +24365,9 @@ msgstr "Zeige nur jene Entwicklungszweige (branches) an, welche die angegebene E
 
 #. type: Labeled list
 #: en/git-for-each-ref.txt:82
-#, fuzzy, no-wrap, priority:100
-#| msgid "--no-merged"
+#, no-wrap, priority:100
 msgid "--no-merged[=<object>]"
-msgstr "--no-merged"
+msgstr "--no-merged[=<Objekt>]"
 
 #. type: Plain text
 #: en/git-for-each-ref.txt:86
@@ -24384,10 +24378,9 @@ msgstr "Zeige nur jene Entwicklungszweige (branches) an, welche die angegebene E
 
 #. type: Labeled list
 #: en/git-for-each-ref.txt:87
-#, fuzzy, no-wrap, priority:100
-#| msgid "--contains <commit>"
+#, no-wrap, priority:100
 msgid "--contains[=<object>]"
-msgstr "--contains <commit>"
+msgstr "--contains[=<Objekt>]"
 
 #. type: Plain text
 #: en/git-for-each-ref.txt:90
@@ -24398,10 +24391,9 @@ msgstr "Zeige nur jene Entwicklungszweige (branches) an, welche die angegebene E
 
 #. type: Labeled list
 #: en/git-for-each-ref.txt:91
-#, fuzzy, no-wrap, priority:100
-#| msgid "--contains <commit>"
+#, no-wrap, priority:100
 msgid "--no-contains[=<object>]"
-msgstr "--contains <commit>"
+msgstr "--no-contains[=<Objekt>]"
 
 #. type: Plain text
 #: en/git-for-each-ref.txt:94
@@ -33562,17 +33554,15 @@ msgstr "Nimm die Eintragungsbemerkung (commit message) der spezifizierten Datei.
 
 #. type: Labeled list
 #: en/git-notes.txt:147
-#, fuzzy, no-wrap, priority:100
-#| msgid "-C <commit>"
+#, no-wrap, priority:100
 msgid "-C <object>"
-msgstr "-C <commit>"
+msgstr "-C <Objekt>"
 
 #. type: Labeled list
 #: en/git-notes.txt:148
-#, fuzzy, no-wrap, priority:100
-#| msgid "--reuse-message=<commit>"
+#, no-wrap, priority:100
 msgid "--reuse-message=<object>"
-msgstr "--reuse-message=<commit>"
+msgstr "--reuse-message=<Objekt>"
 
 #. type: Plain text
 #: en/git-notes.txt:152
@@ -33582,17 +33572,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:153
-#, fuzzy, no-wrap, priority:100
-#| msgid "-c <commit>"
+#, no-wrap, priority:100
 msgid "-c <object>"
-msgstr "-c <commit>"
+msgstr "-c <Objekt>"
 
 #. type: Labeled list
 #: en/git-notes.txt:154
-#, fuzzy, no-wrap, priority:100
-#| msgid "--reedit-message=<commit>"
+#, no-wrap, priority:100
 msgid "--reedit-message=<object>"
-msgstr "--reedit-message=<commit>"
+msgstr "--reedit-message=<Objekt>"
 
 #. type: Plain text
 #: en/git-notes.txt:157
@@ -41708,7 +41696,7 @@ msgstr ""
 #: en/git-replace.txt:69
 #, no-wrap, priority:100
 msgid "--edit <object>"
-msgstr ""
+msgstr "--edit <Objekt>"
 
 #. type: Plain text
 #: en/git-replace.txt:77
@@ -46115,7 +46103,7 @@ msgstr ""
 #: en/git-shortlog.txt:42
 #, no-wrap, priority:260
 msgid "--format[=<format>]"
-msgstr ""
+msgstr "--format[=<Format>]"
 
 #. type: Plain text
 #: en/git-shortlog.txt:47
@@ -51007,10 +50995,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-switch.txt:39
-#, fuzzy, no-wrap, priority:100
-#| msgid "<newbranch>"
+#, no-wrap, priority:100
 msgid "<new-branch>"
-msgstr "<newbranch>"
+msgstr "<Neuer-Branch>"
 
 #. type: Plain text
 #: en/git-switch.txt:48
@@ -51026,17 +51013,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-switch.txt:59
-#, fuzzy, no-wrap, priority:100
-#| msgid "<newbranch>"
+#, no-wrap, priority:100
 msgid "-c <new-branch>"
-msgstr "<newbranch>"
+msgstr "-c <Neuer-Branch>"
 
 #. type: Labeled list
 #: en/git-switch.txt:60
-#, fuzzy, no-wrap, priority:100
-#| msgid "<newbranch>"
+#, no-wrap, priority:100
 msgid "--create <new-branch>"
-msgstr "<newbranch>"
+msgstr "--create <Neuer-Branch>"
 
 #. type: Plain text
 #: en/git-switch.txt:64
@@ -51056,17 +51041,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-switch.txt:70
-#, fuzzy, no-wrap, priority:100
-#| msgid "<newbranch>"
+#, no-wrap, priority:100
 msgid "-C <new-branch>"
-msgstr "<newbranch>"
+msgstr "-C <Neuer-Branch>"
 
 #. type: Labeled list
 #: en/git-switch.txt:71
-#, fuzzy, no-wrap, priority:100
-#| msgid "<new_branch>"
+#, no-wrap, priority:100
 msgid "--force-create <new-branch>"
-msgstr "<new_branch>"
+msgstr "--force-create <Neuer-Branch>"
 
 #. type: Plain text
 #: en/git-switch.txt:75
@@ -51138,10 +51121,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-switch.txt:171
-#, fuzzy, no-wrap, priority:100
-#| msgid "<new_branch>"
+#, no-wrap, priority:100
 msgid "--orphan <new-branch>"
-msgstr "<new_branch>"
+msgstr "--orphan <Neuer-Branch>"
 
 #. type: Plain text
 #: en/git-switch.txt:174
@@ -55755,17 +55737,15 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:134
-#, fuzzy, no-wrap, priority:240
-#| msgid "<newbranch>"
+#, no-wrap, priority:240
 msgid "-b <new-branch>"
-msgstr "<newbranch>"
+msgstr "-b <Neuer-Branch>"
 
 #. type: Labeled list
 #: en/git-worktree.txt:135
-#, fuzzy, no-wrap, priority:240
-#| msgid "<newbranch>"
+#, no-wrap, priority:240
 msgid "-B <new-branch>"
-msgstr "<newbranch>"
+msgstr "-B <Neuer-Branch>"
 
 #. type: Plain text
 #: en/git-worktree.txt:142
@@ -58191,7 +58171,7 @@ msgstr ""
 #: en/pretty-options.txt:1
 #, no-wrap, priority:260
 msgid "--pretty[=<format>]"
-msgstr ""
+msgstr "--pretty[=<Format>]"
 
 #. type: Plain text
 #: en/pretty-options.txt:10
diff --git a/po/pre-translate-dictionary.de.po b/po/pre-translate-dictionary.de.po
index 4808a2488ecd487d5d7360c86e87fc1ce3d7a464..45fce9281c039312019590703d0024b6aebe82dd 100644
--- a/po/pre-translate-dictionary.de.po
+++ b/po/pre-translate-dictionary.de.po
@@ -87,13 +87,24 @@ msgstr "\1Name\2"
 msgid "(--[a-zA-Z-]+=<)length(>)"
 msgstr "\1L채nge\2"
 
-
-msgid "(-{1,2}[a-zA-Z-]+[=\s]<)option(>)"
+msgid "(-{1,2}[a-zA-Z-]+[=\s]?<)option(>)"
 msgstr "\1Option\2"
 
 msgid "(-{1,2}[a-zA-Z-]+[=\s]<)options(>)"
 msgstr "\1Optionen\2"
 
+msgid "(-{,2}[a-zA-Z-\/]*\[?[=\s]?<)new[-_]?branch(>\]?)"
+msgstr "\1Neuer-Branch\2"
+
+msgid "(-{,2}[a-zA-Z-\/]*\[?[=\s]?<)old[-_]?branch(>\]?)"
+msgstr "\1Alter-Branch\2"
+
+msgid "(-{1,2}[a-zA-Z-\/]+\[?[=\s]?<)object(>\]?)"
+msgstr "\1Objekt\2"
+
+msgid "(-{1,2}[a-zA-Z-\/]+\[?[=\s]?<)format(>\]?)"
+msgstr "\1Format\2"
+
 #~ msgid "release notes for ((link:RelNotes/[0-9.]+.txt\[[0-9.]+\][.,]?\s*)+)."
 #~ msgstr "Versionshinweise f체r \1."