Skip to content
Snippets Groups Projects
Unverified Commit f8357eea authored by Jean-Noël Avila's avatar Jean-Noël Avila Committed by Hosted Weblate
Browse files

Translated using Weblate (German)

Currently translated at 18.5% (1807 of 9790 strings)

Translation: Git Manpages/Translations
Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/de/


Signed-off-by: default avatarJean-Noël Avila <jn.avila@free.fr>
parent a9eedc64
No related branches found
No related tags found
No related merge requests found
...@@ -9,13 +9,15 @@ msgid "" ...@@ -9,13 +9,15 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: git documentation\n" "Project-Id-Version: git documentation\n"
"POT-Creation-Date: 2019-01-26 17:40+0100\n" "POT-Creation-Date: 2019-01-26 17:40+0100\n"
"PO-Revision-Date: 2019-01-16 13:41+0100\n" "PO-Revision-Date: 2019-01-30 07:39+0000\n"
"Last-Translator: Matthias Aßhauer <mha1993@live.de>\n" "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: de\n" "Language: de\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 3.5-dev\n"
   
#. type: Labeled list #. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:525 en/git-instaweb.txt:44 #: en/blame-options.txt:1 en/diff-options.txt:525 en/git-instaweb.txt:44
...@@ -2566,8 +2568,7 @@ msgstr "" ...@@ -2566,8 +2568,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/config.txt:300 #: en/config.txt:300
#, fuzzy, no-wrap #, no-wrap
#| msgid "status"
msgid "statusHints" msgid "statusHints"
msgstr "status" msgstr "status"
   
...@@ -2584,8 +2585,7 @@ msgstr "" ...@@ -2584,8 +2585,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/config.txt:306 #: en/config.txt:306
#, fuzzy, no-wrap #, no-wrap
#| msgid "status"
msgid "statusUoption" msgid "statusUoption"
msgstr "status" msgstr "status"
   
...@@ -9634,8 +9634,7 @@ msgstr "" ...@@ -9634,8 +9634,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/diff-config.txt:93 #: en/diff-config.txt:93
#, fuzzy, no-wrap #, no-wrap
#| msgid "$ git diff\n"
msgid "`git diff`" msgid "`git diff`"
msgstr "$ git diff\n" msgstr "$ git diff\n"
   
...@@ -14505,8 +14504,6 @@ msgstr "" ...@@ -14505,8 +14504,6 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-am.txt:229 #: en/git-am.txt:229
#, fuzzy
#| msgid "linkgit:git-add[1]"
msgid "linkgit:git-apply[1]." msgid "linkgit:git-apply[1]."
msgstr "linkgit:git-add[1]" msgstr "linkgit:git-add[1]"
   
...@@ -15060,8 +15057,6 @@ msgstr "" ...@@ -15060,8 +15057,6 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-apply.txt:272 #: en/git-apply.txt:272
#, fuzzy
#| msgid "linkgit:git-add[1]"
msgid "linkgit:git-am[1]." msgid "linkgit:git-am[1]."
msgstr "linkgit:git-add[1]" msgstr "linkgit:git-add[1]"
   
...@@ -15832,8 +15827,7 @@ msgstr "" ...@@ -15832,8 +15827,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-bisect.txt:80 #: en/git-bisect.txt:80
#, fuzzy, no-wrap #, no-wrap
#| msgid "$ git commit -a\n"
msgid "$ git bisect bad\n" msgid "$ git bisect bad\n"
msgstr "$ git commit -a\n" msgstr "$ git commit -a\n"
   
...@@ -15899,8 +15893,7 @@ msgstr "" ...@@ -15899,8 +15893,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-bisect.txt:116 #: en/git-bisect.txt:116
#, fuzzy, no-wrap #, no-wrap
#| msgid "$ git commit\n"
msgid "$ git bisect reset <commit>\n" msgid "$ git bisect reset <commit>\n"
msgstr "$ git commit\n" msgstr "$ git commit\n"
   
...@@ -16095,8 +16088,7 @@ msgstr "" ...@@ -16095,8 +16088,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-bisect.txt:224 #: en/git-bisect.txt:224
#, fuzzy, no-wrap #, no-wrap
#| msgid "$ git log\n"
msgid "$ git bisect log\n" msgid "$ git bisect log\n"
msgstr "$ git log\n" msgstr "$ git log\n"
   
...@@ -19091,8 +19083,6 @@ msgstr "" ...@@ -19091,8 +19083,6 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-check-attr.txt:117 #: en/git-check-attr.txt:117
#, fuzzy
#| msgid "linkgit:git-add[1]"
msgid "linkgit:gitattributes[5]." msgid "linkgit:gitattributes[5]."
msgstr "linkgit:git-add[1]" msgstr "linkgit:git-add[1]"
   
...@@ -20268,10 +20258,7 @@ msgstr "" ...@@ -20268,10 +20258,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-checkout.txt:311 en/git-checkout.txt:346 en/git-checkout.txt:363 #: en/git-checkout.txt:311 en/git-checkout.txt:346 en/git-checkout.txt:363
#, fuzzy, no-wrap #, no-wrap
#| msgid ""
#| "(edit file)\n"
#| "$ git commit -a\n"
msgid "$ edit; git add; git commit\n" msgid "$ edit; git add; git commit\n"
msgstr "" msgstr ""
"(Datei bearbeiten)\n" "(Datei bearbeiten)\n"
...@@ -20382,8 +20369,7 @@ msgstr "" ...@@ -20382,8 +20369,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-checkout.txt:380 #: en/git-checkout.txt:380
#, fuzzy, no-wrap #, no-wrap
#| msgid "$ git checkout mytopic\n"
msgid "$ git checkout master\n" msgid "$ git checkout master\n"
msgstr "$ git checkout mytopic\n" msgstr "$ git checkout mytopic\n"
   
...@@ -20412,11 +20398,7 @@ msgstr "" ...@@ -20412,11 +20398,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-checkout.txt:400 #: en/git-checkout.txt:400
#, fuzzy, no-wrap #, no-wrap
#| msgid ""
#| "$ git diff <1>\n"
#| "$ git diff --cached <2>\n"
#| "$ git diff HEAD <3>\n"
msgid "" msgid ""
"$ git checkout -b foo <1>\n" "$ git checkout -b foo <1>\n"
"$ git branch foo <2>\n" "$ git branch foo <2>\n"
...@@ -20536,8 +20518,7 @@ msgstr "" ...@@ -20536,8 +20518,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-checkout.txt:457 #: en/git-checkout.txt:457
#, fuzzy, no-wrap #, no-wrap
#| msgid "$ git checkout -- hello.c\n"
msgid "$ git checkout -- '*.c'\n" msgid "$ git checkout -- '*.c'\n"
msgstr "$ git checkout -- hello.c\n" msgstr "$ git checkout -- hello.c\n"
   
...@@ -21598,8 +21579,7 @@ msgstr "git-gitool - Graphische Alternative zu git-commit" ...@@ -21598,8 +21579,7 @@ msgstr "git-gitool - Graphische Alternative zu git-commit"
   
#. type: Plain text #. type: Plain text
#: en/git-citool.txt:12 #: en/git-citool.txt:12
#, fuzzy, no-wrap #, no-wrap
#| msgid "'git citool'"
msgid "'git citool'\n" msgid "'git citool'\n"
msgstr "'git citool'" msgstr "'git citool'"
   
...@@ -21780,12 +21760,7 @@ msgstr "" ...@@ -21780,12 +21760,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-clean.txt:90 #: en/git-clean.txt:90
#, fuzzy, no-wrap #, 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 "" msgid ""
" *** Commands ***\n" " *** Commands ***\n"
"\t1: clean 2: filter by pattern 3: select by numbers\n" "\t1: clean 2: filter by pattern 3: select by numbers\n"
...@@ -23208,8 +23183,7 @@ msgstr "" ...@@ -23208,8 +23183,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-commit.txt:83 #: en/git-commit.txt:83
#, fuzzy, no-wrap #, no-wrap
#| msgid "-C <commit>"
msgid "--fixup=<commit>" msgid "--fixup=<commit>"
msgstr "-C <commit>" msgstr "-C <commit>"
   
...@@ -23223,8 +23197,7 @@ msgstr "" ...@@ -23223,8 +23197,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-commit.txt:89 #: en/git-commit.txt:89
#, fuzzy, no-wrap #, no-wrap
#| msgid "--contains <commit>"
msgid "--squash=<commit>" msgid "--squash=<commit>"
msgstr "--contains <commit>" msgstr "--contains <commit>"
   
...@@ -25630,8 +25603,7 @@ msgstr "" ...@@ -25630,8 +25603,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-credential-store.txt:50 #: en/git-credential-store.txt:50
#, fuzzy, no-wrap #, no-wrap
#| msgid "~/.gitconfig"
msgid "~/.git-credentials" msgid "~/.git-credentials"
msgstr "~/.gitconfig" msgstr "~/.gitconfig"
   
...@@ -27954,8 +27926,7 @@ msgstr "" ...@@ -27954,8 +27926,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-daemon.txt:213 #: en/git-daemon.txt:213
#, fuzzy, no-wrap #, no-wrap
#| msgid "-u <upload-pack>"
msgid "upload-pack" msgid "upload-pack"
msgstr "-u <upload-pack>" msgstr "-u <upload-pack>"
   
...@@ -27969,8 +27940,7 @@ msgstr "" ...@@ -27969,8 +27940,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-daemon.txt:219 #: en/git-daemon.txt:219
#, fuzzy, no-wrap #, no-wrap
#| msgid "-u <upload-pack>"
msgid "upload-archive" msgid "upload-archive"
msgstr "-u <upload-pack>" msgstr "-u <upload-pack>"
   
...@@ -29797,10 +29767,6 @@ msgstr "Ausgabe in umgekehrter Reihenfolge." ...@@ -29797,10 +29767,6 @@ msgstr "Ausgabe in umgekehrter Reihenfolge."
   
#. type: Plain text #. type: Plain text
#: en/git-diff.txt:186 #: en/git-diff.txt:186
#, fuzzy
#| msgid ""
#| "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
#| "merge[1], linkgit:git-commit-tree[1]"
msgid "" msgid ""
"diff(1), linkgit:git-difftool[1], linkgit:git-log[1], " "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], "
"linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]" "linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
...@@ -33499,8 +33465,7 @@ msgstr "" ...@@ -33499,8 +33465,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-fetch.txt:161 #: en/git-fetch.txt:161
#, fuzzy, no-wrap #, no-wrap
#| msgid "alice$ git fetch bob\n"
msgid "$ git fetch origin\n" msgid "$ git fetch origin\n"
msgstr "alice$ git fetch bob\n" msgstr "alice$ git fetch bob\n"
   
...@@ -35721,8 +35686,7 @@ msgstr "" ...@@ -35721,8 +35686,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-format-patch.txt:274 #: en/git-format-patch.txt:274
#, fuzzy, no-wrap #, no-wrap
#| msgid "--contains <commit>"
msgid "--base=<commit>" msgid "--base=<commit>"
msgstr "--contains <commit>" msgstr "--contains <commit>"
   
...@@ -36427,8 +36391,7 @@ msgstr "" ...@@ -36427,8 +36391,7 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-fsck-objects.txt:13 #: en/git-fsck-objects.txt:13
#, fuzzy, no-wrap #, no-wrap
#| msgid "'git fsck-objects' ..."
msgid "'git fsck-objects' ...\n" msgid "'git fsck-objects' ...\n"
msgstr "'git fsck-objects' ..." msgstr "'git fsck-objects' ..."
   
...@@ -37928,8 +37891,7 @@ msgstr "" ...@@ -37928,8 +37891,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-gui.txt:74 #: en/git-gui.txt:74
#, fuzzy, no-wrap #, no-wrap
#| msgid "'git citool'"
msgid "`git gui citool`" msgid "`git gui citool`"
msgstr "'git citool'" msgstr "'git citool'"
   
...@@ -37969,8 +37931,7 @@ msgstr "" ...@@ -37969,8 +37931,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-gui.txt:92 #: en/git-gui.txt:92
#, fuzzy, no-wrap #, no-wrap
#| msgid "'git citool'"
msgid "`git citool`" msgid "`git citool`"
msgstr "'git citool'" msgstr "'git citool'"
   
...@@ -39580,9 +39541,6 @@ msgstr "" ...@@ -39580,9 +39541,6 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-imap-send.txt:180 #: en/git-imap-send.txt:180
#, fuzzy
#| msgid ""
#| "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid "linkgit:git-format-patch[1], linkgit:git-send-email[1], mbox(5)" msgid "linkgit:git-format-patch[1], linkgit:git-send-email[1], mbox(5)"
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]" msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
   
...@@ -41964,8 +41922,7 @@ msgstr "" ...@@ -41964,8 +41922,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-ls-remote.txt:40 #: en/git-ls-remote.txt:40
#, fuzzy, no-wrap #, no-wrap
#| msgid "-u <upload-pack>"
msgid "--upload-pack=<exec>" msgid "--upload-pack=<exec>"
msgstr "-u <upload-pack>" msgstr "-u <upload-pack>"
   
...@@ -43983,8 +43940,7 @@ msgstr "" ...@@ -43983,8 +43940,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-merge.txt:331 #: en/git-merge.txt:331
#, fuzzy, no-wrap #, no-wrap
#| msgid "$ git commit -a\n"
msgid "$ git merge --no-commit maint\n" msgid "$ git merge --no-commit maint\n"
msgstr "$ git commit -a\n" msgstr "$ git commit -a\n"
   
...@@ -45289,8 +45245,7 @@ msgstr "" ...@@ -45289,8 +45245,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-p4.txt:94 #: en/git-p4.txt:94
#, fuzzy, no-wrap #, no-wrap
#| msgid "$ git branch\n"
msgid "$ git p4 sync\n" msgid "$ git p4 sync\n"
msgstr "$ git branch\n" msgstr "$ git branch\n"
   
...@@ -45701,8 +45656,7 @@ msgstr "" ...@@ -45701,8 +45656,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-p4.txt:275 #: en/git-p4.txt:275
#, fuzzy, no-wrap #, no-wrap
#| msgid "--contains <commit>"
msgid "--origin <commit>" msgid "--origin <commit>"
msgstr "--contains <commit>" msgstr "--contains <commit>"
   
...@@ -48717,10 +48671,7 @@ msgstr "" ...@@ -48717,10 +48671,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-push.txt:494 #: en/git-push.txt:494
#, fuzzy, no-wrap #, no-wrap
#| msgid ""
#| "bob$ git branch -r\n"
#| " origin/master\n"
msgid "`git push origin master`" msgid "`git push origin master`"
msgstr "" msgstr ""
"bob$ git branch -r\n" "bob$ git branch -r\n"
...@@ -53065,8 +53016,7 @@ msgstr "" ...@@ -53065,8 +53016,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-replace.txt:50 #: en/git-replace.txt:50
#, fuzzy, no-wrap #, no-wrap
#| msgid "$ git commit -a\n"
msgid "$ git cat-file commit foo\n" msgid "$ git cat-file commit foo\n"
msgstr "$ git commit -a\n" msgstr "$ git commit -a\n"
   
...@@ -53259,10 +53209,6 @@ msgstr "" ...@@ -53259,10 +53209,6 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-replace.txt:153 #: en/git-replace.txt:153
#, fuzzy
#| msgid ""
#| "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-"
#| "mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
msgid "" msgid ""
"linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-" "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-"
"rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] " "rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] "
...@@ -53497,8 +53443,7 @@ msgstr "" ...@@ -53497,8 +53443,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-rerere.txt:49 #: en/git-rerere.txt:49
#, fuzzy, no-wrap #, no-wrap
#| msgid "diff"
msgid "'diff'" msgid "'diff'"
msgstr "diff" msgstr "diff"
   
...@@ -56142,8 +56087,7 @@ msgstr "" ...@@ -56142,8 +56087,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-rm.txt:122 #: en/git-rm.txt:122
#, fuzzy, no-wrap #, no-wrap
#| msgid "$ git add .\n"
msgid "git add -A\n" msgid "git add -A\n"
msgstr "$ git add .\n" msgstr "$ git add .\n"
   
...@@ -56206,8 +56150,7 @@ msgstr "" ...@@ -56206,8 +56150,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-rm.txt:160 #: en/git-rm.txt:160
#, fuzzy, no-wrap #, no-wrap
#| msgid "git rm Documentation/\\\\*.txt"
msgid "`git rm Documentation/\\*.txt`" msgid "`git rm Documentation/\\*.txt`"
msgstr "git rm Documentation/\\\\*.txt" msgstr "git rm Documentation/\\\\*.txt"
   
...@@ -57312,9 +57255,6 @@ msgstr "" ...@@ -57312,9 +57255,6 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-send-email.txt:479 #: en/git-send-email.txt:479
#, fuzzy
#| msgid ""
#| "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)" 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-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
   
...@@ -63928,9 +63868,6 @@ msgstr "" ...@@ -63928,9 +63868,6 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-tag.txt:348 #: en/git-tag.txt:348
#, fuzzy
#| msgid ""
#| "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgid "linkgit:git-check-ref-format[1]. linkgit:git-config[1]." 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-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
   
...@@ -66291,10 +66228,6 @@ msgstr "" ...@@ -66291,10 +66228,6 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git.txt:1293 #: en/git.txt:1293
#, fuzzy
#| msgid ""
#| "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:everyday[7], "
#| "linkgit:gitcvs-migration[7], link:user-manual.html[The Git User's Manual]"
msgid "" msgid ""
"linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], " "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], "
"linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-" "linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-"
...@@ -69982,15 +69915,11 @@ msgstr "" ...@@ -69982,15 +69915,11 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:7 #: en/mergetools-merge.txt:7
#, fuzzy
#| msgid "diff"
msgid "diffmerge" msgid "diffmerge"
msgstr "diff" msgstr "diff"
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:8 #: en/mergetools-merge.txt:8
#, fuzzy
#| msgid "diff"
msgid "diffuse" msgid "diffuse"
msgstr "diff" msgstr "diff"
   
...@@ -70003,15 +69932,11 @@ msgstr "--merged" ...@@ -70003,15 +69932,11 @@ msgstr "--merged"
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:10 #: en/mergetools-merge.txt:10
#, fuzzy
#| msgid "--merged"
msgid "emerge" msgid "emerge"
msgstr "--merged" msgstr "--merged"
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:11 #: en/mergetools-merge.txt:11
#, fuzzy
#| msgid "diff"
msgid "examdiff" msgid "examdiff"
msgstr "diff" msgstr "diff"
   
...@@ -70022,29 +69947,21 @@ msgstr "" ...@@ -70022,29 +69947,21 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:13 #: en/mergetools-merge.txt:13
#, fuzzy
#| msgid "diff"
msgid "gvimdiff" msgid "gvimdiff"
msgstr "diff" msgstr "diff"
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:14 #: en/mergetools-merge.txt:14
#, fuzzy
#| msgid "diff"
msgid "gvimdiff2" msgid "gvimdiff2"
msgstr "diff" msgstr "diff"
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:15 #: en/mergetools-merge.txt:15
#, fuzzy
#| msgid "diff"
msgid "gvimdiff3" msgid "gvimdiff3"
msgstr "diff" msgstr "diff"
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:16 #: en/mergetools-merge.txt:16
#, fuzzy
#| msgid "diff"
msgid "kdiff3" msgid "kdiff3"
msgstr "diff" msgstr "diff"
   
...@@ -70055,8 +69972,6 @@ msgstr "" ...@@ -70055,8 +69972,6 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:18 #: en/mergetools-merge.txt:18
#, fuzzy
#| msgid "diff"
msgid "opendiff" msgid "opendiff"
msgstr "diff" msgstr "diff"
   
...@@ -70069,8 +69984,6 @@ msgstr "--merged" ...@@ -70069,8 +69984,6 @@ msgstr "--merged"
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:20 #: en/mergetools-merge.txt:20
#, fuzzy
#| msgid "diff"
msgid "tkdiff" msgid "tkdiff"
msgstr "diff" msgstr "diff"
   
...@@ -70081,36 +69994,26 @@ msgstr "" ...@@ -70081,36 +69994,26 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:22 #: en/mergetools-merge.txt:22
#, fuzzy
#| msgid "diff"
msgid "vimdiff" msgid "vimdiff"
msgstr "diff" msgstr "diff"
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:23 #: en/mergetools-merge.txt:23
#, fuzzy
#| msgid "diff"
msgid "vimdiff2" msgid "vimdiff2"
msgstr "diff" msgstr "diff"
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:24 #: en/mergetools-merge.txt:24
#, fuzzy
#| msgid "diff"
msgid "vimdiff3" msgid "vimdiff3"
msgstr "diff" msgstr "diff"
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:25 #: en/mergetools-merge.txt:25
#, fuzzy
#| msgid "--no-merged"
msgid "winmerge" msgid "winmerge"
msgstr "--no-merged" msgstr "--no-merged"
   
#. type: Plain text #. type: Plain text
#: en/mergetools-merge.txt:25 #: en/mergetools-merge.txt:25
#, fuzzy
#| msgid "diff"
msgid "xxdiff" msgid "xxdiff"
msgstr "diff" msgstr "diff"
   
...@@ -70680,8 +70583,6 @@ msgstr "" ...@@ -70680,8 +70583,6 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/pretty-formats.txt:225 #: en/pretty-formats.txt:225
#, fuzzy
#| msgid "Output format"
msgid "'tformat:'" msgid "'tformat:'"
msgstr "Output format" msgstr "Output format"
   
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment