de: fix remaining mistranslated de strings from experimenting with WebLate

Signed-off-by: Matthias Aßhauer <mha1993@live.de>

po/documentation.de.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git documentation\n"
 "POT-Creation-Date: 2019-01-26 17:40+0100\n"
-"PO-Revision-Date: 2019-01-30 13:17+0100\n"
+"PO-Revision-Date: 2019-01-30 20:07+0100\n"
 "Last-Translator: Matthias Aßhauer <mha1993@live.de>\n"
 "Language-Team: Matthias Aßhauer <mha1993@live.de>\n"
 "Language: de\n"
@@ -2568,9 +2568,9 @@ msgstr ""
 #. type: Labeled list
 #: en/config.txt:300
-#, no-wrap
+#, ignore-same, no-wrap
 msgid "statusHints"
-msgstr "status"
+msgstr "statusHints"
 #. type: Plain text
 #: en/config.txt:306
@@ -2585,9 +2585,9 @@ msgstr ""
 #. type: Labeled list
 #: en/config.txt:306
-#, no-wrap
+#, ignore-same, no-wrap
 msgid "statusUoption"
-msgstr "status"
+msgstr "statusUoption"
 #. type: Plain text
 #: en/config.txt:310
@@ -14504,8 +14504,9 @@ msgstr ""
 #. type: Plain text
 #: en/git-am.txt:229
+#, ignore-same
 msgid "linkgit:git-apply[1]."
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:git-apply[1]"
 #. type: Title =
 #: en/git-annotate.txt:2
@@ -15827,9 +15828,9 @@ msgstr ""
 #. type: delimited block -
 #: en/git-bisect.txt:80
-#, no-wrap
+#, ignore-same, no-wrap
 msgid "$ git bisect bad\n"
-msgstr "$ git commit -a\n"
+msgstr "$ git bisect bad\n"
 #. type: Plain text
 #: en/git-bisect.txt:83
@@ -15895,7 +15896,7 @@ msgstr ""
 #: en/git-bisect.txt:116
 #, no-wrap
 msgid "$ git bisect reset <commit>\n"
-msgstr "$ git commit\n"
+msgstr "$ git bisect reset <Commit>\n"
 #. type: Plain text
 #: en/git-bisect.txt:121
@@ -19083,8 +19084,9 @@ msgstr ""
 #. type: Plain text
 #: en/git-check-attr.txt:117
+#, ignore-same
 msgid "linkgit:gitattributes[5]."
-msgstr "linkgit:git-add[1]"
+msgstr "linkgit:gitattributes[5]."
 #. type: Title =
 #: en/git-check-ignore.txt:2
@@ -20258,11 +20260,9 @@ msgstr ""
 #. type: delimited block -
 #: en/git-checkout.txt:311 en/git-checkout.txt:346 en/git-checkout.txt:363
-#, no-wrap
+#, ignore-same, no-wrap
 msgid "$ edit; git add; git commit\n"
-msgstr ""
-"(Datei bearbeiten)\n"
-"$ git commit -a\n"
+msgstr "$ edit; git add; git commit\n"
 #. type: delimited block -
 #: en/git-checkout.txt:319
@@ -20369,9 +20369,9 @@ msgstr ""
 #. type: delimited block -
 #: en/git-checkout.txt:380
-#, no-wrap
+#, ignore-same, no-wrap
 msgid "$ git checkout master\n"
-msgstr "$ git checkout mytopic\n"
+msgstr "$ git checkout master\n"
 #. type: delimited block -
 #: en/git-checkout.txt:388
@@ -20398,15 +20398,15 @@ msgstr ""
 #. type: delimited block -
 #: en/git-checkout.txt:400
-#, no-wrap
+#, ignore-same, no-wrap
 msgid ""
 "$ git checkout -b foo   <1>\n"
 "$ git branch foo        <2>\n"
 "$ git tag foo           <3>\n"
 msgstr ""
-"$ git diff            <1>\n"
-"$ git diff --cached   <2>\n"
-"$ git diff HEAD       <3>\n"
+"$ git checkout -b foo   <1>\n"
+"$ git branch foo        <2>\n"
+"$ git tag foo           <3>\n"
 #. type: Plain text
 #: en/git-checkout.txt:405
@@ -20518,9 +20518,9 @@ msgstr ""
 #. type: delimited block -
 #: en/git-checkout.txt:457
-#, no-wrap
+#, ignore-same, no-wrap
 msgid "$ git checkout -- '*.c'\n"
-msgstr "$ git checkout -- hello.c\n"
+msgstr "$ git checkout -- '*.c'\n"
 #. type: Plain text
 #: en/git-checkout.txt:463
@@ -21760,7 +21760,12 @@ msgstr ""
 #. type: delimited block -
 #: en/git-clean.txt:90
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "    *** Commands ***\n"
+#| "      1: status       2: update       3: revert       4: add untracked\n"
+#| "      5: patch        6: diff         7: quit         8: help\n"
+#| "    What now> 1\n"
 msgid ""
 "    *** Commands ***\n"
 "\t1: clean                2: filter by pattern    3: select by numbers\n"
@@ -23185,7 +23190,7 @@ msgstr ""
 #: en/git-commit.txt:83
 #, no-wrap
 msgid "--fixup=<commit>"
-msgstr "-C <commit>"
+msgstr "--fixup=<Commit>"
 #. type: Plain text
 #: en/git-commit.txt:88
@@ -23199,7 +23204,7 @@ msgstr ""
 #: en/git-commit.txt:89
 #, no-wrap
 msgid "--squash=<commit>"
-msgstr "--contains <commit>"
+msgstr "--squash <Commit>"
 #. type: Plain text
 #: en/git-commit.txt:95
@@ -25603,9 +25608,9 @@ msgstr ""
 #. type: Labeled list
 #: en/git-credential-store.txt:50
-#, no-wrap
+#, ignore-same, no-wrap
 msgid "~/.git-credentials"
-msgstr "~/.gitconfig"
+msgstr "~/.git-credentials"
 #. type: Plain text
 #: en/git-credential-store.txt:52
@@ -27926,9 +27931,9 @@ msgstr ""
 #. type: Labeled list
 #: en/git-daemon.txt:213
-#, no-wrap
+#, ignore-same, no-wrap
 msgid "upload-pack"
-msgstr "-u <upload-pack>"
+msgstr "upload-pack"
 #. type: Plain text
 #: en/git-daemon.txt:218
@@ -27940,9 +27945,9 @@ msgstr ""
 #. type: Labeled list
 #: en/git-daemon.txt:219
-#, no-wrap
+#, ignore-same, no-wrap
 msgid "upload-archive"
-msgstr "-u <upload-pack>"
+msgstr "upload-archive"
 #. type: Plain text
 #: en/git-daemon.txt:223
@@ -29767,12 +29772,13 @@ msgstr "Ausgabe in umgekehrter Reihenfolge."
 #. type: Plain text
 #: en/git-diff.txt:186
+#, ignore-same
 msgid ""
 "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], "
 "linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
 msgstr ""
-"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
-"merge[1], linkgit:git-commit-tree[1]"
+"diff(1), linkgit:git-difftool[1], linkgit:git-log[1], "
+"linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
 #. type: Title =
 #: en/git-fast-export.txt:2
@@ -33465,9 +33471,9 @@ msgstr ""
 #. type: delimited block -
 #: en/git-fetch.txt:161
-#, no-wrap
+#, ignore-same, no-wrap
 msgid "$ git fetch origin\n"
-msgstr "alice$ git fetch bob\n"
+msgstr "$ git fetch origin\n"
 #. type: Plain text
 #: en/git-fetch.txt:167
@@ -35688,7 +35694,7 @@ msgstr ""
 #: en/git-format-patch.txt:274
 #, no-wrap
 msgid "--base=<commit>"
-msgstr "--contains <commit>"
+msgstr "--base=<Commit>"
 #. type: Plain text
 #: en/git-format-patch.txt:278
@@ -37891,9 +37897,9 @@ msgstr ""
 #. type: Labeled list
 #: en/git-gui.txt:74
-#, no-wrap
+#, ignor-same, no-wrap
 msgid "`git gui citool`"
-msgstr "'git citool'"
+msgstr "`git gui citool`"
 #. type: Plain text
 #: en/git-gui.txt:79
@@ -37931,9 +37937,9 @@ msgstr ""
 #. type: Labeled list
 #: en/git-gui.txt:92
-#, no-wrap
+#, ignore-same, no-wrap
 msgid "`git citool`"
-msgstr "'git citool'"
+msgstr "`git citool`"
 #. type: Plain text
 #: en/git-gui.txt:95
@@ -41922,7 +41928,8 @@ msgstr ""
 #. type: Labeled list
 #: en/git-ls-remote.txt:40
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid "-u <upload-pack>"
 msgid "--upload-pack=<exec>"
 msgstr "-u <upload-pack>"
@@ -45245,9 +45252,9 @@ msgstr ""
 #. type: delimited block -
 #: en/git-p4.txt:94
-#, no-wrap
+#, ignore-same, no-wrap
 msgid "$ git p4 sync\n"
-msgstr "$ git branch\n"
+msgstr "$ git p4 sync\n"
 #. type: Plain text
 #: en/git-p4.txt:96
@@ -45658,7 +45665,7 @@ msgstr ""
 #: en/git-p4.txt:275
 #, no-wrap
 msgid "--origin <commit>"
-msgstr "--contains <commit>"
+msgstr "--origin <Commit>"
 #. type: Plain text
 #: en/git-p4.txt:279
@@ -53014,9 +53021,9 @@ msgstr ""
 #. type: delimited block -
 #: en/git-replace.txt:50
-#, no-wrap
+#, ignore-same, no-wrap
 msgid "$ git cat-file commit foo\n"
-msgstr "$ git commit -a\n"
+msgstr "$ git cat-file commit foo\n"
 #. type: Plain text
 #: en/git-replace.txt:53
@@ -53441,9 +53448,9 @@ msgstr ""
 #. type: Labeled list
 #: en/git-rerere.txt:49
-#, no-wrap
+#, ignore-same, no-wrap
 msgid "'diff'"
-msgstr "diff"
+msgstr "'diff'"
 #. type: Plain text
 #: en/git-rerere.txt:55
@@ -56085,9 +56092,9 @@ msgstr ""
 #. type: delimited block -
 #: en/git-rm.txt:122
-#, no-wrap
+#, ignore-same, no-wrap
 msgid "git add -A\n"
-msgstr "$ git add .\n"
+msgstr "$ git add -A\n"
 #. type: Plain text
 #: en/git-rm.txt:125
@@ -56148,9 +56155,9 @@ msgstr ""
 #. type: Labeled list
 #: en/git-rm.txt:160
-#, no-wrap
+#, ignore-same, no-wrap
 msgid "`git rm Documentation/\\*.txt`"
-msgstr "git rm Documentation/\\\\*.txt"
+msgstr "git rm Documentation/\\*.txt"
 #. type: Plain text
 #: en/git-rm.txt:163
@@ -57253,8 +57260,9 @@ msgstr ""
 #. type: Plain text
 #: en/git-send-email.txt:479
+#, ignore-same
 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
-msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
+msgstr "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
 #. type: Title =
 #: en/git-send-pack.txt:2
@@ -63866,8 +63874,9 @@ msgstr ""
 #. type: Plain text
 #: en/git-tag.txt:348
+#, ignore-same
 msgid "linkgit:git-check-ref-format[1].  linkgit:git-config[1]."
-msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
+msgstr "linkgit:git-check-ref-format[1].  linkgit:git-config[1]."
 #. type: Title =
 #: en/git.txt:2
@@ -66232,8 +66241,10 @@ msgid ""
 "tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's "
 "Manual], linkgit:gitworkflows[7]"
 msgstr ""
-"linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:everyday[7], "
-"linkgit:gitcvs-migration[7], link:user-manual.html[The Git User's Manual]"
+"linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], "
+"linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-"
+"tutorial[7], linkgit:gitcli[7], link:user-manual.html[Das "
+"Git-Benutzerhandbuch], linkgit:gitworkflows[7]"
 #. type: Title =
 #: en/git-unpack-file.txt:2
@@ -69913,13 +69924,15 @@ msgstr ""
 #. type: Plain text
 #: en/mergetools-merge.txt:7
+#, ignore-same
 msgid "diffmerge"
-msgstr "diff"
+msgstr "diffmerge"
 #. type: Plain text
 #: en/mergetools-merge.txt:8
+#, ignore-same
 msgid "diffuse"
-msgstr "diff"
+msgstr "diffuse"
 #. type: Plain text
 #: en/mergetools-merge.txt:9
@@ -69930,13 +69943,15 @@ msgstr "--merged"
 #. type: Plain text
 #: en/mergetools-merge.txt:10
+#, ignore-same
 msgid "emerge"
-msgstr "--merged"
+msgstr "emerge"
 #. type: Plain text
 #: en/mergetools-merge.txt:11
+#, ignore-same
 msgid "examdiff"
-msgstr "diff"
+msgstr "examdiff"
 #. type: Plain text
 #: en/mergetools-merge.txt:12
@@ -69945,23 +69960,27 @@ msgstr ""
 #. type: Plain text
 #: en/mergetools-merge.txt:13
+#, ignore-same
 msgid "gvimdiff"
-msgstr "diff"
+msgstr "gvimdiff"
 #. type: Plain text
 #: en/mergetools-merge.txt:14
+#, ignore-same
 msgid "gvimdiff2"
-msgstr "diff"
+msgstr "gvimdiff2"
 #. type: Plain text
 #: en/mergetools-merge.txt:15
+#, ignore-same
 msgid "gvimdiff3"
-msgstr "diff"
+msgstr "gvimdiff3"
 #. type: Plain text
 #: en/mergetools-merge.txt:16
+#, ignore-same
 msgid "kdiff3"
-msgstr "diff"
+msgstr "kdiff3"
 #. type: Plain text
 #: en/mergetools-merge.txt:17
@@ -69970,8 +69989,9 @@ msgstr ""
 #. type: Plain text
 #: en/mergetools-merge.txt:18
+#, ignore-same
 msgid "opendiff"
-msgstr "diff"
+msgstr "opendiff"
 #. type: Plain text
 #: en/mergetools-merge.txt:19
@@ -69982,8 +70002,9 @@ msgstr "--merged"
 #. type: Plain text
 #: en/mergetools-merge.txt:20
+#, ignore-same
 msgid "tkdiff"
-msgstr "diff"
+msgstr "tkdiff"
 #. type: Plain text
 #: en/mergetools-merge.txt:21
@@ -69992,28 +70013,33 @@ msgstr ""
 #. type: Plain text
 #: en/mergetools-merge.txt:22
+#, ignore-same
 msgid "vimdiff"
-msgstr "diff"
+msgstr "vimdiff"
 #. type: Plain text
 #: en/mergetools-merge.txt:23
+#, ignore-same
 msgid "vimdiff2"
-msgstr "diff"
+msgstr "vimdiff2"
 #. type: Plain text
 #: en/mergetools-merge.txt:24
+#, ignore-same
 msgid "vimdiff3"
-msgstr "diff"
+msgstr "vimdiff3"
 #. type: Plain text
 #: en/mergetools-merge.txt:25
+#, ignore-same
 msgid "winmerge"
-msgstr "--no-merged"
+msgstr "winmerge"
 #. type: Plain text
 #: en/mergetools-merge.txt:25
+#, ignore-same
 msgid "xxdiff"
-msgstr "diff"
+msgstr "xxdiff"
 #. type: Title -
 #: en/pretty-formats.txt:2
@@ -70581,8 +70607,9 @@ msgstr ""
 #. type: Plain text
 #: en/pretty-formats.txt:225
+#, ignore-same
 msgid "'tformat:'"
-msgstr "Output format"
+msgstr "'tformat:'"
 #. type: Plain text
 #: en/pretty-formats.txt:233