diff --git a/po/documentation.de.po b/po/documentation.de.po
index 23ae6da27120588498e81ed82f6fe1c1977f26f1..ee0ad57606f40d10ffe20ff4b608df70e89ff79c 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -2203,7 +2203,7 @@ msgstr ""
 
 #. type: Labeled list
 #: en/config.txt:143
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`gitdir/i`"
 msgstr "`gitdir/i`"
 
@@ -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
@@ -6106,7 +6104,7 @@ msgstr "Zeigt den Unterschied zwischen HEAD und dem Index (also was committet wi
 
 #. type: delimited block -
 #: en/git-add.txt:255
-#, no-wrap, priority:300
+#, ignore-begin-space, no-wrap, priority:300
 msgid ""
 "              staged     unstaged path\n"
 "     1:       binary      nothing foo.png\n"
@@ -6142,7 +6140,7 @@ msgstr "Alle ausgew채hlten Listeneintr채ge werden wie folgt mit einem Stern '*'
 
 #. type: delimited block -
 #: en/git-add.txt:284
-#, no-wrap, priority:300
+#, ignore-begin-space, no-wrap, priority:300
 msgid ""
 "           staged     unstaged path\n"
 "  1:       binary      nothing foo.png\n"
@@ -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
@@ -8055,7 +8053,7 @@ msgstr ""
 
 #. type: delimited block -
 #: en/git-bisect.txt:80
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "$ git bisect bad\n"
 msgstr "$ git bisect bad\n"
 
@@ -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-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"
@@ -10104,7 +10102,7 @@ msgstr "git-cat-file(1)"
 #: en/git-cat-file.txt:7
 #, priority:100
 msgid "git-cat-file - Provide content or type and size information for repository objects"
-msgstr "git-cat-file - Inhalt oder Informationen zu Typ und Gr철횩e f체r Repository-Objekte bereitstellen."
+msgstr "git-cat-file - Inhalt oder Informationen zu Typ und Gr철횩e f체r Repository-Objekte bereitstellen"
 
 #. type: Plain text
 #: en/git-cat-file.txt:14
@@ -11761,7 +11759,7 @@ msgstr "If you have local modifications to one or more files that are different
 #: en/git-checkout.txt:255 en/git-switch.txt:132
 #, priority:240
 msgid "When a merge conflict happens, the index entries for conflicting paths are left unmerged, and you need to resolve the conflicts and mark the resolved paths with `git add` (or `git rm` if the merge should result in deletion of the path)."
-msgstr "When a merge conflict happens, the index entries for conflicting paths are left unmerged, and you need to resolve the conflicts and mark the resolved paths with `git add` (or `git rm` if the merge should result in deletion of the path)."
+msgstr ""
 
 #. type: Plain text
 #: en/git-checkout.txt:258
@@ -11959,7 +11957,7 @@ msgstr ""
 
 #. type: delimited block -
 #: en/git-checkout.txt:368 en/git-checkout.txt:403 en/git-checkout.txt:420
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "$ edit; git add; git commit\n"
 msgstr "$ edit; git add; git commit\n"
 
@@ -12055,7 +12053,7 @@ msgstr ""
 
 #. type: delimited block -
 #: en/git-checkout.txt:437
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "$ git checkout master\n"
 msgstr "$ git checkout master\n"
 
@@ -12080,7 +12078,7 @@ msgstr ""
 
 #. type: delimited block -
 #: en/git-checkout.txt:457
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid ""
 "$ git checkout -b foo   <1>\n"
 "$ git branch foo        <2>\n"
@@ -12145,7 +12143,7 @@ msgstr "The following sequence checks out the `master` branch, reverts the `Make
 
 #. type: delimited block -
 #: en/git-checkout.txt:503
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid ""
 "$ git checkout master             <1>\n"
 "$ git checkout master~2 Makefile  <2>\n"
@@ -12161,7 +12159,7 @@ msgstr ""
 #: en/git-checkout.txt:506
 #, priority:240
 msgid "switch branch"
-msgstr "switch branch"
+msgstr ""
 
 #. type: Plain text
 #: en/git-checkout.txt:507 en/git-restore.txt:131
@@ -12185,7 +12183,7 @@ msgstr ""
 
 #. type: delimited block -
 #: en/git-checkout.txt:514
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "$ git checkout -- '*.c'\n"
 msgstr "$ git checkout -- '*.c'\n"
 
@@ -12199,11 +12197,11 @@ msgstr ""
 #: en/git-checkout.txt:524
 #, priority:240
 msgid "If you have an unfortunate branch that is named `hello.c`, this step would be confused as an instruction to switch to that branch.  You should instead write:"
-msgstr "If you have an unfortunate branch that is named `hello.c`, this step would be confused as an instruction to switch to that branch.  You should instead write:"
+msgstr ""
 
 #. type: delimited block -
 #: en/git-checkout.txt:527
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "$ git checkout -- hello.c\n"
 msgstr "$ git checkout -- hello.c\n"
 
@@ -12216,7 +12214,7 @@ msgstr "After working in a wrong branch, switching to the correct branch would b
 
 #. type: delimited block -
 #: en/git-checkout.txt:534
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "$ git checkout mytopic\n"
 msgstr "$ git checkout mytopic\n"
 
@@ -12244,11 +12242,11 @@ msgstr ""
 #: en/git-checkout.txt:547 en/git-switch.txt:217
 #, priority:240
 msgid "You can give the `-m` flag to the command, which would try a three-way merge:"
-msgstr "You can give the `-m` flag to the command, which would try a three-way merge:"
+msgstr ""
 
 #. type: delimited block -
 #: en/git-checkout.txt:551
-#, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:240
 msgid ""
 "$ git checkout -m mytopic\n"
 "Auto-merging frotz\n"
@@ -12260,13 +12258,13 @@ msgstr ""
 #: en/git-checkout.txt:556 en/git-switch.txt:226
 #, priority:240
 msgid "After this three-way merge, the local modifications are _not_ registered in your index file, so `git diff` would show you what changes you made since the tip of the new branch."
-msgstr "After this three-way merge, the local modifications are _not_ registered in your index file, so `git diff` would show you what changes you made since the tip of the new branch."
+msgstr ""
 
 #. type: Plain text
 #: en/git-checkout.txt:559
 #, priority:240
 msgid "When a merge conflict happens during switching branches with the `-m` option, you would see something like this:"
-msgstr "When a merge conflict happens during switching branches with the `-m` option, you would see something like this:"
+msgstr ""
 
 #. type: delimited block -
 #: en/git-checkout.txt:565
@@ -12293,11 +12291,11 @@ msgstr ""
 #: en/git-checkout.txt:571
 #, priority:240
 msgid "At this point, `git diff` shows the changes cleanly merged as in the previous example, as well as the changes in the conflicted files.  Edit and resolve the conflict and mark it resolved with `git add` as usual:"
-msgstr "At this point, `git diff` shows the changes cleanly merged as in the previous example, as well as the changes in the conflicted files.  Edit and resolve the conflict and mark it resolved with `git add` as usual:"
+msgstr ""
 
 #. type: delimited block -
 #: en/git-checkout.txt:575
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid ""
 "$ edit frotz\n"
 "$ git add frotz\n"
@@ -12583,7 +12581,7 @@ msgstr ""
 #: en/git-cherry-pick.txt:43 en/git-merge.txt:116 en/git-revert.txt:36 en/git-verify-commit.txt:27
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "<commit>..."
-msgstr "<Commit>"
+msgstr "<Commit>..."
 
 #. type: Plain text
 #: en/git-cherry-pick.txt:52
@@ -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
@@ -13110,7 +13108,7 @@ msgstr "git-gitool - Graphische Alternative zu git-commit"
 
 #. type: Plain text
 #: en/git-citool.txt:12
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'git citool'\n"
 msgstr "'git citool'\n"
 
@@ -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
@@ -13838,7 +13835,7 @@ msgstr "Erzeuge einen lokalen Klon der vom aktuellen Verzeichnis borgt, ohne 'gi
 
 #. type: delimited block -
 #: en/git-clone.txt:315
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid ""
 "$ git clone -l -s -n . ../copy\n"
 "$ cd ../copy\n"
@@ -13878,7 +13875,7 @@ msgstr "Erzeuge ein 'reines' Projektarchiv um 횆nderungen publik zu machen"
 
 #. type: delimited block -
 #: en/git-clone.txt:332
-#, no-wrap, priority:300
+#, ignore-same, no-wrap, priority:300
 msgid "$ git clone --bare -l /home/proj/.git /pub/scm/proj.git\n"
 msgstr "$ git clone --bare -l /home/proj/.git /pub/scm/proj.git\n"
 
@@ -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
@@ -14228,7 +14224,7 @@ msgstr ""
 
 #. type: Title -
 #: en/git-commit-tree.txt:109
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "Discussion"
 msgstr "Discussion"
 
@@ -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
@@ -14889,7 +14885,7 @@ msgstr "Beim Aufzeichnen der eigenen Arbeit, wird der Inhalt der ver채nderten Da
 
 #. type: delimited block -
 #: en/git-commit.txt:375
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid ""
 "$ edit hello.c\n"
 "$ git rm goodbye.c\n"
@@ -14909,7 +14905,7 @@ msgstr "Anstatt die Dateien nach jeder 횆nderung einzeln im Index vorzubereiten
 
 #. type: delimited block -
 #: en/git-commit.txt:388
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid ""
 "$ edit hello.c\n"
 "$ rm goodbye.c\n"
@@ -14933,7 +14929,7 @@ msgstr "Wurden im Index 횆nderungen an mehreren Dateien vorbereitet, kann die Re
 
 #. type: delimited block -
 #: en/git-commit.txt:404
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid ""
 "$ edit hello.c hello.h\n"
 "$ git add hello.c hello.h\n"
@@ -14953,7 +14949,7 @@ msgstr "Die hier erzeugte Eintragung (commit) enth채lt ausschlie횩lich die 횆nde
 
 #. type: delimited block -
 #: en/git-commit.txt:414 en/git-commit.txt:440
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid "$ git commit\n"
 msgstr "$ git commit\n"
 
@@ -14972,7 +14968,7 @@ msgstr "Nach einer Zusammenf체hrung (merge, durchgef체hrt mit 'git-merge' oder '
 
 #. type: delimited block -
 #: en/git-commit.txt:432
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid ""
 "$ git status | grep unmerged\n"
 "unmerged: hello.c\n"
@@ -15341,13 +15337,13 @@ msgstr ""
 #: en/git-config.txt:141
 #, no-wrap, priority:100
 msgid "-f config-file"
-msgstr "-f config-file"
+msgstr "-f Konfigurationsdatei"
 
 #. type: Labeled list
 #: en/git-config.txt:142
 #, no-wrap, priority:100
 msgid "--file config-file"
-msgstr "--file config-file"
+msgstr "--file Konfigurationsdatei"
 
 #. type: Plain text
 #: en/git-config.txt:144
@@ -15651,7 +15647,7 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-config.txt:286
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "~/.gitconfig"
 msgstr "~/.gitconfig"
 
@@ -15663,7 +15659,7 @@ msgstr "Benutzerspezifische Konfigurationsdatei. Auch \"globale\" Konfigurations
 
 #. type: Labeled list
 #: en/git-config.txt:290
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "$GIT_DIR/config"
 msgstr "$GIT_DIR/config"
 
@@ -15840,7 +15836,7 @@ msgstr "Sie k철nnen den Dateimodus auf \"true\" setzen mit"
 
 #. type: delimited block -
 #: en/git-config.txt:374
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "% git config core.filemode true\n"
 msgstr "% git config core.filemode true\n"
 
@@ -15852,7 +15848,7 @@ msgstr "Die hypothetischen Proxybefehlseintr채ge haben ein Anh채ngel, um untersc
 
 #. type: delimited block -
 #: en/git-config.txt:382
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
 msgstr "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
 
@@ -15870,7 +15866,7 @@ msgstr "Um den Eintrag f체r Umbenennungen zu l철schen, verwenden Sie"
 
 #. type: delimited block -
 #: en/git-config.txt:390
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "% git config --unset diff.renames\n"
 msgstr "% git config --unset diff.renames\n"
 
@@ -15888,7 +15884,7 @@ msgstr "Um den Wert f체r einen gegebenen Schl체ssel abzufragen, benutzen Sie"
 
 #. type: delimited block -
 #: en/git-config.txt:399
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "% git config --get core.filemode\n"
 msgstr "% git config --get core.filemode\n"
 
@@ -15900,7 +15896,7 @@ msgstr "oder"
 
 #. type: delimited block -
 #: en/git-config.txt:405
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "% git config core.filemode\n"
 msgstr "% git config core.filemode\n"
 
@@ -15912,7 +15908,7 @@ msgstr "oder, um eine Multivar abzufragen:"
 
 #. type: delimited block -
 #: en/git-config.txt:411
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
 msgstr "% git config --get core.gitproxy \"for kernel.org$\"\n"
 
@@ -15924,7 +15920,7 @@ msgstr "Falls Sie alle Werte einer Multivar wissen m철chten, verwenden Sie:"
 
 #. type: delimited block -
 #: en/git-config.txt:417
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "% git config --get-all core.gitproxy\n"
 msgstr "% git config --get-all core.gitproxy\n"
 
@@ -15937,7 +15933,7 @@ msgstr "Wenn Sie gerne gef채hrlich leben, k철nnen Sie *alle* core.gitproxy-Eintr
 
 #. type: delimited block -
 #: en/git-config.txt:424
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "% git config --replace-all core.gitproxy ssh\n"
 msgstr "% git config --replace-all core.gitproxy ssh\n"
 
@@ -15949,7 +15945,7 @@ msgstr "Wenn Sie jedoch wirklich nur eine Zeile f체r den Standardproxy ver채nder
 
 #. type: delimited block -
 #: en/git-config.txt:431
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "% git config core.gitproxy ssh '! for '\n"
 msgstr "% git config core.gitproxy ssh '! for '\n"
 
@@ -15961,7 +15957,7 @@ msgstr "Um wirklich die Werte mit einem Ausrufezeichen auszulesen, m체ssen Sie"
 
 #. type: delimited block -
 #: en/git-config.txt:437
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "% git config section.key value '[!]'\n"
 msgstr "% git config section.key value '[!]'\n"
 
@@ -16350,7 +16346,7 @@ msgstr "Wenn nicht explizit mit '--file' ver채ndert, gibt es drei Dateien, in we
 
 #. type: Labeled list
 #: en/git-credential-store.txt:50
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "~/.git-credentials"
 msgstr "~/.git-credentials"
 
@@ -18412,7 +18408,7 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-daemon.txt:235
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "upload-pack"
 msgstr "upload-pack"
 
@@ -18424,7 +18420,7 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-daemon.txt:241
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "upload-archive"
 msgstr "upload-archive"
 
@@ -19779,7 +19775,7 @@ msgstr "Verschiedene M철glichkeiten den Arbeitsbereich zu testen"
 
 #. type: delimited block -
 #: en/git-diff.txt:131
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
 "$ git diff --cached   <2>\n"
@@ -19815,7 +19811,7 @@ msgstr "Vergleich mit beliegigen Eintragungen (commits)"
 
 #. type: delimited block -
 #: en/git-diff.txt:145
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
 "$ git diff HEAD -- ./test  <2>\n"
@@ -19851,7 +19847,7 @@ msgstr "Versionszweige (branches) vergleichen"
 
 #. type: delimited block -
 #: en/git-diff.txt:160
-#, ignore-ellipsis, no-wrap, priority:280
+#, ignore-ellipsis, ignore-same, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
 "$ git diff topic..master   <2>\n"
@@ -19887,7 +19883,7 @@ msgstr "Ausgabe von 'diff' einschr채nken"
 
 #. type: delimited block -
 #: en/git-diff.txt:173
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
 "$ git diff --name-status                <2>\n"
@@ -19924,7 +19920,7 @@ msgstr "Ver채ndern (munging) der 'diff'-Ausgabe"
 
 #. type: delimited block -
 #: en/git-diff.txt:186
-#, no-wrap, priority:280
+#, ignore-same, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
 "$ git diff -R                          <2>\n"
@@ -19946,7 +19942,7 @@ msgstr "Ausgabe in umgekehrter Reihenfolge."
 
 #. type: Plain text
 #: en/git-diff.txt:200
-#, priority:280
+#, ignore-same, priority:280
 msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
 msgstr "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
 
@@ -23168,7 +23164,7 @@ msgstr "Auflisten oder L철schen (wenn die '-d' Option gleichzeitig verwendet wir
 
 #. type: delimited block -
 #: en/git-fetch.txt:248
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "$ git fetch origin\n"
 msgstr "$ git fetch origin\n"
 
@@ -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-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, ignore-same, no-wrap, priority:100
 msgid "'git fsck-objects' ...\n"
 msgstr "'git fsck-objects' ...\n"
 
@@ -27219,7 +27215,7 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-gui.txt:74
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`git gui citool`"
 msgstr "`git gui citool`"
 
@@ -27255,7 +27251,7 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-gui.txt:92
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "`git citool`"
 msgstr "`git citool`"
 
@@ -33890,7 +33886,7 @@ msgstr ""
 
 #. type: delimited block -
 #: en/git-p4.txt:94
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "$ git p4 sync\n"
 msgstr "$ git p4 sync\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
@@ -37312,7 +37307,7 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-push.txt:597
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "`git push origin master`"
 msgstr "`git push origin master`"
 
@@ -40816,7 +40811,7 @@ msgstr "Ohne Argumente wird eine Liste der vorhandenen Remotes angezeigt.  Mehre
 
 #. type: Labeled list
 #: en/git-remote.txt:47
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "'add'"
 msgstr "'add'"
 
@@ -40906,7 +40901,7 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-remote.txt:93
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "'rm'"
 msgstr "'rm'"
 
@@ -41033,7 +41028,7 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-remote.txt:166
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "'show'"
 msgstr "'show'"
 
@@ -41051,7 +41046,7 @@ msgstr "Mit der Option `-n`, werden die entfernten Heads nicht zuerst mit `git l
 
 #. type: Labeled list
 #: en/git-remote.txt:173
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "'prune'"
 msgstr "'prune'"
 
@@ -41076,7 +41071,7 @@ msgstr "Mit der Option `--dry-run`, wird lediglich angezeigt, welche Zweige gel
 
 #. type: Labeled list
 #: en/git-remote.txt:187
-#, no-wrap, priority:220
+#, ignore-same, no-wrap, priority:220
 msgid "'update'"
 msgstr "'update'"
 
@@ -41429,7 +41424,7 @@ msgstr "Gibt Informationen 체ber das entfernte Repository <Name> aus."
 
 #. type: delimited block -
 #: en/git-replace.txt:51
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "$ git cat-file commit foo\n"
 msgstr "$ git cat-file commit foo\n"
 
@@ -41811,7 +41806,7 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-rerere.txt:49
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "'diff'"
 msgstr "'diff'"
 
@@ -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
@@ -45476,7 +45471,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-send-email.txt:521
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 msgstr "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 
@@ -45765,7 +45760,7 @@ msgstr ""
 
 #. type: Title =
 #: en/git-sh-i18n--envsubst.txt:2
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "git-sh-i18n{litdd}envsubst(1)"
 msgstr "git-sh-i18n{litdd}envsubst(1)"
 
@@ -46960,7 +46955,7 @@ msgstr "git-stage(1)"
 #: en/git-stage.txt:7
 #, priority:100
 msgid "git-stage - Add file contents to the staging area"
-msgstr "git-stage - F체ge Dateiinhalte zum Staging-Bereich hinzu."
+msgstr "git-stage - F체ge Dateiinhalte zum Staging-Bereich hinzu"
 
 #. type: Plain text
 #: en/git-stage.txt:13
@@ -48819,7 +48814,7 @@ msgstr "git-svn(1)"
 #: en/git-svn.txt:7
 #, priority:100
 msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
-msgstr "git-svn - Bidirektionale Operationen zwischen einem Subversion-Repository und Git."
+msgstr "git-svn - Bidirektionale Operationen zwischen einem Subversion-Repository und Git"
 
 #. type: Plain text
 #: en/git-svn.txt:12
@@ -51689,7 +51684,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-tag.txt:384
-#, priority:240
+#, ignore-same, priority:240
 msgid "linkgit:git-check-ref-format[1].  linkgit:git-config[1]."
 msgstr "linkgit:git-check-ref-format[1].  linkgit:git-config[1]."
 
@@ -51785,7 +51780,7 @@ msgstr "Diese Option beeinflusst andere Optionen, die Pfade erwarten, wie `--git
 
 #. type: Plain text
 #: en/git.txt:70
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid ""
 "    git --git-dir=a.git --work-tree=b -C c status\n"
 "    git --git-dir=c/a.git --work-tree=c/b status\n"
@@ -52524,12 +52519,11 @@ msgid "`GIT_COMMON_DIR`"
 msgstr "`GIT_COMMON_DIR`"
 
 #. type: Plain text
-# noqa
-# noqa
 #: en/git.txt:481
 #, ignore-ellipsis, priority:100
+#noqa
 msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
-msgstr "Wenn diese Variable einen Pfad enth채lt, werde  nicht-Arbeitsverzeichnis-Dateien, die sich normalerweise in $GIT_DIR befinden stattdessen aus diesem Verzeichnis geladen. Arbeitsverzeichnis-spezifische Dateien wie HEAD oder index werden aus $GIT_DIR geladen. Siehe linkgit:gitrepository-layout[5] und linkgit:git-worktree[1] f체r Details. Andere Pfadvariablen wie GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY, etc. haben Vorrang gegen체ber dieser Variable."
+msgstr "Wenn diese Variable einen Pfad enth채lt, werden nicht-Arbeitsverzeichnis-Dateien, die sich normalerweise in $GIT_DIR befinden stattdessen aus diesem Verzeichnis geladen. Arbeitsverzeichnis-spezifische Dateien wie HEAD oder index werden aus $GIT_DIR geladen. Siehe linkgit:gitrepository-layout[5] und linkgit:git-worktree[1] f체r Details. Andere Pfadvariablen wie GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY, etc. haben Vorrang gegen체ber dieser Variable."
 
 #. type: Title ~
 #: en/git.txt:483
@@ -55400,7 +55394,7 @@ msgstr "`git whatchanged -p v2.6.12.. include/scsi drivers/scsi`"
 #: en/git-whatchanged.txt:34
 #, priority:100
 msgid "Show as patches the commits since version 'v2.6.12' that changed any file in the include/scsi or drivers/scsi subdirectories"
-msgstr "Zeigt alle Commits seit der Version 'v2.6.12', die Dateien in den Verzeichnissen include/scsi oder drivers/scsi ge채ndert haben, als Patches an."
+msgstr "Zeigt alle Commits seit der Version 'v2.6.12', die Dateien in den Verzeichnissen include/scsi oder drivers/scsi ge채ndert haben, als Patches an"
 
 #. type: Labeled list
 #: en/git-whatchanged.txt:35
@@ -56389,9 +56383,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."