Skip to content
Snippets Groups Projects
Commit a281eebe authored by Jean-Noël Avila's avatar Jean-Noël Avila
Browse files

Merge remote-tracking branch 'rimruls/de-failing-checks'

parents 82b6abfb ba7e5a19
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
po/documentation.de.po
+ 101
− 107
View file @ a281eebe
...@@ -2203,7 +2203,7 @@ msgstr "" ...@@ -2203,7 +2203,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/config.txt:143 #: en/config.txt:143
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "`gitdir/i`" msgid "`gitdir/i`"
msgstr "`gitdir/i`" msgstr "`gitdir/i`"
   
...@@ -5587,17 +5587,15 @@ msgstr "Der Fortschritt wird nur standardmäßig auf der Standardfehlerausgabe a ...@@ -5587,17 +5587,15 @@ msgstr "Der Fortschritt wird nur standardmäßig auf der Standardfehlerausgabe a
   
#. type: Labeled list #. type: Labeled list
#: en/fetch-options.txt:219 en/git-ls-remote.txt:73 en/git-push.txt:215 #: en/fetch-options.txt:219 en/git-ls-remote.txt:73 en/git-push.txt:215
#, fuzzy, no-wrap, priority:220 #, no-wrap, priority:220
#| msgid "`option`"
msgid "-o <option>" msgid "-o <option>"
msgstr "`option`" msgstr "-o <Option>"
   
#. type: Labeled list #. type: Labeled list
#: en/fetch-options.txt:220 en/git-clone.txt:135 en/git-ls-remote.txt:74 #: en/fetch-options.txt:220 en/git-clone.txt:135 en/git-ls-remote.txt:74
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
#| msgid "--stop-at-non-option"
msgid "--server-option=<option>" msgid "--server-option=<option>"
msgstr "--stop-at-non-option" msgstr "--server-option=<Option>"
   
#. type: Plain text #. type: Plain text
#: en/fetch-options.txt:227 en/git-clone.txt:142 #: 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 ...@@ -6106,7 +6104,7 @@ msgstr "Zeigt den Unterschied zwischen HEAD und dem Index (also was committet wi
   
#. type: delimited block - #. type: delimited block -
#: en/git-add.txt:255 #: en/git-add.txt:255
#, no-wrap, priority:300 #, ignore-begin-space, no-wrap, priority:300
msgid "" msgid ""
" staged unstaged path\n" " staged unstaged path\n"
" 1: binary nothing foo.png\n" " 1: binary nothing foo.png\n"
...@@ -6142,7 +6140,7 @@ msgstr "Alle ausgewählten Listeneinträge werden wie folgt mit einem Stern '*' ...@@ -6142,7 +6140,7 @@ msgstr "Alle ausgewählten Listeneinträge werden wie folgt mit einem Stern '*'
   
#. type: delimited block - #. type: delimited block -
#: en/git-add.txt:284 #: en/git-add.txt:284
#, no-wrap, priority:300 #, ignore-begin-space, no-wrap, priority:300
msgid "" msgid ""
" staged unstaged path\n" " staged unstaged path\n"
" 1: binary nothing foo.png\n" " 1: binary nothing foo.png\n"
...@@ -6644,7 +6642,7 @@ msgstr "--ignore-whitespace" ...@@ -6644,7 +6642,7 @@ msgstr "--ignore-whitespace"
#: en/git-am.txt:109 en/git-rebase.txt:374 #: en/git-am.txt:109 en/git-rebase.txt:374
#, no-wrap, priority:100 #, no-wrap, priority:100
msgid "--whitespace=<option>" msgid "--whitespace=<option>"
msgstr "" msgstr "--whitespace=<Option>"
   
#. type: Labeled list #. type: Labeled list
#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:337 #: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:337
...@@ -8055,7 +8053,7 @@ msgstr "" ...@@ -8055,7 +8053,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-bisect.txt:80 #: en/git-bisect.txt:80
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "$ git bisect bad\n" msgid "$ git bisect bad\n"
msgstr "$ git bisect bad\n" msgstr "$ git bisect bad\n"
   
...@@ -9415,7 +9413,7 @@ msgstr "" ...@@ -9415,7 +9413,7 @@ msgstr ""
#: en/git-branch.txt:197 #: en/git-branch.txt:197
#, no-wrap, priority:240 #, no-wrap, priority:240
msgid "--abbrev=<length>" msgid "--abbrev=<length>"
msgstr "--abbrev=<length>" msgstr "--abbrev=<Länge>"
   
#. type: Plain text #. type: Plain text
#: en/git-branch.txt:201 #: en/git-branch.txt:201
...@@ -9700,7 +9698,7 @@ msgstr "Löschen eines nicht mehr benötigten Entwicklungszweiges (Branch)" ...@@ -9700,7 +9698,7 @@ msgstr "Löschen eines nicht mehr benötigten Entwicklungszweiges (Branch)"
   
#. type: delimited block - #. type: delimited block -
#: en/git-branch.txt:329 #: en/git-branch.txt:329
#, ignore-ellipsis, no-wrap, priority:240 #, ignore-ellipsis, ignore-same, no-wrap, priority:240
msgid "" msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n" "$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n" "$ cd my.git\n"
...@@ -10104,7 +10102,7 @@ msgstr "git-cat-file(1)" ...@@ -10104,7 +10102,7 @@ msgstr "git-cat-file(1)"
#: en/git-cat-file.txt:7 #: en/git-cat-file.txt:7
#, priority:100 #, priority:100
msgid "git-cat-file - Provide content or type and size information for repository objects" 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 #. type: Plain text
#: en/git-cat-file.txt:14 #: en/git-cat-file.txt:14
...@@ -11761,7 +11759,7 @@ msgstr "If you have local modifications to one or more files that are different ...@@ -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 #: en/git-checkout.txt:255 en/git-switch.txt:132
#, priority:240 #, 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)." 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 #. type: Plain text
#: en/git-checkout.txt:258 #: en/git-checkout.txt:258
...@@ -11959,7 +11957,7 @@ msgstr "" ...@@ -11959,7 +11957,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-checkout.txt:368 en/git-checkout.txt:403 en/git-checkout.txt:420 #: 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" msgid "$ edit; git add; git commit\n"
msgstr "$ edit; git add; git commit\n" msgstr "$ edit; git add; git commit\n"
   
...@@ -12055,7 +12053,7 @@ msgstr "" ...@@ -12055,7 +12053,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-checkout.txt:437 #: en/git-checkout.txt:437
#, no-wrap, priority:240 #, ignore-same, no-wrap, priority:240
msgid "$ git checkout master\n" msgid "$ git checkout master\n"
msgstr "$ git checkout master\n" msgstr "$ git checkout master\n"
   
...@@ -12080,7 +12078,7 @@ msgstr "" ...@@ -12080,7 +12078,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-checkout.txt:457 #: en/git-checkout.txt:457
#, no-wrap, priority:240 #, ignore-same, no-wrap, priority:240
msgid "" msgid ""
"$ git checkout -b foo <1>\n" "$ git checkout -b foo <1>\n"
"$ git branch foo <2>\n" "$ git branch foo <2>\n"
...@@ -12145,7 +12143,7 @@ msgstr "The following sequence checks out the `master` branch, reverts the `Make ...@@ -12145,7 +12143,7 @@ msgstr "The following sequence checks out the `master` branch, reverts the `Make
   
#. type: delimited block - #. type: delimited block -
#: en/git-checkout.txt:503 #: en/git-checkout.txt:503
#, no-wrap, priority:240 #, ignore-same, no-wrap, priority:240
msgid "" msgid ""
"$ git checkout master <1>\n" "$ git checkout master <1>\n"
"$ git checkout master~2 Makefile <2>\n" "$ git checkout master~2 Makefile <2>\n"
...@@ -12161,7 +12159,7 @@ msgstr "" ...@@ -12161,7 +12159,7 @@ msgstr ""
#: en/git-checkout.txt:506 #: en/git-checkout.txt:506
#, priority:240 #, priority:240
msgid "switch branch" msgid "switch branch"
msgstr "switch branch" msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-checkout.txt:507 en/git-restore.txt:131 #: en/git-checkout.txt:507 en/git-restore.txt:131
...@@ -12185,7 +12183,7 @@ msgstr "" ...@@ -12185,7 +12183,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-checkout.txt:514 #: en/git-checkout.txt:514
#, no-wrap, priority:240 #, ignore-same, no-wrap, priority:240
msgid "$ git checkout -- '*.c'\n" msgid "$ git checkout -- '*.c'\n"
msgstr "$ git checkout -- '*.c'\n" msgstr "$ git checkout -- '*.c'\n"
   
...@@ -12199,11 +12197,11 @@ msgstr "" ...@@ -12199,11 +12197,11 @@ msgstr ""
#: en/git-checkout.txt:524 #: en/git-checkout.txt:524
#, priority:240 #, 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:" 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 - #. type: delimited block -
#: en/git-checkout.txt:527 #: en/git-checkout.txt:527
#, no-wrap, priority:240 #, ignore-same, no-wrap, priority:240
msgid "$ git checkout -- hello.c\n" msgid "$ git checkout -- hello.c\n"
msgstr "$ 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 ...@@ -12216,7 +12214,7 @@ msgstr "After working in a wrong branch, switching to the correct branch would b
   
#. type: delimited block - #. type: delimited block -
#: en/git-checkout.txt:534 #: en/git-checkout.txt:534
#, no-wrap, priority:240 #, ignore-same, no-wrap, priority:240
msgid "$ git checkout mytopic\n" msgid "$ git checkout mytopic\n"
msgstr "$ git checkout mytopic\n" msgstr "$ git checkout mytopic\n"
   
...@@ -12244,11 +12242,11 @@ msgstr "" ...@@ -12244,11 +12242,11 @@ msgstr ""
#: en/git-checkout.txt:547 en/git-switch.txt:217 #: en/git-checkout.txt:547 en/git-switch.txt:217
#, priority:240 #, priority:240
msgid "You can give the `-m` flag to the command, which would try a three-way merge:" 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 - #. type: delimited block -
#: en/git-checkout.txt:551 #: en/git-checkout.txt:551
#, no-wrap, priority:240 #, fuzzy, no-wrap, priority:240
msgid "" msgid ""
"$ git checkout -m mytopic\n" "$ git checkout -m mytopic\n"
"Auto-merging frotz\n" "Auto-merging frotz\n"
...@@ -12260,13 +12258,13 @@ msgstr "" ...@@ -12260,13 +12258,13 @@ msgstr ""
#: en/git-checkout.txt:556 en/git-switch.txt:226 #: en/git-checkout.txt:556 en/git-switch.txt:226
#, priority:240 #, 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." 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 #. type: Plain text
#: en/git-checkout.txt:559 #: en/git-checkout.txt:559
#, priority:240 #, priority:240
msgid "When a merge conflict happens during switching branches with the `-m` option, you would see something like this:" 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 - #. type: delimited block -
#: en/git-checkout.txt:565 #: en/git-checkout.txt:565
...@@ -12293,11 +12291,11 @@ msgstr "" ...@@ -12293,11 +12291,11 @@ msgstr ""
#: en/git-checkout.txt:571 #: en/git-checkout.txt:571
#, priority:240 #, 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:" 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 - #. type: delimited block -
#: en/git-checkout.txt:575 #: en/git-checkout.txt:575
#, no-wrap, priority:240 #, ignore-same, no-wrap, priority:240
msgid "" msgid ""
"$ edit frotz\n" "$ edit frotz\n"
"$ git add frotz\n" "$ git add frotz\n"
...@@ -12583,7 +12581,7 @@ msgstr "" ...@@ -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 #: 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 #, ignore-ellipsis, no-wrap, priority:240
msgid "<commit>..." msgid "<commit>..."
msgstr "<Commit>" msgstr "<Commit>..."
   
#. type: Plain text #. type: Plain text
#: en/git-cherry-pick.txt:52 #: en/git-cherry-pick.txt:52
...@@ -12737,9 +12735,9 @@ msgstr "`option`" ...@@ -12737,9 +12735,9 @@ msgstr "`option`"
   
#. type: Labeled list #. type: Labeled list
#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:117 #: 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>" msgid "--strategy-option=<option>"
msgstr "--stop-at-non-option" msgstr "--strategy-option=<Option>"
   
#. type: Plain text #. type: Plain text
#: en/git-cherry-pick.txt:155 en/git-revert.txt:111 #: en/git-cherry-pick.txt:155 en/git-revert.txt:111
...@@ -13110,7 +13108,7 @@ msgstr "git-gitool - Graphische Alternative zu git-commit" ...@@ -13110,7 +13108,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
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "'git citool'\n" msgid "'git citool'\n"
msgstr "'git citool'\n" msgstr "'git citool'\n"
   
...@@ -13589,7 +13587,7 @@ msgstr "-o <name>" ...@@ -13589,7 +13587,7 @@ msgstr "-o <name>"
#: en/git-clone.txt:168 #: en/git-clone.txt:168
#, no-wrap, priority:300 #, no-wrap, priority:300
msgid "--origin <name>" msgid "--origin <name>"
msgstr "--origin <name>" msgstr "--origin <Name>"
   
#. type: Plain text #. type: Plain text
#: en/git-clone.txt:171 #: en/git-clone.txt:171
...@@ -13606,10 +13604,9 @@ msgstr "-o <name>" ...@@ -13606,10 +13604,9 @@ msgstr "-o <name>"
   
#. type: Labeled list #. type: Labeled list
#: en/git-clone.txt:173 #: en/git-clone.txt:173
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
#| msgid "<branchname>"
msgid "--branch <name>" msgid "--branch <name>"
msgstr "<branchname>" msgstr "--branch <Name>"
   
#. type: Plain text #. type: Plain text
#: en/git-clone.txt:180 #: en/git-clone.txt:180
...@@ -13838,7 +13835,7 @@ msgstr "Erzeuge einen lokalen Klon der vom aktuellen Verzeichnis borgt, ohne 'gi ...@@ -13838,7 +13835,7 @@ msgstr "Erzeuge einen lokalen Klon der vom aktuellen Verzeichnis borgt, ohne 'gi
   
#. type: delimited block - #. type: delimited block -
#: en/git-clone.txt:315 #: en/git-clone.txt:315
#, no-wrap, priority:300 #, ignore-same, no-wrap, priority:300
msgid "" msgid ""
"$ git clone -l -s -n . ../copy\n" "$ git clone -l -s -n . ../copy\n"
"$ cd ../copy\n" "$ cd ../copy\n"
...@@ -13878,7 +13875,7 @@ msgstr "Erzeuge ein 'reines' Projektarchiv um Änderungen publik zu machen" ...@@ -13878,7 +13875,7 @@ msgstr "Erzeuge ein 'reines' Projektarchiv um Änderungen publik zu machen"
   
#. type: delimited block - #. type: delimited block -
#: en/git-clone.txt:332 #: 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" 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" msgstr "$ git clone --bare -l /home/proj/.git /pub/scm/proj.git\n"
   
...@@ -13910,10 +13907,9 @@ msgstr "" ...@@ -13910,10 +13907,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-column.txt:23 #: en/git-column.txt:23
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "--origin <name>"
msgid "--command=<name>" msgid "--command=<name>"
msgstr "--origin <name>" msgstr "--command=<Name>"
   
#. type: Plain text #. type: Plain text
#: en/git-column.txt:26 #: en/git-column.txt:26
...@@ -14228,7 +14224,7 @@ msgstr "" ...@@ -14228,7 +14224,7 @@ msgstr ""
   
#. type: Title - #. type: Title -
#: en/git-commit-tree.txt:109 #: en/git-commit-tree.txt:109
#, no-wrap, priority:100 #, fuzzy, no-wrap, priority:100
msgid "Discussion" msgid "Discussion"
msgstr "Discussion" msgstr "Discussion"
   
...@@ -14350,13 +14346,13 @@ msgstr "" ...@@ -14350,13 +14346,13 @@ msgstr ""
#: en/git-commit.txt:76 #: en/git-commit.txt:76
#, no-wrap, priority:280 #, no-wrap, priority:280
msgid "-C <commit>" msgid "-C <commit>"
msgstr "-C <commit>" msgstr "-C <Commit>"
   
#. type: Labeled list #. type: Labeled list
#: en/git-commit.txt:77 #: en/git-commit.txt:77
#, no-wrap, priority:280 #, no-wrap, priority:280
msgid "--reuse-message=<commit>" msgid "--reuse-message=<commit>"
msgstr "--reuse-message=<commit>" msgstr "--reuse-message=<Commit>"
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:81 #: en/git-commit.txt:81
...@@ -14368,13 +14364,13 @@ msgstr "Nimm eine existierende Eintragung (commit) und verwende die Eintragungsb ...@@ -14368,13 +14364,13 @@ msgstr "Nimm eine existierende Eintragung (commit) und verwende die Eintragungsb
#: en/git-commit.txt:82 #: en/git-commit.txt:82
#, no-wrap, priority:280 #, no-wrap, priority:280
msgid "-c <commit>" msgid "-c <commit>"
msgstr "-c <commit>" msgstr "-c <Commit>"
   
#. type: Labeled list #. type: Labeled list
#: en/git-commit.txt:83 #: en/git-commit.txt:83
#, no-wrap, priority:280 #, no-wrap, priority:280
msgid "--reedit-message=<commit>" msgid "--reedit-message=<commit>"
msgstr "--reedit-message=<commit>" msgstr "--reedit-message=<Commit>"
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:86 #: en/git-commit.txt:86
...@@ -14398,7 +14394,7 @@ msgstr "" ...@@ -14398,7 +14394,7 @@ msgstr ""
#: en/git-commit.txt:93 #: en/git-commit.txt:93
#, no-wrap, priority:280 #, no-wrap, priority:280
msgid "--squash=<commit>" msgid "--squash=<commit>"
msgstr "--squash <Commit>" msgstr "--squash=<Commit>"
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:99 #: en/git-commit.txt:99
...@@ -14889,7 +14885,7 @@ msgstr "Beim Aufzeichnen der eigenen Arbeit, wird der Inhalt der veränderten Da ...@@ -14889,7 +14885,7 @@ msgstr "Beim Aufzeichnen der eigenen Arbeit, wird der Inhalt der veränderten Da
   
#. type: delimited block - #. type: delimited block -
#: en/git-commit.txt:375 #: en/git-commit.txt:375
#, no-wrap, priority:280 #, ignore-same, no-wrap, priority:280
msgid "" msgid ""
"$ edit hello.c\n" "$ edit hello.c\n"
"$ git rm goodbye.c\n" "$ git rm goodbye.c\n"
...@@ -14909,7 +14905,7 @@ msgstr "Anstatt die Dateien nach jeder Änderung einzeln im Index vorzubereiten ...@@ -14909,7 +14905,7 @@ msgstr "Anstatt die Dateien nach jeder Änderung einzeln im Index vorzubereiten
   
#. type: delimited block - #. type: delimited block -
#: en/git-commit.txt:388 #: en/git-commit.txt:388
#, no-wrap, priority:280 #, ignore-same, no-wrap, priority:280
msgid "" msgid ""
"$ edit hello.c\n" "$ edit hello.c\n"
"$ rm goodbye.c\n" "$ rm goodbye.c\n"
...@@ -14933,7 +14929,7 @@ msgstr "Wurden im Index Änderungen an mehreren Dateien vorbereitet, kann die Re ...@@ -14933,7 +14929,7 @@ msgstr "Wurden im Index Änderungen an mehreren Dateien vorbereitet, kann die Re
   
#. type: delimited block - #. type: delimited block -
#: en/git-commit.txt:404 #: en/git-commit.txt:404
#, no-wrap, priority:280 #, ignore-same, no-wrap, priority:280
msgid "" msgid ""
"$ edit hello.c hello.h\n" "$ edit hello.c hello.h\n"
"$ git add 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 ...@@ -14953,7 +14949,7 @@ msgstr "Die hier erzeugte Eintragung (commit) enthält ausschließlich die Ände
   
#. type: delimited block - #. type: delimited block -
#: en/git-commit.txt:414 en/git-commit.txt:440 #: en/git-commit.txt:414 en/git-commit.txt:440
#, no-wrap, priority:280 #, ignore-same, no-wrap, priority:280
msgid "$ git commit\n" msgid "$ git commit\n"
msgstr "$ git commit\n" msgstr "$ git commit\n"
   
...@@ -14972,7 +14968,7 @@ msgstr "Nach einer Zusammenführung (merge, durchgeführt mit 'git-merge' oder ' ...@@ -14972,7 +14968,7 @@ msgstr "Nach einer Zusammenführung (merge, durchgeführt mit 'git-merge' oder '
   
#. type: delimited block - #. type: delimited block -
#: en/git-commit.txt:432 #: en/git-commit.txt:432
#, no-wrap, priority:280 #, ignore-same, no-wrap, priority:280
msgid "" msgid ""
"$ git status | grep unmerged\n" "$ git status | grep unmerged\n"
"unmerged: hello.c\n" "unmerged: hello.c\n"
...@@ -15341,13 +15337,13 @@ msgstr "" ...@@ -15341,13 +15337,13 @@ msgstr ""
#: en/git-config.txt:141 #: en/git-config.txt:141
#, no-wrap, priority:100 #, no-wrap, priority:100
msgid "-f config-file" msgid "-f config-file"
msgstr "-f config-file" msgstr "-f Konfigurationsdatei"
   
#. type: Labeled list #. type: Labeled list
#: en/git-config.txt:142 #: en/git-config.txt:142
#, no-wrap, priority:100 #, no-wrap, priority:100
msgid "--file config-file" msgid "--file config-file"
msgstr "--file config-file" msgstr "--file Konfigurationsdatei"
   
#. type: Plain text #. type: Plain text
#: en/git-config.txt:144 #: en/git-config.txt:144
...@@ -15651,7 +15647,7 @@ msgstr "" ...@@ -15651,7 +15647,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-config.txt:286 #: en/git-config.txt:286
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "~/.gitconfig" msgid "~/.gitconfig"
msgstr "~/.gitconfig" msgstr "~/.gitconfig"
   
...@@ -15663,7 +15659,7 @@ msgstr "Benutzerspezifische Konfigurationsdatei. Auch \"globale\" Konfigurations ...@@ -15663,7 +15659,7 @@ msgstr "Benutzerspezifische Konfigurationsdatei. Auch \"globale\" Konfigurations
   
#. type: Labeled list #. type: Labeled list
#: en/git-config.txt:290 #: en/git-config.txt:290
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "$GIT_DIR/config" msgid "$GIT_DIR/config"
msgstr "$GIT_DIR/config" msgstr "$GIT_DIR/config"
   
...@@ -15840,7 +15836,7 @@ msgstr "Sie können den Dateimodus auf \"true\" setzen mit" ...@@ -15840,7 +15836,7 @@ msgstr "Sie können den Dateimodus auf \"true\" setzen mit"
   
#. type: delimited block - #. type: delimited block -
#: en/git-config.txt:374 #: en/git-config.txt:374
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "% git config core.filemode true\n" msgid "% git config core.filemode true\n"
msgstr "% 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 ...@@ -15852,7 +15848,7 @@ msgstr "Die hypothetischen Proxybefehlseinträge haben ein Anhängel, um untersc
   
#. type: delimited block - #. type: delimited block -
#: en/git-config.txt:382 #: 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" 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" 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" ...@@ -15870,7 +15866,7 @@ msgstr "Um den Eintrag für Umbenennungen zu löschen, verwenden Sie"
   
#. type: delimited block - #. type: delimited block -
#: en/git-config.txt:390 #: en/git-config.txt:390
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "% git config --unset diff.renames\n" msgid "% git config --unset diff.renames\n"
msgstr "% 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" ...@@ -15888,7 +15884,7 @@ msgstr "Um den Wert für einen gegebenen Schlüssel abzufragen, benutzen Sie"
   
#. type: delimited block - #. type: delimited block -
#: en/git-config.txt:399 #: en/git-config.txt:399
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "% git config --get core.filemode\n" msgid "% git config --get core.filemode\n"
msgstr "% git config --get core.filemode\n" msgstr "% git config --get core.filemode\n"
   
...@@ -15900,7 +15896,7 @@ msgstr "oder" ...@@ -15900,7 +15896,7 @@ msgstr "oder"
   
#. type: delimited block - #. type: delimited block -
#: en/git-config.txt:405 #: en/git-config.txt:405
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "% git config core.filemode\n" msgid "% git config core.filemode\n"
msgstr "% git config core.filemode\n" msgstr "% git config core.filemode\n"
   
...@@ -15912,7 +15908,7 @@ msgstr "oder, um eine Multivar abzufragen:" ...@@ -15912,7 +15908,7 @@ msgstr "oder, um eine Multivar abzufragen:"
   
#. type: delimited block - #. type: delimited block -
#: en/git-config.txt:411 #: 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" msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr "% 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:" ...@@ -15924,7 +15920,7 @@ msgstr "Falls Sie alle Werte einer Multivar wissen möchten, verwenden Sie:"
   
#. type: delimited block - #. type: delimited block -
#: en/git-config.txt:417 #: en/git-config.txt:417
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "% git config --get-all core.gitproxy\n" msgid "% git config --get-all core.gitproxy\n"
msgstr "% 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 ...@@ -15937,7 +15933,7 @@ msgstr "Wenn Sie gerne gefährlich leben, können Sie *alle* core.gitproxy-Eintr
   
#. type: delimited block - #. type: delimited block -
#: en/git-config.txt:424 #: en/git-config.txt:424
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "% git config --replace-all core.gitproxy ssh\n" msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr "% 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 ...@@ -15949,7 +15945,7 @@ msgstr "Wenn Sie jedoch wirklich nur eine Zeile für den Standardproxy veränder
   
#. type: delimited block - #. type: delimited block -
#: en/git-config.txt:431 #: en/git-config.txt:431
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "% git config core.gitproxy ssh '! for '\n" msgid "% git config core.gitproxy ssh '! for '\n"
msgstr "% 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" ...@@ -15961,7 +15957,7 @@ msgstr "Um wirklich die Werte mit einem Ausrufezeichen auszulesen, müssen Sie"
   
#. type: delimited block - #. type: delimited block -
#: en/git-config.txt:437 #: en/git-config.txt:437
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "% git config section.key value '[!]'\n" msgid "% git config section.key value '[!]'\n"
msgstr "% 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 ...@@ -16350,7 +16346,7 @@ msgstr "Wenn nicht explizit mit '--file' verändert, gibt es drei Dateien, in we
   
#. type: Labeled list #. type: Labeled list
#: en/git-credential-store.txt:50 #: en/git-credential-store.txt:50
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "~/.git-credentials" msgid "~/.git-credentials"
msgstr "~/.git-credentials" msgstr "~/.git-credentials"
   
...@@ -18412,7 +18408,7 @@ msgstr "" ...@@ -18412,7 +18408,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-daemon.txt:235 #: en/git-daemon.txt:235
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "upload-pack" msgid "upload-pack"
msgstr "upload-pack" msgstr "upload-pack"
   
...@@ -18424,7 +18420,7 @@ msgstr "" ...@@ -18424,7 +18420,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-daemon.txt:241 #: en/git-daemon.txt:241
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "upload-archive" msgid "upload-archive"
msgstr "upload-archive" msgstr "upload-archive"
   
...@@ -19779,7 +19775,7 @@ msgstr "Verschiedene Möglichkeiten den Arbeitsbereich zu testen" ...@@ -19779,7 +19775,7 @@ msgstr "Verschiedene Möglichkeiten den Arbeitsbereich zu testen"
   
#. type: delimited block - #. type: delimited block -
#: en/git-diff.txt:131 #: en/git-diff.txt:131
#, no-wrap, priority:280 #, ignore-same, no-wrap, priority:280
msgid "" msgid ""
"$ git diff <1>\n" "$ git diff <1>\n"
"$ git diff --cached <2>\n" "$ git diff --cached <2>\n"
...@@ -19815,7 +19811,7 @@ msgstr "Vergleich mit beliegigen Eintragungen (commits)" ...@@ -19815,7 +19811,7 @@ msgstr "Vergleich mit beliegigen Eintragungen (commits)"
   
#. type: delimited block - #. type: delimited block -
#: en/git-diff.txt:145 #: en/git-diff.txt:145
#, no-wrap, priority:280 #, ignore-same, no-wrap, priority:280
msgid "" msgid ""
"$ git diff test <1>\n" "$ git diff test <1>\n"
"$ git diff HEAD -- ./test <2>\n" "$ git diff HEAD -- ./test <2>\n"
...@@ -19851,7 +19847,7 @@ msgstr "Versionszweige (branches) vergleichen" ...@@ -19851,7 +19847,7 @@ msgstr "Versionszweige (branches) vergleichen"
   
#. type: delimited block - #. type: delimited block -
#: en/git-diff.txt:160 #: en/git-diff.txt:160
#, ignore-ellipsis, no-wrap, priority:280 #, ignore-ellipsis, ignore-same, no-wrap, priority:280
msgid "" msgid ""
"$ git diff topic master <1>\n" "$ git diff topic master <1>\n"
"$ git diff topic..master <2>\n" "$ git diff topic..master <2>\n"
...@@ -19887,7 +19883,7 @@ msgstr "Ausgabe von 'diff' einschränken" ...@@ -19887,7 +19883,7 @@ msgstr "Ausgabe von 'diff' einschränken"
   
#. type: delimited block - #. type: delimited block -
#: en/git-diff.txt:173 #: en/git-diff.txt:173
#, no-wrap, priority:280 #, ignore-same, no-wrap, priority:280
msgid "" msgid ""
"$ git diff --diff-filter=MRC <1>\n" "$ git diff --diff-filter=MRC <1>\n"
"$ git diff --name-status <2>\n" "$ git diff --name-status <2>\n"
...@@ -19924,7 +19920,7 @@ msgstr "Verändern (munging) der 'diff'-Ausgabe" ...@@ -19924,7 +19920,7 @@ msgstr "Verändern (munging) der 'diff'-Ausgabe"
   
#. type: delimited block - #. type: delimited block -
#: en/git-diff.txt:186 #: en/git-diff.txt:186
#, no-wrap, priority:280 #, ignore-same, no-wrap, priority:280
msgid "" msgid ""
"$ git diff --find-copies-harder -B -C <1>\n" "$ git diff --find-copies-harder -B -C <1>\n"
"$ git diff -R <2>\n" "$ git diff -R <2>\n"
...@@ -19946,7 +19942,7 @@ msgstr "Ausgabe in umgekehrter Reihenfolge." ...@@ -19946,7 +19942,7 @@ msgstr "Ausgabe in umgekehrter Reihenfolge."
   
#. type: Plain text #. type: Plain text
#: en/git-diff.txt:200 #: 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]" 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]" 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 ...@@ -23168,7 +23164,7 @@ msgstr "Auflisten oder Löschen (wenn die '-d' Option gleichzeitig verwendet wir
   
#. type: delimited block - #. type: delimited block -
#: en/git-fetch.txt:248 #: en/git-fetch.txt:248
#, no-wrap, priority:220 #, ignore-same, no-wrap, priority:220
msgid "$ git fetch origin\n" msgid "$ git fetch origin\n"
msgstr "$ 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 ...@@ -25794,7 +25790,7 @@ msgstr "git-fsck-objects - überprüft die Verbundenheit und Korrektheit der Obj
   
#. type: Plain text #. type: Plain text
#: en/git-fsck-objects.txt:13 #: 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" msgid "'git fsck-objects' ...\n"
msgstr "'git fsck-objects' ...\n" msgstr "'git fsck-objects' ...\n"
   
...@@ -27219,7 +27215,7 @@ msgstr "" ...@@ -27219,7 +27215,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-gui.txt:74 #: en/git-gui.txt:74
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "`git gui citool`" msgid "`git gui citool`"
msgstr "`git gui citool`" msgstr "`git gui citool`"
   
...@@ -27255,7 +27251,7 @@ msgstr "" ...@@ -27255,7 +27251,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-gui.txt:92 #: en/git-gui.txt:92
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "`git citool`" msgid "`git citool`"
msgstr "`git citool`" msgstr "`git citool`"
   
...@@ -33890,7 +33886,7 @@ msgstr "" ...@@ -33890,7 +33886,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-p4.txt:94 #: en/git-p4.txt:94
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "$ git p4 sync\n" msgid "$ git p4 sync\n"
msgstr "$ git p4 sync\n" msgstr "$ git p4 sync\n"
   
...@@ -36780,10 +36776,9 @@ msgstr "" ...@@ -36780,10 +36776,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-push.txt:216 #: en/git-push.txt:216
#, fuzzy, no-wrap, priority:220 #, no-wrap, priority:220
#| msgid "--push-option"
msgid "--push-option=<option>" msgid "--push-option=<option>"
msgstr "--push-option" msgstr "--push-option=<Option>"
   
#. type: Plain text #. type: Plain text
#: en/git-push.txt:226 #: en/git-push.txt:226
...@@ -37312,7 +37307,7 @@ msgstr "" ...@@ -37312,7 +37307,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-push.txt:597 #: en/git-push.txt:597
#, no-wrap, priority:220 #, ignore-same, no-wrap, priority:220
msgid "`git push origin master`" msgid "`git push origin master`"
msgstr "`git push origin master`" msgstr "`git push origin master`"
   
...@@ -40816,7 +40811,7 @@ msgstr "Ohne Argumente wird eine Liste der vorhandenen Remotes angezeigt. Mehre ...@@ -40816,7 +40811,7 @@ msgstr "Ohne Argumente wird eine Liste der vorhandenen Remotes angezeigt. Mehre
   
#. type: Labeled list #. type: Labeled list
#: en/git-remote.txt:47 #: en/git-remote.txt:47
#, no-wrap, priority:220 #, ignore-same, no-wrap, priority:220
msgid "'add'" msgid "'add'"
msgstr "'add'" msgstr "'add'"
   
...@@ -40906,7 +40901,7 @@ msgstr "" ...@@ -40906,7 +40901,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-remote.txt:93 #: en/git-remote.txt:93
#, no-wrap, priority:220 #, ignore-same, no-wrap, priority:220
msgid "'rm'" msgid "'rm'"
msgstr "'rm'" msgstr "'rm'"
   
...@@ -41033,7 +41028,7 @@ msgstr "" ...@@ -41033,7 +41028,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-remote.txt:166 #: en/git-remote.txt:166
#, no-wrap, priority:220 #, ignore-same, no-wrap, priority:220
msgid "'show'" msgid "'show'"
msgstr "'show'" msgstr "'show'"
   
...@@ -41051,7 +41046,7 @@ msgstr "Mit der Option `-n`, werden die entfernten Heads nicht zuerst mit `git l ...@@ -41051,7 +41046,7 @@ msgstr "Mit der Option `-n`, werden die entfernten Heads nicht zuerst mit `git l
   
#. type: Labeled list #. type: Labeled list
#: en/git-remote.txt:173 #: en/git-remote.txt:173
#, no-wrap, priority:220 #, ignore-same, no-wrap, priority:220
msgid "'prune'" msgid "'prune'"
msgstr "'prune'" msgstr "'prune'"
   
...@@ -41076,7 +41071,7 @@ msgstr "Mit der Option `--dry-run`, wird lediglich angezeigt, welche Zweige gel ...@@ -41076,7 +41071,7 @@ msgstr "Mit der Option `--dry-run`, wird lediglich angezeigt, welche Zweige gel
   
#. type: Labeled list #. type: Labeled list
#: en/git-remote.txt:187 #: en/git-remote.txt:187
#, no-wrap, priority:220 #, ignore-same, no-wrap, priority:220
msgid "'update'" msgid "'update'"
msgstr "'update'" msgstr "'update'"
   
...@@ -41429,7 +41424,7 @@ msgstr "Gibt Informationen über das entfernte Repository <Name> aus." ...@@ -41429,7 +41424,7 @@ msgstr "Gibt Informationen über das entfernte Repository <Name> aus."
   
#. type: delimited block - #. type: delimited block -
#: en/git-replace.txt:51 #: en/git-replace.txt:51
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "$ git cat-file commit foo\n" msgid "$ git cat-file commit foo\n"
msgstr "$ git cat-file commit foo\n" msgstr "$ git cat-file commit foo\n"
   
...@@ -41811,7 +41806,7 @@ msgstr "" ...@@ -41811,7 +41806,7 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-rerere.txt:49 #: en/git-rerere.txt:49
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "'diff'" msgid "'diff'"
msgstr "'diff'" msgstr "'diff'"
   
...@@ -44863,9 +44858,9 @@ msgstr "" ...@@ -44863,9 +44858,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-send-email.txt:230 #: en/git-send-email.txt:230
#, fuzzy, priority:100 #, priority:100
msgid "--smtp-server-option=<option>" msgid "--smtp-server-option=<option>"
msgstr "--stop-at-non-option" msgstr "--smtp-server-option=<Option>"
   
#. type: Plain text #. type: Plain text
#: en/git-send-email.txt:234 #: en/git-send-email.txt:234
...@@ -45476,7 +45471,7 @@ msgstr "" ...@@ -45476,7 +45471,7 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-send-email.txt:521 #: 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)" 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)" msgstr "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)"
   
...@@ -45765,7 +45760,7 @@ msgstr "" ...@@ -45765,7 +45760,7 @@ msgstr ""
   
#. type: Title = #. type: Title =
#: en/git-sh-i18n--envsubst.txt:2 #: en/git-sh-i18n--envsubst.txt:2
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "git-sh-i18n{litdd}envsubst(1)" msgid "git-sh-i18n{litdd}envsubst(1)"
msgstr "git-sh-i18n{litdd}envsubst(1)" msgstr "git-sh-i18n{litdd}envsubst(1)"
   
...@@ -46960,7 +46955,7 @@ msgstr "git-stage(1)" ...@@ -46960,7 +46955,7 @@ msgstr "git-stage(1)"
#: en/git-stage.txt:7 #: en/git-stage.txt:7
#, priority:100 #, priority:100
msgid "git-stage - Add file contents to the staging area" 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 #. type: Plain text
#: en/git-stage.txt:13 #: en/git-stage.txt:13
...@@ -48819,7 +48814,7 @@ msgstr "git-svn(1)" ...@@ -48819,7 +48814,7 @@ msgstr "git-svn(1)"
#: en/git-svn.txt:7 #: en/git-svn.txt:7
#, priority:100 #, priority:100
msgid "git-svn - Bidirectional operation between a Subversion repository and Git" 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 #. type: Plain text
#: en/git-svn.txt:12 #: en/git-svn.txt:12
...@@ -51689,7 +51684,7 @@ msgstr "" ...@@ -51689,7 +51684,7 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-tag.txt:384 #: en/git-tag.txt:384
#, priority:240 #, ignore-same, priority:240
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-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 ...@@ -51785,7 +51780,7 @@ msgstr "Diese Option beeinflusst andere Optionen, die Pfade erwarten, wie `--git
   
#. type: Plain text #. type: Plain text
#: en/git.txt:70 #: en/git.txt:70
#, no-wrap, priority:100 #, ignore-same, no-wrap, priority:100
msgid "" msgid ""
" git --git-dir=a.git --work-tree=b -C c status\n" " git --git-dir=a.git --work-tree=b -C c status\n"
" git --git-dir=c/a.git --work-tree=c/b status\n" " git --git-dir=c/a.git --work-tree=c/b status\n"
...@@ -52524,12 +52519,11 @@ msgid "`GIT_COMMON_DIR`" ...@@ -52524,12 +52519,11 @@ msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`" msgstr "`GIT_COMMON_DIR`"
   
#. type: Plain text #. type: Plain text
# noqa
# noqa
#: en/git.txt:481 #: en/git.txt:481
#, ignore-ellipsis, priority:100 #, 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..." 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 ~ #. type: Title ~
#: en/git.txt:483 #: en/git.txt:483
...@@ -55400,7 +55394,7 @@ msgstr "`git whatchanged -p v2.6.12.. include/scsi drivers/scsi`" ...@@ -55400,7 +55394,7 @@ msgstr "`git whatchanged -p v2.6.12.. include/scsi drivers/scsi`"
#: en/git-whatchanged.txt:34 #: en/git-whatchanged.txt:34
#, priority:100 #, 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" 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 #. type: Labeled list
#: en/git-whatchanged.txt:35 #: en/git-whatchanged.txt:35
...@@ -56389,9 +56383,9 @@ msgstr "" ...@@ -56389,9 +56383,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/merge-options.txt:116 #: en/merge-options.txt:116
#, fuzzy, no-wrap, priority:240 #, no-wrap, priority:240
msgid "-X <option>" msgid "-X <option>"
msgstr "`option`" msgstr "-X <Option>"
   
#. type: Plain text #. type: Plain text
#: en/merge-options.txt:120 #: en/merge-options.txt:120
po/pre-translate-dictionary.de.po
+ 16
− 0
View file @ a281eebe
...@@ -78,6 +78,22 @@ msgstr "\1Encoding\2" ...@@ -78,6 +78,22 @@ msgstr "\1Encoding\2"
msgid "(--[a-zA-Z-]+=<)address(>)" msgid "(--[a-zA-Z-]+=<)address(>)"
msgstr "\1Adresse\2" 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*)+)." #~ msgid "release notes for ((link:RelNotes/[0-9.]+.txt\[[0-9.]+\][.,]?\s*)+)."
#~ msgstr "Versionshinweise für \1." #~ msgstr "Versionshinweise für \1."
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

feedback to tooltime@ajou.ac.kr or hwan@ajou.ac.kr