diff --git a/po/documentation.de.po b/po/documentation.de.po
index 6472324404be073f8910d1ad7452f152ee057848..ce3d05c4418ef31caced517030791d966241c9f7 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -5587,17 +5587,15 @@ msgstr "Der Fortschritt wird nur standardm채횩ig auf der Standardfehlerausgabe a
 
 #. type: Labeled list
 #: en/fetch-options.txt:219 en/git-ls-remote.txt:73 en/git-push.txt:215
-#, fuzzy, no-wrap, priority:220
-#| msgid "`option`"
+#, no-wrap, priority:220
 msgid "-o <option>"
-msgstr "`option`"
+msgstr "-o <Option>"
 
 #. type: Labeled list
 #: en/fetch-options.txt:220 en/git-clone.txt:135 en/git-ls-remote.txt:74
-#, fuzzy, no-wrap, priority:300
-#| msgid "--stop-at-non-option"
+#, no-wrap, priority:300
 msgid "--server-option=<option>"
-msgstr "--stop-at-non-option"
+msgstr "--server-option=<Option>"
 
 #. type: Plain text
 #: en/fetch-options.txt:227 en/git-clone.txt:142
@@ -6644,7 +6642,7 @@ msgstr "--ignore-whitespace"
 #: en/git-am.txt:109 en/git-rebase.txt:374
 #, no-wrap, priority:100
 msgid "--whitespace=<option>"
-msgstr ""
+msgstr "--whitespace=<Option>"
 
 #. type: Labeled list
 #: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:337
@@ -9415,7 +9413,7 @@ msgstr ""
 #: en/git-branch.txt:197
 #, no-wrap, priority:240
 msgid "--abbrev=<length>"
-msgstr "--abbrev=<length>"
+msgstr "--abbrev=<L채nge>"
 
 #. type: Plain text
 #: en/git-branch.txt:201
@@ -9700,7 +9698,7 @@ msgstr "L철schen eines nicht mehr ben철tigten Entwicklungszweiges (Branch)"
 
 #. type: delimited block -
 #: en/git-branch.txt:329
-#, ignore-same, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, ignore-same, no-wrap, priority:240
 msgid ""
 "$ git clone git://git.kernel.org/.../git.git my.git\n"
 "$ cd my.git\n"
@@ -12737,9 +12735,9 @@ msgstr "`option`"
 
 #. type: Labeled list
 #: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:117
-#, fuzzy, no-wrap, priority:240
+#, no-wrap, priority:240
 msgid "--strategy-option=<option>"
-msgstr "--stop-at-non-option"
+msgstr "--strategy-option=<Option>"
 
 #. type: Plain text
 #: en/git-cherry-pick.txt:155 en/git-revert.txt:111
@@ -13589,7 +13587,7 @@ msgstr "-o <name>"
 #: en/git-clone.txt:168
 #, no-wrap, priority:300
 msgid "--origin <name>"
-msgstr "--origin <name>"
+msgstr "--origin <Name>"
 
 #. type: Plain text
 #: en/git-clone.txt:171
@@ -13606,10 +13604,9 @@ msgstr "-o <name>"
 
 #. type: Labeled list
 #: en/git-clone.txt:173
-#, fuzzy, no-wrap, priority:300
-#| msgid "<branchname>"
+#, no-wrap, priority:300
 msgid "--branch <name>"
-msgstr "<branchname>"
+msgstr "--branch <Name>"
 
 #. type: Plain text
 #: en/git-clone.txt:180
@@ -13910,10 +13907,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-column.txt:23
-#, fuzzy, no-wrap, priority:100
-#| msgid "--origin <name>"
+#, no-wrap, priority:100
 msgid "--command=<name>"
-msgstr "--origin <name>"
+msgstr "--command=<Name>"
 
 #. type: Plain text
 #: en/git-column.txt:26
@@ -14350,13 +14346,13 @@ msgstr ""
 #: en/git-commit.txt:76
 #, no-wrap, priority:280
 msgid "-C <commit>"
-msgstr "-C <commit>"
+msgstr "-C <Commit>"
 
 #. type: Labeled list
 #: en/git-commit.txt:77
 #, no-wrap, priority:280
 msgid "--reuse-message=<commit>"
-msgstr "--reuse-message=<commit>"
+msgstr "--reuse-message=<Commit>"
 
 #. type: Plain text
 #: en/git-commit.txt:81
@@ -14368,13 +14364,13 @@ msgstr "Nimm eine existierende Eintragung (commit) und verwende die Eintragungsb
 #: en/git-commit.txt:82
 #, no-wrap, priority:280
 msgid "-c <commit>"
-msgstr "-c <commit>"
+msgstr "-c <Commit>"
 
 #. type: Labeled list
 #: en/git-commit.txt:83
 #, no-wrap, priority:280
 msgid "--reedit-message=<commit>"
-msgstr "--reedit-message=<commit>"
+msgstr "--reedit-message=<Commit>"
 
 #. type: Plain text
 #: en/git-commit.txt:86
@@ -14398,7 +14394,7 @@ msgstr ""
 #: en/git-commit.txt:93
 #, no-wrap, priority:280
 msgid "--squash=<commit>"
-msgstr "--squash <Commit>"
+msgstr "--squash=<Commit>"
 
 #. type: Plain text
 #: en/git-commit.txt:99
@@ -25794,7 +25790,7 @@ msgstr "git-fsck-objects - 체berpr체ft die Verbundenheit und Korrektheit der Obj
 
 #. type: Plain text
 #: en/git-fsck-objects.txt:13
-#, ignore-same, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, ignore-same, no-wrap, priority:100
 msgid "'git fsck-objects' ...\n"
 msgstr "'git fsck-objects' ...\n"
 
@@ -36780,10 +36776,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-push.txt:216
-#, fuzzy, no-wrap, priority:220
-#| msgid "--push-option"
+#, no-wrap, priority:220
 msgid "--push-option=<option>"
-msgstr "--push-option"
+msgstr "--push-option=<Option>"
 
 #. type: Plain text
 #: en/git-push.txt:226
@@ -44863,9 +44858,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-send-email.txt:230
-#, fuzzy, priority:100
+#, priority:100
 msgid "--smtp-server-option=<option>"
-msgstr "--stop-at-non-option"
+msgstr "--smtp-server-option=<Option>"
 
 #. type: Plain text
 #: en/git-send-email.txt:234
@@ -56389,9 +56384,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/merge-options.txt:116
-#, fuzzy, no-wrap, priority:240
+#, no-wrap, priority:240
 msgid "-X <option>"
-msgstr "`option`"
+msgstr "-X <Option>"
 
 #. type: Plain text
 #: en/merge-options.txt:120
diff --git a/po/pre-translate-dictionary.de.po b/po/pre-translate-dictionary.de.po
index 7e328e0da65d68aa448d4b803b950686d4938e4f..4808a2488ecd487d5d7360c86e87fc1ce3d7a464 100644
--- a/po/pre-translate-dictionary.de.po
+++ b/po/pre-translate-dictionary.de.po
@@ -78,6 +78,22 @@ msgstr "\1Encoding\2"
 msgid "(--[a-zA-Z-]+=<)address(>)"
 msgstr "\1Adresse\2"
 
+msgid "(-{,2}[a-zA-Z-]+[=\s]?<)commit(>[\s.]*)"
+msgstr "\1Commit\2"
+
+msgid "(--[a-zA-Z-]+[=\s]<)name(>)"
+msgstr "\1Name\2"
+
+msgid "(--[a-zA-Z-]+=<)length(>)"
+msgstr "\1L채nge\2"
+
+
+msgid "(-{1,2}[a-zA-Z-]+[=\s]<)option(>)"
+msgstr "\1Option\2"
+
+msgid "(-{1,2}[a-zA-Z-]+[=\s]<)options(>)"
+msgstr "\1Optionen\2"
+
 #~ msgid "release notes for ((link:RelNotes/[0-9.]+.txt\[[0-9.]+\][.,]?\s*)+)."
 #~ msgstr "Versionshinweise f체r \1."