diff --git a/po/documentation.de.po b/po/documentation.de.po index e7969f7a..20f218b9 100644 --- a/po/documentation.de.po +++ b/po/documentation.de.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2023-11-04 20:14+0100\n" -"PO-Revision-Date: 2023-08-05 18:04+0000\n" +"POT-Creation-Date: 2023-12-10 22:38+0100\n" +"PO-Revision-Date: 2023-12-22 14:19+0100\n" "Last-Translator: Justin Nogossek \n" "Language-Team: Matthias Aßhauer \n" "Language: de\n" @@ -22,7 +22,9 @@ msgstr "" "X-Generator: Weblate 5.0-dev\n" #. type: Labeled list -#: en/blame-options.txt:1 en/diff-options.txt:780 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:180 en/git-status.txt:31 +#: en/blame-options.txt:1 en/diff-options.txt:780 en/git-instaweb.txt:45 +#: en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:180 +#: en/git-status.txt:31 #, ignore-same, no-wrap, priority:280 msgid "-b" msgstr "-b" @@ -30,11 +32,16 @@ msgstr "-b" #. type: Plain text #: en/blame-options.txt:4 #, fuzzy, priority:100 -msgid "Show blank SHA-1 for boundary commits. This can also be controlled via the `blame.blankBoundary` config option." -msgstr "Leere SHA-1 für Grenz-Commits anzeigen. Kann auch über die Option `blame.blankboundary` gesteuert werden." +msgid "" +"Show blank SHA-1 for boundary commits. This can also be controlled via the " +"`blame.blankBoundary` config option." +msgstr "" +"Leere SHA-1 für Grenz-Commits anzeigen. Kann auch über die Option " +"`blame.blankboundary` gesteuert werden." #. type: Labeled list -#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:405 en/git-fsck.txt:38 en/git-rebase.txt:583 +#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:405 +#: en/git-fsck.txt:38 en/git-rebase.txt:583 #, ignore-same, no-wrap, priority:100 msgid "--root" msgstr "--root" @@ -42,8 +49,12 @@ msgstr "--root" #. type: Plain text #: en/blame-options.txt:8 #, priority:100 -msgid "Do not treat root commits as boundaries. This can also be controlled via the `blame.showRoot` config option." -msgstr "Root-Commits nicht als Grenze behandeln. Kann auch über die Option `blame.showRoot` gesteuert werden." +msgid "" +"Do not treat root commits as boundaries. This can also be controlled via " +"the `blame.showRoot` config option." +msgstr "" +"Root-Commits nicht als Grenze behandeln. Kann auch über die Option " +"`blame.showRoot` gesteuert werden." #. type: Labeled list #: en/blame-options.txt:9 @@ -72,17 +83,30 @@ msgstr "-L : " #. type: Plain text #: en/blame-options.txt:17 #, fuzzy, priority:100 -msgid "Annotate only the line range given by ',', or by the function name regex ''. May be specified multiple times. Overlapping ranges are allowed." -msgstr "Nur den angegebenen Zeilenbereich annotieren. Kann mehrfach angegeben werden. Überlappende Bereiche sind erlaubt." +msgid "" +"Annotate only the line range given by ',', or by the function " +"name regex ''. May be specified multiple times. Overlapping " +"ranges are allowed." +msgstr "" +"Nur den angegebenen Zeilenbereich annotieren. Kann mehrfach angegeben " +"werden. Überlappende Bereiche sind erlaubt." #. type: Plain text #: en/blame-options.txt:20 #, fuzzy, priority:100 -msgid "'' and '' are optional. `-L ` or `-L ,` spans from '' to end of file. `-L ,` spans from start of file to ''." -msgstr " und sind optional.``-L '' oder ``-L ,'' geht von bis zum Dateiende. ``-L ,'' geht vom Dateianfang bis ." +msgid "" +"'' and '' are optional. `-L ` or `-L ,` spans from" +" '' to end of file. `-L ,` spans from start of file to ''." +msgstr "" +" und sind optional.``-L '' oder ``-L ,'' geht" +" von bis zum Dateiende. ``-L ,'' geht vom Dateianfang bis " +"." #. type: Labeled list -#: en/blame-options.txt:23 en/git-archive.txt:45 en/git-branch.txt:181 en/git-checkout.txt:205 en/git-clone.txt:45 en/git-config.txt:181 en/git-grep.txt:156 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:94 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:21 +#: en/blame-options.txt:23 en/git-archive.txt:45 en/git-branch.txt:181 +#: en/git-checkout.txt:205 en/git-clone.txt:45 en/git-config.txt:181 +#: en/git-grep.txt:156 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 +#: en/git-repack.txt:94 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:21 #, ignore-same, no-wrap, priority:300 msgid "-l" msgstr "-l" @@ -94,7 +118,10 @@ msgid "Show long rev (Default: off)." msgstr "Zeige lange Revisionsnummer an (Standard: aus)." #. type: Labeled list -#: en/blame-options.txt:26 en/diff-options.txt:163 en/fetch-options.txt:194 en/git-branch.txt:217 en/git-cat-file.txt:40 en/git-checkout.txt:162 en/git-diff-tree.txt:39 en/git-ls-files.txt:140 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:153 +#: en/blame-options.txt:26 en/diff-options.txt:163 en/fetch-options.txt:194 +#: en/git-branch.txt:217 en/git-cat-file.txt:40 en/git-checkout.txt:162 +#: en/git-diff-tree.txt:39 en/git-ls-files.txt:140 en/git-ls-remote.txt:26 +#: en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:153 #, ignore-same, no-wrap, priority:280 msgid "-t" msgstr "-t" @@ -114,8 +141,11 @@ msgstr "-S " #. type: Plain text #: en/blame-options.txt:31 #, priority:100 -msgid "Use revisions from revs-file instead of calling linkgit:git-rev-list[1]." -msgstr "Nimm Revisionen aus der Revisionen-Datei statt linkgit:git-rev-list[1] aufzurufen." +msgid "" +"Use revisions from revs-file instead of calling linkgit:git-rev-list[1]." +msgstr "" +"Nimm Revisionen aus der Revisionen-Datei statt linkgit:git-rev-list[1] " +"aufzurufen." #. type: Labeled list #: en/blame-options.txt:32 @@ -126,11 +156,23 @@ msgstr "--reverse .." #. type: Plain text #: en/blame-options.txt:39 #, priority:100 -msgid "Walk history forward instead of backward. Instead of showing the revision in which a line appeared, this shows the last revision in which a line has existed. This requires a range of revision like START..END where the path to blame exists in START. `git blame --reverse START` is taken as `git blame --reverse START..HEAD` for convenience." -msgstr "Den Verlauf vorwärts statt rückwärts durchgehen. Anstatt die erste Revision anzuzeigen, in der eine Zeile erschien, wird die letzte Revision angezeigt, in der die Zeile noch existierte. Dies erfordert einen Revisionsbereich wie ANFANG..ENDE, wobei die gesuchte Stelle in ANFANG existieren muss. `git blame --reverse ANFANG` ist die Abkürzung für `git blame --reverse ANFANG..HEAD`." +msgid "" +"Walk history forward instead of backward. Instead of showing the revision in" +" which a line appeared, this shows the last revision in which a line has " +"existed. This requires a range of revision like START..END where the path to" +" blame exists in START. `git blame --reverse START` is taken as `git blame " +"--reverse START..HEAD` for convenience." +msgstr "" +"Den Verlauf vorwärts statt rückwärts durchgehen. Anstatt die erste Revision " +"anzuzeigen, in der eine Zeile erschien, wird die letzte Revision angezeigt, " +"in der die Zeile noch existierte. Dies erfordert einen Revisionsbereich wie " +"ANFANG..ENDE, wobei die gesuchte Stelle in ANFANG existieren muss. `git " +"blame --reverse ANFANG` ist die Abkürzung für `git blame --reverse " +"ANFANG..HEAD`." #. type: Labeled list -#: en/blame-options.txt:40 en/git-bisect.txt:373 en/git-describe.txt:122 en/rev-list-options.txt:129 +#: en/blame-options.txt:40 en/git-bisect.txt:373 en/git-describe.txt:122 +#: en/rev-list-options.txt:129 #, ignore-same, no-wrap, priority:260 msgid "--first-parent" msgstr "--first-parent" @@ -138,17 +180,27 @@ msgstr "--first-parent" #. type: Plain text #: en/blame-options.txt:45 #, priority:100 -msgid "Follow only the first parent commit upon seeing a merge commit. This option can be used to determine when a line was introduced to a particular integration branch, rather than when it was introduced to the history overall." +msgid "" +"Follow only the first parent commit upon seeing a merge commit. This option " +"can be used to determine when a line was introduced to a particular " +"integration branch, rather than when it was introduced to the history " +"overall." msgstr "" #. type: Labeled list -#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:135 en/git-add.txt:96 en/git-cat-file.txt:55 en/git-checkout.txt:276 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:209 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:196 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:128 +#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 +#: en/fetch-options.txt:135 en/git-add.txt:96 en/git-cat-file.txt:55 +#: en/git-checkout.txt:276 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 +#: en/git-grep.txt:209 en/git-instaweb.txt:41 en/git-merge-file.txt:63 +#: en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:196 +#: en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:128 #, ignore-same, no-wrap, priority:300 msgid "-p" msgstr "-p" #. type: Labeled list -#: en/blame-options.txt:47 en/fetch-options.txt:81 en/git-commit.txt:149 en/git-push.txt:177 en/git-worktree.txt:239 +#: en/blame-options.txt:47 en/fetch-options.txt:81 en/git-commit.txt:149 +#: en/git-push.txt:177 en/git-worktree.txt:239 #, ignore-same, no-wrap, priority:280 msgid "--porcelain" msgstr "--porcelain" @@ -168,8 +220,13 @@ msgstr "--line-porcelain" #. type: Plain text #: en/blame-options.txt:54 #, priority:100 -msgid "Show the porcelain format, but output commit information for each line, not just the first time a commit is referenced. Implies --porcelain." -msgstr "Das \"Porcelain\"-Format anzeigen, aber Commit-Information für jede Zeile anzeigen, nicht nur bei der ersten Erwähnung eines Commits. Impliziert --porcelain." +msgid "" +"Show the porcelain format, but output commit information for each line, not " +"just the first time a commit is referenced. Implies --porcelain." +msgstr "" +"Das \"Porcelain\"-Format anzeigen, aber Commit-Information für jede Zeile " +"anzeigen, nicht nur bei der ersten Erwähnung eines Commits. Impliziert " +"--porcelain." #. type: Labeled list #: en/blame-options.txt:55 en/git-pack-objects.txt:176 en/git-svn.txt:373 @@ -180,7 +237,8 @@ msgstr "--incremental" #. type: Plain text #: en/blame-options.txt:58 #, priority:100 -msgid "Show the result incrementally in a format designed for machine consumption." +msgid "" +"Show the result incrementally in a format designed for machine consumption." msgstr "Das Resultat inkrementell in einem maschinenlesbaren Format anzeigen." #. type: Labeled list @@ -192,8 +250,16 @@ msgstr "--encoding=" #. type: Plain text #: en/blame-options.txt:65 #, priority:100 -msgid "Specifies the encoding used to output author names and commit summaries. Setting it to `none` makes blame output unconverted data. For more information see the discussion about encoding in the linkgit:git-log[1] manual page." -msgstr "Definiert das Encoding für die Ausgabe der Autorennamen und Commit-Zusammenfassungen. Mit dem Wert `none` gibt blame die Daten unkonvertiert aus. Für mehr Informationen lesen Sie die Encoding-Diskussion in der Hilfe zu linkgit:git-log[1]." +msgid "" +"Specifies the encoding used to output author names and commit summaries. " +"Setting it to `none` makes blame output unconverted data. For more " +"information see the discussion about encoding in the linkgit:git-log[1] " +"manual page." +msgstr "" +"Definiert das Encoding für die Ausgabe der Autorennamen und Commit-" +"Zusammenfassungen. Mit dem Wert `none` gibt blame die Daten unkonvertiert " +"aus. Für mehr Informationen lesen Sie die Encoding-Diskussion in der Hilfe " +"zu linkgit:git-log[1]." #. type: Labeled list #: en/blame-options.txt:66 @@ -204,7 +270,10 @@ msgstr "--contents " #. type: Plain text #: en/blame-options.txt:70 #, priority:100 -msgid "Annotate using the contents from the named file, starting from if it is specified, and HEAD otherwise. You may specify '-' to make the command read from the standard input for the file contents." +msgid "" +"Annotate using the contents from the named file, starting from if it " +"is specified, and HEAD otherwise. You may specify '-' to make the command " +"read from the standard input for the file contents." msgstr "" #. type: Labeled list @@ -216,8 +285,16 @@ msgstr "--date " #. type: Plain text #: en/blame-options.txt:77 #, priority:100 -msgid "Specifies the format used to output dates. If --date is not provided, the value of the blame.date config variable is used. If the blame.date config variable is also not set, the iso format is used. For supported values, see the discussion of the --date option at linkgit:git-log[1]." -msgstr "Gibt das Datumsausgabeformat an. Wenn --date nicht angegeben ist, wird der Wert der config-Variable blame.date verwendet. Wenn blame.date auch nicht gesetzt ist, wird das ISO-Format verwendet. Für unterstützte Werte lesen Sie die Abschnitt über die --date Option auf linkgit:git-log[1]." +msgid "" +"Specifies the format used to output dates. If --date is not provided, the " +"value of the blame.date config variable is used. If the blame.date config " +"variable is also not set, the iso format is used. For supported values, see " +"the discussion of the --date option at linkgit:git-log[1]." +msgstr "" +"Gibt das Datumsausgabeformat an. Wenn --date nicht angegeben ist, wird der " +"Wert der config-Variable blame.date verwendet. Wenn blame.date auch nicht " +"gesetzt ist, wird das ISO-Format verwendet. Für unterstützte Werte lesen Sie" +" die Abschnitt über die --date Option auf linkgit:git-log[1]." #. type: Labeled list #: en/blame-options.txt:78 en/git-fsck.txt:100 @@ -228,8 +305,16 @@ msgstr "--[no-]progress" #. type: Plain text #: en/blame-options.txt:84 #, priority:100 -msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal. This flag enables progress reporting even if not attached to a terminal. Can't use `--progress` together with `--porcelain` or `--incremental`." -msgstr "Der Fortschritt wird nur standardmäßig auf der Standardfehlerausgabe angezeigt, wenn dieser an ein Terminal angebunden ist. Dieses Flag erlaubt die Fortschrittsanzeige auch ohne Terminalanbindung. `--progress` kann nicht zusammen mit `--porcelain` oder `--incremental` verwendet werden." +msgid "" +"Progress status is reported on the standard error stream by default when it " +"is attached to a terminal. This flag enables progress reporting even if not " +"attached to a terminal. Can't use `--progress` together with `--porcelain` " +"or `--incremental`." +msgstr "" +"Der Fortschritt wird nur standardmäßig auf der Standardfehlerausgabe " +"angezeigt, wenn dieser an ein Terminal angebunden ist. Dieses Flag erlaubt " +"die Fortschrittsanzeige auch ohne Terminalanbindung. `--progress` kann nicht" +" zusammen mit `--porcelain` oder `--incremental` verwendet werden." #. type: Labeled list #: en/blame-options.txt:85 @@ -240,14 +325,36 @@ msgstr "-M[]" #. type: Plain text #: en/blame-options.txt:95 #, priority:100 -msgid "Detect moved or copied lines within a file. When a commit moves or copies a block of lines (e.g. the original file has A and then B, and the commit changes it to B and then A), the traditional 'blame' algorithm notices only half of the movement and typically blames the lines that were moved up (i.e. B) to the parent and assigns blame to the lines that were moved down (i.e. A) to the child commit. With this option, both groups of lines are blamed on the parent by running extra passes of inspection." -msgstr "Ermittelt verschobene oder kopierte Zeilen innerhalb einer Datei. Wenn ein Commit einen Zeilenblock verschiebt oder kopiert (z.B. wenn die Ausgangsdatei zuerst A und dann B hat und der Commit das zu B und dann A verändert), bemerkt der traditionelle 'blame'-Algorithmus nur die Hälfte der Bewegung und schreibt normalerweise die nach oben verschobenen Zeilen (A) dem Elterncommit und die nach unten verschobenen Zeilen (B) dem Kindcommit zu. Mit dieser Option werden beide Zeilenblöcke dem Elterncommit zugeschrieben, indem zusätzliche Prüfungen durchgeführt werden." +msgid "" +"Detect moved or copied lines within a file. When a commit moves or copies a " +"block of lines (e.g. the original file has A and then B, and the commit " +"changes it to B and then A), the traditional 'blame' algorithm notices only " +"half of the movement and typically blames the lines that were moved up (i.e." +" B) to the parent and assigns blame to the lines that were moved down (i.e. " +"A) to the child commit. With this option, both groups of lines are blamed " +"on the parent by running extra passes of inspection." +msgstr "" +"Ermittelt verschobene oder kopierte Zeilen innerhalb einer Datei. Wenn ein " +"Commit einen Zeilenblock verschiebt oder kopiert (z.B. wenn die " +"Ausgangsdatei zuerst A und dann B hat und der Commit das zu B und dann A " +"verändert), bemerkt der traditionelle 'blame'-Algorithmus nur die Hälfte der" +" Bewegung und schreibt normalerweise die nach oben verschobenen Zeilen (A) " +"dem Elterncommit und die nach unten verschobenen Zeilen (B) dem Kindcommit " +"zu. Mit dieser Option werden beide Zeilenblöcke dem Elterncommit " +"zugeschrieben, indem zusätzliche Prüfungen durchgeführt werden." #. type: Plain text #: en/blame-options.txt:100 #, priority:100 -msgid " is optional but it is the lower bound on the number of alphanumeric characters that Git must detect as moving/copying within a file for it to associate those lines with the parent commit. The default value is 20." -msgstr " ist optional. Es ist die Untergrenze für die Anzahl alphanumerischer Zeichen, die Git innerhalb einer Datei als geschoben/kopiert ermitteln muss, damit diese Zeilen mit dem Elterncommit assoziiert werden. Der Standardwert ist 20." +msgid "" +" is optional but it is the lower bound on the number of alphanumeric " +"characters that Git must detect as moving/copying within a file for it to " +"associate those lines with the parent commit. The default value is 20." +msgstr "" +" ist optional. Es ist die Untergrenze für die Anzahl alphanumerischer " +"Zeichen, die Git innerhalb einer Datei als geschoben/kopiert ermitteln muss," +" damit diese Zeilen mit dem Elterncommit assoziiert werden. Der Standardwert" +" ist 20." #. type: Labeled list #: en/blame-options.txt:101 @@ -258,14 +365,37 @@ msgstr "-C[]" #. type: Plain text #: en/blame-options.txt:110 #, priority:100 -msgid "In addition to `-M`, detect lines moved or copied from other files that were modified in the same commit. This is useful when you reorganize your program and move code around across files. When this option is given twice, the command additionally looks for copies from other files in the commit that creates the file. When this option is given three times, the command additionally looks for copies from other files in any commit." -msgstr "Zusätzlich zu `-M`, Zeilen suchen, die aus anderen Dateien, die im selben Commit bearbeitet wurden, verschoben oder kopiert wurden. Das ist hilfreich, wenn Sie Ihr Programm umorganisieren und Code zwischen Dateien hin- und herschieben. Wenn diese Option zweimal mitgegeben wird, sucht der Befehl zusätzlich Kopien aus anderen Dateien des Commits, der die Datei erstellt. Wenn die Option dreimal mitgegeben wird, sucht der Befehl außerdem Kopien aus anderen Dateien in allen Commits." +msgid "" +"In addition to `-M`, detect lines moved or copied from other files that were" +" modified in the same commit. This is useful when you reorganize your " +"program and move code around across files. When this option is given twice," +" the command additionally looks for copies from other files in the commit " +"that creates the file. When this option is given three times, the command " +"additionally looks for copies from other files in any commit." +msgstr "" +"Zusätzlich zu `-M`, Zeilen suchen, die aus anderen Dateien, die im selben " +"Commit bearbeitet wurden, verschoben oder kopiert wurden. Das ist hilfreich," +" wenn Sie Ihr Programm umorganisieren und Code zwischen Dateien hin- und " +"herschieben. Wenn diese Option zweimal mitgegeben wird, sucht der Befehl " +"zusätzlich Kopien aus anderen Dateien des Commits, der die Datei erstellt. " +"Wenn die Option dreimal mitgegeben wird, sucht der Befehl außerdem Kopien " +"aus anderen Dateien in allen Commits." #. type: Plain text #: en/blame-options.txt:117 #, priority:100 -msgid " is optional but it is the lower bound on the number of alphanumeric characters that Git must detect as moving/copying between files for it to associate those lines with the parent commit. And the default value is 40. If there are more than one `-C` options given, the argument of the last `-C` will take effect." -msgstr " ist optional. Es ist die Untergrenze für die Anzahl alphanumerischer Zeichen, die Git als zwischen Dateien geschoben/kopiert ermitteln muss, damit diese Zeilen mit dem Elternkommit assoziiert werden. Der Standardwert ist 40. Wenn mehr als eine `-C`-Option angegeben wird, zählt das -Argument des letzten `-C`." +msgid "" +" is optional but it is the lower bound on the number of alphanumeric " +"characters that Git must detect as moving/copying between files for it to " +"associate those lines with the parent commit. And the default value is 40. " +"If there are more than one `-C` options given, the argument of the " +"last `-C` will take effect." +msgstr "" +" ist optional. Es ist die Untergrenze für die Anzahl alphanumerischer " +"Zeichen, die Git als zwischen Dateien geschoben/kopiert ermitteln muss, " +"damit diese Zeilen mit dem Elternkommit assoziiert werden. Der Standardwert " +"ist 40. Wenn mehr als eine `-C`-Option angegeben wird, zählt das " +"-Argument des letzten `-C`." #. type: Labeled list #: en/blame-options.txt:118 @@ -276,7 +406,17 @@ msgstr "--ignore-rev " #. type: Plain text #: en/blame-options.txt:129 #, priority:100 -msgid "Ignore changes made by the revision when assigning blame, as if the change never happened. Lines that were changed or added by an ignored commit will be blamed on the previous commit that changed that line or nearby lines. This option may be specified multiple times to ignore more than one revision. If the `blame.markIgnoredLines` config option is set, then lines that were changed by an ignored commit and attributed to another commit will be marked with a `?` in the blame output. If the `blame.markUnblamableLines` config option is set, then those lines touched by an ignored commit that we could not attribute to another revision are marked with a '*'." +msgid "" +"Ignore changes made by the revision when assigning blame, as if the change " +"never happened. Lines that were changed or added by an ignored commit will " +"be blamed on the previous commit that changed that line or nearby lines. " +"This option may be specified multiple times to ignore more than one " +"revision. If the `blame.markIgnoredLines` config option is set, then lines " +"that were changed by an ignored commit and attributed to another commit will" +" be marked with a `?` in the blame output. If the " +"`blame.markUnblamableLines` config option is set, then those lines touched " +"by an ignored commit that we could not attribute to another revision are " +"marked with a '*'." msgstr "" #. type: Labeled list @@ -288,7 +428,12 @@ msgstr "--ignore-revs-file " #. type: Plain text #: en/blame-options.txt:136 #, priority:100 -msgid "Ignore revisions listed in `file`, which must be in the same format as an `fsck.skipList`. This option may be repeated, and these files will be processed after any files specified with the `blame.ignoreRevsFile` config option. An empty file name, `\"\"`, will clear the list of revs from previously processed files." +msgid "" +"Ignore revisions listed in `file`, which must be in the same format as an " +"`fsck.skipList`. This option may be repeated, and these files will be " +"processed after any files specified with the `blame.ignoreRevsFile` config " +"option. An empty file name, `\"\"`, will clear the list of revs from " +"previously processed files." msgstr "" #. type: Labeled list @@ -300,7 +445,11 @@ msgstr "--color-lines" #. type: Plain text #: en/blame-options.txt:142 #, priority:100 -msgid "Color line annotations in the default format differently if they come from the same commit as the preceding line. This makes it easier to distinguish code blocks introduced by different commits. The color defaults to cyan and can be adjusted using the `color.blame.repeatedLines` config option." +msgid "" +"Color line annotations in the default format differently if they come from " +"the same commit as the preceding line. This makes it easier to distinguish " +"code blocks introduced by different commits. The color defaults to cyan and " +"can be adjusted using the `color.blame.repeatedLines` config option." msgstr "" #. type: Labeled list @@ -312,12 +461,17 @@ msgstr "--color-by-age" #. type: Plain text #: en/blame-options.txt:147 #, priority:100 -msgid "Color line annotations depending on the age of the line in the default format. The `color.blame.highlightRecent` config option controls what color is used for each range of age." +msgid "" +"Color line annotations depending on the age of the line in the default " +"format. The `color.blame.highlightRecent` config option controls what color" +" is used for each range of age." msgstr "" #. type: Labeled list -#: en/blame-options.txt:148 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:60 en/git-grep.txt:114 en/git-ls-remote.txt:24 en/git.txt:49 -#, ignore-same, no-wrap, priority:100 +#: en/blame-options.txt:148 en/git-archimport.txt:71 en/git-cvsimport.txt:184 +#: en/git-cvsserver.txt:60 en/git-grep.txt:114 en/git-ls-remote.txt:24 +#: en/git.txt:49 +#, ignore-same, no-wrap, priority:300 msgid "-h" msgstr "-h" @@ -329,1974 +483,2245 @@ msgstr "Hilfetext anzeigen." #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:1 en/git-blame.txt:254 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-annotate[1]" msgstr "linkgit:git-annotate[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:3 -#, priority:100 +#, priority:300 msgid "Annotate file lines with commit information." msgstr "Zeilen der Datei mit Commit-Informationen versehen und anzeigen." #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:4 en/git-annotate.txt:30 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-blame[1]" msgstr "linkgit:git-blame[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:6 -#, priority:100 +#, priority:300 msgid "Show what revision and author last modified each line of a file." -msgstr "Anzeigen, durch welchen Commit und Autor die jeweiligen Zeilen einer Datei zuletzt geändert wurden." +msgstr "" +"Anzeigen, durch welchen Commit und Autor die jeweiligen Zeilen einer Datei " +"zuletzt geändert wurden." #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:7 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-bugreport[1]" msgstr "linkgit:git-bugreport[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:9 -#, fuzzy, priority:100 +#, fuzzy, priority:300 msgid "Collect information for user to file a bug report." -msgstr "Informationen für den Benutzer zum Einreichen eines Fehlerberichts sammeln" +msgstr "" +"Informationen für den Benutzer zum Einreichen eines Fehlerberichts sammeln" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:10 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-count-objects[1]" msgstr "linkgit:git-count-objects[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:12 -#, priority:100 +#, priority:300 msgid "Count unpacked number of objects and their disk consumption." msgstr "Anzahl und Speicherverbrauch ungepackter Objekte zählen." #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:13 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-diagnose[1]" msgstr "linkgit:git-diagnose[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:15 -#, priority:100 +#, priority:300 msgid "Generate a zip archive of diagnostic information." msgstr "" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:16 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-difftool[1]" msgstr "linkgit:git-difftool[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:18 -#, priority:100 +#, priority:300 msgid "Show changes using common diff tools." msgstr "Änderungen mittels den allgemeinen Diff-Tools anzeigen." #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:19 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-fsck[1]" msgstr "linkgit:git-fsck[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:21 en/git-fsck.txt:20 -#, priority:100 +#, priority:300 msgid "Verifies the connectivity and validity of the objects in the database." -msgstr "Stellt die Verbundenheit und Gültigkeit der Objekte in der Datenbank sicher." +msgstr "" +"Stellt die Verbundenheit und Gültigkeit der Objekte in der Datenbank sicher." #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:22 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-help[1]" msgstr "linkgit:git-help[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:24 -#, priority:100 +#, priority:300 msgid "Display help information about Git." msgstr "Hilfsinformationen über Git anzeigen." #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:25 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-instaweb[1]" msgstr "linkgit:git-instaweb[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:27 -#, priority:100 +#, priority:300 msgid "Instantly browse your working repository in gitweb." msgstr "Ihr aktuelles Repository sofort in gitweb betrachten." #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:28 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-merge-tree[1]" msgstr "linkgit:git-merge-tree[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:30 -#, fuzzy, priority:100 +#, fuzzy, priority:300 msgid "Perform merge without touching index or working tree." msgstr "3-Wege-Merge anzeigen ohne den Index zu verändern." #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:31 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-rerere[1]" msgstr "linkgit:git-rerere[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:33 -#, priority:100 +#, priority:300 msgid "Reuse recorded resolution of conflicted merges." msgstr "Aufgezeichnete Auflösung von Merge-Konflikten wiederverwenden." #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:34 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-show-branch[1]" msgstr "linkgit:git-show-branch[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:36 -#, priority:100 +#, priority:300 msgid "Show branches and their commits." msgstr "Branches und ihre Commits ausgeben." #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:37 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-verify-commit[1]" msgstr "linkgit:git-verify-commit[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:39 -#, priority:100 +#, priority:300 msgid "Check the GPG signature of commits." msgstr "Die GPG-Signatur von Commits prüfen." #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:40 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-verify-tag[1]" msgstr "linkgit:git-verify-tag[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:42 -#, priority:100 +#, priority:300 msgid "Check the GPG signature of tags." msgstr "Die GPG-Signatur von Tags prüfen." #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:43 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-version[1]" msgstr "linkgit:git-version[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:45 -#, fuzzy, priority:100 +#, fuzzy, priority:300 #| msgid "Display help information about Git." msgid "Display version information about Git." msgstr "Hilfsinformationen über Git anzeigen." #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:46 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-whatchanged[1]" msgstr "linkgit:git-whatchanged[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:48 -#, priority:100 +#, priority:300 msgid "Show logs with difference each commit introduces." msgstr "Logs mit dem Unterschied, den jeder Commit einführt, anzeigen." #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:49 en/git-instaweb.txt:91 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:gitweb[1]" msgstr "linkgit:gitweb[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:51 -#, priority:100 +#, priority:300 msgid "Git web interface (web frontend to Git repositories)." msgstr "Git Web Interface (Web-Frontend für Git-Repositories)." #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:135 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-config[1]" msgstr "linkgit:git-config[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:3 -#, priority:100 +#, priority:300 msgid "Get and set repository or global options." msgstr "Repositoryweite oder globale Optionen lesen und setzen." #. type: Plain text #: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1577 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-fast-export[1]" msgstr "linkgit:git-fast-export[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:6 -#, priority:100 +#, priority:300 msgid "Git data exporter." msgstr "Export-Tool für Git-Daten." #. type: Plain text #: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-fast-import[1]" msgstr "linkgit:git-fast-import[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:9 -#, priority:100 +#, priority:300 msgid "Backend for fast Git data importers." msgstr "Backend für schnelle Git-Datenimport-Tools." #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:10 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-filter-branch[1]" msgstr "linkgit:git-filter-branch[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:12 -#, priority:100 +#, priority:300 msgid "Rewrite branches." msgstr "Branches umschreiben." #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:132 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-mergetool[1]" msgstr "linkgit:git-mergetool[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:15 -#, priority:100 +#, priority:300 msgid "Run merge conflict resolution tools to resolve merge conflicts." -msgstr "Ausführen von Tools zur Auflösung von Merge-Konflikten zur Behebung dieser." +msgstr "" +"Ausführen von Tools zur Auflösung von Merge-Konflikten zur Behebung dieser." #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:16 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-pack-refs[1]" msgstr "linkgit:git-pack-refs[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:18 -#, priority:100 +#, priority:300 msgid "Pack heads and tags for efficient repository access." msgstr "Branches und Tags für effizienten Zugriff auf das Repository packen." #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:19 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-prune[1]" msgstr "linkgit:git-prune[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:21 -#, priority:100 +#, priority:300 msgid "Prune all unreachable objects from the object database." msgstr "Alle nicht erreichbaren Objekte von der Objektdatenbank entfernen." #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:22 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-reflog[1]" msgstr "linkgit:git-reflog[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:24 -#, priority:100 +#, priority:300 msgid "Manage reflog information." msgstr "Reflog-Informationen verwalten." #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:25 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-remote[1]" msgstr "linkgit:git-remote[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:27 -#, priority:100 +#, priority:300 msgid "Manage set of tracked repositories." msgstr "Einen Satz entfernter Repositories verwalten." #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:28 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-repack[1]" msgstr "linkgit:git-repack[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:30 -#, priority:100 +#, priority:300 msgid "Pack unpacked objects in a repository." msgstr "Ungepackte Objekte in einem Repository packen." #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:31 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-replace[1]" msgstr "linkgit:git-replace[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:33 -#, priority:100 +#, priority:300 msgid "Create, list, delete refs to replace objects." msgstr "Referenzen für ersetzende Objekte erstellen, auflisten, löschen." +#. type: Labeled list +#: en/cmds-developerinterfaces.txt:1 +#, ignore-same, no-wrap, priority:300 +msgid "linkgit:gitformat-bundle[5]" +msgstr "linkgit:gitformat-bundle[5]" + +#. type: Plain text +#: en/cmds-developerinterfaces.txt:3 +#, priority:300 +msgid "The bundle file format." +msgstr "" + +#. type: Labeled list +#: en/cmds-developerinterfaces.txt:4 +#, ignore-same, no-wrap, priority:300 +msgid "linkgit:gitformat-chunk[5]" +msgstr "linkgit:gitformat-chunk[5]" + +#. type: Plain text +#: en/cmds-developerinterfaces.txt:6 +#, priority:300 +msgid "Chunk-based file formats." +msgstr "" + +#. type: Labeled list +#: en/cmds-developerinterfaces.txt:7 +#, ignore-same, no-wrap, priority:300 +msgid "linkgit:gitformat-commit-graph[5]" +msgstr "linkgit:gitformat-commit-graph[5]" + +#. type: Plain text +#: en/cmds-developerinterfaces.txt:9 +#, fuzzy, priority:300 +#| msgid "Git internal format" +msgid "Git commit-graph format." +msgstr "Git-internes Format" + +#. type: Labeled list +#: en/cmds-developerinterfaces.txt:10 +#, ignore-same, no-wrap, priority:300 +msgid "linkgit:gitformat-index[5]" +msgstr "linkgit:gitformat-index[5]" + +#. type: Plain text +#: en/cmds-developerinterfaces.txt:12 +#, fuzzy, priority:300 +#| msgid "Git internal format" +msgid "Git index format." +msgstr "Git-internes Format" + +#. type: Labeled list +#: en/cmds-developerinterfaces.txt:13 +#, ignore-same, no-wrap, priority:300 +msgid "linkgit:gitformat-pack[5]" +msgstr "linkgit:gitformat-pack[5]" + +#. type: Plain text +#: en/cmds-developerinterfaces.txt:15 +#, fuzzy, priority:300 +#| msgid "Git internal format" +msgid "Git pack format." +msgstr "Git-internes Format" + +#. type: Labeled list +#: en/cmds-developerinterfaces.txt:16 +#, ignore-same, no-wrap, priority:300 +msgid "linkgit:gitformat-signature[5]" +msgstr "linkgit:gitformat-signature[5]" + +#. type: Plain text +#: en/cmds-developerinterfaces.txt:18 +#, priority:300 +msgid "Git cryptographic signature formats." +msgstr "" + +#. type: Labeled list +#: en/cmds-developerinterfaces.txt:19 +#, ignore-same, no-wrap, priority:300 +msgid "linkgit:gitprotocol-capabilities[5]" +msgstr "linkgit:gitprotocol-capabilities[5]" + +#. type: Plain text +#: en/cmds-developerinterfaces.txt:21 +#, priority:300 +msgid "Protocol v0 and v1 capabilities." +msgstr "" + +#. type: Labeled list +#: en/cmds-developerinterfaces.txt:22 +#, ignore-same, no-wrap, priority:300 +msgid "linkgit:gitprotocol-common[5]" +msgstr "linkgit:gitprotocol-common[5]" + +#. type: Plain text +#: en/cmds-developerinterfaces.txt:24 +#, priority:300 +msgid "Things common to various protocols." +msgstr "" + +#. type: Labeled list +#: en/cmds-developerinterfaces.txt:25 +#, ignore-same, no-wrap, priority:300 +msgid "linkgit:gitprotocol-http[5]" +msgstr "linkgit:gitprotocol-http[5]" + +#. type: Plain text +#: en/cmds-developerinterfaces.txt:27 +#, priority:300 +msgid "Git HTTP-based protocols." +msgstr "" + +#. type: Labeled list +#: en/cmds-developerinterfaces.txt:28 +#, ignore-same, no-wrap, priority:300 +msgid "linkgit:gitprotocol-pack[5]" +msgstr "linkgit:gitprotocol-pack[5]" + +#. type: Plain text +#: en/cmds-developerinterfaces.txt:30 +#, priority:300 +msgid "How packs are transferred over-the-wire." +msgstr "" + +#. type: Labeled list +#: en/cmds-developerinterfaces.txt:31 +#, ignore-same, no-wrap, priority:300 +msgid "linkgit:gitprotocol-v2[5]" +msgstr "linkgit:gitprotocol-v2[5]" + +#. type: Plain text +#: en/cmds-developerinterfaces.txt:33 +#, priority:300 +msgid "Git Wire Protocol, Version 2." +msgstr "" + #. type: Labeled list #: en/cmds-foreignscminterface.txt:1 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-archimport[1]" msgstr "linkgit:git-archimport[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:3 -#, priority:100 +#, priority:300 msgid "Import a GNU Arch repository into Git." msgstr "Ein GNU-Arch-Repository in Git importieren." #. type: Labeled list #: en/cmds-foreignscminterface.txt:4 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-cvsexportcommit[1]" msgstr "linkgit:git-cvsexportcommit[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:6 -#, priority:100 +#, priority:300 msgid "Export a single commit to a CVS checkout." msgstr "Einzelnen Commit zu einem ausgecheckten CVS-Repository exportieren." #. type: Labeled list #: en/cmds-foreignscminterface.txt:7 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-cvsimport[1]" msgstr "linkgit:git-cvsimport[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:9 -#, priority:100 +#, priority:300 msgid "Salvage your data out of another SCM people love to hate." msgstr "Ihre Daten aus einem anderen SCM übernehmen." #. type: Labeled list #: en/cmds-foreignscminterface.txt:10 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-cvsserver[1]" msgstr "linkgit:git-cvsserver[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:12 -#, priority:100 +#, priority:300 msgid "A CVS server emulator for Git." msgstr "Ein CVS-Server-Emulator für Git." #. type: Labeled list #: en/cmds-foreignscminterface.txt:13 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-imap-send[1]" msgstr "linkgit:git-imap-send[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:15 -#, priority:100 +#, priority:300 msgid "Send a collection of patches from stdin to an IMAP folder." -msgstr "Eine Sammlung von Patches von der Standard-Eingabe an einen IMAP-Ordner senden." +msgstr "" +"Eine Sammlung von Patches von der Standard-Eingabe an einen IMAP-Ordner " +"senden." #. type: Labeled list #: en/cmds-foreignscminterface.txt:16 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-p4[1]" msgstr "linkgit:git-p4[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:18 -#, priority:100 +#, priority:300 msgid "Import from and submit to Perforce repositories." msgstr "Repositories aus Perforce importieren und an diese senden." #. type: Labeled list #: en/cmds-foreignscminterface.txt:19 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-quiltimport[1]" msgstr "linkgit:git-quiltimport[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:21 -#, priority:100 +#, priority:300 msgid "Applies a quilt patchset onto the current branch." msgstr "Patches aus quilt auf aktuellen Branch anwenden." #. type: Labeled list #: en/cmds-foreignscminterface.txt:22 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-request-pull[1]" msgstr "linkgit:git-request-pull[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:24 -#, priority:100 +#, priority:300 msgid "Generates a summary of pending changes." msgstr "Eine Übersicht über ausstehende Änderungen generieren." #. type: Labeled list #: en/cmds-foreignscminterface.txt:25 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-send-email[1]" msgstr "linkgit:git-send-email[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:27 -#, priority:100 +#, priority:300 msgid "Send a collection of patches as emails." msgstr "Eine Sammlung von Patches als E-Mails versenden." #. type: Labeled list #: en/cmds-foreignscminterface.txt:28 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-svn[1]" msgstr "linkgit:git-svn[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:30 -#, priority:100 +#, priority:300 msgid "Bidirectional operation between a Subversion repository and Git." -msgstr "Bidirektionale Operationen zwischen einem Subversion-Repository und Git." +msgstr "" +"Bidirektionale Operationen zwischen einem Subversion-Repository und Git." #. type: Labeled list #: en/cmds-guide.txt:1 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:gitcore-tutorial[7]" msgstr "linkgit:gitcore-tutorial[7]" #. type: Plain text #: en/cmds-guide.txt:3 -#, fuzzy, priority:100 +#, fuzzy, priority:300 msgid "A Git core tutorial for developers." msgstr "eine Git Anleitung für Entwickler" #. type: Labeled list #: en/cmds-guide.txt:4 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:gitcredentials[7]" msgstr "linkgit:gitcredentials[7]" #. type: Plain text #: en/cmds-guide.txt:6 -#, fuzzy, priority:100 +#, fuzzy, priority:300 msgid "Providing usernames and passwords to Git." msgstr "Bereitstellung von Benutzernamen und Passwörtern für Git" #. type: Labeled list #: en/cmds-guide.txt:7 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:gitcvs-migration[7]" msgstr "linkgit:gitcvs-migration[7]" #. type: Plain text #: en/cmds-guide.txt:9 -#, fuzzy, priority:100 +#, fuzzy, priority:300 msgid "Git for CVS users." msgstr "Git für CVS Benutzer" #. type: Labeled list #: en/cmds-guide.txt:10 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:gitdiffcore[7]" msgstr "linkgit:gitdiffcore[7]" #. type: Plain text #: en/cmds-guide.txt:12 -#, fuzzy, priority:100 +#, fuzzy, priority:300 msgid "Tweaking diff output." msgstr "Manipulation (munging) der 'diff'-Ausgabe" #. type: Labeled list #: en/cmds-guide.txt:13 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:giteveryday[7]" msgstr "linkgit:giteveryday[7]" #. type: Plain text #: en/cmds-guide.txt:15 -#, fuzzy, priority:100 +#, fuzzy, priority:300 msgid "A useful minimum set of commands for Everyday Git." -msgstr "ein kleine, nützliche Menge von Befehlen für die tägliche Verwendung von Git" +msgstr "" +"ein kleine, nützliche Menge von Befehlen für die tägliche Verwendung von Git" #. type: Labeled list #: en/cmds-guide.txt:16 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:gitfaq[7]" msgstr "linkgit:gitfaq[7]" #. type: Plain text #: en/cmds-guide.txt:18 -#, fuzzy, priority:100 +#, fuzzy, priority:300 msgid "Frequently asked questions about using Git." msgstr "Häufig gestellte Fragen über die Nutzung von Git" #. type: Labeled list #: en/cmds-guide.txt:19 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:gitglossary[7]" msgstr "linkgit:gitglossary[7]" #. type: Plain text #: en/cmds-guide.txt:21 -#, fuzzy, priority:100 +#, fuzzy, priority:300 msgid "A Git Glossary." msgstr "gitglossary - Ein GIT-Glossar" #. type: Plain text #: en/cmds-guide.txt:22 en/git-upload-pack.txt:61 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:gitnamespaces[7]" msgstr "linkgit:gitnamespaces[7]" #. type: Plain text #: en/cmds-guide.txt:24 -#, fuzzy, priority:100 +#, fuzzy, priority:300 msgid "Git namespaces." msgstr "whitespace (Leerzeichen)" #. type: Plain text #: en/cmds-guide.txt:25 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:gitremote-helpers[7]" msgstr "linkgit:gitremote-helpers[7]" #. type: Plain text #: en/cmds-guide.txt:27 -#, fuzzy, priority:100 +#, fuzzy, priority:300 msgid "Helper programs to interact with remote repositories." msgstr "Hilfsprogramme zur Interaktion mit Remote-Repositories" #. type: Labeled list #: en/cmds-guide.txt:28 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:gitsubmodules[7]" msgstr "linkgit:gitsubmodules[7]" #. type: Plain text #: en/cmds-guide.txt:30 -#, fuzzy, priority:100 +#, fuzzy, priority:300 msgid "Mounting one repository inside another." msgstr "Einbinden eines Repositories in ein anderes" #. type: Labeled list #: en/cmds-guide.txt:31 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:gittutorial[7]" msgstr "linkgit:gittutorial[7]" #. type: Plain text #: en/cmds-guide.txt:33 -#, fuzzy, priority:100 +#, fuzzy, priority:300 msgid "A tutorial introduction to Git." msgstr "Eine portable grafische Schnittstelle zu Git." #. type: Labeled list #: en/cmds-guide.txt:34 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:gittutorial-2[7]" msgstr "linkgit:gittutorial-2[7]" #. type: Plain text #: en/cmds-guide.txt:36 -#, fuzzy, priority:100 +#, fuzzy, priority:300 msgid "A tutorial introduction to Git: part two." msgstr "Eine portable grafische Schnittstelle zu Git." #. type: Labeled list #: en/cmds-guide.txt:37 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:gitworkflows[7]" msgstr "linkgit:gitworkflows[7]" #. type: Plain text #: en/cmds-guide.txt:39 -#, fuzzy, priority:100 +#, fuzzy, priority:300 msgid "An overview of recommended workflows with Git." -msgstr "Siehe linkgit:gitworkflows[7] für eine Übersicht über empfohlene Arbeitsabläufe." +msgstr "" +"Siehe linkgit:gitworkflows[7] für eine Übersicht über empfohlene " +"Arbeitsabläufe." #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:201 -#, ignore-same, no-wrap, priority:280 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-add[1]" msgstr "linkgit:git-add[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:3 -#, priority:100 +#, priority:300 msgid "Add file contents to the index." msgstr "Füge Dateiinhalte zum Index hinzu." #. type: Labeled list #: en/cmds-mainporcelain.txt:4 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-am[1]" msgstr "linkgit:git-am[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:6 -#, priority:100 +#, priority:300 msgid "Apply a series of patches from a mailbox." msgstr "Eine Serie von Patches von einer Mailbox anwenden." #. type: Labeled list #: en/cmds-mainporcelain.txt:7 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-archive[1]" msgstr "linkgit:git-archive[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:9 -#, priority:100 +#, priority:300 msgid "Create an archive of files from a named tree." msgstr "Dateiarchiv von angegebenem Verzeichnis erstellen." #. type: Labeled list #: en/cmds-mainporcelain.txt:10 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-bisect[1]" msgstr "linkgit:git-bisect[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:12 -#, priority:100 +#, priority:300 msgid "Use binary search to find the commit that introduced a bug." -msgstr "Binärsuche verwenden, um den Commit zu finden, der einen Fehler verursacht hat." +msgstr "" +"Binärsuche verwenden, um den Commit zu finden, der einen Fehler verursacht " +"hat." #. type: Labeled list #: en/cmds-mainporcelain.txt:13 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-branch[1]" msgstr "linkgit:git-branch[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:15 -#, priority:100 +#, priority:300 msgid "List, create, or delete branches." msgstr "Branches anzeigen, erstellen oder entfernen." #. type: Labeled list #: en/cmds-mainporcelain.txt:16 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-bundle[1]" msgstr "linkgit:git-bundle[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:18 -#, priority:100 +#, priority:300 msgid "Move objects and refs by archive." msgstr "Objekte und Referenzen über ein Archiv verteilen." #. type: Labeled list #: en/cmds-mainporcelain.txt:19 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-checkout[1]" msgstr "linkgit:git-checkout[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:21 -#, priority:100 +#, priority:300 msgid "Switch branches or restore working tree files." -msgstr "Branches wechseln oder Dateien im Arbeitsverzeichnis wiederherstellen." +msgstr "" +"Branches wechseln oder Dateien im Arbeitsverzeichnis wiederherstellen." #. type: Plain text #: en/cmds-mainporcelain.txt:22 en/git-revert.txt:165 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-cherry-pick[1]" msgstr "linkgit:git-cherry-pick[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:24 -#, priority:100 +#, priority:300 msgid "Apply the changes introduced by some existing commits." msgstr "Änderungen eines existierenden Commits anwenden." #. type: Labeled list #: en/cmds-mainporcelain.txt:25 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-citool[1]" msgstr "linkgit:git-citool[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:27 -#, priority:100 +#, priority:300 msgid "Graphical alternative to git-commit." msgstr "Graphische Alternative zu git-commit." #. type: Labeled list #: en/cmds-mainporcelain.txt:28 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-clean[1]" msgstr "linkgit:git-clean[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:30 -#, priority:100 +#, priority:300 msgid "Remove untracked files from the working tree." msgstr "Unversionierte Dateien vom Arbeitsverzeichnis entfernen." #. type: Labeled list #: en/cmds-mainporcelain.txt:31 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-clone[1]" msgstr "linkgit:git-clone[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:33 -#, priority:100 +#, priority:300 msgid "Clone a repository into a new directory." msgstr "Ein Repository in einem neuen Verzeichnis klonen." #. type: Labeled list #: en/cmds-mainporcelain.txt:34 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-commit[1]" msgstr "linkgit:git-commit[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:36 -#, priority:100 +#, priority:300 msgid "Record changes to the repository." msgstr "Änderungen in das Repository eintragen." #. type: Labeled list #: en/cmds-mainporcelain.txt:37 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-describe[1]" msgstr "linkgit:git-describe[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:39 -#, priority:100 +#, priority:300 msgid "Give an object a human readable name based on an available ref." -msgstr "Einem Objekt einen für Menschen lesbaren Namen basierend auf einer verfügbaren Referenz geben." +msgstr "" +"Einem Objekt einen für Menschen lesbaren Namen basierend auf einer " +"verfügbaren Referenz geben." #. type: Labeled list #: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:129 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-diff[1]" msgstr "linkgit:git-diff[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:42 -#, priority:100 +#, priority:300 msgid "Show changes between commits, commit and working tree, etc." -msgstr "Änderungen zwischen Commits, Commit und Arbeitsverzeichnis, etc. anzeigen." +msgstr "" +"Änderungen zwischen Commits, Commit und Arbeitsverzeichnis, etc. anzeigen." #. type: Plain text #: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:133 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-fetch[1]" msgstr "linkgit:git-fetch[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:45 -#, priority:100 +#, priority:300 msgid "Download objects and refs from another repository." msgstr "Objekte und Referenzen von einem anderen Repository herunterladen." #. type: Labeled list #: en/cmds-mainporcelain.txt:46 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-format-patch[1]" msgstr "linkgit:git-format-patch[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:48 -#, priority:100 +#, priority:300 msgid "Prepare patches for e-mail submission." msgstr "Patches für E-Mail-Versand vorbereiten." #. type: Labeled list #: en/cmds-mainporcelain.txt:49 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-gc[1]" msgstr "linkgit:git-gc[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:51 -#, priority:100 +#, priority:300 msgid "Cleanup unnecessary files and optimize the local repository." -msgstr "Nicht benötigte Dateien entfernen und das lokale Repository optimieren." +msgstr "" +"Nicht benötigte Dateien entfernen und das lokale Repository optimieren." #. type: Labeled list #: en/cmds-mainporcelain.txt:52 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-grep[1]" msgstr "linkgit:git-grep[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:54 -#, priority:100 +#, priority:300 msgid "Print lines matching a pattern." msgstr "Zeilen darstellen, die einem Muster entsprechen." #. type: Labeled list #: en/cmds-mainporcelain.txt:55 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-gui[1]" msgstr "linkgit:git-gui[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:57 -#, priority:100 +#, priority:300 msgid "A portable graphical interface to Git." msgstr "Eine portable grafische Schnittstelle zu Git." #. type: Labeled list #: en/cmds-mainporcelain.txt:58 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-init[1]" msgstr "linkgit:git-init[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:60 -#, priority:100 +#, priority:300 msgid "Create an empty Git repository or reinitialize an existing one." -msgstr "Ein leeres Git-Repository erstellen oder ein bestehendes neuinitialisieren." +msgstr "" +"Ein leeres Git-Repository erstellen oder ein bestehendes neuinitialisieren." #. type: Plain text #: en/cmds-mainporcelain.txt:61 en/git-range-diff.txt:294 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-log[1]" msgstr "linkgit:git-log[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:63 -#, priority:100 +#, priority:300 msgid "Show commit logs." msgstr "Commit-Historie anzeigen." #. type: Labeled list #: en/cmds-mainporcelain.txt:64 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-maintenance[1]" msgstr "linkgit:git-maintenance[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:66 -#, fuzzy, priority:100 +#, fuzzy, priority:300 msgid "Run tasks to optimize Git repository data." msgstr "Lädt ein entferntes Git-Repository über HTTP herunter." #. type: Plain text #: en/cmds-mainporcelain.txt:67 en/git-fmt-merge-msg.txt:79 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-merge[1]" msgstr "linkgit:git-merge[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:69 -#, priority:100 +#, priority:300 msgid "Join two or more development histories together." msgstr "Zwei oder mehr Entwicklungszweige zusammenführen." #. type: Labeled list #: en/cmds-mainporcelain.txt:70 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-mv[1]" msgstr "linkgit:git-mv[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:72 -#, priority:100 +#, priority:300 msgid "Move or rename a file, a directory, or a symlink." -msgstr "Eine Datei, ein Verzeichnis oder einen Symlink verschieben oder umbenennen." +msgstr "" +"Eine Datei, ein Verzeichnis oder einen Symlink verschieben oder umbenennen." #. type: Labeled list #: en/cmds-mainporcelain.txt:73 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-notes[1]" msgstr "linkgit:git-notes[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:75 -#, priority:100 +#, priority:300 msgid "Add or inspect object notes." msgstr "Objekt-Notizen hinzufügen oder überprüfen." #. type: Plain text #: en/cmds-mainporcelain.txt:76 en/git-fetch.txt:314 -#, ignore-same, no-wrap, priority:220 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-pull[1]" msgstr "linkgit:git-pull[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:78 -#, priority:100 +#, priority:300 msgid "Fetch from and integrate with another repository or a local branch." -msgstr "Objekte von einem externen Repository anfordern und sie mit einem anderen Repository oder einem lokalen Branch zusammenführen." +msgstr "" +"Objekte von einem externen Repository anfordern und sie mit einem anderen " +"Repository oder einem lokalen Branch zusammenführen." #. type: Labeled list #: en/cmds-mainporcelain.txt:79 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-push[1]" msgstr "linkgit:git-push[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:81 -#, priority:100 +#, priority:300 msgid "Update remote refs along with associated objects." msgstr "Remote-Referenzen mitsamt den verbundenen Objekten aktualisieren." #. type: Labeled list #: en/cmds-mainporcelain.txt:82 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-range-diff[1]" msgstr "linkgit:git-range-diff[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:84 -#, priority:100 +#, priority:300 msgid "Compare two commit ranges (e.g. two versions of a branch)." msgstr "Vergleiche zwei Commit-Bereiche (z.B. zwei Versionen eines Branches)." #. type: Plain text #: en/cmds-mainporcelain.txt:85 en/git-svn.txt:1171 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-rebase[1]" msgstr "linkgit:git-rebase[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:87 -#, priority:100 +#, priority:300 msgid "Reapply commits on top of another base tip." msgstr "Wiederholtes Anwenden von Commits auf anderem Basis-Commit." #. type: Labeled list #: en/cmds-mainporcelain.txt:88 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-reset[1]" msgstr "linkgit:git-reset[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:90 -#, priority:100 +#, priority:300 msgid "Reset current HEAD to the specified state." msgstr "Aktuellen HEAD zu einem spezifizierten Zustand setzen." #. type: Labeled list #: en/cmds-mainporcelain.txt:91 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-restore[1]" msgstr "linkgit:git-restore[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:93 -#, priority:100 +#, priority:300 msgid "Restore working tree files." msgstr "Dateien im Arbeitsverzeichnis wiederherstellen." #. type: Plain text #: en/cmds-mainporcelain.txt:94 en/git-cherry-pick.txt:240 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-revert[1]" msgstr "linkgit:git-revert[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:96 -#, priority:100 +#, priority:300 msgid "Revert some existing commits." msgstr "Einige bestehende Commits rückgängig machen." #. type: Labeled list #: en/cmds-mainporcelain.txt:97 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-rm[1]" msgstr "linkgit:git-rm[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:99 -#, priority:100 +#, priority:300 msgid "Remove files from the working tree and from the index." msgstr "Dateien aus dem Arbeitsverzeichnis und dem Index löschen." #. type: Labeled list #: en/cmds-mainporcelain.txt:100 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-shortlog[1]" msgstr "linkgit:git-shortlog[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:102 -#, priority:100 +#, priority:300 msgid "Summarize 'git log' output." msgstr "Ausgabe von 'git log' zusammenfassen." #. type: Labeled list #: en/cmds-mainporcelain.txt:103 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-show[1]" msgstr "linkgit:git-show[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:105 -#, priority:100 +#, priority:300 msgid "Show various types of objects." msgstr "Verschiedene Arten von Objekten anzeigen." #. type: Labeled list #: en/cmds-mainporcelain.txt:106 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-sparse-checkout[1]" msgstr "linkgit:git-sparse-checkout[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:108 -#, fuzzy, priority:100 +#, fuzzy, priority:300 msgid "Reduce your working tree to a subset of tracked files." -msgstr "Reduzieren Sie Ihr Arbeitsverzeichnis auf eine Teilmenge der versionierten Dateien" +msgstr "" +"Reduzieren Sie Ihr Arbeitsverzeichnis auf eine Teilmenge der versionierten " +"Dateien" #. type: Labeled list #: en/cmds-mainporcelain.txt:109 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-stash[1]" msgstr "linkgit:git-stash[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:111 -#, priority:100 +#, priority:300 msgid "Stash the changes in a dirty working directory away." msgstr "Änderungen in einem Arbeitsverzeichnis aufbewahren." #. type: Labeled list #: en/cmds-mainporcelain.txt:112 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-status[1]" msgstr "linkgit:git-status[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:114 -#, priority:100 +#, priority:300 msgid "Show the working tree status." msgstr "Den Zustand des Arbeitsverzeichnisses anzeigen." #. type: Labeled list #: en/cmds-mainporcelain.txt:115 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-submodule[1]" msgstr "linkgit:git-submodule[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:117 -#, priority:100 +#, priority:300 msgid "Initialize, update or inspect submodules." msgstr "Submodule initialisieren, aktualisieren oder inspizieren." #. type: Labeled list #: en/cmds-mainporcelain.txt:118 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-switch[1]" msgstr "linkgit:git-switch[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:120 -#, priority:100 +#, priority:300 msgid "Switch branches." msgstr "Branches wechseln." #. type: Labeled list #: en/cmds-mainporcelain.txt:121 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-tag[1]" msgstr "linkgit:git-tag[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:123 -#, priority:100 +#, priority:300 msgid "Create, list, delete or verify a tag object signed with GPG." -msgstr "Ein mit GPG signiertes Tag-Objekt erzeugen, auflisten, löschen oder verifizieren." +msgstr "" +"Ein mit GPG signiertes Tag-Objekt erzeugen, auflisten, löschen oder " +"verifizieren." #. type: Labeled list #: en/cmds-mainporcelain.txt:124 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-worktree[1]" msgstr "linkgit:git-worktree[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:126 -#, priority:100 +#, priority:300 msgid "Manage multiple working trees." msgstr "Mehrere Arbeitsverzeichnisse verwalten." #. type: Labeled list #: en/cmds-mainporcelain.txt:127 en/git-gui.txt:104 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:gitk[1]" msgstr "linkgit:gitk[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:129 -#, priority:100 +#, priority:300 msgid "The Git repository browser." msgstr "Der Git-Repository-Browser." #. type: Labeled list #: en/cmds-mainporcelain.txt:130 -#, fuzzy, no-wrap, priority:100 +#, fuzzy, no-wrap, priority:300 #| msgid "linkgit:git-clean[1]" msgid "linkgit:scalar[1]" msgstr "linkgit:git-clean[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:132 -#, fuzzy, priority:100 +#, fuzzy, priority:300 msgid "A tool for managing large Git repositories." msgstr "Einen Git-Befehl für mehrere Repositories ausführen" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:1 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-cat-file[1]" msgstr "linkgit:git-cat-file[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:3 -#, priority:100 +#, priority:300 msgid "Provide content or type and size information for repository objects." -msgstr "Inhalt oder Informationen zu Typ und Größe für Repository-Objekte bereitstellen." +msgstr "" +"Inhalt oder Informationen zu Typ und Größe für Repository-Objekte " +"bereitstellen." #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:4 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-cherry[1]" msgstr "linkgit:git-cherry[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:6 -#, priority:100 +#, priority:300 msgid "Find commits yet to be applied to upstream." -msgstr "Commits finden, die noch auf dem Upstream-Branch angewendet werden müssen." +msgstr "" +"Commits finden, die noch auf dem Upstream-Branch angewendet werden müssen." #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:7 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-diff-files[1]" msgstr "linkgit:git-diff-files[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:9 -#, priority:100 +#, priority:300 msgid "Compares files in the working tree and the index." msgstr "Dateien von dem Arbeitsverzeichnis und dem Index vergleichen." #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:10 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-diff-index[1]" msgstr "linkgit:git-diff-index[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:12 -#, priority:100 +#, priority:300 msgid "Compare a tree to the working tree or index." msgstr "Ein Verzeichnis von dem Arbeitsverzeichnis und dem Index vergleichen." #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:13 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-diff-tree[1]" msgstr "linkgit:git-diff-tree[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:15 -#, priority:100 +#, priority:300 msgid "Compares the content and mode of blobs found via two tree objects." -msgstr "Den Inhalt und Modus von Blobs aus zwei Verzeichnisobjekten vergleichen." +msgstr "" +"Den Inhalt und Modus von Blobs aus zwei Verzeichnisobjekten vergleichen." #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:16 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-for-each-ref[1]" msgstr "linkgit:git-for-each-ref[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:18 -#, priority:100 +#, priority:300 msgid "Output information on each ref." msgstr "Informationen für jede Referenz ausgeben." #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:19 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-for-each-repo[1]" msgstr "linkgit:git-for-each-repo[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:21 -#, fuzzy, priority:100 +#, fuzzy, priority:300 msgid "Run a Git command on a list of repositories." msgstr "Einen Git-Befehl für mehrere Repositories ausführen" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:22 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-get-tar-commit-id[1]" msgstr "linkgit:git-get-tar-commit-id[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:24 -#, priority:100 +#, priority:300 msgid "Extract commit ID from an archive created using git-archive." -msgstr "Commit-ID eines Archivs extrahieren, welches mit git-archive erstellt wurde." +msgstr "" +"Commit-ID eines Archivs extrahieren, welches mit git-archive erstellt wurde." #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:25 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-ls-files[1]" msgstr "linkgit:git-ls-files[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:27 -#, priority:100 +#, priority:300 msgid "Show information about files in the index and the working tree." -msgstr "Informationen über Dateien in dem Index und im Arbeitsverzeichnis anzeigen." +msgstr "" +"Informationen über Dateien in dem Index und im Arbeitsverzeichnis anzeigen." #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:28 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-ls-remote[1]" msgstr "linkgit:git-ls-remote[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:30 -#, priority:100 +#, priority:300 msgid "List references in a remote repository." msgstr "Referenzen in einem Remote-Repository auflisten." #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:31 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-ls-tree[1]" msgstr "linkgit:git-ls-tree[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:33 -#, priority:100 +#, priority:300 msgid "List the contents of a tree object." msgstr "Inhalte eines Tree-Objektes auflisten." #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:34 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-merge-base[1]" msgstr "linkgit:git-merge-base[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:36 -#, priority:100 +#, priority:300 msgid "Find as good common ancestors as possible for a merge." msgstr "Bestmöglichen gemeinsamen Vorgänger-Commit für einen Merge finden." #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:37 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-name-rev[1]" msgstr "linkgit:git-name-rev[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:39 -#, priority:100 +#, priority:300 msgid "Find symbolic names for given revs." msgstr "Symbolische Namen für die gegebenen Commits finden." #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:40 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-pack-redundant[1]" msgstr "linkgit:git-pack-redundant[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:42 -#, priority:100 +#, priority:300 msgid "Find redundant pack files." msgstr "Redundante Paketdateien finden." #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:43 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-rev-list[1]" msgstr "linkgit:git-rev-list[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:45 -#, priority:100 +#, priority:300 msgid "Lists commit objects in reverse chronological order." msgstr "Commit-Objekte chronologisch absteigend sortiert auflisten." #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:46 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-rev-parse[1]" msgstr "linkgit:git-rev-parse[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:48 -#, priority:100 +#, priority:300 msgid "Pick out and massage parameters." msgstr "Parameter herauspicken und ändern." #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:49 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-show-index[1]" msgstr "linkgit:git-show-index[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:51 -#, priority:100 +#, priority:300 msgid "Show packed archive index." msgstr "Gepackten Archiv-Index anzeigen." #. type: Plain text #: en/cmds-plumbinginterrogators.txt:52 en/git-for-each-ref.txt:498 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-show-ref[1]" msgstr "linkgit:git-show-ref[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:54 -#, priority:100 +#, priority:300 msgid "List references in a local repository." msgstr "Referenzen in einem lokalen Repository auflisten." #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:55 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-unpack-file[1]" msgstr "linkgit:git-unpack-file[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:57 -#, priority:100 +#, priority:300 msgid "Creates a temporary file with a blob's contents." msgstr "Eine temporäre Datei mit den Inhalten eines Blobs erstellen." #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:58 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-var[1]" msgstr "linkgit:git-var[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:60 -#, priority:100 +#, priority:300 msgid "Show a Git logical variable." msgstr "Eine logische Variable von Git anzeigen." #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:61 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-verify-pack[1]" msgstr "linkgit:git-verify-pack[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:63 -#, priority:100 +#, priority:300 msgid "Validate packed Git archive files." msgstr "Gepackte Git-Archivdateien validieren." #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:1 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-apply[1]" msgstr "linkgit:git-apply[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:3 -#, priority:100 +#, priority:300 msgid "Apply a patch to files and/or to the index." msgstr "Einen Patch auf Dateien und/oder den Index anwenden." #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:4 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-checkout-index[1]" msgstr "linkgit:git-checkout-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:6 -#, priority:100 +#, priority:300 msgid "Copy files from the index to the working tree." msgstr "Dateien von dem Index ins Arbeitsverzeichnis kopieren." #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:7 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-commit-graph[1]" msgstr "linkgit:git-commit-graph[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:9 -#, priority:100 +#, priority:300 msgid "Write and verify Git commit-graph files." msgstr "Schreibe und verifiziere Git-Commit-Graph-Dateien." #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:10 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-commit-tree[1]" msgstr "linkgit:git-commit-tree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:12 -#, priority:100 +#, priority:300 msgid "Create a new commit object." msgstr "Ein neues Commit-Objekt erstellen." #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:13 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-hash-object[1]" msgstr "linkgit:git-hash-object[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:15 -#, priority:100 +#, priority:300 msgid "Compute object ID and optionally creates a blob from a file." -msgstr "Von einer Datei die Objekt-ID berechnen und optional ein Blob erstellen." +msgstr "" +"Von einer Datei die Objekt-ID berechnen und optional ein Blob erstellen." #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:16 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-index-pack[1]" msgstr "linkgit:git-index-pack[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:18 -#, priority:100 +#, priority:300 msgid "Build pack index file for an existing packed archive." msgstr "Pack-Index-Datei für ein existierendes gepacktes Archiv erzeugen." #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:19 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-merge-file[1]" msgstr "linkgit:git-merge-file[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:21 -#, priority:100 +#, priority:300 msgid "Run a three-way file merge." msgstr "Einen 3-Wege-Datei-Merge ausführen." #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:22 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-merge-index[1]" msgstr "linkgit:git-merge-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:24 -#, priority:100 +#, priority:300 msgid "Run a merge for files needing merging." msgstr "Einen Merge für zusammenzuführende Dateien ausführen." #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:25 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-mktag[1]" msgstr "linkgit:git-mktag[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:27 -#, fuzzy, priority:100 +#, fuzzy, priority:300 msgid "Creates a tag object with extra validation." msgstr "Ein Tag-Objekt erstellen." #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:28 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-mktree[1]" msgstr "linkgit:git-mktree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:30 -#, priority:100 +#, priority:300 msgid "Build a tree-object from ls-tree formatted text." msgstr "Tree-Objekt aus ls-tree formattiertem Text erzeugen." #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:31 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-multi-pack-index[1]" msgstr "linkgit:git-multi-pack-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:33 -#, priority:100 +#, priority:300 msgid "Write and verify multi-pack-indexes." msgstr "Schreibe und verifiziere Multipackindizes." #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:34 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-pack-objects[1]" msgstr "linkgit:git-pack-objects[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:36 -#, priority:100 +#, priority:300 msgid "Create a packed archive of objects." msgstr "Ein gepacktes Archiv von Objekten erstellen." #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:37 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-prune-packed[1]" msgstr "linkgit:git-prune-packed[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:39 -#, priority:100 +#, priority:300 msgid "Remove extra objects that are already in pack files." -msgstr "Zusätzliche Objekte, die sich bereits in Paketdateien befinden, entfernen." +msgstr "" +"Zusätzliche Objekte, die sich bereits in Paketdateien befinden, entfernen." #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:40 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-read-tree[1]" msgstr "linkgit:git-read-tree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:42 -#, priority:100 +#, priority:300 msgid "Reads tree information into the index." msgstr "Verzeichnisinformationen in den Index einlesen." #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:43 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-symbolic-ref[1]" msgstr "linkgit:git-symbolic-ref[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:45 -#, priority:100 +#, priority:300 msgid "Read, modify and delete symbolic refs." msgstr "Symbolische Referenzen lesen, ändern und löschen." #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:46 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-unpack-objects[1]" msgstr "linkgit:git-unpack-objects[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:48 -#, priority:100 +#, priority:300 msgid "Unpack objects from a packed archive." msgstr "Objekte aus einem gepackten Archiv entpacken." #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:49 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-update-index[1]" msgstr "linkgit:git-update-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:51 -#, priority:100 +#, priority:300 msgid "Register file contents in the working tree to the index." msgstr "Dateiinhalte aus dem Arbeitsverzeichnis im Index registrieren." #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:52 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-update-ref[1]" msgstr "linkgit:git-update-ref[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:54 -#, priority:100 +#, priority:300 msgid "Update the object name stored in a ref safely." -msgstr "Den Objektnamen, der in einer Referenz gespeichert ist, sicher aktualisieren." +msgstr "" +"Den Objektnamen, der in einer Referenz gespeichert ist, sicher " +"aktualisieren." #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:55 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-write-tree[1]" msgstr "linkgit:git-write-tree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:57 -#, priority:100 +#, priority:300 msgid "Create a tree object from the current index." msgstr "Tree-Objekt vom aktuellen Index erstellen." #. type: Labeled list #: en/cmds-purehelpers.txt:1 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-check-attr[1]" msgstr "linkgit:git-check-attr[1]" #. type: Plain text #: en/cmds-purehelpers.txt:3 -#, priority:100 +#, priority:300 msgid "Display gitattributes information." msgstr "gitattributes-Informationen darstellen." #. type: Labeled list #: en/cmds-purehelpers.txt:4 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-check-ignore[1]" msgstr "linkgit:git-check-ignore[1]" #. type: Plain text #: en/cmds-purehelpers.txt:6 -#, priority:100 +#, priority:300 msgid "Debug gitignore / exclude files." msgstr "Fehlersuche in gitignore- / exclude-Dateien." #. type: Labeled list #: en/cmds-purehelpers.txt:7 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-check-mailmap[1]" msgstr "linkgit:git-check-mailmap[1]" #. type: Plain text #: en/cmds-purehelpers.txt:9 -#, priority:100 +#, priority:300 msgid "Show canonical names and email addresses of contacts." msgstr "Name und E-Mail-Adresse von Kontakten anzeigen." #. type: Labeled list #: en/cmds-purehelpers.txt:10 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-check-ref-format[1]" msgstr "linkgit:git-check-ref-format[1]" #. type: Plain text #: en/cmds-purehelpers.txt:12 -#, priority:100 +#, priority:300 msgid "Ensures that a reference name is well formed." msgstr "Sicherstellen, dass ein Referenzname wohlgeformt ist." #. type: Labeled list #: en/cmds-purehelpers.txt:13 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-column[1]" msgstr "linkgit:git-column[1]" #. type: Plain text #: en/cmds-purehelpers.txt:15 -#, priority:100 +#, priority:300 msgid "Display data in columns." msgstr "Daten in Spalten anzeigen." #. type: Labeled list #: en/cmds-purehelpers.txt:16 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-credential[1]" msgstr "linkgit:git-credential[1]" #. type: Plain text #: en/cmds-purehelpers.txt:18 -#, priority:100 +#, priority:300 msgid "Retrieve and store user credentials." msgstr "Zugangsdaten des Benutzers abrufen und speichern." #. type: Labeled list #: en/cmds-purehelpers.txt:19 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-credential-cache[1]" msgstr "linkgit:git-credential-cache[1]" #. type: Plain text #: en/cmds-purehelpers.txt:21 -#, priority:100 +#, priority:300 msgid "Helper to temporarily store passwords in memory." -msgstr "Hilfsprogramm zum temporären Speichern von Zugangsdaten im Hauptspeicher." +msgstr "" +"Hilfsprogramm zum temporären Speichern von Zugangsdaten im Hauptspeicher." #. type: Labeled list #: en/cmds-purehelpers.txt:22 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-credential-store[1]" msgstr "linkgit:git-credential-store[1]" #. type: Plain text #: en/cmds-purehelpers.txt:24 -#, priority:100 +#, priority:300 msgid "Helper to store credentials on disk." msgstr "Hilfsprogramm zum Speichern von Zugangsdaten auf der Festplatte." #. type: Labeled list #: en/cmds-purehelpers.txt:25 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-fmt-merge-msg[1]" msgstr "linkgit:git-fmt-merge-msg[1]" #. type: Plain text #: en/cmds-purehelpers.txt:27 -#, priority:100 +#, priority:300 msgid "Produce a merge commit message." msgstr "Beschreibung eines Merge-Commits erzeugen." #. type: Labeled list #: en/cmds-purehelpers.txt:28 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-hook[1]" msgstr "linkgit:git-hook[1]" #. type: Plain text #: en/cmds-purehelpers.txt:30 -#, fuzzy, priority:100 +#, fuzzy, priority:300 msgid "Run git hooks." msgstr "Git-Hooks ausführen" #. type: Labeled list #: en/cmds-purehelpers.txt:31 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-interpret-trailers[1]" msgstr "linkgit:git-interpret-trailers[1]" #. type: Plain text #: en/cmds-purehelpers.txt:33 -#, priority:100 +#, priority:300 msgid "Add or parse structured information in commit messages." -msgstr "Strukturierte Informationen in Commit-Beschreibungen hinzufügen oder parsen." +msgstr "" +"Strukturierte Informationen in Commit-Beschreibungen hinzufügen oder parsen." #. type: Labeled list #: en/cmds-purehelpers.txt:34 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-mailinfo[1]" msgstr "linkgit:git-mailinfo[1]" #. type: Plain text #: en/cmds-purehelpers.txt:36 -#, priority:100 +#, priority:300 msgid "Extracts patch and authorship from a single e-mail message." -msgstr "Patch und Urheberschaft aus einer einzelnen E-Mail-Nachricht extrahieren." +msgstr "" +"Patch und Urheberschaft aus einer einzelnen E-Mail-Nachricht extrahieren." #. type: Labeled list #: en/cmds-purehelpers.txt:37 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-mailsplit[1]" msgstr "linkgit:git-mailsplit[1]" #. type: Plain text #: en/cmds-purehelpers.txt:39 -#, priority:100 +#, priority:300 msgid "Simple UNIX mbox splitter program." msgstr "Einfaches UNIX mbox Splitter-Programm." #. type: Labeled list #: en/cmds-purehelpers.txt:40 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-merge-one-file[1]" msgstr "linkgit:git-merge-one-file[1]" #. type: Plain text #: en/cmds-purehelpers.txt:42 -#, priority:100 +#, priority:300 msgid "The standard helper program to use with git-merge-index." msgstr "Das Standard-Hilfsprogramm für die Verwendung mit git-merge-index." #. type: Plain text #: en/cmds-purehelpers.txt:43 en/git-cherry.txt:142 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-patch-id[1]" msgstr "linkgit:git-patch-id[1]" #. type: Plain text #: en/cmds-purehelpers.txt:45 -#, priority:100 +#, priority:300 msgid "Compute unique ID for a patch." msgstr "Eindeutige ID für einen Patch berechnen." #. type: Labeled list #: en/cmds-purehelpers.txt:46 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-sh-i18n[1]" msgstr "linkgit:git-sh-i18n[1]" #. type: Plain text #: en/cmds-purehelpers.txt:48 -#, priority:100 +#, priority:300 msgid "Git's i18n setup code for shell scripts." msgstr "Git's i18n-Konfigurationscode für Shell-Skripte." #. type: Labeled list #: en/cmds-purehelpers.txt:49 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-sh-setup[1]" msgstr "linkgit:git-sh-setup[1]" #. type: Plain text #: en/cmds-purehelpers.txt:51 -#, priority:100 +#, priority:300 msgid "Common Git shell script setup code." msgstr "Allgemeiner Git Shell-Skript Konfigurationscode." #. type: Labeled list #: en/cmds-purehelpers.txt:52 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-stripspace[1]" msgstr "linkgit:git-stripspace[1]" #. type: Plain text #: en/cmds-purehelpers.txt:54 -#, priority:100 +#, priority:300 msgid "Remove unnecessary whitespace." msgstr "Nicht erforderlichen Whitespace entfernen." #. type: Labeled list #: en/cmds-synchelpers.txt:1 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-http-fetch[1]" msgstr "linkgit:git-http-fetch[1]" #. type: Plain text #: en/cmds-synchelpers.txt:3 -#, priority:100 +#, priority:300 msgid "Download from a remote Git repository via HTTP." msgstr "Von einem Remote-Git-Repository über HTTP herunterladen." #. type: Labeled list #: en/cmds-synchelpers.txt:4 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-http-push[1]" msgstr "linkgit:git-http-push[1]" #. type: Plain text #: en/cmds-synchelpers.txt:6 -#, priority:100 +#, priority:300 msgid "Push objects over HTTP/DAV to another repository." msgstr "Objekte über HTTP/DAV zu einem anderen Repository übertragen." #. type: Labeled list #: en/cmds-synchelpers.txt:7 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-receive-pack[1]" msgstr "linkgit:git-receive-pack[1]" #. type: Plain text #: en/cmds-synchelpers.txt:9 -#, priority:100 +#, priority:300 msgid "Receive what is pushed into the repository." msgstr "Empfangen was in das Repository übertragen wurde." #. type: Labeled list #: en/cmds-synchelpers.txt:10 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-shell[1]" msgstr "linkgit:git-shell[1]" #. type: Plain text #: en/cmds-synchelpers.txt:12 -#, priority:100 +#, priority:300 msgid "Restricted login shell for Git-only SSH access." msgstr "Login-Shell beschränkt für Nur-Git SSH-Zugriff." #. type: Labeled list #: en/cmds-synchelpers.txt:13 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-upload-archive[1]" msgstr "linkgit:git-upload-archive[1]" #. type: Plain text #: en/cmds-synchelpers.txt:15 -#, priority:100 +#, priority:300 msgid "Send archive back to git-archive." msgstr "Archiv zurück zu git-archive senden." #. type: Labeled list #: en/cmds-synchelpers.txt:16 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-upload-pack[1]" msgstr "linkgit:git-upload-pack[1]" #. type: Plain text #: en/cmds-synchelpers.txt:18 -#, priority:100 +#, priority:300 msgid "Send objects packed back to git-fetch-pack." msgstr "Objekte gepackt zurück an git-fetch-pack senden." #. type: Labeled list #: en/cmds-synchingrepositories.txt:1 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-daemon[1]" msgstr "linkgit:git-daemon[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:3 -#, priority:100 +#, priority:300 msgid "A really simple server for Git repositories." msgstr "Ein wirklich einfacher Server für Git Repositories." #. type: Labeled list #: en/cmds-synchingrepositories.txt:4 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-fetch-pack[1]" msgstr "linkgit:git-fetch-pack[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:6 -#, priority:100 +#, priority:300 msgid "Receive missing objects from another repository." msgstr "Fehlende Objekte von einem anderen Repository empfangen." #. type: Labeled list #: en/cmds-synchingrepositories.txt:7 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-http-backend[1]" msgstr "linkgit:git-http-backend[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:9 -#, priority:100 +#, priority:300 msgid "Server side implementation of Git over HTTP." msgstr "Serverseitige Implementierung von Git über HTTP." #. type: Labeled list #: en/cmds-synchingrepositories.txt:10 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-send-pack[1]" msgstr "linkgit:git-send-pack[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:12 -#, priority:100 +#, priority:300 msgid "Push objects over Git protocol to another repository." -msgstr "Objekte über das Git Protokoll zu einem anderen Repository übertragen." +msgstr "" +"Objekte über das Git Protokoll zu einem anderen Repository übertragen." #. type: Labeled list #: en/cmds-synchingrepositories.txt:13 -#, ignore-same, no-wrap, priority:100 +#, ignore-same, no-wrap, priority:300 msgid "linkgit:git-update-server-info[1]" msgstr "linkgit:git-update-server-info[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:15 -#, priority:100 +#, priority:300 msgid "Update auxiliary info file to help dumb servers." msgstr "Hilfsinformationsdatei zur Hilfe von einfachen Servern aktualisieren." +#. type: Plain text +#: en/cmds-userinterfaces.txt:1 en/git-archive.txt:238 +#, ignore-same, no-wrap, priority:300 +msgid "linkgit:gitattributes[5]" +msgstr "linkgit:gitattributes[5]" + +#. type: Plain text +#: en/cmds-userinterfaces.txt:3 +#, fuzzy, priority:300 +msgid "Defining attributes per path." +msgstr "Zeige alle Attribute einer Datei:" + +#. type: Labeled list +#: en/cmds-userinterfaces.txt:4 +#, ignore-same, no-wrap, priority:300 +msgid "linkgit:gitcli[7]" +msgstr "linkgit:gitcli[7]" + +#. type: Plain text +#: en/cmds-userinterfaces.txt:6 +#, fuzzy, priority:300 +msgid "Git command-line interface and conventions." +msgstr "Git Kommandozeilenschnittstelle und Konventionen" + +#. type: Labeled list +#: en/cmds-userinterfaces.txt:7 +#, ignore-same, no-wrap, priority:300 +msgid "linkgit:githooks[5]" +msgstr "linkgit:githooks[5]" + +#. type: Plain text +#: en/cmds-userinterfaces.txt:9 +#, fuzzy, priority:300 +msgid "Hooks used by Git." +msgstr "von Git verwendete Hooks" + +#. type: Plain text +#: en/cmds-userinterfaces.txt:10 en/git-clean.txt:146 en/git-status.txt:524 +#, ignore-same, no-wrap, priority:300 +msgid "linkgit:gitignore[5]" +msgstr "linkgit:gitignore[5]" + +#. type: Plain text +#: en/cmds-userinterfaces.txt:12 +#, fuzzy, priority:300 +msgid "Specifies intentionally untracked files to ignore." +msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien" + +#. type: Labeled list +#: en/cmds-userinterfaces.txt:13 +#, ignore-same, no-wrap, priority:300 +msgid "linkgit:gitmailmap[5]" +msgstr "linkgit:gitmailmap[5]" + +#. type: Plain text +#: en/cmds-userinterfaces.txt:15 +#, fuzzy, priority:300 +msgid "Map author/committer names and/or E-Mail addresses." +msgstr "Autor/Commit-Ersteller und/oder E-Mail-Adressen zuordnen" + +#. type: Labeled list +#: en/cmds-userinterfaces.txt:16 +#, ignore-same, no-wrap, priority:300 +msgid "linkgit:gitmodules[5]" +msgstr "linkgit:gitmodules[5]" + +#. type: Plain text +#: en/cmds-userinterfaces.txt:18 +#, fuzzy, priority:300 +msgid "Defining submodule properties." +msgstr "Definition von Submodul-Eigenschaften" + +#. type: Labeled list +#: en/cmds-userinterfaces.txt:19 +#, ignore-same, no-wrap, priority:300 +msgid "linkgit:gitrepository-layout[5]" +msgstr "linkgit:gitrepository-layout[5]" + +#. type: Plain text +#: en/cmds-userinterfaces.txt:21 +#, fuzzy, priority:300 +msgid "Git Repository Layout." +msgstr "Das Git-Repository" + +#. type: Labeled list +#: en/cmds-userinterfaces.txt:22 +#, ignore-same, no-wrap, priority:300 +msgid "linkgit:gitrevisions[7]" +msgstr "linkgit:gitrevisions[7]" + +#. type: Plain text +#: en/cmds-userinterfaces.txt:24 +#, fuzzy, priority:300 +msgid "Specifying revisions and ranges for Git." +msgstr "Spezifikation von Commits und Bereichen für Git" + #. type: Title - #: en/config.txt:2 en/git-worktree.txt:309 #, no-wrap, priority:240 @@ -2306,15 +2731,52 @@ msgstr "KONFIGURATIONSDATEI" #. type: Plain text #: en/config.txt:12 #, priority:100 -msgid "The Git configuration file contains a number of variables that affect the Git commands' behavior. The files `.git/config` and optionally `config.worktree` (see the \"CONFIGURATION FILE\" section of linkgit:git-worktree[1]) in each repository are used to store the configuration for that repository, and `$HOME/.gitconfig` is used to store a per-user configuration as fallback values for the `.git/config` file. The file `/etc/gitconfig` can be used to store a system-wide default configuration." -msgstr "Die Git-Konfigurationsdatei enthält eine Reihe von Variablen, die das Verhalten der Git-Befehle beeinflussen. Die Dateien `.git/config` und optional `config.worktree` (siehe den Abschnitt „KONFIGURATIONSDATEI“ in linkgit:git-worktree[1]) in jedem Repository werden verwendet, um die Konfiguration für dieses Repository zu speichern. Mit `$HOME/.gitconfig` wird außerdem pro Benutzer eine Konfiguration als Fallback-Werte für die Datei `.git/config` gespeichert. Die Datei `/etc/gitconfig` kann verwendet werden, um eine systemweite Standardkonfiguration zu sichern." +msgid "" +"The Git configuration file contains a number of variables that affect the " +"Git commands' behavior. The files `.git/config` and optionally " +"`config.worktree` (see the \"CONFIGURATION FILE\" section of linkgit:git-" +"worktree[1]) in each repository are used to store the configuration for that" +" repository, and `$HOME/.gitconfig` is used to store a per-user " +"configuration as fallback values for the `.git/config` file. The file " +"`/etc/gitconfig` can be used to store a system-wide default configuration." +msgstr "" +"Die Git-Konfigurationsdatei enthält eine Reihe von Variablen, die das " +"Verhalten der Git-Befehle beeinflussen. Die Dateien `.git/config` und " +"optional `config.worktree` (siehe den Abschnitt „KONFIGURATIONSDATEI“ in " +"linkgit:git-worktree[1]) in jedem Repository werden verwendet, um die " +"Konfiguration für dieses Repository zu speichern. Mit `$HOME/.gitconfig` " +"wird außerdem pro Benutzer eine Konfiguration als Fallback-Werte für die " +"Datei `.git/config` gespeichert. Die Datei `/etc/gitconfig` kann verwendet " +"werden, um eine systemweite Standardkonfiguration zu sichern." #. type: Plain text #: en/config.txt:21 #, fuzzy, priority:100 -#| msgid "The configuration variables are used by both the Git plumbing and the porcelains. The variables are divided into sections, wherein the fully qualified variable name of the variable itself is the last dot-separated segment and the section name is everything before the last dot. The variable names are case-insensitive, allow only alphanumeric characters and `-`, and must start with an alphabetic character. Some variables may appear multiple times; we say then that the variable is multivalued." -msgid "The configuration variables are used by both the Git plumbing and the porcelain commands. The variables are divided into sections, wherein the fully qualified variable name of the variable itself is the last dot-separated segment and the section name is everything before the last dot. The variable names are case-insensitive, allow only alphanumeric characters and `-`, and must start with an alphabetic character. Some variables may appear multiple times; we say then that the variable is multivalued." -msgstr "Die Konfigurationsvariablen werden sowohl von den \"Plumbing\"- als auch von den \"Porcelain\"-Befehlen verwendet. Die Variablen sind in Gruppen unterteilt, wobei der vollqualifizierte Variablenname das Segment nach dem letzten Punkt ist und der Gruppenname alles vor dem letzten Punkt. Die Variablennamen unterscheiden nicht zwischen Groß- und Kleinschreibung, erlauben nur alphanumerische Zeichen und '-' und müssen mit einem alphanumerischen Zeichen beginnen. Einige Variablen dürfen mehrmals vorkommen; wir sagen dann, die Variable ist mehrwertig." +#| msgid "" +#| "The configuration variables are used by both the Git plumbing and the " +#| "porcelains. The variables are divided into sections, wherein the fully " +#| "qualified variable name of the variable itself is the last dot-separated " +#| "segment and the section name is everything before the last dot. The variable" +#| " names are case-insensitive, allow only alphanumeric characters and `-`, and" +#| " must start with an alphabetic character. Some variables may appear " +#| "multiple times; we say then that the variable is multivalued." +msgid "" +"The configuration variables are used by both the Git plumbing and the " +"porcelain commands. The variables are divided into sections, wherein the " +"fully qualified variable name of the variable itself is the last dot-" +"separated segment and the section name is everything before the last dot. " +"The variable names are case-insensitive, allow only alphanumeric characters " +"and `-`, and must start with an alphabetic character. Some variables may " +"appear multiple times; we say then that the variable is multivalued." +msgstr "" +"Die Konfigurationsvariablen werden sowohl von den \"Plumbing\"- als auch von" +" den \"Porcelain\"-Befehlen verwendet. Die Variablen sind in Gruppen " +"unterteilt, wobei der vollqualifizierte Variablenname das Segment nach dem " +"letzten Punkt ist und der Gruppenname alles vor dem letzten Punkt. Die " +"Variablennamen unterscheiden nicht zwischen Groß- und Kleinschreibung, " +"erlauben nur alphanumerische Zeichen und '-' und müssen mit einem " +"alphanumerischen Zeichen beginnen. Einige Variablen dürfen mehrmals " +"vorkommen; wir sagen dann, die Variable ist mehrwertig." #. type: Title ~ #: en/config.txt:23 @@ -2325,20 +2787,44 @@ msgstr "Syntax" #. type: Plain text #: en/config.txt:28 #, priority:100 -msgid "The syntax is fairly flexible and permissive; whitespaces are mostly ignored. The '#' and ';' characters begin comments to the end of line, blank lines are ignored." -msgstr "Die Syntax ist ziemlich flexibel und tolerant; Leerzeichen werden größtenteils ignoriert. Die Zeichen '#' und ';' beginnen Kommentare bis zum Zeilenende, Leerzeilen werden ignoriert." +msgid "" +"The syntax is fairly flexible and permissive; whitespaces are mostly " +"ignored. The '#' and ';' characters begin comments to the end of line, " +"blank lines are ignored." +msgstr "" +"Die Syntax ist ziemlich flexibel und tolerant; Leerzeichen werden " +"größtenteils ignoriert. Die Zeichen '#' und ';' beginnen Kommentare bis zum " +"Zeilenende, Leerzeilen werden ignoriert." #. type: Plain text #: en/config.txt:35 #, priority:100 -msgid "The file consists of sections and variables. A section begins with the name of the section in square brackets and continues until the next section begins. Section names are case-insensitive. Only alphanumeric characters, `-` and `.` are allowed in section names. Each variable must belong to some section, which means that there must be a section header before the first setting of a variable." -msgstr "Die Datei besteht aus Gruppen und Variablen. Eine Gruppe beginnt mit dem Gruppennamen in eckigen Klammern und geht bis zum nächsten Gruppenanfang. Gruppennamen unterscheiden keine Groß- und Kleinschreibung. Nur alphanumerische Zeichen, '-' und '.' sind in Gruppennamen erlaubt. Jede Variable muss zu einer Gruppe gehören, was bedeutet, dass eine Gruppenüberschrift vor der ersten Variablenzuweisung zwingend ist." +msgid "" +"The file consists of sections and variables. A section begins with the name" +" of the section in square brackets and continues until the next section " +"begins. Section names are case-insensitive. Only alphanumeric characters, " +"`-` and `.` are allowed in section names. Each variable must belong to some" +" section, which means that there must be a section header before the first " +"setting of a variable." +msgstr "" +"Die Datei besteht aus Gruppen und Variablen. Eine Gruppe beginnt mit dem " +"Gruppennamen in eckigen Klammern und geht bis zum nächsten Gruppenanfang. " +"Gruppennamen unterscheiden keine Groß- und Kleinschreibung. Nur " +"alphanumerische Zeichen, '-' und '.' sind in Gruppennamen erlaubt. Jede " +"Variable muss zu einer Gruppe gehören, was bedeutet, dass eine " +"Gruppenüberschrift vor der ersten Variablenzuweisung zwingend ist." #. type: Plain text #: en/config.txt:39 #, priority:100 -msgid "Sections can be further divided into subsections. To begin a subsection put its name in double quotes, separated by space from the section name, in the section header, like in the example below:" -msgstr "Gruppen können weiter in Untergruppen unterteilt werden. Um eine Untergruppe zu beginnen, schreiben Sie ihren Namen in doppelten Anführungszeichen, durch ein Leerzeichen vom Gruppentitel getrennt, wie in folgendem Beispiel:" +msgid "" +"Sections can be further divided into subsections. To begin a subsection put" +" its name in double quotes, separated by space from the section name, in the" +" section header, like in the example below:" +msgstr "" +"Gruppen können weiter in Untergruppen unterteilt werden. Um eine Untergruppe" +" zu beginnen, schreiben Sie ihren Namen in doppelten Anführungszeichen, " +"durch ein Leerzeichen vom Gruppentitel getrennt, wie in folgendem Beispiel:" #. type: delimited block - #: en/config.txt:42 @@ -2349,38 +2835,99 @@ msgstr "\t[Gruppe \"Untergruppe\"]\n" #. type: Plain text #: en/config.txt:53 #, fuzzy, priority:100 -msgid "Subsection names are case sensitive and can contain any characters except newline and the null byte. Doublequote `\"` and backslash can be included by escaping them as `\\\"` and `\\\\`, respectively. Backslashes preceding other characters are dropped when reading; for example, `\\t` is read as `t` and `\\0` is read as `0`. Section headers cannot span multiple lines. Variables may belong directly to a section or to a given subsection. You can have `[section]` if you have `[section \"subsection\"]`, but you don't need to." -msgstr "Die Namen der Untergruppen unterscheiden zwischen Groß- und Kleinschreibung und können beliebige Zeichen enthalten, außer Zeilenumbruch und Null-Byte. Doppelte Anführungszeichen '\"' und Rückwärtsschrägstriche '\\' können mit Escaping verwenden werden, also '\\\"' und '\\\\'. Rückwärtsschrägstriche vor anderen Zeichen werden beim Lesen weggelassen; '\\t' wird beispielsweise als 't' gelesen und '\\0' als '0'. Gruppentitel können nicht über mehrere Zeilen gehen. Variablen können direkt zu einer Gruppe oder zu einer Untergruppe gehören. Sie können '[Gruppe]' haben, wenn Sie '[Gruppe \"Untergruppe\"]' haben, aber es ist nicht zwingend nötig." +msgid "" +"Subsection names are case sensitive and can contain any characters except " +"newline and the null byte. Doublequote `\"` and backslash can be included by" +" escaping them as `\\\"` and `\\\\`, respectively. Backslashes preceding " +"other characters are dropped when reading; for example, `\\t` is read as `t`" +" and `\\0` is read as `0`. Section headers cannot span multiple lines. " +"Variables may belong directly to a section or to a given subsection. You can" +" have `[section]` if you have `[section \"subsection\"]`, but you don't need" +" to." +msgstr "" +"Die Namen der Untergruppen unterscheiden zwischen Groß- und Kleinschreibung " +"und können beliebige Zeichen enthalten, außer Zeilenumbruch und Null-Byte. " +"Doppelte Anführungszeichen '\"' und Rückwärtsschrägstriche '\\' können mit " +"Escaping verwenden werden, also '\\\"' und '\\\\'. Rückwärtsschrägstriche " +"vor anderen Zeichen werden beim Lesen weggelassen; '\\t' wird beispielsweise" +" als 't' gelesen und '\\0' als '0'. Gruppentitel können nicht über mehrere " +"Zeilen gehen. Variablen können direkt zu einer Gruppe oder zu einer " +"Untergruppe gehören. Sie können '[Gruppe]' haben, wenn Sie '[Gruppe " +"\"Untergruppe\"]' haben, aber es ist nicht zwingend nötig." #. type: Plain text #: en/config.txt:58 #, priority:100 -msgid "There is also a deprecated `[section.subsection]` syntax. With this syntax, the subsection name is converted to lower-case and is also compared case sensitively. These subsection names follow the same restrictions as section names." -msgstr "Es gibt außerdem die veraltete '[Gruppe.Untergruppe]'-Syntax. Mit dieser Syntax wird der Untergruppenname in Kleinbuchstaben konvertiert und unterscheidet dann auch zwischen Groß- und Kleinschreibung. Diese Untergruppennamen folgen den gleichen Einschränkungen wie Gruppennamen." +msgid "" +"There is also a deprecated `[section.subsection]` syntax. With this syntax, " +"the subsection name is converted to lower-case and is also compared case " +"sensitively. These subsection names follow the same restrictions as section " +"names." +msgstr "" +"Es gibt außerdem die veraltete '[Gruppe.Untergruppe]'-Syntax. Mit dieser " +"Syntax wird der Untergruppenname in Kleinbuchstaben konvertiert und " +"unterscheidet dann auch zwischen Groß- und Kleinschreibung. Diese " +"Untergruppennamen folgen den gleichen Einschränkungen wie Gruppennamen." #. type: Plain text #: en/config.txt:65 #, priority:100 -msgid "All the other lines (and the remainder of the line after the section header) are recognized as setting variables, in the form 'name = value' (or just 'name', which is a short-hand to say that the variable is the boolean \"true\"). The variable names are case-insensitive, allow only alphanumeric characters and `-`, and must start with an alphabetic character." -msgstr "Alle anderen Zeilen (und der Rest der Zeile nach der Gruppenüberschrift) werden als Einstellungsvariablen erkannt, in der Form 'Name = Wert' (oder nur 'Name', was bedeutet, der Wert der Variable ist \"true\"). Die Variablennamen unterscheiden zwischen Groß- und Kleinschreibung, dürfen nur alphanumerische Zeichen und '-' enthalten und müssen mit einem alphanumerischen Zeichen beginnen." +msgid "" +"All the other lines (and the remainder of the line after the section header)" +" are recognized as setting variables, in the form 'name = value' (or just " +"'name', which is a short-hand to say that the variable is the boolean " +"\"true\"). The variable names are case-insensitive, allow only alphanumeric" +" characters and `-`, and must start with an alphabetic character." +msgstr "" +"Alle anderen Zeilen (und der Rest der Zeile nach der Gruppenüberschrift) " +"werden als Einstellungsvariablen erkannt, in der Form 'Name = Wert' (oder " +"nur 'Name', was bedeutet, der Wert der Variable ist \"true\"). Die " +"Variablennamen unterscheiden zwischen Groß- und Kleinschreibung, dürfen nur " +"alphanumerische Zeichen und '-' enthalten und müssen mit einem " +"alphanumerischen Zeichen beginnen." #. type: Plain text #: en/config.txt:73 #, fuzzy, priority:100 -msgid "A line that defines a value can be continued to the next line by ending it with a `\\`; the backslash and the end-of-line are stripped. Leading whitespaces after 'name =', the remainder of the line after the first comment character '#' or ';', and trailing whitespaces of the line are discarded unless they are enclosed in double quotes. Internal whitespaces within the value are retained verbatim." -msgstr "Eine Zeile, die einen Wert definiert, kann auf der nächsten Zeile weitergehen, indem sie mit '\\' aufhört; der Rückwärtsschrägstrich und das Zeilenende werden verworfen. Leerzeichen nach 'Name=', der Rest einer Zeile nach dem ersten Kommentarzeichen '#' oder ';' und Leerzeichen am Zeilenende werden verworfen, außer sie stehen zwischen doppelten Anführungszeichen. Leerzeichen im Innern des Werts werden im Wortlaut beibehalten." +msgid "" +"A line that defines a value can be continued to the next line by ending it " +"with a `\\`; the backslash and the end-of-line are stripped. Leading " +"whitespaces after 'name =', the remainder of the line after the first " +"comment character '#' or ';', and trailing whitespaces of the line are " +"discarded unless they are enclosed in double quotes. Internal whitespaces " +"within the value are retained verbatim." +msgstr "" +"Eine Zeile, die einen Wert definiert, kann auf der nächsten Zeile " +"weitergehen, indem sie mit '\\' aufhört; der Rückwärtsschrägstrich und das " +"Zeilenende werden verworfen. Leerzeichen nach 'Name=', der Rest einer Zeile " +"nach dem ersten Kommentarzeichen '#' oder ';' und Leerzeichen am Zeilenende " +"werden verworfen, außer sie stehen zwischen doppelten Anführungszeichen. " +"Leerzeichen im Innern des Werts werden im Wortlaut beibehalten." #. type: Plain text #: en/config.txt:76 #, priority:100 -msgid "Inside double quotes, double quote `\"` and backslash `\\` characters must be escaped: use `\\\"` for `\"` and `\\\\` for `\\`." -msgstr "Zwischen doppelten Anführungszeichen müssen doppelte Anführungszeichen '\"' und Rückwärtsschrägstriche '\\' escaped werden: '\\\"' für '\"' und '\\\\' für '\\'." +msgid "" +"Inside double quotes, double quote `\"` and backslash `\\` characters must " +"be escaped: use `\\\"` for `\"` and `\\\\` for `\\`." +msgstr "" +"Zwischen doppelten Anführungszeichen müssen doppelte Anführungszeichen '\"' " +"und Rückwärtsschrägstriche '\\' escaped werden: '\\\"' für '\"' und '\\\\' " +"für '\\'." #. type: Plain text #: en/config.txt:81 #, priority:100 -msgid "The following escape sequences (beside `\\\"` and `\\\\`) are recognized: `\\n` for newline character (NL), `\\t` for horizontal tabulation (HT, TAB) and `\\b` for backspace (BS). Other char escape sequences (including octal escape sequences) are invalid." -msgstr "Die folgenden Escape-Sequenzen (neben '\\\"' und '\\\\') werden erkannt: '\\n' als Zeilenumbruch (NL), '\\t' für Tab (HT, TAB) und '\\b' für Backspace (BS). Andere Escape-Sequenzen (auch oktale Escape-Sequenzen) sind ungültig." +msgid "" +"The following escape sequences (beside `\\\"` and `\\\\`) are recognized: " +"`\\n` for newline character (NL), `\\t` for horizontal tabulation (HT, TAB)" +" and `\\b` for backspace (BS). Other char escape sequences (including " +"octal escape sequences) are invalid." +msgstr "" +"Die folgenden Escape-Sequenzen (neben '\\\"' und '\\\\') werden erkannt: " +"'\\n' als Zeilenumbruch (NL), '\\t' für Tab (HT, TAB) und '\\b' für " +"Backspace (BS). Andere Escape-Sequenzen (auch oktale Escape-Sequenzen) sind " +"ungültig." #. type: Title ~ #: en/config.txt:84 @@ -2391,20 +2938,48 @@ msgstr "Includes (Dateieinbettungen)" #. type: Plain text #: en/config.txt:91 #, priority:100 -msgid "The `include` and `includeIf` sections allow you to include config directives from another source. These sections behave identically to each other with the exception that `includeIf` sections may be ignored if their condition does not evaluate to true; see \"Conditional includes\" below." -msgstr "Die Abschnitte `include` und `includeIf` erlauben es Ihnen, Konfigurationsanweisungen aus einer anderen Quelle einzubinden. Diese Abschnitte verhalten sich identisch zueinander mit der Ausnahme, dass die Abschnitte `includeIf` ignoriert werden können, wenn ihre Bedingung nicht als „true“ erkannt wird; siehe „Bedingte Includes“ weiter unten." +msgid "" +"The `include` and `includeIf` sections allow you to include config " +"directives from another source. These sections behave identically to each " +"other with the exception that `includeIf` sections may be ignored if their " +"condition does not evaluate to true; see \"Conditional includes\" below." +msgstr "" +"Die Abschnitte `include` und `includeIf` erlauben es Ihnen, " +"Konfigurationsanweisungen aus einer anderen Quelle einzubinden. Diese " +"Abschnitte verhalten sich identisch zueinander mit der Ausnahme, dass die " +"Abschnitte `includeIf` ignoriert werden können, wenn ihre Bedingung nicht " +"als „true“ erkannt wird; siehe „Bedingte Includes“ weiter unten." #. type: Plain text #: en/config.txt:96 #, priority:100 -msgid "You can include a config file from another by setting the special `include.path` (or `includeIf.*.path`) variable to the name of the file to be included. The variable takes a pathname as its value, and is subject to tilde expansion. These variables can be given multiple times." -msgstr "Sie können eine Konfigurationsdatei aus einer anderen Quelle einbinden, indem Sie die spezielle Variable `include.path` (oder `includeIf.*.path`) auf den Namen der einzubindenden Datei setzen. Die Variable nimmt einen Pfadnamen als Wert an und berücksichtigt die Tilde-Erweiterung. Diese Variablen können mehrfach angegeben werden." +msgid "" +"You can include a config file from another by setting the special " +"`include.path` (or `includeIf.*.path`) variable to the name of the file to " +"be included. The variable takes a pathname as its value, and is subject to " +"tilde expansion. These variables can be given multiple times." +msgstr "" +"Sie können eine Konfigurationsdatei aus einer anderen Quelle einbinden, " +"indem Sie die spezielle Variable `include.path` (oder `includeIf.*.path`) " +"auf den Namen der einzubindenden Datei setzen. Die Variable nimmt einen " +"Pfadnamen als Wert an und berücksichtigt die Tilde-Erweiterung. Diese " +"Variablen können mehrfach angegeben werden." #. type: Plain text #: en/config.txt:102 #, priority:100 -msgid "The contents of the included file are inserted immediately, as if they had been found at the location of the include directive. If the value of the variable is a relative path, the path is considered to be relative to the configuration file in which the include directive was found. See below for examples." -msgstr "Der Inhalt der eingebundenen Datei wird sofort eingefügt, so als ob er an der Stelle der Include-Anweisung gefunden worden wäre. Wenn der Wert der Variablen ein relativer Pfad ist, wird der Pfad als relativ zu der Konfigurationsdatei angesehen, in der die Include-Anweisung gefunden wurde. Siehe Beispiele weiter unten." +msgid "" +"The contents of the included file are inserted immediately, as if they had " +"been found at the location of the include directive. If the value of the " +"variable is a relative path, the path is considered to be relative to the " +"configuration file in which the include directive was found. See below for " +"examples." +msgstr "" +"Der Inhalt der eingebundenen Datei wird sofort eingefügt, so als ob er an " +"der Stelle der Include-Anweisung gefunden worden wäre. Wenn der Wert der " +"Variablen ein relativer Pfad ist, wird der Pfad als relativ zu der " +"Konfigurationsdatei angesehen, in der die Include-Anweisung gefunden wurde." +" Siehe Beispiele weiter unten." #. type: Title ~ #: en/config.txt:104 @@ -2415,15 +2990,29 @@ msgstr "Bedingte Includes" #. type: Plain text #: en/config.txt:109 #, fuzzy, priority:100 -#| msgid "You can include a config file from another conditionally by setting a `includeIf..path` variable to the name of the file to be included." -msgid "You can conditionally include a config file from another by setting an `includeIf..path` variable to the name of the file to be included." -msgstr "Sie können eine Konfigurationsdatei aus einer anderen bedingt einbinden, indem Sie eine `includeIf..path` Variable auf den Namen der einzubindenden Datei setzen." +#| msgid "" +#| "You can include a config file from another conditionally by setting a " +#| "`includeIf..path` variable to the name of the file to be " +#| "included." +msgid "" +"You can conditionally include a config file from another by setting an " +"`includeIf..path` variable to the name of the file to be " +"included." +msgstr "" +"Sie können eine Konfigurationsdatei aus einer anderen bedingt einbinden, " +"indem Sie eine `includeIf..path` Variable auf den Namen der " +"einzubindenden Datei setzen." #. type: Plain text #: en/config.txt:113 #, priority:100 -msgid "The condition starts with a keyword followed by a colon and some data whose format and meaning depends on the keyword. Supported keywords are:" -msgstr "Die Bedingung beginnt mit einem Schlüsselwort, gefolgt von einem Doppelpunkt und einigen Daten, deren Format und Bedeutung vom Schlüsselwort abhängt. Gültige Schlüsselwörter sind:" +msgid "" +"The condition starts with a keyword followed by a colon and some data whose " +"format and meaning depends on the keyword. Supported keywords are:" +msgstr "" +"Die Bedingung beginnt mit einem Schlüsselwort, gefolgt von einem Doppelpunkt" +" und einigen Daten, deren Format und Bedeutung vom Schlüsselwort abhängt. " +"Gültige Schlüsselwörter sind:" #. type: Labeled list #: en/config.txt:114 @@ -2434,50 +3023,87 @@ msgstr "`gitdir`" #. type: Plain text #: en/config.txt:119 #, priority:100 -msgid "The data that follows the keyword `gitdir:` is used as a glob pattern. If the location of the .git directory matches the pattern, the include condition is met." -msgstr "Die Daten, die dem Schlüsselwort `gitdir:` folgen, werden als Glob-Pattern verwendet. Wenn die Position des Verzeichnisses .git mit dem Pattern übereinstimmt, ist die Include-Bedingung erfüllt." +msgid "" +"The data that follows the keyword `gitdir:` is used as a glob pattern. If " +"the location of the .git directory matches the pattern, the include " +"condition is met." +msgstr "" +"Die Daten, die dem Schlüsselwort `gitdir:` folgen, werden als Glob-Pattern " +"verwendet. Wenn die Position des Verzeichnisses .git mit dem Pattern " +"übereinstimmt, ist die Include-Bedingung erfüllt." #. type: Plain text -#: en/config.txt:124 +#: en/config.txt:125 #, fuzzy, priority:100 -msgid "The .git location may be auto-discovered, or come from `$GIT_DIR` environment variable. If the repository is auto-discovered via a .git file (e.g. from submodules, or a linked worktree), the .git location would be the final location where the .git directory is, not where the" -msgstr "Die .git-Position kann automatisch ermittelt werden oder aus der Umgebungsvariablen `$GIT_DIR` abgeleitet werden. Wenn das Repository über eine .git-Datei automatisch erkannt wird (z.B. aus Untermodulen oder einem verknüpften Arbeitsverzeichnis), wäre der Speicherort von .git der finale Ort, an dem sich das .git-Verzeichnis befindet, nicht der Ort, an dem sich die" - -#. type: Block title -#: en/config.txt:124 -#, no-wrap, priority:100 -msgid "git file is." -msgstr "git-Datei befindet." +msgid "" +"The .git location may be auto-discovered, or come from `$GIT_DIR` " +"environment variable. If the repository is auto-discovered via a .git file " +"(e.g. from submodules, or a linked worktree), the .git location would be the" +" final location where the .git directory is, not where the .git file is." +msgstr "" +"Die .git-Position kann automatisch ermittelt werden oder aus der " +"Umgebungsvariablen `$GIT_DIR` abgeleitet werden. Wenn das Repository über " +"eine .git-Datei automatisch erkannt wird (z.B. aus Untermodulen oder einem " +"verknüpften Arbeitsverzeichnis), wäre der Speicherort von .git der finale " +"Ort, an dem sich das .git-Verzeichnis befindet, nicht der Ort, an dem sich " +"die" #. type: Plain text #: en/config.txt:129 #, priority:100 -msgid "The pattern can contain standard globbing wildcards and two additional ones, `**/` and `/**`, that can match multiple path components. Please refer to linkgit:gitignore[5] for details. For convenience:" -msgstr "Das Suchmuster kann Standard-Globbing-Platzhalter und zwei zusätzliche Platzhalter, `**/` und `/**`, enthalten, die mit mehreren Pfadkomponenten übereinstimmen könnten. Bitte lesen Sie linkgit:gitignore[5] für weitere Details. Der Einfachheit halber:" +msgid "" +"The pattern can contain standard globbing wildcards and two additional ones," +" `**/` and `/**`, that can match multiple path components. Please refer to " +"linkgit:gitignore[5] for details. For convenience:" +msgstr "" +"Das Suchmuster kann Standard-Globbing-Platzhalter und zwei zusätzliche " +"Platzhalter, `**/` und `/**`, enthalten, die mit mehreren Pfadkomponenten " +"übereinstimmen könnten. Bitte lesen Sie linkgit:gitignore[5] für weitere " +"Details. Der Einfachheit halber:" #. type: Plain text #: en/config.txt:132 #, priority:100 -msgid "If the pattern starts with `~/`, `~` will be substituted with the content of the environment variable `HOME`." -msgstr "Beginnt das Pattern mit `~/`, so wird das `~` durch den Inhalt der Umgebungsvariablen `HOME` ersetzt." +msgid "" +"If the pattern starts with `~/`, `~` will be substituted with the content of" +" the environment variable `HOME`." +msgstr "" +"Beginnt das Pattern mit `~/`, so wird das `~` durch den Inhalt der " +"Umgebungsvariablen `HOME` ersetzt." #. type: Plain text #: en/config.txt:135 #, priority:100 -msgid "If the pattern starts with `./`, it is replaced with the directory containing the current config file." -msgstr "Beginnt das Pattern mit `./`, so wird es durch das Verzeichnis ersetzt, das die aktuelle Konfigurationsdatei enthält." +msgid "" +"If the pattern starts with `./`, it is replaced with the directory " +"containing the current config file." +msgstr "" +"Beginnt das Pattern mit `./`, so wird es durch das Verzeichnis ersetzt, das " +"die aktuelle Konfigurationsdatei enthält." #. type: Plain text #: en/config.txt:139 #, priority:100 -msgid "If the pattern does not start with either `~/`, `./` or `/`, `**/` will be automatically prepended. For example, the pattern `foo/bar` becomes `**/foo/bar` and would match `/any/path/to/foo/bar`." -msgstr "Beginnt das Pattern weder mit `~/`, `./` noch mit `/`, wird automatisch ein `**/` vorangestellt. Zum Beispiel wird das Suchmuster `foo/bar` zu `**/foo/bar` und würde mit `/irgendein/Pfad/zu/foo/bar` übereinstimmen." +msgid "" +"If the pattern does not start with either `~/`, `./` or `/`, `**/` will be " +"automatically prepended. For example, the pattern `foo/bar` becomes " +"`**/foo/bar` and would match `/any/path/to/foo/bar`." +msgstr "" +"Beginnt das Pattern weder mit `~/`, `./` noch mit `/`, wird automatisch ein " +"`**/` vorangestellt. Zum Beispiel wird das Suchmuster `foo/bar` zu " +"`**/foo/bar` und würde mit `/irgendein/Pfad/zu/foo/bar` übereinstimmen." #. type: Plain text #: en/config.txt:143 #, priority:100 -msgid "If the pattern ends with `/`, `**` will be automatically added. For example, the pattern `foo/` becomes `foo/**`. In other words, it matches \"foo\" and everything inside, recursively." -msgstr "Endet das Pattern mit `/`, so wird automatisch `**` hinzugefügt. Beispielsweise wird das Suchmuster `foo/` zu `foo/**`. Mit anderen Worten, es stimmt rekursiv mit „foo“ und allem, was sich darin befindet, überein." +msgid "" +"If the pattern ends with `/`, `**` will be automatically added. For example," +" the pattern `foo/` becomes `foo/**`. In other words, it matches \"foo\" and" +" everything inside, recursively." +msgstr "" +"Endet das Pattern mit `/`, so wird automatisch `**` hinzugefügt. " +"Beispielsweise wird das Suchmuster `foo/` zu `foo/**`. Mit anderen Worten, " +"es stimmt rekursiv mit „foo“ und allem, was sich darin befindet, überein." #. type: Labeled list #: en/config.txt:144 @@ -2488,8 +3114,13 @@ msgstr "`gitdir/i`" #. type: Plain text #: en/config.txt:147 #, priority:100 -msgid "This is the same as `gitdir` except that matching is done case-insensitively (e.g. on case-insensitive file systems)" -msgstr "Das entspricht `gitdir`, außer dass der Abgleich ohne Berücksichtigung von Groß- und Kleinschreibung erfolgt (z.B. auf Dateisystemen ohne diese Unterscheidung)" +msgid "" +"This is the same as `gitdir` except that matching is done case-insensitively" +" (e.g. on case-insensitive file systems)" +msgstr "" +"Das entspricht `gitdir`, außer dass der Abgleich ohne Berücksichtigung von " +"Groß- und Kleinschreibung erfolgt (z.B. auf Dateisystemen ohne diese " +"Unterscheidung)" #. type: Labeled list #: en/config.txt:148 @@ -2500,14 +3131,35 @@ msgstr "`onbranch`" #. type: Plain text #: en/config.txt:155 #, priority:100 -msgid "The data that follows the keyword `onbranch:` is taken to be a pattern with standard globbing wildcards and two additional ones, `**/` and `/**`, that can match multiple path components. If we are in a worktree where the name of the branch that is currently checked out matches the pattern, the include condition is met." -msgstr "Die Daten, die dem Schlüsselwort `onbranch:` folgen, werden als ein Pattern mit Standard-Globbing-Platzhaltern und zwei zusätzlichen Platzhaltern, `**/` und `/**`, verstanden, die mit mehreren Pfadkomponenten übereinstimmen könnten. Wenn wir uns in einem Arbeitsbereich befinden, in dem der Name des Branches, der gerade ausgecheckt wird, mit dem Suchmuster übereinstimmt, ist die Include-Bedingung erfüllt." +msgid "" +"The data that follows the keyword `onbranch:` is taken to be a pattern with " +"standard globbing wildcards and two additional ones, `**/` and `/**`, that " +"can match multiple path components. If we are in a worktree where the name " +"of the branch that is currently checked out matches the pattern, the include" +" condition is met." +msgstr "" +"Die Daten, die dem Schlüsselwort `onbranch:` folgen, werden als ein Pattern " +"mit Standard-Globbing-Platzhaltern und zwei zusätzlichen Platzhaltern, `**/`" +" und `/**`, verstanden, die mit mehreren Pfadkomponenten übereinstimmen " +"könnten. Wenn wir uns in einem Arbeitsbereich befinden, in dem der Name des" +" Branches, der gerade ausgecheckt wird, mit dem Suchmuster übereinstimmt, " +"ist die Include-Bedingung erfüllt." #. type: Plain text #: en/config.txt:161 #, priority:100 -msgid "If the pattern ends with `/`, `**` will be automatically added. For example, the pattern `foo/` becomes `foo/**`. In other words, it matches all branches that begin with `foo/`. This is useful if your branches are organized hierarchically and you would like to apply a configuration to all the branches in that hierarchy." -msgstr "Endet das Pattern mit `/`, wird automatisch `**` hinzugefügt. Zum Beispiel wird das Muster `foo/` zu `foo/**`. Mit anderen Worten, es passt auf alle Branches, die mit `foo/` beginnen. Das ist dann hilfreich, wenn Ihre Branches hierarchisch organisiert sind und Sie eine Konfiguration auf alle Branches in dieser Hierarchie anwenden möchten." +msgid "" +"If the pattern ends with `/`, `**` will be automatically added. For example," +" the pattern `foo/` becomes `foo/**`. In other words, it matches all " +"branches that begin with `foo/`. This is useful if your branches are " +"organized hierarchically and you would like to apply a configuration to all " +"the branches in that hierarchy." +msgstr "" +"Endet das Pattern mit `/`, wird automatisch `**` hinzugefügt. Zum Beispiel " +"wird das Muster `foo/` zu `foo/**`. Mit anderen Worten, es passt auf alle " +"Branches, die mit `foo/` beginnen. Das ist dann hilfreich, wenn Ihre " +"Branches hierarchisch organisiert sind und Sie eine Konfiguration auf alle " +"Branches in dieser Hierarchie anwenden möchten." #. type: Labeled list #: en/config.txt:162 @@ -2518,32 +3170,59 @@ msgstr "" #. type: Plain text #: en/config.txt:170 #, fuzzy, priority:100 -msgid "The data that follows this keyword is taken to be a pattern with standard globbing wildcards and two additional ones, `**/` and `/**`, that can match multiple components. The first time this keyword is seen, the rest of the config files will be scanned for remote URLs (without applying any values). If there exists at least one remote URL that matches this pattern, the include condition is met." -msgstr "Die Daten, die dem Schlüsselwort `onbranch:` folgen, werden als ein Pattern mit Standard-Globbing-Platzhaltern und zwei zusätzlichen Platzhaltern, `**/` und `/**`, verstanden, die mit mehreren Pfadkomponenten übereinstimmen könnten. Wenn wir uns in einem Arbeitsbereich befinden, in dem der Name des Branches, der gerade ausgecheckt wird, mit dem Suchmuster übereinstimmt, ist die Include-Bedingung erfüllt." +msgid "" +"The data that follows this keyword is taken to be a pattern with standard " +"globbing wildcards and two additional ones, `**/` and `/**`, that can match " +"multiple components. The first time this keyword is seen, the rest of the " +"config files will be scanned for remote URLs (without applying any values). " +"If there exists at least one remote URL that matches this pattern, the " +"include condition is met." +msgstr "" +"Die Daten, die dem Schlüsselwort `onbranch:` folgen, werden als ein Pattern " +"mit Standard-Globbing-Platzhaltern und zwei zusätzlichen Platzhaltern, `**/`" +" und `/**`, verstanden, die mit mehreren Pfadkomponenten übereinstimmen " +"könnten. Wenn wir uns in einem Arbeitsbereich befinden, in dem der Name des" +" Branches, der gerade ausgecheckt wird, mit dem Suchmuster übereinstimmt, " +"ist die Include-Bedingung erfüllt." #. type: Plain text #: en/config.txt:173 #, priority:100 -msgid "Files included by this option (directly or indirectly) are not allowed to contain remote URLs." +msgid "" +"Files included by this option (directly or indirectly) are not allowed to " +"contain remote URLs." msgstr "" #. type: Plain text #: en/config.txt:184 #, priority:100 -msgid "Note that unlike other includeIf conditions, resolving this condition relies on information that is not yet known at the point of reading the condition. A typical use case is this option being present as a system-level or global-level config, and the remote URL being in a local-level config; hence the need to scan ahead when resolving this condition. In order to avoid the chicken-and-egg problem in which potentially-included files can affect whether such files are potentially included, Git breaks the cycle by prohibiting these files from affecting the resolution of these conditions (thus, prohibiting them from declaring remote URLs)." +msgid "" +"Note that unlike other includeIf conditions, resolving this condition relies" +" on information that is not yet known at the point of reading the condition." +" A typical use case is this option being present as a system-level or " +"global-level config, and the remote URL being in a local-level config; hence" +" the need to scan ahead when resolving this condition. In order to avoid the" +" chicken-and-egg problem in which potentially-included files can affect " +"whether such files are potentially included, Git breaks the cycle by " +"prohibiting these files from affecting the resolution of these conditions " +"(thus, prohibiting them from declaring remote URLs)." msgstr "" #. type: Plain text #: en/config.txt:188 #, priority:100 -msgid "As for the naming of this keyword, it is for forwards compatibility with a naming scheme that supports more variable-based include conditions, but currently Git only supports the exact keyword described above." +msgid "" +"As for the naming of this keyword, it is for forwards compatibility with a " +"naming scheme that supports more variable-based include conditions, but " +"currently Git only supports the exact keyword described above." msgstr "" #. type: Plain text #: en/config.txt:190 #, priority:100 msgid "A few more notes on matching via `gitdir` and `gitdir/i`:" -msgstr "Noch ein paar Anmerkungen zum Vergleichen über `gitdir` und `gitdir/i`:" +msgstr "" +"Noch ein paar Anmerkungen zum Vergleichen über `gitdir` und `gitdir/i`:" #. type: Plain text #: en/config.txt:192 @@ -2554,20 +3233,39 @@ msgstr "Symlinks in `$GIT_DIR` werden vor dem Abgleich nicht ausgewertet." #. type: Plain text #: en/config.txt:197 #, priority:100 -msgid "Both the symlink & realpath versions of paths will be matched outside of `$GIT_DIR`. E.g. if ~/git is a symlink to /mnt/storage/git, both `gitdir:~/git` and `gitdir:/mnt/storage/git` will match." -msgstr "Sowohl die Symlink- als auch die Realpfad-Versionen der Pfadangaben werden außerhalb von `$GIT_DIR` abgeglichen. Wenn z.B. ~/git ein Symlink zu /mnt/storage/git wäre, dann würden beide Versionen von `gitdir:~/git` und `gitdir:/mnt/storage/git` übereinstimmen." +msgid "" +"Both the symlink & realpath versions of paths will be matched outside of " +"`$GIT_DIR`. E.g. if ~/git is a symlink to /mnt/storage/git, both " +"`gitdir:~/git` and `gitdir:/mnt/storage/git` will match." +msgstr "" +"Sowohl die Symlink- als auch die Realpfad-Versionen der Pfadangaben werden " +"außerhalb von `$GIT_DIR` abgeglichen. Wenn z.B. ~/git ein Symlink zu " +"/mnt/storage/git wäre, dann würden beide Versionen von `gitdir:~/git` und " +"`gitdir:/mnt/storage/git` übereinstimmen." #. type: Plain text #: en/config.txt:202 #, priority:100 -msgid "This was not the case in the initial release of this feature in v2.13.0, which only matched the realpath version. Configuration that wants to be compatible with the initial release of this feature needs to either specify only the realpath version, or both versions." -msgstr "Dies war bei der ursprünglichen Version dieses Features in v2.13.0 nicht der Fall, welche nur der realpath-Version entsprochen hat. Eine Konfiguration, die mit der ursprünglichen Version dieses Features kompatibel sein will, muss entweder nur die realpath-Version oder beide Versionen angeben." +msgid "" +"This was not the case in the initial release of this feature in v2.13.0, " +"which only matched the realpath version. Configuration that wants to be " +"compatible with the initial release of this feature needs to either specify " +"only the realpath version, or both versions." +msgstr "" +"Dies war bei der ursprünglichen Version dieses Features in v2.13.0 nicht der" +" Fall, welche nur der realpath-Version entsprochen hat. Eine Konfiguration, " +"die mit der ursprünglichen Version dieses Features kompatibel sein will, " +"muss entweder nur die realpath-Version oder beide Versionen angeben." #. type: Plain text #: en/config.txt:205 #, priority:100 -msgid "Note that \"../\" is not special and will match literally, which is unlikely what you want." -msgstr "Beachten Sie, dass \"../\" nichts Besonderes ist und wortwörtlich übereinstimmen wird, was vermutlich nicht das ist, was Sie erreichen wollen." +msgid "" +"Note that \"../\" is not special and will match literally, which is unlikely" +" what you want." +msgstr "" +"Beachten Sie, dass \"../\" nichts Besonderes ist und wortwörtlich " +"übereinstimmen wird, was vermutlich nicht das ist, was Sie erreichen wollen." #. type: Title ~ #: en/config.txt:207 en/git-rev-parse.txt:393 en/git-rev-parse.txt:449 @@ -2731,8 +3429,14 @@ msgstr "Werte" #. type: Plain text #: en/config.txt:272 #, priority:100 -msgid "Values of many variables are treated as a simple string, but there are variables that take values of specific types and there are rules as to how to spell them." -msgstr "Die Werte vieler Variablen werden als einfache Zeichenfolge behandelt, aber es gibt Variablen, die Werte bestimmter Typen annehmen und es gibt Richtlinien, wie sie zu formulieren sind." +msgid "" +"Values of many variables are treated as a simple string, but there are " +"variables that take values of specific types and there are rules as to how " +"to spell them." +msgstr "" +"Die Werte vieler Variablen werden als einfache Zeichenfolge behandelt, aber " +"es gibt Variablen, die Werte bestimmter Typen annehmen und es gibt " +"Richtlinien, wie sie zu formulieren sind." #. type: Labeled list #: en/config.txt:273 @@ -2743,8 +3447,13 @@ msgstr "boolean" #. type: Plain text #: en/config.txt:278 #, priority:100 -msgid "When a variable is said to take a boolean value, many synonyms are accepted for 'true' and 'false'; these are all case-insensitive." -msgstr "Wenn eine Variable einen Wahrheitswert annehmen soll, werden viele Synonyme für 'true' oder 'false' akzeptiert; Groß- und Kleinschreibung wird dabei nicht beachtet." +msgid "" +"When a variable is said to take a boolean value, many synonyms are accepted " +"for 'true' and 'false'; these are all case-insensitive." +msgstr "" +"Wenn eine Variable einen Wahrheitswert annehmen soll, werden viele Synonyme " +"für 'true' oder 'false' akzeptiert; Groß- und Kleinschreibung wird dabei " +"nicht beachtet." #. type: Labeled list #: en/config.txt:279 @@ -2755,7 +3464,9 @@ msgstr "true" #. type: Plain text #: en/config.txt:282 #, fuzzy, priority:100 -msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= ` is taken as true." +msgid "" +"Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable " +"defined without `= ` is taken as true." msgstr "" "und `1` sein. Auch eine Variable, die ohne `= `\n" "definiert ist, wird als wahr angenommen.\n" @@ -2769,14 +3480,22 @@ msgstr "false" #. type: Plain text #: en/config.txt:285 #, fuzzy, priority:100 -msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string." -msgstr "Boolesche Werte für „false“ können alternativ auch `no`, `off`, `false`," +msgid "" +"Boolean false literals are `no`, `off`, `false`, `0` and the empty string." +msgstr "" +"Boolesche Werte für „false“ können alternativ auch `no`, `off`, `false`," #. type: Plain text #: en/config.txt:289 #, priority:100 -msgid "When converting a value to its canonical form using the `--type=bool` type specifier, 'git config' will ensure that the output is \"true\" or \"false\" (spelled in lowercase)." -msgstr "Bei der Konvertierung eines Wertes in seine kanonische Form unter Verwendung des `--type=bool` Typ-Bezeichners wird 'git config' die Ausgabe \"true\" oder \"false\" (in Kleinbuchstaben geschrieben) ausgeben." +msgid "" +"When converting a value to its canonical form using the `--type=bool` type " +"specifier, 'git config' will ensure that the output is \"true\" or \"false\"" +" (spelled in lowercase)." +msgstr "" +"Bei der Konvertierung eines Wertes in seine kanonische Form unter Verwendung" +" des `--type=bool` Typ-Bezeichners wird 'git config' die Ausgabe \"true\" " +"oder \"false\" (in Kleinbuchstaben geschrieben) ausgeben." #. type: Labeled list #: en/config.txt:290 @@ -2787,8 +3506,13 @@ msgstr "integer" #. type: Plain text #: en/config.txt:294 #, ignore-ellipsis, priority:100 -msgid "The value for many variables that specify various sizes can be suffixed with `k`, `M`,... to mean \"scale the number by 1024\", \"by 1024x1024\", etc." -msgstr "Der Wert für viele Variablen, die unterschiedliche Größen angeben, kann mit den Suffixen `k`, `M`, ... versehen werden. Das bedeutet, dass die Zahl \"mit 1024\", \"mit 1024x1024\", ... skaliert wird." +msgid "" +"The value for many variables that specify various sizes can be suffixed with" +" `k`, `M`,... to mean \"scale the number by 1024\", \"by 1024x1024\", etc." +msgstr "" +"Der Wert für viele Variablen, die unterschiedliche Größen angeben, kann mit " +"den Suffixen `k`, `M`, ... versehen werden. Das bedeutet, dass die Zahl " +"\"mit 1024\", \"mit 1024x1024\", ... skaliert wird." #. type: Labeled list #: en/config.txt:295 en/diff-options.txt:451 en/git-for-each-ref.txt:190 @@ -2799,56 +3523,123 @@ msgstr "color" #. type: Plain text #: en/config.txt:299 #, priority:100 -msgid "The value for a variable that takes a color is a list of colors (at most two, one for foreground and one for background) and attributes (as many as you want), separated by spaces." -msgstr "Der Wert für eine Variable, die eine Farbe darstellt, ist eine durch Leerzeichen getrennte Liste von Farben (maximal zwei, einmal Vordergrund und einmal Hintergrund) und von Attributen (unbegrenzt viele)." +msgid "" +"The value for a variable that takes a color is a list of colors (at most " +"two, one for foreground and one for background) and attributes (as many as " +"you want), separated by spaces." +msgstr "" +"Der Wert für eine Variable, die eine Farbe darstellt, ist eine durch " +"Leerzeichen getrennte Liste von Farben (maximal zwei, einmal Vordergrund und" +" einmal Hintergrund) und von Attributen (unbegrenzt viele)." #. type: Plain text #: en/config.txt:305 #, fuzzy, priority:100 -msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan`, `white` and `default`. The first color given is the foreground; the second is the background. All the basic colors except `normal` and `default` have a bright variant that can be specified by prefixing the color with `bright`, like `brightred`." -msgstr "Die akzeptierten Grundfarben sind `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` und `white`. Die erste angegebene Farbe ist der Vordergrund, die zweite bestimmt den Hintergrund. Alle Grundfarben mit Ausnahme von `normal` haben eine helle Variante, die durch Voranstellen von `bright` vor der Farbe spezifiziert werden kann, wie z.B. `brightred`." +msgid "" +"The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, " +"`blue`, `magenta`, `cyan`, `white` and `default`. The first color given is " +"the foreground; the second is the background. All the basic colors except " +"`normal` and `default` have a bright variant that can be specified by " +"prefixing the color with `bright`, like `brightred`." +msgstr "" +"Die akzeptierten Grundfarben sind `normal`, `black`, `red`, `green`, " +"`yellow`, `blue`, `magenta`, `cyan` und `white`. Die erste angegebene Farbe" +" ist der Vordergrund, die zweite bestimmt den Hintergrund. Alle Grundfarben" +" mit Ausnahme von `normal` haben eine helle Variante, die durch Voranstellen" +" von `bright` vor der Farbe spezifiziert werden kann, wie z.B. `brightred`." #. type: Plain text #: en/config.txt:309 #, priority:100 -msgid "The color `normal` makes no change to the color. It is the same as an empty string, but can be used as the foreground color when specifying a background color alone (for example, \"normal red\")." +msgid "" +"The color `normal` makes no change to the color. It is the same as an empty " +"string, but can be used as the foreground color when specifying a background" +" color alone (for example, \"normal red\")." msgstr "" #. type: Plain text #: en/config.txt:313 #, priority:100 -msgid "The color `default` explicitly resets the color to the terminal default, for example to specify a cleared background. Although it varies between terminals, this is usually not the same as setting to \"white black\"." +msgid "" +"The color `default` explicitly resets the color to the terminal default, for" +" example to specify a cleared background. Although it varies between " +"terminals, this is usually not the same as setting to \"white black\"." msgstr "" #. type: Plain text #: en/config.txt:318 #, priority:100 -msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`." -msgstr "Farben können auch als Zahlen zwischen 0 und 255 angegeben werden; diese verwenden den ANSI-256-Farbmodus (beachten Sie jedoch, dass dies möglicherweise nicht von allen Terminals unterstützt wird). Wenn Ihr Terminal dies unterstützt, können Sie auch 24-bit RGB-Werte als Hex-Wert angeben, wie z.B. `#ff0ab3`." +msgid "" +"Colors may also be given as numbers between 0 and 255; these use ANSI " +"256-color mode (but note that not all terminals may support this). If your " +"terminal supports it, you may also specify 24-bit RGB values as hex, like " +"`#ff0ab3`." +msgstr "" +"Farben können auch als Zahlen zwischen 0 und 255 angegeben werden; diese " +"verwenden den ANSI-256-Farbmodus (beachten Sie jedoch, dass dies " +"möglicherweise nicht von allen Terminals unterstützt wird). Wenn Ihr " +"Terminal dies unterstützt, können Sie auch 24-bit RGB-Werte als Hex-Wert " +"angeben, wie z.B. `#ff0ab3`." #. type: Plain text #: en/config.txt:325 #, priority:100 -msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)." -msgstr "Die akzeptierten Attribute sind `bold`, `dim`, `ul`, `blink`, `reverse`, `italic` und `strike` (für durchgekreuzte oder durchgestrichene Zeichen). Die Position jeglicher Attribute in Bezug auf die Farben (vor, nach oder zwischen den Farben) spielt keine Rolle. Bestimmte Attribute können abgeschaltet werden, indem man ihnen `no` oder `no-` voranstellt (z.B. `noreverse`, `no-ul`, usw.)." +msgid "" +"The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, " +"`italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The " +"position of any attributes with respect to the colors (before, after, or in " +"between), doesn't matter. Specific attributes may be turned off by prefixing" +" them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)." +msgstr "" +"Die akzeptierten Attribute sind `bold`, `dim`, `ul`, `blink`, `reverse`, " +"`italic` und `strike` (für durchgekreuzte oder durchgestrichene Zeichen). " +"Die Position jeglicher Attribute in Bezug auf die Farben (vor, nach oder " +"zwischen den Farben) spielt keine Rolle. Bestimmte Attribute können " +"abgeschaltet werden, indem man ihnen `no` oder `no-` voranstellt (z.B. " +"`noreverse`, `no-ul`, usw.)." #. type: Plain text #: en/config.txt:330 #, priority:100 -msgid "The pseudo-attribute `reset` resets all colors and attributes before applying the specified coloring. For example, `reset green` will result in a green foreground and default background without any active attributes." +msgid "" +"The pseudo-attribute `reset` resets all colors and attributes before " +"applying the specified coloring. For example, `reset green` will result in a" +" green foreground and default background without any active attributes." msgstr "" #. type: Plain text #: en/config.txt:333 #, priority:100 -msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely." -msgstr "Ein leerer Farb-String erzeugt überhaupt keinen Farbeffekt. Damit kann das Einfärben bestimmter Elemente vermieden werden, ohne die Farbe vollständig zu deaktivieren." +msgid "" +"An empty color string produces no color effect at all. This can be used to " +"avoid coloring specific elements without disabling color entirely." +msgstr "" +"Ein leerer Farb-String erzeugt überhaupt keinen Farbeffekt. Damit kann das " +"Einfärben bestimmter Elemente vermieden werden, ohne die Farbe vollständig " +"zu deaktivieren." #. type: Plain text #: en/config.txt:342 #, priority:100 -msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there." -msgstr "Für die vordefinierten Farbslots von Git sollen die Attribute am Anfang jedes Elements in der farbigen Ausgabe zurückgesetzt werden. Wenn Sie also `color.decorate.branch` auf `black` setzen, wird dieser Branch-Name in schlichtem „schwarz“ dargestellt, selbst wenn die vorherige Sache in der gleichen Ausgabezeile (z.B. öffnende Klammer vor der Liste der Branch-Namen in der `log --decorate` Ausgabe) mit `bold` oder einem anderen Attribut dargestellt wird. Benutzerdefinierte Protokollformate können jedoch eine kompliziertere und überlagerte Farbgebung bewirken, und die negierten Formen könnten dort nützlich sein." +msgid "" +"For git's pre-defined color slots, the attributes are meant to be reset at " +"the beginning of each item in the colored output. So setting " +"`color.decorate.branch` to `black` will paint that branch name in a plain " +"`black`, even if the previous thing on the same output line (e.g. opening " +"parenthesis before the list of branch names in `log --decorate` output) is " +"set to be painted with `bold` or some other attribute. However, custom log " +"formats may do more complicated and layered coloring, and the negated forms " +"may be useful there." +msgstr "" +"Für die vordefinierten Farbslots von Git sollen die Attribute am Anfang " +"jedes Elements in der farbigen Ausgabe zurückgesetzt werden. Wenn Sie also " +"`color.decorate.branch` auf `black` setzen, wird dieser Branch-Name in " +"schlichtem „schwarz“ dargestellt, selbst wenn die vorherige Sache in der " +"gleichen Ausgabezeile (z.B. öffnende Klammer vor der Liste der Branch-Namen " +"in der `log --decorate` Ausgabe) mit `bold` oder einem anderen Attribut " +"dargestellt wird. Benutzerdefinierte Protokollformate können jedoch eine " +"kompliziertere und überlagerte Farbgebung bewirken, und die negierten Formen" +" könnten dort nützlich sein." #. type: Labeled list #: en/config.txt:343 @@ -2859,13 +3650,30 @@ msgstr "pathname" #. type: Plain text #: en/config.txt:349 #, priority:100 -msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory." -msgstr "Einer Variablen, die einen Pfadnamen-Wert annimmt, kann ein String übergeben werden, der mit \"`~/`\" oder \"`~user/`\" beginnt. Die übliche Tilde-Erweiterung kommt bei einem solchen String zur Anwendung: `~/` wird auf den Wert von `$HOME` erweitert, und `~user/` auf das Home-Verzeichnis des angegebenen Benutzers." +msgid "" +"A variable that takes a pathname value can be given a string that begins " +"with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such" +" a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the " +"specified user's home directory." +msgstr "" +"Einer Variablen, die einen Pfadnamen-Wert annimmt, kann ein String übergeben" +" werden, der mit \"`~/`\" oder \"`~user/`\" beginnt. Die übliche Tilde-" +"Erweiterung kommt bei einem solchen String zur Anwendung: `~/` wird auf den " +"Wert von `$HOME` erweitert, und `~user/` auf das Home-Verzeichnis des " +"angegebenen Benutzers." #. type: Plain text #: en/config.txt:358 #, priority:100 -msgid "If a path starts with `%(prefix)/`, the remainder is interpreted as a path relative to Git's \"runtime prefix\", i.e. relative to the location where Git itself was installed. For example, `%(prefix)/bin/` refers to the directory in which the Git executable itself lives. If Git was compiled without runtime prefix support, the compiled-in prefix will be substituted instead. In the unlikely event that a literal path needs to be specified that should _not_ be expanded, it needs to be prefixed by `./`, like so: `./%(prefix)/bin`." +msgid "" +"If a path starts with `%(prefix)/`, the remainder is interpreted as a path " +"relative to Git's \"runtime prefix\", i.e. relative to the location where " +"Git itself was installed. For example, `%(prefix)/bin/` refers to the " +"directory in which the Git executable itself lives. If Git was compiled " +"without runtime prefix support, the compiled-in prefix will be substituted " +"instead. In the unlikely event that a literal path needs to be specified " +"that should _not_ be expanded, it needs to be prefixed by `./`, like so: " +"`./%(prefix)/bin`." msgstr "" #. type: Title ~ @@ -2877,14 +3685,29 @@ msgstr "Variablen" #. type: Plain text #: en/config.txt:366 #, priority:100 -msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page." -msgstr "Beachten Sie, dass diese Liste nicht ausführlich und nicht unbedingt vollständig ist. Für kommando-spezifische Variablen finden Sie eine ausführlichere Beschreibung in der entsprechenden Manpage." +msgid "" +"Note that this list is non-comprehensive and not necessarily complete. For " +"command-specific variables, you will find a more detailed description in the" +" appropriate manual page." +msgstr "" +"Beachten Sie, dass diese Liste nicht ausführlich und nicht unbedingt " +"vollständig ist. Für kommando-spezifische Variablen finden Sie eine " +"ausführlichere Beschreibung in der entsprechenden Manpage." #. type: Plain text #: en/config.txt:371 #, priority:100 -msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation." -msgstr "Andere Git-Tools können und werden ihre eigenen Variablen verwenden. Wenn Sie neue Variablen für die Verwendung in Ihrem eigenen Dienstprogramm entwickeln, stellen Sie sicher, dass deren Namen nicht in Konflikt mit denen stehen, die von Git selbst und anderen beliebten Hilfsprogrammen verwendet werden. Beschreiben Sie diese Variablen in Ihrer Dokumentation." +msgid "" +"Other git-related tools may and do use their own variables. When inventing " +"new variables for use in your own tool, make sure their names do not " +"conflict with those that are used by Git itself and other popular tools, and" +" describe them in your documentation." +msgstr "" +"Andere Git-Tools können und werden ihre eigenen Variablen verwenden. Wenn " +"Sie neue Variablen für die Verwendung in Ihrem eigenen Dienstprogramm " +"entwickeln, stellen Sie sicher, dass deren Namen nicht in Konflikt mit denen" +" stehen, die von Git selbst und anderen beliebten Hilfsprogrammen verwendet " +"werden. Beschreiben Sie diese Variablen in Ihrer Dokumentation." #. type: Labeled list #: en/config/merge.txt:1 @@ -2895,7 +3718,19 @@ msgstr "merge.conflictStyle" #. type: Plain text #: en/config/merge.txt:15 #, priority:240 -msgid "Specify the style in which conflicted hunks are written out to working tree files upon merge. The default is \"merge\", which shows a `<<<<<<<` conflict marker, changes made by one side, a `=======` marker, changes made by the other side, and then a `>>>>>>>` marker. An alternate style, \"diff3\", adds a `|||||||` marker and the original text before the `=======` marker. The \"merge\" style tends to produce smaller conflict regions than diff3, both because of the exclusion of the original text, and because when a subset of lines match on the two sides, they are just pulled out of the conflict region. Another alternate style, \"zdiff3\", is similar to diff3 but removes matching lines on the two sides from the conflict region when those matching lines appear near either the beginning or end of a conflict region." +msgid "" +"Specify the style in which conflicted hunks are written out to working tree " +"files upon merge. The default is \"merge\", which shows a `<<<<<<<` " +"conflict marker, changes made by one side, a `=======` marker, changes made " +"by the other side, and then a `>>>>>>>` marker. An alternate style, " +"\"diff3\", adds a `|||||||` marker and the original text before the " +"`=======` marker. The \"merge\" style tends to produce smaller conflict " +"regions than diff3, both because of the exclusion of the original text, and " +"because when a subset of lines match on the two sides, they are just pulled " +"out of the conflict region. Another alternate style, \"zdiff3\", is similar" +" to diff3 but removes matching lines on the two sides from the conflict " +"region when those matching lines appear near either the beginning or end of " +"a conflict region." msgstr "" #. type: Labeled list @@ -2907,7 +3742,14 @@ msgstr "merge.defaultToUpstream" #. type: Plain text #: en/config/merge.txt:25 #, priority:240 -msgid "If merge is called without any commit argument, merge the upstream branches configured for the current branch by using their last observed values stored in their remote-tracking branches. The values of the `branch..merge` that name the branches at the remote named by `branch..remote` are consulted, and then they are mapped via `remote..fetch` to their corresponding remote-tracking branches, and the tips of these tracking branches are merged. Defaults to true." +msgid "" +"If merge is called without any commit argument, merge the upstream branches " +"configured for the current branch by using their last observed values stored" +" in their remote-tracking branches. The values of the `branch..merge` that name the branches at the remote named by " +"`branch..remote` are consulted, and then they are mapped via" +" `remote..fetch` to their corresponding remote-tracking branches, " +"and the tips of these tracking branches are merged. Defaults to true." msgstr "" #. type: Labeled list @@ -2919,7 +3761,14 @@ msgstr "merge.ff" #. type: Plain text #: en/config/merge.txt:35 #, priority:240 -msgid "By default, Git does not create an extra merge commit when merging a commit that is a descendant of the current commit. Instead, the tip of the current branch is fast-forwarded. When set to `false`, this variable tells Git to create an extra merge commit in such a case (equivalent to giving the `--no-ff` option from the command line). When set to `only`, only such fast-forward merges are allowed (equivalent to giving the `--ff-only` option from the command line)." +msgid "" +"By default, Git does not create an extra merge commit when merging a commit " +"that is a descendant of the current commit. Instead, the tip of the current " +"branch is fast-forwarded. When set to `false`, this variable tells Git to " +"create an extra merge commit in such a case (equivalent to giving the `--no-" +"ff` option from the command line). When set to `only`, only such fast-" +"forward merges are allowed (equivalent to giving the `--ff-only` option from" +" the command line)." msgstr "" #. type: Labeled list @@ -2931,7 +3780,9 @@ msgstr "merge.verifySignatures" #. type: Plain text #: en/config/merge.txt:39 #, priority:240 -msgid "If true, this is equivalent to the --verify-signatures command line option. See linkgit:git-merge[1] for details." +msgid "" +"If true, this is equivalent to the --verify-signatures command line option. " +"See linkgit:git-merge[1] for details." msgstr "" #. type: Labeled list @@ -2943,7 +3794,12 @@ msgstr "merge.renameLimit" #. type: Plain text #: en/config/merge.txt:49 #, priority:240 -msgid "The number of files to consider in the exhaustive portion of rename detection during a merge. If not specified, defaults to the value of diff.renameLimit. If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000. This setting has no effect if rename detection is turned off." +msgid "" +"The number of files to consider in the exhaustive portion of rename " +"detection during a merge. If not specified, defaults to the value of " +"diff.renameLimit. If neither merge.renameLimit nor diff.renameLimit are " +"specified, currently defaults to 7000. This setting has no effect if rename" +" detection is turned off." msgstr "" #. type: Labeled list @@ -2955,7 +3811,10 @@ msgstr "merge.renames" #. type: Plain text #: en/config/merge.txt:54 #, priority:240 -msgid "Whether Git detects renames. If set to \"false\", rename detection is disabled. If set to \"true\", basic rename detection is enabled. Defaults to the value of diff.renames." +msgid "" +"Whether Git detects renames. If set to \"false\", rename detection is " +"disabled. If set to \"true\", basic rename detection is enabled. Defaults " +"to the value of diff.renames." msgstr "" #. type: Labeled list @@ -2967,7 +3826,16 @@ msgstr "merge.directoryRenames" #. type: Plain text #: en/config/merge.txt:67 #, priority:240 -msgid "Whether Git detects directory renames, affecting what happens at merge time to new files added to a directory on one side of history when that directory was renamed on the other side of history. If merge.directoryRenames is set to \"false\", directory rename detection is disabled, meaning that such new files will be left behind in the old directory. If set to \"true\", directory rename detection is enabled, meaning that such new files will be moved into the new directory. If set to \"conflict\", a conflict will be reported for such paths. If merge.renames is false, merge.directoryRenames is ignored and treated as false. Defaults to \"conflict\"." +msgid "" +"Whether Git detects directory renames, affecting what happens at merge time " +"to new files added to a directory on one side of history when that directory" +" was renamed on the other side of history. If merge.directoryRenames is set" +" to \"false\", directory rename detection is disabled, meaning that such new" +" files will be left behind in the old directory. If set to \"true\", " +"directory rename detection is enabled, meaning that such new files will be " +"moved into the new directory. If set to \"conflict\", a conflict will be " +"reported for such paths. If merge.renames is false, merge.directoryRenames " +"is ignored and treated as false. Defaults to \"conflict\"." msgstr "" #. type: Labeled list @@ -2979,7 +3847,14 @@ msgstr "merge.renormalize" #. type: Plain text #: en/config/merge.txt:77 #, priority:240 -msgid "Tell Git that canonical representation of files in the repository has changed over time (e.g. earlier commits record text files with CRLF line endings, but recent ones use LF line endings). In such a repository, Git can convert the data recorded in commits to a canonical form before performing a merge to reduce unnecessary conflicts. For more information, see section \"Merging branches with differing checkin/checkout attributes\" in linkgit:gitattributes[5]." +msgid "" +"Tell Git that canonical representation of files in the repository has " +"changed over time (e.g. earlier commits record text files with CRLF line " +"endings, but recent ones use LF line endings). In such a repository, Git " +"can convert the data recorded in commits to a canonical form before " +"performing a merge to reduce unnecessary conflicts. For more information, " +"see section \"Merging branches with differing checkin/checkout attributes\" " +"in linkgit:gitattributes[5]." msgstr "" #. type: Labeled list @@ -2991,7 +3866,9 @@ msgstr "merge.stat" #. type: Plain text #: en/config/merge.txt:81 #, priority:240 -msgid "Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge. True by default." +msgid "" +"Whether to print the diffstat between ORIG_HEAD and the merge result at the " +"end of the merge. True by default." msgstr "" #. type: Labeled list @@ -3003,7 +3880,13 @@ msgstr "merge.autoStash" #. type: Plain text #: en/config/merge.txt:91 #, priority:240 -msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run merge on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts. This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1]. Defaults to false." +msgid "" +"When set to true, automatically create a temporary stash entry before the " +"operation begins, and apply it after the operation ends. This means that " +"you can run merge on a dirty worktree. However, use with care: the final " +"stash application after a successful merge might result in non-trivial " +"conflicts. This option can be overridden by the `--no-autostash` and " +"`--autostash` options of linkgit:git-merge[1]. Defaults to false." msgstr "" #. type: Labeled list @@ -3015,7 +3898,11 @@ msgstr "merge.tool" #. type: Plain text #: en/config/merge.txt:97 #, priority:240 -msgid "Controls which merge tool is used by linkgit:git-mergetool[1]. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool..cmd variable is defined." +msgid "" +"Controls which merge tool is used by linkgit:git-mergetool[1]. The list " +"below shows the valid built-in values. Any other value is treated as a " +"custom merge tool and requires that a corresponding mergetool..cmd " +"variable is defined." msgstr "" #. type: Labeled list @@ -3027,7 +3914,11 @@ msgstr "merge.guitool" #. type: Plain text #: en/config/merge.txt:103 #, priority:240 -msgid "Controls which merge tool is used by linkgit:git-mergetool[1] when the -g/--gui flag is specified. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool..cmd variable is defined." +msgid "" +"Controls which merge tool is used by linkgit:git-mergetool[1] when the " +"-g/--gui flag is specified. The list below shows the valid built-in values." +" Any other value is treated as a custom merge tool and requires that a " +"corresponding mergetool..cmd variable is defined." msgstr "" #. type: Labeled list @@ -3039,7 +3930,12 @@ msgstr "merge.verbosity" #. type: Plain text #: en/config/merge.txt:113 #, priority:240 -msgid "Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. Can be overridden by the `GIT_MERGE_VERBOSITY` environment variable." +msgid "" +"Controls the amount of output shown by the recursive merge strategy. Level " +"0 outputs nothing except a final error message if conflicts were detected. " +"Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level" +" 5 and above outputs debugging information. The default is level 2. Can be" +" overridden by the `GIT_MERGE_VERBOSITY` environment variable." msgstr "" #. type: Labeled list @@ -3051,7 +3947,9 @@ msgstr "merge..name" #. type: Plain text #: en/config/merge.txt:117 #, priority:240 -msgid "Defines a human-readable name for a custom low-level merge driver. See linkgit:gitattributes[5] for details." +msgid "" +"Defines a human-readable name for a custom low-level merge driver. See " +"linkgit:gitattributes[5] for details." msgstr "" #. type: Labeled list @@ -3063,7 +3961,9 @@ msgstr "merge..driver" #. type: Plain text #: en/config/merge.txt:121 #, priority:240 -msgid "Defines the command that implements a custom low-level merge driver. See linkgit:gitattributes[5] for details." +msgid "" +"Defines the command that implements a custom low-level merge driver. See " +"linkgit:gitattributes[5] for details." msgstr "" #. type: Labeled list @@ -3075,7 +3975,9 @@ msgstr "merge..recursive" #. type: Plain text #: en/config/merge.txt:125 #, priority:240 -msgid "Names a low-level merge driver to be used when performing an internal merge between common ancestors. See linkgit:gitattributes[5] for details." +msgid "" +"Names a low-level merge driver to be used when performing an internal merge " +"between common ancestors. See linkgit:gitattributes[5] for details." msgstr "" #. type: Labeled list @@ -3087,7 +3989,9 @@ msgstr "merge.branchdesc" #. type: Plain text #: en/config/fmt-merge-msg.txt:5 #, priority:240 -msgid "In addition to branch names, populate the log message with the branch description text associated with them. Defaults to false." +msgid "" +"In addition to branch names, populate the log message with the branch " +"description text associated with them. Defaults to false." msgstr "" #. type: Labeled list @@ -3099,7 +4003,10 @@ msgstr "merge.log" #. type: Plain text #: en/config/fmt-merge-msg.txt:11 #, priority:240 -msgid "In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged. Defaults to false, and true is a synonym for 20." +msgid "" +"In addition to branch names, populate the log message with at most the " +"specified number of one-line descriptions from the actual commits that are " +"being merged. Defaults to false, and true is a synonym for 20." msgstr "" #. type: Labeled list @@ -3111,13 +4018,21 @@ msgstr "merge.suppressDest" #. type: Plain text #: en/config/fmt-merge-msg.txt:18 #, priority:240 -msgid "By adding a glob that matches the names of integration branches to this multi-valued configuration variable, the default merge message computed for merges into these integration branches will omit \"into \" from its title." +msgid "" +"By adding a glob that matches the names of integration branches to this " +"multi-valued configuration variable, the default merge message computed for " +"merges into these integration branches will omit \"into \" from" +" its title." msgstr "" #. type: Plain text #: en/config/fmt-merge-msg.txt:22 #, priority:240 -msgid "An element with an empty value can be used to clear the list of globs accumulated from previous configuration entries. When there is no `merge.suppressDest` variable defined, the default value of `master` is used for backward compatibility." +msgid "" +"An element with an empty value can be used to clear the list of globs " +"accumulated from previous configuration entries. When there is no " +"`merge.suppressDest` variable defined, the default value of `master` is used" +" for backward compatibility." msgstr "" #. type: Title - @@ -3129,8 +4044,12 @@ msgstr "DATUMSFORMATE" #. type: Plain text #: en/date-formats.txt:6 #, priority:280 -msgid "The `GIT_AUTHOR_DATE` and `GIT_COMMITTER_DATE` environment variables support the following date formats:" -msgstr "Die Umgebungsvariablen `GIT_AUTHOR_DATE`, und `GIT_COMMITTER_DATE` unterstützen die folgenden Datumsformate:" +msgid "" +"The `GIT_AUTHOR_DATE` and `GIT_COMMITTER_DATE` environment variables support" +" the following date formats:" +msgstr "" +"Die Umgebungsvariablen `GIT_AUTHOR_DATE`, und `GIT_COMMITTER_DATE` " +"unterstützen die folgenden Datumsformate:" #. type: Labeled list #: en/date-formats.txt:7 @@ -3141,8 +4060,16 @@ msgstr "Git-internes Format" #. type: Plain text #: en/date-formats.txt:12 #, fuzzy, priority:280 -msgid "It is ` `, where `` is the number of seconds since the UNIX epoch. `` is a positive or negative offset from UTC. For example CET (which is 1 hour ahead of UTC) is `+0100`." -msgstr "Dieses Format ist als ` ` definiert, wobei `` die Anzahl Sekunden seit dem 1.1.1970, 0:00 Uhr UTC und `` ein positiver oder negativer Versatz gegenüber UTC ist. MEZ (die 1 Stunde vor UTC liegt) ist zum Beispiel `+0100`." +msgid "" +"It is ` `, where `` is the" +" number of seconds since the UNIX epoch. `` is a positive" +" or negative offset from UTC. For example CET (which is 1 hour ahead of " +"UTC) is `+0100`." +msgstr "" +"Dieses Format ist als ` ` definiert, " +"wobei `` die Anzahl Sekunden seit dem 1.1.1970, 0:00 Uhr " +"UTC und `` ein positiver oder negativer Versatz gegenüber " +"UTC ist. MEZ (die 1 Stunde vor UTC liegt) ist zum Beispiel `+0100`." #. type: Labeled list #: en/date-formats.txt:13 @@ -3153,8 +4080,12 @@ msgstr "RFC 2822" #. type: Plain text #: en/date-formats.txt:16 #, priority:280 -msgid "The standard email format as described by RFC 2822, for example `Thu, 07 Apr 2005 22:13:13 +0200`." -msgstr "Das Standard-E-Mail-Format, wie es in RFC 2822 definiert ist. Zum Beispiel `Thu, 07 Apr 2005 22:13:13 +0200`." +msgid "" +"The standard email format as described by RFC 2822, for example `Thu, 07 Apr" +" 2005 22:13:13 +0200`." +msgstr "" +"Das Standard-E-Mail-Format, wie es in RFC 2822 definiert ist. Zum Beispiel " +"`Thu, 07 Apr 2005 22:13:13 +0200`." #. type: Labeled list #: en/date-formats.txt:17 @@ -3165,20 +4096,39 @@ msgstr "ISO 8601" #. type: Plain text #: en/date-formats.txt:23 #, priority:280 -msgid "Time and date specified by the ISO 8601 standard, for example `2005-04-07T22:13:13`. The parser accepts a space instead of the `T` character as well. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`." -msgstr "Uhrzeit und Datum nach dem ISO 8601-Standard, z. B. `2005-04-07T22:13:13`. Der Parser akzeptiert auch ein Leerzeichen anstelle des Zeichens \"T\". Bruchteile einer Sekunde werden ignoriert, zum Beispiel wird `2005-04-07T22:13:13.019` als `2005-04-07T22:13:13` behandelt." +msgid "" +"Time and date specified by the ISO 8601 standard, for example " +"`2005-04-07T22:13:13`. The parser accepts a space instead of the `T` " +"character as well. Fractional parts of a second will be ignored, for example" +" `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`." +msgstr "" +"Uhrzeit und Datum nach dem ISO 8601-Standard, z. B. `2005-04-07T22:13:13`. " +"Der Parser akzeptiert auch ein Leerzeichen anstelle des Zeichens \"T\". " +"Bruchteile einer Sekunde werden ignoriert, zum Beispiel wird " +"`2005-04-07T22:13:13.019` als `2005-04-07T22:13:13` behandelt." #. type: Plain text #: en/date-formats.txt:26 #, priority:280 -msgid "In addition, the date part is accepted in the following formats: `YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`." -msgstr "Außerdem wird das Datum in folgenden Formaten akzeptiert: `YYYY.MM.DD`, `MM/DD/YYYY` und `DD.MM.YYYY`." +msgid "" +"In addition, the date part is accepted in the following formats: " +"`YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`." +msgstr "" +"Außerdem wird das Datum in folgenden Formaten akzeptiert: `YYYY.MM.DD`, " +"`MM/DD/YYYY` und `DD.MM.YYYY`." #. type: Plain text #: en/date-formats.txt:31 #, priority:280 -msgid "In addition to recognizing all date formats above, the `--date` option will also try to make sense of other, more human-centric date formats, such as relative dates like \"yesterday\" or \"last Friday at noon\"." -msgstr "Zusätzlich zur Erkennung aller oben genannten Datumsformate versucht die Option `--date` auch, andere, eher menschenbezogene Datumsformate zu verstehen, wie z. B. relative Datumsangaben wie \"gestern\" oder \"letzten Freitag um 12 Uhr\"." +msgid "" +"In addition to recognizing all date formats above, the `--date` option will " +"also try to make sense of other, more human-centric date formats, such as " +"relative dates like \"yesterday\" or \"last Friday at noon\"." +msgstr "" +"Zusätzlich zur Erkennung aller oben genannten Datumsformate versucht die " +"Option `--date` auch, andere, eher menschenbezogene Datumsformate zu " +"verstehen, wie z. B. relative Datumsangaben wie \"gestern\" oder \"letzten " +"Freitag um 12 Uhr\"." #. type: Title - #: en/diff-format.txt:2 @@ -3189,14 +4139,21 @@ msgstr "Rohdaten-Ausgabe-Format" #. type: Plain text #: en/diff-format.txt:6 #, priority:280 -msgid "The raw output format from \"git-diff-index\", \"git-diff-tree\", \"git-diff-files\" and \"git diff --raw\" are very similar." -msgstr "Die rohen Ausgabeformate von \"git-diff-index\", \"git-diff-tree\", \"git-diff-files\" und \"git diff --raw\" sind sehr ähnlich." +msgid "" +"The raw output format from \"git-diff-index\", \"git-diff-tree\", \"git-" +"diff-files\" and \"git diff --raw\" are very similar." +msgstr "" +"Die rohen Ausgabeformate von \"git-diff-index\", \"git-diff-tree\", \"git-" +"diff-files\" und \"git diff --raw\" sind sehr ähnlich." #. type: Plain text #: en/diff-format.txt:9 #, priority:280 -msgid "These commands all compare two sets of things; what is compared differs:" -msgstr "Die Befehle vergleichen alle zwei Sätze von Dingen; was verglichen wird, unterscheidet sich:" +msgid "" +"These commands all compare two sets of things; what is compared differs:" +msgstr "" +"Die Befehle vergleichen alle zwei Sätze von Dingen; was verglichen wird, " +"unterscheidet sich:" #. type: Labeled list #: en/diff-format.txt:10 @@ -3232,7 +4189,9 @@ msgstr "git-diff-tree [-r] [...]" #: en/diff-format.txt:18 #, priority:280 msgid "compares the trees named by the two arguments." -msgstr "vergleicht die Verzeichnis-Bäume, die durch die beiden Argumente bestimmt wurden." +msgstr "" +"vergleicht die Verzeichnis-Bäume, die durch die beiden Argumente bestimmt " +"wurden." #. type: Labeled list #: en/diff-format.txt:19 @@ -3249,8 +4208,14 @@ msgstr "vergleicht den Index mit den Dateien auf dem Dateisystem." #. type: Plain text #: en/diff-format.txt:25 #, priority:280 -msgid "The \"git-diff-tree\" command begins its output by printing the hash of what is being compared. After that, all the commands print one output line per changed file." -msgstr "Der \"git-diff-tree\"-Befehl beginnt seine Ausgabe mit dem Ausgeben des Hashes von dem, was verglichen wird. Danach geben alle Befehle eine Ausgabezeile pro geänderter Datei aus." +msgid "" +"The \"git-diff-tree\" command begins its output by printing the hash of what" +" is being compared. After that, all the commands print one output line per " +"changed file." +msgstr "" +"Der \"git-diff-tree\"-Befehl beginnt seine Ausgabe mit dem Ausgeben des " +"Hashes von dem, was verglichen wird. Danach geben alle Befehle eine " +"Ausgabezeile pro geänderter Datei aus." #. type: Plain text #: en/diff-format.txt:27 @@ -3295,7 +4260,8 @@ msgid "mode for \"src\"; 000000 if creation or unmerged." msgstr "Modus für \"src\"; 000000 falls erstellt oder nicht gemergt." #. type: Plain text -#: en/diff-format.txt:42 en/diff-format.txt:44 en/diff-format.txt:46 en/diff-format.txt:48 +#: en/diff-format.txt:42 en/diff-format.txt:44 en/diff-format.txt:46 +#: en/diff-format.txt:48 #, priority:280 msgid "a space." msgstr "ein Leerzeichen." @@ -3315,8 +4281,12 @@ msgstr "SHA1-Hash für \"src\"; 0\\{40\\} falls erstellt oder nicht gemergt." #. type: Plain text #: en/diff-format.txt:47 #, fuzzy, priority:280 -msgid "sha1 for \"dst\"; 0\\{40\\} if deletion, unmerged or \"work tree out of sync with the index\"." -msgstr "SHA1-Hash für \"dst\"; 0\\{40\\}falls erstellt, nicht gemergt oder \"Arbeitsbereich überprüfen\"." +msgid "" +"sha1 for \"dst\"; 0\\{40\\} if deletion, unmerged or \"work tree out of sync" +" with the index\"." +msgstr "" +"SHA1-Hash für \"dst\"; 0\\{40\\}falls erstellt, nicht gemergt oder " +"\"Arbeitsbereich überprüfen\"." #. type: Plain text #: en/diff-format.txt:49 @@ -3340,7 +4310,9 @@ msgstr "Pfad für \"src\"" #: en/diff-format.txt:52 #, priority:280 msgid "a tab or a NUL when `-z` option is used; only exists for C or R." -msgstr "ein Tab oder ein NUL, wenn die `-z`-Option benutzt wird; existiert nur für C oder R." +msgstr "" +"ein Tab oder ein NUL, wenn die `-z`-Option benutzt wird; existiert nur für C" +" oder R." #. type: Plain text #: en/diff-format.txt:53 @@ -3352,7 +4324,9 @@ msgstr "Pfad für \"dst\"; existiert nur für C oder R." #: en/diff-format.txt:54 #, priority:280 msgid "an LF or a NUL when `-z` option is used, to terminate the record." -msgstr "ein LF oder ein NUL, wenn die `-z`-Option benutzt wird, um den Datensatz zu beenden." +msgstr "" +"ein LF oder ein NUL, wenn die `-z`-Option benutzt wird, um den Datensatz zu " +"beenden." #. type: Plain text #: en/diff-format.txt:56 @@ -3393,32 +4367,51 @@ msgstr "R: Umbenennen einer Datei" #. type: Plain text #: en/diff-format.txt:63 #, fuzzy, priority:280 -msgid "T: change in the type of the file (regular file, symbolic link or submodule)" +msgid "" +"T: change in the type of the file (regular file, symbolic link or submodule)" msgstr "T: Änderungen in dem Typ der Datei" #. type: Plain text #: en/diff-format.txt:65 #, priority:280 -msgid "U: file is unmerged (you must complete the merge before it can be committed)" -msgstr "U: Datei ist nicht zusammengeführt (du musst die Zusammenführung abschließen, bevor es commited werden kann)" +msgid "" +"U: file is unmerged (you must complete the merge before it can be committed)" +msgstr "" +"U: Datei ist nicht zusammengeführt (du musst die Zusammenführung " +"abschließen, bevor es commited werden kann)" #. type: Plain text #: en/diff-format.txt:66 #, priority:280 msgid "X: \"unknown\" change type (most probably a bug, please report it)" -msgstr "X: \"unbekannt\" Änderungstyp (höchstwahrscheinlich ein Bug, bitte melde ihn)" +msgstr "" +"X: \"unbekannt\" Änderungstyp (höchstwahrscheinlich ein Bug, bitte melde " +"ihn)" #. type: Plain text #: en/diff-format.txt:71 #, priority:280 -msgid "Status letters C and R are always followed by a score (denoting the percentage of similarity between the source and target of the move or copy). Status letter M may be followed by a score (denoting the percentage of dissimilarity) for file rewrites." -msgstr "Die Status-Buchstaben C und R werden immer von einer Punktzahl gefolgt (die den Prozentsatz der Ähnlichkeit zwischen Quelle und Ziel des Verschiebens oder des Kopierens angibt). Auf den Status-Buchstaben M kann eine Punktzahl (die den Prozentsatz der Unähnlichkeit angibt) für das Umschreiben von Dateien folgen." +msgid "" +"Status letters C and R are always followed by a score (denoting the " +"percentage of similarity between the source and target of the move or copy)." +" Status letter M may be followed by a score (denoting the percentage of " +"dissimilarity) for file rewrites." +msgstr "" +"Die Status-Buchstaben C und R werden immer von einer Punktzahl gefolgt (die " +"den Prozentsatz der Ähnlichkeit zwischen Quelle und Ziel des Verschiebens " +"oder des Kopierens angibt). Auf den Status-Buchstaben M kann eine Punktzahl" +" (die den Prozentsatz der Unähnlichkeit angibt) für das Umschreiben von " +"Dateien folgen." #. type: Plain text #: en/diff-format.txt:74 #, fuzzy, priority:280 -msgid "The sha1 for \"dst\" is shown as all 0's if a file on the filesystem is out of sync with the index." -msgstr " wird als alle 0 angezeigt, wenn eine Datei neu auf dem Dateisystem ist und sie nicht synchron mit dem Index ist." +msgid "" +"The sha1 for \"dst\" is shown as all 0's if a file on the filesystem is out " +"of sync with the index." +msgstr "" +" wird als alle 0 angezeigt, wenn eine Datei neu auf dem Dateisystem " +"ist und sie nicht synchron mit dem Index ist." #. type: Labeled list #: en/diff-format.txt:76 en/git-svn.txt:499 en/git-svn.txt:539 @@ -3435,8 +4428,17 @@ msgstr ":100644 100644 5be4a4a 0000000 M Datei.c\n" #. type: Plain text #: en/diff-format.txt:85 en/git-ls-files.txt:255 en/git-ls-tree.txt:134 #, priority:280 -msgid "Without the `-z` option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). Using `-z` the filename is output verbatim and the line is terminated by a NUL byte." -msgstr "Ohne die Option `-z` werden Pfadnamen mit „ungewöhnlichen“ Zeichen in Anführungszeichen gesetzt, wie für die Konfigurationsvariable `core.quotePath` erklärt (siehe linkgit:git-config[1]). Mit `-z` wird der Dateiname wortwörtlich ausgegeben und die Zeile mit einem NUL-Byte abgeschlossen." +msgid "" +"Without the `-z` option, pathnames with \"unusual\" characters are quoted as" +" explained for the configuration variable `core.quotePath` (see linkgit:git-" +"config[1]). Using `-z` the filename is output verbatim and the line is " +"terminated by a NUL byte." +msgstr "" +"Ohne die Option `-z` werden Pfadnamen mit „ungewöhnlichen“ Zeichen in " +"Anführungszeichen gesetzt, wie für die Konfigurationsvariable " +"`core.quotePath` erklärt (siehe linkgit:git-config[1]). Mit `-z` wird der " +"Dateiname wortwörtlich ausgegeben und die Zeile mit einem NUL-Byte " +"abgeschlossen." #. type: Title - #: en/diff-format.txt:87 @@ -3447,8 +4449,15 @@ msgstr "diff-Format bei Merges" #. type: Plain text #: en/diff-format.txt:93 #, priority:280 -msgid "\"git-diff-tree\", \"git-diff-files\" and \"git-diff --raw\" can take `-c` or `--cc` option to generate diff output also for merge commits. The output differs from the format described above in the following way:" -msgstr "„git-diff-tree“, „git-diff-files“ und „git-diff --raw“ können die Option `-c` oder `--cc` benutzen, um Diff-Ausgaben auch für Merge-Commits zu erzeugen. Die Ausgabe unterscheidet sich von dem oben beschriebenen Format in der folgenden Weise:" +msgid "" +"\"git-diff-tree\", \"git-diff-files\" and \"git-diff --raw\" can take `-c` " +"or `--cc` option to generate diff output also for merge commits. The output" +" differs from the format described above in the following way:" +msgstr "" +"„git-diff-tree“, „git-diff-files“ und „git-diff --raw“ können die Option " +"`-c` oder `--cc` benutzen, um Diff-Ausgaben auch für Merge-Commits zu " +"erzeugen. Die Ausgabe unterscheidet sich von dem oben beschriebenen Format " +"in der folgenden Weise:" #. type: Plain text #: en/diff-format.txt:95 @@ -3466,7 +4475,8 @@ msgstr "Es gibt weitere „src“-Modi und „src“-SHA1-Hashes" #: en/diff-format.txt:97 #, priority:280 msgid "status is concatenated status characters for each parent" -msgstr "Für jedes Elternteil ist der Status als verkettete Statuszeichen dargestellt" +msgstr "" +"Für jedes Elternteil ist der Status als verkettete Statuszeichen dargestellt" #. type: Plain text #: en/diff-format.txt:98 @@ -3483,7 +4493,11 @@ msgstr "Pfadnamen der Datei werden durch Tabulatoren getrennt" #. type: Plain text #: en/diff-format.txt:104 #, priority:280 -msgid "For `-c` and `--cc`, only the destination or final path is shown even if the file was renamed on any side of history. With `--combined-all-paths`, the name of the path in each parent is shown followed by the name of the path in the merge commit." +msgid "" +"For `-c` and `--cc`, only the destination or final path is shown even if the" +" file was renamed on any side of history. With `--combined-all-paths`, the " +"name of the path in each parent is shown followed by the name of the path in" +" the merge commit." msgstr "" #. type: Plain text @@ -3519,8 +4533,12 @@ msgstr "" #. type: Plain text #: en/diff-format.txt:122 #, priority:280 -msgid "Note that 'combined diff' lists only files which were modified from all parents." -msgstr "Beachten Sie bitte, dass 'combined diff' nur Dateien auflistet, die von allen Elternteilen modifiziert wurden." +msgid "" +"Note that 'combined diff' lists only files which were modified from all " +"parents." +msgstr "" +"Beachten Sie bitte, dass 'combined diff' nur Dateien auflistet, die von " +"allen Elternteilen modifiziert wurden." #. type: Title - #: en/diff-format.txt:128 @@ -3531,14 +4549,31 @@ msgstr "andere diff-Formate" #. type: Plain text #: en/diff-format.txt:134 #, priority:280 -msgid "The `--summary` option describes newly added, deleted, renamed and copied files. The `--stat` option adds diffstat(1) graph to the output. These options can be combined with other options, such as `-p`, and are meant for human consumption." -msgstr "Die Option `--summary` beschreibt neu hinzugefügte, gelöschte, umbenannte und kopierte Dateien. Die Option `--stat` fügt ein diffstat(1)-Diagramm zur Ausgabe hinzu. Diese Optionen können mit anderen Optionen, wie z.B. `-p`, kombiniert werden und sind für den Gebrauch durch Personen gedacht." +msgid "" +"The `--summary` option describes newly added, deleted, renamed and copied " +"files. The `--stat` option adds diffstat(1) graph to the output. These " +"options can be combined with other options, such as `-p`, and are meant for " +"human consumption." +msgstr "" +"Die Option `--summary` beschreibt neu hinzugefügte, gelöschte, umbenannte " +"und kopierte Dateien. Die Option `--stat` fügt ein diffstat(1)-Diagramm zur" +" Ausgabe hinzu. Diese Optionen können mit anderen Optionen, wie z.B. `-p`, " +"kombiniert werden und sind für den Gebrauch durch Personen gedacht." #. type: Plain text #: en/diff-format.txt:139 #, priority:280 -msgid "When showing a change that involves a rename or a copy, `--stat` output formats the pathnames compactly by combining common prefix and suffix of the pathnames. For example, a change that moves `arch/i386/Makefile` to `arch/x86/Makefile` while modifying 4 lines will be shown like this:" -msgstr "Wenn eine Änderung angezeigt wird, die eine Umbenennung oder eine Kopie beinhaltet, formatiert `--stat` die Pfadnamen kompakt, indem es gemeinsame Präfixe und Suffixe der Pfadnamen vereint. Zum Beispiel wird eine Änderung, die `arch/i386/Makefile` nach `arch/x86/Makefile` verschiebt, wobei noch 4 Zeilen modifiziert werden, wie folgt dargestellt:" +msgid "" +"When showing a change that involves a rename or a copy, `--stat` output " +"formats the pathnames compactly by combining common prefix and suffix of the" +" pathnames. For example, a change that moves `arch/i386/Makefile` to " +"`arch/x86/Makefile` while modifying 4 lines will be shown like this:" +msgstr "" +"Wenn eine Änderung angezeigt wird, die eine Umbenennung oder eine Kopie " +"beinhaltet, formatiert `--stat` die Pfadnamen kompakt, indem es gemeinsame " +"Präfixe und Suffixe der Pfadnamen vereint. Zum Beispiel wird eine Änderung," +" die `arch/i386/Makefile` nach `arch/x86/Makefile` verschiebt, wobei noch 4 " +"Zeilen modifiziert werden, wie folgt dargestellt:" #. type: delimited block - #: en/diff-format.txt:142 @@ -3549,8 +4584,14 @@ msgstr "arch/{i386 => x86}/Makefile | 4 +--\n" #. type: Plain text #: en/diff-format.txt:147 #, priority:280 -msgid "The `--numstat` option gives the diffstat(1) information but is designed for easier machine consumption. An entry in `--numstat` output looks like this:" -msgstr "Die Option `--numstat` liefert die diffstat(1)-Informationen, ist aber hauptsächlich die maschinelle Verarbeitung gedacht. Ein solcher Einsatz in der `--numstat`-Ausgabe sieht wie folgt aus:" +msgid "" +"The `--numstat` option gives the diffstat(1) information but is designed for" +" easier machine consumption. An entry in `--numstat` output looks like " +"this:" +msgstr "" +"Die Option `--numstat` liefert die diffstat(1)-Informationen, ist aber " +"hauptsächlich die maschinelle Verarbeitung gedacht. Ein solcher Einsatz in " +"der `--numstat`-Ausgabe sieht wie folgt aus:" #. type: delimited block - #: en/diff-format.txt:151 @@ -3575,7 +4616,8 @@ msgid "the number of added lines;" msgstr "die Anzahl der eingefügten Zeilen;" #. type: Plain text -#: en/diff-format.txt:157 en/diff-format.txt:159 en/diff-format.txt:173 en/diff-format.txt:175 +#: en/diff-format.txt:157 en/diff-format.txt:159 en/diff-format.txt:173 +#: en/diff-format.txt:175 #, priority:280 msgid "a tab;" msgstr "ein Tabulator;" @@ -3601,8 +4643,10 @@ msgstr "eine neue Zeile." #. type: Plain text #: en/diff-format.txt:163 #, priority:280 -msgid "When `-z` output option is in effect, the output is formatted this way:" -msgstr "Wenn die Ausgabeoption `-z` aktiv ist, wird die Ausgabe so formatiert:" +msgid "" +"When `-z` output option is in effect, the output is formatted this way:" +msgstr "" +"Wenn die Ausgabeoption `-z` aktiv ist, wird die Ausgabe so formatiert:" #. type: delimited block - #: en/diff-format.txt:167 @@ -3647,8 +4691,20 @@ msgstr "ein NUL." #. type: Plain text #: en/diff-format.txt:185 #, priority:280 -msgid "The extra `NUL` before the preimage path in renamed case is to allow scripts that read the output to tell if the current record being read is a single-path record or a rename/copy record without reading ahead. After reading added and deleted lines, reading up to `NUL` would yield the pathname, but if that is `NUL`, the record will show two paths." -msgstr "Die zusätzliche `NUL` vor dem Pre-Image-Pfad (falls eine Umbenennung vorliegt) soll es auslesenden Skripten ermöglichen zu erkennen, ob bei dem aktuell gelesenen Datensatz ein Single-Path-Datensatz oder ein Datensatz zum Umbenennen/Kopieren vorliegt, ohne ihn vorab lesen zu müssen. Nach dem Lesen von hinzugefügten und gelöschten Zeilen würde das Lesen bis zur `NUL` den Pfadnamen ergeben, wenn aber dieser `NUL` ist, zeigt der Datensatz zwei Pfade an." +msgid "" +"The extra `NUL` before the preimage path in renamed case is to allow scripts" +" that read the output to tell if the current record being read is a single-" +"path record or a rename/copy record without reading ahead. After reading " +"added and deleted lines, reading up to `NUL` would yield the pathname, but " +"if that is `NUL`, the record will show two paths." +msgstr "" +"Die zusätzliche `NUL` vor dem Pre-Image-Pfad (falls eine Umbenennung " +"vorliegt) soll es auslesenden Skripten ermöglichen zu erkennen, ob bei dem " +"aktuell gelesenen Datensatz ein Single-Path-Datensatz oder ein Datensatz zum" +" Umbenennen/Kopieren vorliegt, ohne ihn vorab lesen zu müssen. Nach dem " +"Lesen von hinzugefügten und gelöschten Zeilen würde das Lesen bis zur `NUL` " +"den Pfadnamen ergeben, wenn aber dieser `NUL` ist, zeigt der Datensatz zwei " +"Pfade an." #. type: Title - #: en/diff-generate-patch.txt:3 @@ -3659,13 +4715,21 @@ msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:16 #, priority:280 -msgid "Running linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], or linkgit:git-diff-files[1] with the `-p` option produces patch text. You can customize the creation of patch text via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables (see linkgit:git[1]), and the `diff` attribute (see linkgit:gitattributes[5])." +msgid "" +"Running linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], " +"linkgit:git-diff-index[1], linkgit:git-diff-tree[1], or linkgit:git-diff-" +"files[1] with the `-p` option produces patch text. You can customize the " +"creation of patch text via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` " +"environment variables (see linkgit:git[1]), and the `diff` attribute (see " +"linkgit:gitattributes[5])." msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:19 #, priority:280 -msgid "What the -p option produces is slightly different from the traditional diff format:" +msgid "" +"What the -p option produces is slightly different from the traditional diff " +"format:" msgstr "" #. type: Plain text @@ -3683,13 +4747,19 @@ msgstr "diff --git a/datei1 b/datei2\n" #. type: Plain text #: en/diff-generate-patch.txt:27 #, priority:280 -msgid "The `a/` and `b/` filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, `/dev/null` is _not_ used in place of the `a/` or `b/` filenames." +msgid "" +"The `a/` and `b/` filenames are the same unless rename/copy is involved. " +"Especially, even for a creation or a deletion, `/dev/null` is _not_ used in " +"place of the `a/` or `b/` filenames." msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:31 #, priority:280 -msgid "When a rename/copy is involved, `file1` and `file2` show the name of the source file of the rename/copy and the name of the file that the rename/copy produces, respectively." +msgid "" +"When a rename/copy is involved, `file1` and `file2` show the name of the " +"source file of the rename/copy and the name of the file that the rename/copy" +" produces, respectively." msgstr "" #. type: Plain text @@ -3718,37 +4788,57 @@ msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:48 #, priority:280 -msgid "File modes are printed as 6-digit octal numbers including the file type and file permission bits." +msgid "" +"File modes are printed as 6-digit octal numbers including the file type and " +"file permission bits." msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:50 #, priority:280 -msgid "Path names in extended headers do not include the `a/` and `b/` prefixes." +msgid "" +"Path names in extended headers do not include the `a/` and `b/` prefixes." msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:57 #, priority:280 -msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one." +msgid "" +"The similarity index is the percentage of unchanged lines, and the " +"dissimilarity index is the percentage of changed lines. It is a rounded " +"down integer, followed by a percent sign. The similarity index value of " +"100% is thus reserved for two equal files, while 100% dissimilarity means " +"that no line from the old file made it into the new one." msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:61 #, priority:280 -msgid "The index line includes the blob object names before and after the change. The is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode." +msgid "" +"The index line includes the blob object names before and after the change. " +"The is included if the file mode does not change; otherwise, separate" +" lines indicate the old and the new mode." msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:65 #, fuzzy, priority:280 -msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])." -msgstr "Ohne diese Option werden Pfadnamen mit „unüblichen“ Zeichen in Anführungszeichen gesetzt, wie es für die Konfigurations-Variable `core.quotePath` definiert ist (siehe linkgit:git-config[1])." +msgid "" +"Pathnames with \"unusual\" characters are quoted as explained for the " +"configuration variable `core.quotePath` (see linkgit:git-config[1])." +msgstr "" +"Ohne diese Option werden Pfadnamen mit „unüblichen“ Zeichen in " +"Anführungszeichen gesetzt, wie es für die Konfigurations-Variable " +"`core.quotePath` definiert ist (siehe linkgit:git-config[1])." #. type: Plain text #: en/diff-generate-patch.txt:70 #, priority:280 -msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:" +msgid "" +"All the `file1` files in the output refer to files before the commit, and " +"all the `file2` files refer to files after the commit. It is incorrect to " +"apply each change to each file sequentially. For example, this patch will " +"swap a and b:" msgstr "" #. type: Plain text @@ -3766,7 +4856,10 @@ msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:82 #, priority:280 -msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages." +msgid "" +"Hunk headers mention the name of the function to which the hunk applies. " +"See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for " +"details of how to tailor this to specific languages." msgstr "" #. type: Title - @@ -3778,7 +4871,12 @@ msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:93 #, priority:280 -msgid "Any diff-generating command can take the `-c` or `--cc` option to produce a 'combined diff' when showing a merge. This is the default format when showing merges with linkgit:git-diff[1] or linkgit:git-show[1]. Note also that you can give suitable `--diff-merges` option to any of these commands to force generation of diffs in a specific format." +msgid "" +"Any diff-generating command can take the `-c` or `--cc` option to produce a " +"'combined diff' when showing a merge. This is the default format when " +"showing merges with linkgit:git-diff[1] or linkgit:git-show[1]. Note also " +"that you can give suitable `--diff-merges` option to any of these commands " +"to force generation of diffs in a specific format." msgstr "" #. type: Plain text @@ -3833,7 +4931,9 @@ msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:128 #, priority:280 -msgid "It is preceded by a \"git diff\" header, that looks like this (when the `-c` option is used):" +msgid "" +"It is preceded by a \"git diff\" header, that looks like this (when the `-c`" +" option is used):" msgstr "" #. type: Plain text @@ -3857,7 +4957,9 @@ msgstr " diff --cc Datei\n" #. type: Plain text #: en/diff-generate-patch.txt:137 #, priority:280 -msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):" +msgid "" +"It is followed by one or more extended header lines (this example shows a " +"merge with two parents):" msgstr "" #. type: Plain text @@ -3873,7 +4975,12 @@ msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:148 #, priority:280 -msgid "The `mode ,..` line appears only if at least one of the is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two and are not used by combined diff format." +msgid "" +"The `mode ,..` line appears only if at least one of the " +" is different from the rest. Extended headers with information about " +"detected content movement (renames and copying detection) are designed to " +"work with the diff of two and are not used by combined diff " +"format." msgstr "" #. type: Plain text @@ -3883,7 +4990,8 @@ msgid "It is followed by a two-line from-file/to-file header:" msgstr "" #. type: Plain text -#: en/diff-generate-patch.txt:152 en/diff-generate-patch.txt:163 en/diff-generate-patch.txt:164 en/diff-generate-patch.txt:165 +#: en/diff-generate-patch.txt:152 en/diff-generate-patch.txt:163 +#: en/diff-generate-patch.txt:164 en/diff-generate-patch.txt:165 #, priority:280 msgid "a/file" msgstr "" @@ -3897,25 +5005,36 @@ msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:157 #, priority:280 -msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files." +msgid "" +"Similar to the two-line header for the traditional 'unified' diff format, " +"`/dev/null` is used to signal created or deleted files." msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:161 #, priority:280 -msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:" +msgid "" +"However, if the --combined-all-paths option is provided, instead of a two-" +"line from-file/to-file, you get an N+1 line from-file/to-file header, where " +"N is the number of parents in the merge commit:" msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:170 #, priority:280 -msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents." +msgid "" +"This extended format can be useful if rename or copy detection is active, to" +" allow you to see the original name of the file in different parents." msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:176 #, priority:280 -msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:" +msgid "" +"Chunk header format is modified to prevent people from accidentally feeding " +"it to `patch -p1`. Combined diff format was created for review of merge " +"commit changes, and was not meant to be applied. The change is similar to " +"the change in the extended 'index' header:" msgstr "" #. type: Plain text @@ -3927,31 +5046,54 @@ msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:181 #, priority:280 -msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format." +msgid "" +"There are (number of parents + 1) `@` characters in the chunk header for " +"combined diff format." msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:190 #, ignore-ellipsis, priority:280 -msgid "Unlike the traditional 'unified' diff format, which shows two files A and B with a single column that has `-` (minus -- appears in A but removed in B), `+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) prefix, this format compares two or more files file1, file2,... with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it." +msgid "" +"Unlike the traditional 'unified' diff format, which shows two files A and B " +"with a single column that has `-` (minus -- appears in A but removed in B), " +"`+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) " +"prefix, this format compares two or more files file1, file2,... with one " +"file X, and shows how X differs from each of fileN. One column for each of " +"fileN is prepended to the output line to note how X's line is different from" +" it." msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:196 #, priority:280 -msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)." +msgid "" +"A `-` character in the column N means that the line appears in fileN but it " +"does not appear in the result. A `+` character in the column N means that " +"the line appears in the result, and fileN does not have that line (in other " +"words, the line was added, from the point of view of that parent)." msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:202 #, priority:280 -msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)." +msgid "" +"In the above example output, the function signature was changed from both " +"files (hence two `-` removals from both file1 and file2, plus `++` to mean " +"one line that was added does not appear in either file1 or file2). Also, " +"eight other lines are the same from file1 but do not appear in file2 (hence " +"prefixed with `+`)." msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:208 #, priority:280 -msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")." +msgid "" +"When shown by `git diff-tree -c`, it compares the parents of a merge commit " +"with the merge result (i.e. file1..fileN are the parents). When shown by " +"`git diff-files -c`, it compares the two unresolved merge parents with the " +"working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage" +" 3 aka \"their version\")." msgstr "" #. type: Labeled list @@ -3967,13 +5109,17 @@ msgid "Generate plain patches without any diffstats." msgstr "Generiert einfache Patches ohne irgendwelche Diffstats." #. type: Labeled list -#: en/diff-options.txt:23 en/fetch-options.txt:264 en/git-add.txt:119 en/git-am.txt:92 en/git-checkout-index.txt:26 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:80 en/git-mailinfo.txt:54 en/git-push.txt:373 en/git-read-tree.txt:45 en/git-stash.txt:166 +#: en/diff-options.txt:23 en/fetch-options.txt:264 en/git-add.txt:119 +#: en/git-am.txt:92 en/git-checkout-index.txt:26 en/git-cvsexportcommit.txt:64 +#: en/git-cvsimport.txt:98 en/git-ls-files.txt:80 en/git-mailinfo.txt:54 +#: en/git-push.txt:373 en/git-read-tree.txt:45 en/git-stash.txt:166 #, ignore-same, no-wrap, priority:300 msgid "-u" msgstr "-u" #. type: Labeled list -#: en/diff-options.txt:24 en/git-add.txt:97 en/git-checkout.txt:277 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:197 +#: en/diff-options.txt:24 en/git-add.txt:97 en/git-checkout.txt:277 +#: en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:197 #, ignore-same, no-wrap, priority:300 msgid "--patch" msgstr "--patch" @@ -3983,7 +5129,8 @@ msgstr "--patch" #, fuzzy, priority:280 #| msgid "Generate patch (see section on generating patches)." msgid "Generate patch (see <>)." -msgstr "Patch generieren (siehe den Abschnitt über das Erstellen von Patches)." +msgstr "" +"Patch generieren (siehe den Abschnitt über das Erstellen von Patches)." #. type: Plain text #: en/diff-options.txt:28 en/diff-options.txt:146 @@ -3992,7 +5139,12 @@ msgid "\tThis is the default.\n" msgstr "\tDas ist die Standardeinstellung.\n" #. type: Labeled list -#: en/diff-options.txt:30 en/git-am.txt:38 en/git-blame.txt:75 en/git-cat-file.txt:44 en/git-cherry-pick.txt:105 en/git-clone.txt:76 en/git-diff-tree.txt:77 en/git-format-patch.txt:138 en/git-ls-files.txt:68 en/git-revert.txt:100 en/git-shortlog.txt:34 en/git-show-ref.txt:53 en/git-status.txt:27 en/git-stripspace.txt:38 en/git-svn.txt:46 en/git-tag.txt:64 en/git-verify-pack.txt:31 en/signoff-option.txt:2 +#: en/diff-options.txt:30 en/git-am.txt:38 en/git-blame.txt:75 +#: en/git-cat-file.txt:44 en/git-cherry-pick.txt:105 en/git-clone.txt:76 +#: en/git-diff-tree.txt:77 en/git-format-patch.txt:138 en/git-ls-files.txt:68 +#: en/git-revert.txt:100 en/git-shortlog.txt:34 en/git-show-ref.txt:53 +#: en/git-status.txt:27 en/git-stripspace.txt:38 en/git-svn.txt:46 +#: en/git-tag.txt:64 en/git-verify-pack.txt:31 en/signoff-option.txt:2 #, ignore-same, no-wrap, priority:300 msgid "-s" msgstr "-s" @@ -4006,12 +5158,26 @@ msgstr "--no-patch" #. type: Plain text #: en/diff-options.txt:36 #, fuzzy, priority:280 -#| msgid "Suppress diff output. Useful for commands like `git show` that show the patch by default, or to cancel the effect of `--patch`." -msgid "Suppress all output from the diff machinery. Useful for commands like `git show` that show the patch by default to squelch their output, or to cancel the effect of options like `--patch`, `--stat` earlier on the command line in an alias." -msgstr "Diff-Ausgabe unterdrücken. Sinnvoll für Befehle wie `git show`, die den Patch standardmäßig anzeigen oder um die Wirkung von `--patch` aufzuheben." +#| msgid "" +#| "Suppress diff output. Useful for commands like `git show` that show the " +#| "patch by default, or to cancel the effect of `--patch`." +msgid "" +"Suppress all output from the diff machinery. Useful for commands like `git " +"show` that show the patch by default to squelch their output, or to cancel " +"the effect of options like `--patch`, `--stat` earlier on the command line " +"in an alias." +msgstr "" +"Diff-Ausgabe unterdrücken. Sinnvoll für Befehle wie `git show`, die den " +"Patch standardmäßig anzeigen oder um die Wirkung von `--patch` aufzuheben." #. type: Labeled list -#: en/diff-options.txt:40 en/git-am.txt:77 en/git-branch.txt:131 en/git-checkout.txt:248 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 en/git-help.txt:96 en/git-instaweb.txt:36 en/git-ls-files.txt:48 en/git-mailinfo.txt:71 en/git-read-tree.txt:33 en/git-rebase.txt:363 en/git-repack.txt:247 en/git-restore.txt:88 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:58 +#: en/diff-options.txt:40 en/git-am.txt:77 en/git-branch.txt:131 +#: en/git-checkout.txt:248 en/git-cvsexportcommit.txt:60 +#: en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 +#: en/git-help.txt:96 en/git-instaweb.txt:36 en/git-ls-files.txt:48 +#: en/git-mailinfo.txt:71 en/git-read-tree.txt:33 en/git-rebase.txt:363 +#: en/git-repack.txt:247 en/git-restore.txt:88 en/git-svn.txt:308 +#: en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:58 #, ignore-same, no-wrap, priority:280 msgid "-m" msgstr "-m" @@ -4019,11 +5185,18 @@ msgstr "-m" #. type: Plain text #: en/diff-options.txt:44 #, priority:280 -msgid "Show diffs for merge commits in the default format. This is similar to '--diff-merges=on', except `-m` will produce no output unless `-p` is given as well." +msgid "" +"Show diffs for merge commits in the default format. This is similar to '--" +"diff-merges=on', except `-m` will produce no output unless `-p` is given as " +"well." msgstr "" #. type: Labeled list -#: en/diff-options.txt:45 en/git-am.txt:57 en/git-blame.txt:53 en/git-branch.txt:138 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:93 en/git-grep.txt:188 en/git-help.txt:65 en/git-ls-files.txt:38 en/git-shortlog.txt:87 en/git-stripspace.txt:42 +#: en/diff-options.txt:45 en/git-am.txt:57 en/git-blame.txt:53 +#: en/git-branch.txt:138 en/git-cvsexportcommit.txt:37 +#: en/git-diff-files.txt:37 en/git-diff-tree.txt:93 en/git-grep.txt:188 +#: en/git-help.txt:65 en/git-ls-files.txt:38 en/git-shortlog.txt:87 +#: en/git-stripspace.txt:42 #, ignore-same, no-wrap, priority:280 msgid "-c" msgstr "-c" @@ -4031,7 +5204,9 @@ msgstr "-c" #. type: Plain text #: en/diff-options.txt:48 #, priority:280 -msgid "Produce combined diff output for merge commits. Shortcut for '--diff-merges=combined -p'." +msgid "" +"Produce combined diff output for merge commits. Shortcut for '--diff-" +"merges=combined -p'." msgstr "" #. type: Labeled list @@ -4043,7 +5218,9 @@ msgstr "--cc" #. type: Plain text #: en/diff-options.txt:52 #, priority:280 -msgid "Produce dense combined diff output for merge commits. Shortcut for '--diff-merges=dense-combined -p'." +msgid "" +"Produce dense combined diff output for merge commits. Shortcut for '--diff-" +"merges=dense-combined -p'." msgstr "" #. type: Labeled list @@ -4055,7 +5232,9 @@ msgstr "--dd" #. type: Plain text #: en/diff-options.txt:57 #, priority:280 -msgid "Produce diff with respect to first parent for both merge and regular commits. Shortcut for '--diff-merges=first-parent -p'." +msgid "" +"Produce diff with respect to first parent for both merge and regular " +"commits. Shortcut for '--diff-merges=first-parent -p'." msgstr "" #. type: Labeled list @@ -4067,7 +5246,9 @@ msgstr "--remerge-diff" #. type: Plain text #: en/diff-options.txt:61 #, priority:280 -msgid "Produce remerge-diff output for merge commits. Shortcut for '--diff-merges=remerge -p'." +msgid "" +"Produce remerge-diff output for merge commits. Shortcut for '--diff-" +"merges=remerge -p'." msgstr "" #. type: Labeled list @@ -4091,7 +5272,10 @@ msgstr "diffmerge" #. type: Plain text #: en/diff-options.txt:69 #, priority:280 -msgid "Specify diff format to be used for merge commits. Default is {diff-merges-default} unless `--first-parent` is in use, in which case `first-parent` is the default." +msgid "" +"Specify diff format to be used for merge commits. Default is {diff-merges-" +"default} unless `--first-parent` is in use, in which case `first-parent` is " +"the default." msgstr "" #. type: Plain text @@ -4110,7 +5294,8 @@ msgstr "none" #. type: Plain text #: en/diff-options.txt:76 #, priority:280 -msgid "Disable output of diffs for merge commits. Useful to override implied value." +msgid "" +"Disable output of diffs for merge commits. Useful to override implied value." msgstr "" #. type: Labeled list @@ -4122,7 +5307,10 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:82 #, priority:280 -msgid "Make diff output for merge commits to be shown in the default format. The default format can be changed using `log.diffMerges` configuration variable, whose default value is `separate`." +msgid "" +"Make diff output for merge commits to be shown in the default format. The " +"default format can be changed using `log.diffMerges` configuration variable," +" whose default value is `separate`." msgstr "" #. type: Labeled list @@ -4135,7 +5323,9 @@ msgstr "--first-parent" #. type: Plain text #: en/diff-options.txt:86 #, priority:280 -msgid "Show full diff with respect to first parent. This is the same format as `--patch` produces for non-merge commits." +msgid "" +"Show full diff with respect to first parent. This is the same format as " +"`--patch` produces for non-merge commits." msgstr "" #. type: Labeled list @@ -4147,7 +5337,9 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:90 #, priority:280 -msgid "Show full diff with respect to each of parents. Separate log entry and diff is generated for each parent." +msgid "" +"Show full diff with respect to each of parents. Separate log entry and diff" +" is generated for each parent." msgstr "" #. type: Labeled list @@ -4159,7 +5351,10 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:96 #, priority:280 -msgid "Show differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents." +msgid "" +"Show differences from each of the parents to the merge result simultaneously" +" instead of showing pairwise diff between a parent and the result one at a " +"time. Furthermore, it lists only files which were modified from all parents." msgstr "" #. type: Labeled list @@ -4171,7 +5366,10 @@ msgstr "diffmerge" #. type: Plain text #: en/diff-options.txt:102 #, priority:280 -msgid "Further compress output produced by `--diff-merges=combined` by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification." +msgid "" +"Further compress output produced by `--diff-merges=combined` by omitting " +"uninteresting hunks whose contents in the parents have only two variants and" +" the merge result picks one of them without modification." msgstr "" #. type: Labeled list @@ -4184,13 +5382,18 @@ msgstr "emerge" #. type: Plain text #: en/diff-options.txt:108 #, priority:280 -msgid "Remerge two-parent merge commits to create a temporary tree object--potentially containing files with conflict markers and such. A diff is then shown between that temporary tree and the actual merge commit." +msgid "" +"Remerge two-parent merge commits to create a temporary tree object--" +"potentially containing files with conflict markers and such. A diff is then" +" shown between that temporary tree and the actual merge commit." msgstr "" #. type: Plain text #: en/diff-options.txt:112 #, priority:280 -msgid "The output emitted when this option is used is subject to change, and so is its interaction with other options (unless explicitly documented)." +msgid "" +"The output emitted when this option is used is subject to change, and so is " +"its interaction with other options (unless explicitly documented)." msgstr "" #. type: Labeled list @@ -4202,7 +5405,12 @@ msgstr "--combined-all-paths" #. type: Plain text #: en/diff-options.txt:120 #, priority:280 -msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when `--diff-merges=[dense-]combined` is in use, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)." +msgid "" +"This flag causes combined diffs (used for merge commits) to list the name of" +" the file from all parents. It thus only has effect when `--diff-" +"merges=[dense-]combined` is in use, and is likely only useful if filename " +"changes are detected (i.e. when either rename or copy detection have been " +"requested)." msgstr "" #. type: Labeled list @@ -4221,7 +5429,9 @@ msgstr "--unified=" #: en/diff-options.txt:126 #, fuzzy, priority:280 msgid "Generate diffs with lines of context instead of the usual three." -msgstr "Erzeugt Diffs mit Kontextzeilen, anstatt der üblichen drei. Das impliziert `--patch`." +msgstr "" +"Erzeugt Diffs mit Kontextzeilen, anstatt der üblichen drei. Das " +"impliziert `--patch`." #. type: Plain text #: en/diff-options.txt:128 en/diff-options.txt:537 @@ -4262,11 +5472,17 @@ msgstr "--output-indicator-context=" #. type: Plain text #: en/diff-options.txt:139 #, priority:280 -msgid "Specify the character used to indicate new, old or context lines in the generated patch. Normally they are '+', '-' and ' ' respectively." -msgstr "Gibt das Zeichen an, das verwendet wird, um neue, alte oder Kontextzeilen im generierten Patch anzuzeigen. Normalerweise sind das '+', '-' und ' ' (Leerzeichen)." +msgid "" +"Specify the character used to indicate new, old or context lines in the " +"generated patch. Normally they are '+', '-' and ' ' respectively." +msgstr "" +"Gibt das Zeichen an, das verwendet wird, um neue, alte oder Kontextzeilen im" +" generierten Patch anzuzeigen. Normalerweise sind das '+', '-' und ' ' " +"(Leerzeichen)." #. type: Labeled list -#: en/diff-options.txt:141 en/git-replace.txt:78 en/git-verify-commit.txt:19 en/git-verify-tag.txt:19 +#: en/diff-options.txt:141 en/git-replace.txt:78 en/git-verify-commit.txt:19 +#: en/git-verify-tag.txt:19 #, ignore-same, no-wrap, priority:280 msgid "--raw" msgstr "--raw" @@ -4309,7 +5525,9 @@ msgstr "Synonym für `-p --raw`." #: en/diff-options.txt:165 #, fuzzy, priority:280 msgid "Show the tree objects in the diff output." -msgstr "Zeigt nur Namen und die Art der Änderung, nicht aber die tatsächliche Ausgabe von diff." +msgstr "" +"Zeigt nur Namen und die Art der Änderung, nicht aber die tatsächliche " +"Ausgabe von diff." #. type: Labeled list #: en/diff-options.txt:167 @@ -4320,8 +5538,13 @@ msgstr "--indent-heuristic" #. type: Plain text #: en/diff-options.txt:170 #, priority:280 -msgid "Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default." -msgstr "Aktiviert die Heuristik, mit der die Abgrenzung unterschiedlicher Hunk-Objekte verlagert wird, um Patches leichter lesbar zu machen. Das ist die Standardeinstellung." +msgid "" +"Enable the heuristic that shifts diff hunk boundaries to make patches easier" +" to read. This is the default." +msgstr "" +"Aktiviert die Heuristik, mit der die Abgrenzung unterschiedlicher Hunk-" +"Objekte verlagert wird, um Patches leichter lesbar zu machen. Das ist die " +"Standardeinstellung." #. type: Labeled list #: en/diff-options.txt:171 @@ -4345,7 +5568,8 @@ msgstr "--minimal" #: en/diff-options.txt:177 en/diff-options.txt:203 #, priority:280 msgid "Spend extra time to make sure the smallest possible diff is produced." -msgstr "Verwendet zusätzliche Zeit darauf, um das kleinstmögliche Diff zu erzeugen." +msgstr "" +"Verwendet zusätzliche Zeit darauf, um das kleinstmögliche Diff zu erzeugen." #. type: Labeled list #: en/diff-options.txt:178 @@ -4392,8 +5616,16 @@ msgstr "Diese Option kann mehr als einmal angegeben werden." #. type: Plain text #: en/diff-options.txt:193 #, priority:280 -msgid "If a line exists in both the source and destination, exists only once, and starts with this text, this algorithm attempts to prevent it from appearing as a deletion or addition in the output. It uses the \"patience diff\" algorithm internally." -msgstr "Falls eine Zeile, die sowohl in der Quelle als auch im Ziel existiert, aber nur einmal vorhanden ist und mit diesem beginnt, versucht dieser Algorithmus zu verhindern, dass sie in der Ausgabe als Löschung oder Einfügung erscheint. Er verwendet intern den „patience diff“-Algorithmus." +msgid "" +"If a line exists in both the source and destination, exists only once, and " +"starts with this text, this algorithm attempts to prevent it from appearing " +"as a deletion or addition in the output. It uses the \"patience diff\" " +"algorithm internally." +msgstr "" +"Falls eine Zeile, die sowohl in der Quelle als auch im Ziel existiert, aber " +"nur einmal vorhanden ist und mit diesem beginnt, versucht dieser " +"Algorithmus zu verhindern, dass sie in der Ausgabe als Löschung oder " +"Einfügung erscheint. Er verwendet intern den „patience diff“-Algorithmus." #. type: Labeled list #: en/diff-options.txt:194 @@ -4405,7 +5637,9 @@ msgstr "--diff-algorithm={patience|minimal|histogram|myers}" #: en/diff-options.txt:196 #, priority:280 msgid "Choose a diff algorithm. The variants are as follows:" -msgstr "Einen Diff-Algorithmus auswählen. Die verschiedenen Alternativen folgen unten:" +msgstr "" +"Einen Diff-Algorithmus auswählen. Die verschiedenen Alternativen folgen " +"unten:" #. type: Labeled list #: en/diff-options.txt:198 @@ -4417,7 +5651,9 @@ msgstr "`default`, `myers`" #: en/diff-options.txt:200 #, priority:280 msgid "The basic greedy diff algorithm. Currently, this is the default." -msgstr "Der allgemeine „gefräßige“ Diff-Algorithmus. Derzeit ist dies die Standardeinstellung." +msgstr "" +"Der allgemeine „gefräßige“ Diff-Algorithmus. Derzeit ist dies die " +"Standardeinstellung." #. type: Labeled list #: en/diff-options.txt:200 @@ -4435,7 +5671,8 @@ msgstr "`patience`" #: en/diff-options.txt:205 #, priority:280 msgid "Use \"patience diff\" algorithm when generating patches." -msgstr "Verwenden Sie den \"patience diff\"-Algorithmus zum Generieren von Patches." +msgstr "" +"Verwenden Sie den \"patience diff\"-Algorithmus zum Generieren von Patches." #. type: Labeled list #: en/diff-options.txt:205 @@ -4446,14 +5683,24 @@ msgstr "`histogram`" #. type: Plain text #: en/diff-options.txt:208 #, priority:280 -msgid "This algorithm extends the patience algorithm to \"support low-occurrence common elements\"." -msgstr "Dieser Algorithmus erweitert den 'patience'-Algorithmus, um „allgemeine Elemente mit geringer Häufigkeit zu berücksichtigen“." +msgid "" +"This algorithm extends the patience algorithm to \"support low-occurrence " +"common elements\"." +msgstr "" +"Dieser Algorithmus erweitert den 'patience'-Algorithmus, um „allgemeine " +"Elemente mit geringer Häufigkeit zu berücksichtigen“." #. type: Plain text #: en/diff-options.txt:213 #, priority:280 -msgid "For instance, if you configured the `diff.algorithm` variable to a non-default value and want to use the default one, then you have to use `--diff-algorithm=default` option." -msgstr "Wenn Sie die Variable `diff.algorithm` auf einen nicht voreingestellten Wert konfiguriert haben und den voreingestellten Wert verwenden wollen, dann müssen Sie die Option `--diff-algorithm=default` verwenden." +msgid "" +"For instance, if you configured the `diff.algorithm` variable to a non-" +"default value and want to use the default one, then you have to use `--diff-" +"algorithm=default` option." +msgstr "" +"Wenn Sie die Variable `diff.algorithm` auf einen nicht voreingestellten Wert" +" konfiguriert haben und den voreingestellten Wert verwenden wollen, dann " +"müssen Sie die Option `--diff-algorithm=default` verwenden." #. type: Labeled list #: en/diff-options.txt:214 @@ -4464,15 +5711,54 @@ msgstr "--stat[=[,[,]]]" #. type: Plain text #: en/diff-options.txt:229 #, fuzzy, ignore-ellipsis, priority:280 -#| msgid "Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by ``. The width of the filename part can be limited by giving another width `` after a comma. The width of the graph part can be limited by using `--stat-graph-width=` (affects all commands generating a stat graph) or by setting `diff.statGraphWidth=` (does not affect `git format-patch`). By giving a third parameter ``, you can limit the output to the first `` lines, followed by `...` if there are more." -msgid "Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by ``. The width of the filename part can be limited by giving another width `` after a comma or by setting `diff.statNameWidth=`. The width of the graph part can be limited by using `--stat-graph-width=` or by setting `diff.statGraphWidth=`. Using `--stat` or `--stat-graph-width` affects all commands generating a stat graph, while setting `diff.statNameWidth` or `diff.statGraphWidth` does not affect `git format-patch`. By giving a third parameter ``, you can limit the output to the first `` lines, followed by `...` if there are more." -msgstr "Erzeugt ein Diffstat. Standardmäßig wird so viel Platz wie nötig für den Dateinamen und der Rest für den Graphen-Teil verwendet. Die maximale Breite ist auf die Terminalbreite voreingestellt (oder 80 Spalten, wenn kein Terminal angeschlossen ist). Sie kann durch `` überschrieben werden. Die Breite des Dateinamenteils kann durch die Angabe einer anderen Breite `` nach einem Komma begrenzt werden. Die Breite des Graphen-Teils kann durch die Verwendung von `--stat-graph-width=` (betrifft alle Befehle, die einen stat-Graphen erzeugen) oder durch die Einstellung von `diff.statGraphWidth=` (betrifft nicht den `git format-patch`) begrenzt werden. Indem Sie einen dritten Parameter `` angeben, können Sie die Ausgabe auf die ersten `` Zeilen beschränken, gefolgt von `...`, falls es noch mehr sind." +#| msgid "" +#| "Generate a diffstat. By default, as much space as necessary will be used for" +#| " the filename part, and the rest for the graph part. Maximum width defaults " +#| "to terminal width, or 80 columns if not connected to a terminal, and can be " +#| "overridden by ``. The width of the filename part can be limited by " +#| "giving another width `` after a comma. The width of the graph " +#| "part can be limited by using `--stat-graph-width=` (affects all " +#| "commands generating a stat graph) or by setting " +#| "`diff.statGraphWidth=` (does not affect `git format-patch`). By " +#| "giving a third parameter ``, you can limit the output to the first " +#| "`` lines, followed by `...` if there are more." +msgid "" +"Generate a diffstat. By default, as much space as necessary will be used for" +" the filename part, and the rest for the graph part. Maximum width defaults " +"to terminal width, or 80 columns if not connected to a terminal, and can be " +"overridden by ``. The width of the filename part can be limited by " +"giving another width `` after a comma or by setting " +"`diff.statNameWidth=`. The width of the graph part can be limited by " +"using `--stat-graph-width=` or by setting " +"`diff.statGraphWidth=`. Using `--stat` or `--stat-graph-width` " +"affects all commands generating a stat graph, while setting " +"`diff.statNameWidth` or `diff.statGraphWidth` does not affect `git format-" +"patch`. By giving a third parameter ``, you can limit the output to " +"the first `` lines, followed by `...` if there are more." +msgstr "" +"Erzeugt ein Diffstat. Standardmäßig wird so viel Platz wie nötig für den " +"Dateinamen und der Rest für den Graphen-Teil verwendet. Die maximale Breite " +"ist auf die Terminalbreite voreingestellt (oder 80 Spalten, wenn kein " +"Terminal angeschlossen ist). Sie kann durch `` überschrieben werden." +" Die Breite des Dateinamenteils kann durch die Angabe einer anderen Breite " +"`` nach einem Komma begrenzt werden. Die Breite des Graphen-" +"Teils kann durch die Verwendung von `--stat-graph-width=` (betrifft " +"alle Befehle, die einen stat-Graphen erzeugen) oder durch die Einstellung " +"von `diff.statGraphWidth=` (betrifft nicht den `git format-patch`) " +"begrenzt werden. Indem Sie einen dritten Parameter `` angeben, " +"können Sie die Ausgabe auf die ersten `` Zeilen beschränken, gefolgt" +" von `...`, falls es noch mehr sind." #. type: Plain text #: en/diff-options.txt:232 #, priority:280 -msgid "These parameters can also be set individually with `--stat-width=`, `--stat-name-width=` and `--stat-count=`." -msgstr "Diese Parameter können auch individuell mit `--stat-width=`, `--stat-name-width=` und `--stat-count=` eingestellt werden." +msgid "" +"These parameters can also be set individually with `--stat-width=`, " +"`--stat-name-width=` and `--stat-count=`." +msgstr "" +"Diese Parameter können auch individuell mit `--stat-width=`, " +"`--stat-name-width=` und `--stat-count=` eingestellt " +"werden." #. type: Labeled list #: en/diff-options.txt:233 @@ -4483,8 +5769,19 @@ msgstr "--compact-summary" #. type: Plain text #: en/diff-options.txt:240 #, priority:280 -msgid "Output a condensed summary of extended header information such as file creations or deletions (\"new\" or \"gone\", optionally \"+l\" if it's a symlink) and mode changes (\"+x\" or \"-x\" for adding or removing executable bit respectively) in diffstat. The information is put between the filename part and the graph part. Implies `--stat`." -msgstr "Gibt in diffstat eine komprimierte Zusammenfassung der zusätzlichen Header-Informationen aus, wie die Dateierzeugung oder -löschung (\"new\" oder \"gone\", optional \"+l\", wenn es sich um einen Symlink handelt) und der Modusänderungen (\"+x\" oder \"-x\" zum Hinzufügen bzw. Entfernen eines ausführbaren Bits). Die Informationen werden zwischen dem Dateinamen-Teil und dem Diagramm-Teil eingefügt. Die Option `--stat` ist impliziert." +msgid "" +"Output a condensed summary of extended header information such as file " +"creations or deletions (\"new\" or \"gone\", optionally \"+l\" if it's a " +"symlink) and mode changes (\"+x\" or \"-x\" for adding or removing " +"executable bit respectively) in diffstat. The information is put between the" +" filename part and the graph part. Implies `--stat`." +msgstr "" +"Gibt in diffstat eine komprimierte Zusammenfassung der zusätzlichen Header-" +"Informationen aus, wie die Dateierzeugung oder -löschung (\"new\" oder " +"\"gone\", optional \"+l\", wenn es sich um einen Symlink handelt) und der " +"Modusänderungen (\"+x\" oder \"-x\" zum Hinzufügen bzw. Entfernen eines " +"ausführbaren Bits). Die Informationen werden zwischen dem Dateinamen-Teil " +"und dem Diagramm-Teil eingefügt. Die Option `--stat` ist impliziert." #. type: Labeled list #: en/diff-options.txt:241 en/git-apply.txt:45 @@ -4495,8 +5792,15 @@ msgstr "--numstat" #. type: Plain text #: en/diff-options.txt:247 #, priority:280 -msgid "Similar to `--stat`, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly. For binary files, outputs two `-` instead of saying `0 0`." -msgstr "Vergleichbar mit `--stat`, zeigt aber die Anzahl der hinzugefügten und gelöschten Zeilen in dezimaler Notation und den Pfadnamen ohne Abkürzung an, um es maschinenfreundlicher zu machen. Gibt bei Binärdateien zwei `-` aus, statt `0 0` zu verwenden." +msgid "" +"Similar to `--stat`, but shows number of added and deleted lines in decimal " +"notation and pathname without abbreviation, to make it more machine " +"friendly. For binary files, outputs two `-` instead of saying `0 0`." +msgstr "" +"Vergleichbar mit `--stat`, zeigt aber die Anzahl der hinzugefügten und " +"gelöschten Zeilen in dezimaler Notation und den Pfadnamen ohne Abkürzung an," +" um es maschinenfreundlicher zu machen. Gibt bei Binärdateien zwei `-` aus," +" statt `0 0` zu verwenden." #. type: Labeled list #: en/diff-options.txt:248 @@ -4507,8 +5811,13 @@ msgstr "--shortstat" #. type: Plain text #: en/diff-options.txt:252 #, priority:280 -msgid "Output only the last line of the `--stat` format containing total number of modified files, as well as number of added and deleted lines." -msgstr "Gibt nur die letzte Zeile des `--stat`-Formats aus. Diese enthält die Gesamtzahl der modifizierten Dateien sowie die Anzahl der hinzugefügten und gelöschten Zeilen." +msgid "" +"Output only the last line of the `--stat` format containing total number of " +"modified files, as well as number of added and deleted lines." +msgstr "" +"Gibt nur die letzte Zeile des `--stat`-Formats aus. Diese enthält die " +"Gesamtzahl der modifizierten Dateien sowie die Anzahl der hinzugefügten und " +"gelöschten Zeilen." #. type: Labeled list #: en/diff-options.txt:253 @@ -4525,8 +5834,18 @@ msgstr "--dirstat[=]" #. type: Plain text #: en/diff-options.txt:261 #, priority:280 -msgid "Output the distribution of relative amount of changes for each sub-directory. The behavior of `--dirstat` can be customized by passing it a comma separated list of parameters. The defaults are controlled by the `diff.dirstat` configuration variable (see linkgit:git-config[1]). The following parameters are available:" -msgstr "Ausgabe der relativen Anzahl von Änderungen für jedes Unterverzeichnis. Das Verhalten von `--dirstat` kann durch Übergabe einer durch Kommata getrennten Liste von Parametern angepasst werden. Die Voreinstellungen werden durch die Konfigurations-Variable `diff.dirstat` gesteuert (siehe linkgit:git-config[1]). Die folgenden Parameter sind verfügbar:" +msgid "" +"Output the distribution of relative amount of changes for each sub-" +"directory. The behavior of `--dirstat` can be customized by passing it a " +"comma separated list of parameters. The defaults are controlled by the " +"`diff.dirstat` configuration variable (see linkgit:git-config[1]). The " +"following parameters are available:" +msgstr "" +"Ausgabe der relativen Anzahl von Änderungen für jedes Unterverzeichnis. Das " +"Verhalten von `--dirstat` kann durch Übergabe einer durch Kommata getrennten" +" Liste von Parametern angepasst werden. Die Voreinstellungen werden durch " +"die Konfigurations-Variable `diff.dirstat` gesteuert (siehe linkgit:git-" +"config[1]). Die folgenden Parameter sind verfügbar:" #. type: Labeled list #: en/diff-options.txt:263 @@ -4537,8 +5856,19 @@ msgstr "`changes`" #. type: Plain text #: en/diff-options.txt:269 #, priority:280 -msgid "Compute the dirstat numbers by counting the lines that have been removed from the source, or added to the destination. This ignores the amount of pure code movements within a file. In other words, rearranging lines in a file is not counted as much as other changes. This is the default behavior when no parameter is given." -msgstr "Berechnet die Dirstat-Werte durch Zählen der Zeilen, die aus der Quelle entfernt oder dem Ziel hinzugefügt wurden. Dabei wird die Anzahl der reinen Codebewegungen innerhalb einer Datei ignoriert. Mit anderen Worten, das Umgruppieren von Zeilen in einer Datei wird nicht so stark gezählt wie andere Änderungen. Dieses Verhalten ist das Standardverhalten, wenn kein Parameter angegeben wird." +msgid "" +"Compute the dirstat numbers by counting the lines that have been removed " +"from the source, or added to the destination. This ignores the amount of " +"pure code movements within a file. In other words, rearranging lines in a " +"file is not counted as much as other changes. This is the default behavior " +"when no parameter is given." +msgstr "" +"Berechnet die Dirstat-Werte durch Zählen der Zeilen, die aus der Quelle " +"entfernt oder dem Ziel hinzugefügt wurden. Dabei wird die Anzahl der reinen " +"Codebewegungen innerhalb einer Datei ignoriert. Mit anderen Worten, das " +"Umgruppieren von Zeilen in einer Datei wird nicht so stark gezählt wie " +"andere Änderungen. Dieses Verhalten ist das Standardverhalten, wenn kein " +"Parameter angegeben wird." #. type: Labeled list #: en/diff-options.txt:269 @@ -4549,8 +5879,23 @@ msgstr "`lines`" #. type: Plain text #: en/diff-options.txt:277 #, priority:280 -msgid "Compute the dirstat numbers by doing the regular line-based diff analysis, and summing the removed/added line counts. (For binary files, count 64-byte chunks instead, since binary files have no natural concept of lines). This is a more expensive `--dirstat` behavior than the `changes` behavior, but it does count rearranged lines within a file as much as other changes. The resulting output is consistent with what you get from the other `--*stat` options." -msgstr "Berechnet die Dirstat-Werte, indem die normale zeilenbasierte Diff-Analyse durchgeführt und die Anzahl der entfernten/hinzugefügten Zeilen summiert wird. (Bei Binärdateien zählt man dagegen 64-Byte-Blöcke, da Binärdateien kein logisches Konzept für Zeilen haben). Das ist ein aufwändigeres Verhalten von `--dirstat` als das von `changes`, aber es zählt neu angeordnete Zeilen innerhalb einer Datei genauso stark wie andere Änderungen. Die resultierende Ausgabe ist konsistent mit dem, was Sie mit den anderen `--*stat`-Optionen erhalten." +msgid "" +"Compute the dirstat numbers by doing the regular line-based diff analysis, " +"and summing the removed/added line counts. (For binary files, count 64-byte " +"chunks instead, since binary files have no natural concept of lines). This " +"is a more expensive `--dirstat` behavior than the `changes` behavior, but it" +" does count rearranged lines within a file as much as other changes. The " +"resulting output is consistent with what you get from the other `--*stat` " +"options." +msgstr "" +"Berechnet die Dirstat-Werte, indem die normale zeilenbasierte Diff-Analyse " +"durchgeführt und die Anzahl der entfernten/hinzugefügten Zeilen summiert " +"wird. (Bei Binärdateien zählt man dagegen 64-Byte-Blöcke, da Binärdateien " +"kein logisches Konzept für Zeilen haben). Das ist ein aufwändigeres " +"Verhalten von `--dirstat` als das von `changes`, aber es zählt neu " +"angeordnete Zeilen innerhalb einer Datei genauso stark wie andere " +"Änderungen. Die resultierende Ausgabe ist konsistent mit dem, was Sie mit " +"den anderen `--*stat`-Optionen erhalten." #. type: Labeled list #: en/diff-options.txt:277 @@ -4561,8 +5906,16 @@ msgstr "`files`" #. type: Plain text #: en/diff-options.txt:282 #, priority:280 -msgid "Compute the dirstat numbers by counting the number of files changed. Each changed file counts equally in the dirstat analysis. This is the computationally cheapest `--dirstat` behavior, since it does not have to look at the file contents at all." -msgstr "Berechnet die Dirstat-Werte, indem die Anzahl der geänderten Dateien gezählt wird. Jede geänderte Datei zählt bei der Dirstat-Analyse gleich viel. Das ist das rechnerisch einfachste Verhalten von `--dirstat', da es den Datei-Inhalt überhaupt nicht untersuchen muss." +msgid "" +"Compute the dirstat numbers by counting the number of files changed. Each " +"changed file counts equally in the dirstat analysis. This is the " +"computationally cheapest `--dirstat` behavior, since it does not have to " +"look at the file contents at all." +msgstr "" +"Berechnet die Dirstat-Werte, indem die Anzahl der geänderten Dateien gezählt" +" wird. Jede geänderte Datei zählt bei der Dirstat-Analyse gleich viel. Das " +"ist das rechnerisch einfachste Verhalten von `--dirstat', da es den Datei-" +"Inhalt überhaupt nicht untersuchen muss." #. type: Labeled list #: en/diff-options.txt:282 @@ -4573,8 +5926,17 @@ msgstr "`cumulative`" #. type: Plain text #: en/diff-options.txt:287 #, priority:280 -msgid "Count changes in a child directory for the parent directory as well. Note that when using `cumulative`, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the `noncumulative` parameter." -msgstr "Zählt die Änderungen in einem Tochterverzeichnis auch für das Elternverzeichnis. Beachten Sie, dass bei der Verwendung von `cumulative` die Summe der gemeldeten Prozentsätze 100 % überschreiten kann. Das Standardverhalten (nicht kumulativ) kann mit dem Parameter `noncumulative` festgelegt werden." +msgid "" +"Count changes in a child directory for the parent directory as well. Note " +"that when using `cumulative`, the sum of the percentages reported may exceed" +" 100%. The default (non-cumulative) behavior can be specified with the " +"`noncumulative` parameter." +msgstr "" +"Zählt die Änderungen in einem Tochterverzeichnis auch für das " +"Elternverzeichnis. Beachten Sie, dass bei der Verwendung von `cumulative` " +"die Summe der gemeldeten Prozentsätze 100 % überschreiten kann. Das " +"Standardverhalten (nicht kumulativ) kann mit dem Parameter `noncumulative` " +"festgelegt werden." #. type: Labeled list #: en/diff-options.txt:287 en/git-cherry.txt:39 @@ -4585,14 +5947,24 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:291 #, priority:280 -msgid "An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes are not shown in the output." -msgstr "Ein ganzzahliger Parameter gibt einen Grenzwert in Prozent an (3 % als Standard). Verzeichnisse, die weniger als diesen Prozentsatz der Änderungen ausmachen, werden in der Ausgabe nicht angezeigt." +msgid "" +"An integer parameter specifies a cut-off percent (3% by default). " +"Directories contributing less than this percentage of the changes are not " +"shown in the output." +msgstr "" +"Ein ganzzahliger Parameter gibt einen Grenzwert in Prozent an (3 % als " +"Standard). Verzeichnisse, die weniger als diesen Prozentsatz der Änderungen" +" ausmachen, werden in der Ausgabe nicht angezeigt." #. type: Plain text #: en/diff-options.txt:297 #, priority:280 -msgid "Example: The following will count changed files, while ignoring directories with less than 10% of the total amount of changed files, and accumulating child directory counts in the parent directories: `--dirstat=files,10,cumulative`." -msgstr "Beispiel: Der folgende Befehl wird geänderte Dateien zählen, wobei Verzeichnisse mit weniger als 10 % der Gesamtmenge der geänderten Dateien ignoriert werden und die Anzahl der Unterverzeichnisse in den übergeordneten Verzeichnissen aufsummiert wird: `--dirstat=Dateien,10,kumulativ`." +msgid "" +"Example: The following will count changed files, while ignoring directories " +"with less than 10% of the total amount of changed files, and accumulating " +"child directory counts in the parent directories: " +"`--dirstat=files,10,cumulative`." +msgstr "Beispiel: Der folgende Befehl wird geänderte Dateien zählen, wobei Verzeichnisse mit weniger als 10 % der Gesamtmenge der geänderten Dateien ignoriert werden und die Anzahl der Unterverzeichnisse in den übergeordneten Verzeichnissen aufsummiert wird: `--dirstat=files,10,kumulativ`." #. type: Labeled list #: en/diff-options.txt:298 @@ -4616,10 +5988,11 @@ msgstr "--dirstat-by-file[=...]" #: en/diff-options.txt:303 #, ignore-ellipsis, priority:280 msgid "Synonym for --dirstat=files,param1,param2..." -msgstr "Synonym für --dirstat=Dateien,Parameter1,Parameter2..." +msgstr "Synonym für --dirstat=files,Parameter1,Parameter2..." #. type: Labeled list -#: en/diff-options.txt:304 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:168 +#: en/diff-options.txt:304 en/git-apply.txt:52 en/git-shortlog.txt:35 +#: en/merge-options.txt:168 #, ignore-same, no-wrap, priority:280 msgid "--summary" msgstr "--summary" @@ -4627,8 +6000,12 @@ msgstr "--summary" #. type: Plain text #: en/diff-options.txt:307 #, priority:280 -msgid "Output a condensed summary of extended header information such as creations, renames and mode changes." -msgstr "Ausgabe einer komprimierten Zusammenfassung der erweiterten Header-Informationen wie z.B. Erstellen, Umbenennen und Änderungen der Modi." +msgid "" +"Output a condensed summary of extended header information such as creations," +" renames and mode changes." +msgstr "" +"Ausgabe einer komprimierten Zusammenfassung der erweiterten Header-" +"Informationen wie z.B. Erstellen, Umbenennen und Änderungen der Modi." #. type: Labeled list #: en/diff-options.txt:309 @@ -4643,7 +6020,12 @@ msgid "Synonym for `-p --stat`." msgstr "Synonym für `-p --stat`." #. type: Labeled list -#: en/diff-options.txt:315 en/git-apply.txt:116 en/git-cat-file.txt:249 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:73 en/git-commit.txt:158 en/git-config.txt:229 en/git-grep.txt:176 en/git-ls-files.txt:99 en/git-ls-tree.txt:55 en/git-merge-tree.txt:43 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:179 en/git-worktree.txt:245 +#: en/diff-options.txt:315 en/git-apply.txt:116 en/git-cat-file.txt:249 +#: en/git-check-attr.txt:34 en/git-check-ignore.txt:47 +#: en/git-checkout-index.txt:73 en/git-commit.txt:158 en/git-config.txt:229 +#: en/git-grep.txt:176 en/git-ls-files.txt:99 en/git-ls-tree.txt:55 +#: en/git-merge-tree.txt:43 en/git-mktree.txt:23 en/git-status.txt:126 +#: en/git-update-index.txt:179 en/git-worktree.txt:245 #, ignore-same, no-wrap, priority:280 msgid "-z" msgstr "-z" @@ -4658,8 +6040,12 @@ msgstr "\tTrennt die Commits mit NULs statt mit neuen Zeilenumbrüchen.\n" #. type: Plain text #: en/diff-options.txt:321 #, priority:280 -msgid "Also, when `--raw` or `--numstat` has been given, do not munge pathnames and use NULs as output field terminators." -msgstr "Außerdem sollten Sie, wenn `--raw` oder `--numstat` angegeben wurde, keine Pfadnamen verkürzen und NULs als Ausgabefeld-Terminatoren verwenden." +msgid "" +"Also, when `--raw` or `--numstat` has been given, do not munge pathnames and" +" use NULs as output field terminators." +msgstr "" +"Außerdem sollten Sie, wenn `--raw` oder `--numstat` angegeben wurde, keine " +"Pfadnamen verkürzen und NULs als Ausgabefeld-Terminatoren verwenden." #. type: Plain text #: en/diff-options.txt:325 @@ -4674,11 +6060,18 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:330 en/git-apply.txt:123 #, priority:280 -msgid "Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])." -msgstr "Ohne diese Option werden Pfadnamen mit „unüblichen“ Zeichen in Anführungszeichen gesetzt, wie es für die Konfigurations-Variable `core.quotePath` definiert ist (siehe linkgit:git-config[1])." +msgid "" +"Without this option, pathnames with \"unusual\" characters are quoted as " +"explained for the configuration variable `core.quotePath` (see linkgit:git-" +"config[1])." +msgstr "" +"Ohne diese Option werden Pfadnamen mit „unüblichen“ Zeichen in " +"Anführungszeichen gesetzt, wie es für die Konfigurations-Variable " +"`core.quotePath` definiert ist (siehe linkgit:git-config[1])." #. type: Labeled list -#: en/diff-options.txt:331 en/git-config.txt:238 en/git-grep.txt:158 en/git-ls-tree.txt:59 en/git-merge-tree.txt:49 en/git-name-rev.txt:74 +#: en/diff-options.txt:331 en/git-config.txt:238 en/git-grep.txt:158 +#: en/git-ls-tree.txt:59 en/git-merge-tree.txt:49 en/git-name-rev.txt:74 #, ignore-same, no-wrap, priority:280 msgid "--name-only" msgstr "--name-only" @@ -4686,8 +6079,15 @@ msgstr "--name-only" #. type: Plain text #: en/diff-options.txt:335 #, fuzzy, priority:280 -msgid "Show only names of changed files. The file names are often encoded in UTF-8. For more information see the discussion about encoding in the linkgit:git-log[1] manual page." -msgstr "Definiert das Encoding für die Ausgabe der Autorennamen und Commit-Zusammenfassungen. Mit dem Wert `none` gibt blame die Daten unkonvertiert aus. Für mehr Informationen lesen Sie die Encoding-Diskussion in der Hilfe zu linkgit:git-log[1]." +msgid "" +"Show only names of changed files. The file names are often encoded in UTF-8." +" For more information see the discussion about encoding in the linkgit:git-" +"log[1] manual page." +msgstr "" +"Definiert das Encoding für die Ausgabe der Autorennamen und Commit-" +"Zusammenfassungen. Mit dem Wert `none` gibt blame die Daten unkonvertiert " +"aus. Für mehr Informationen lesen Sie die Encoding-Diskussion in der Hilfe " +"zu linkgit:git-log[1]." #. type: Labeled list #: en/diff-options.txt:336 en/git-ls-tree.txt:60 @@ -4698,8 +6098,13 @@ msgstr "--name-status" #. type: Plain text #: en/diff-options.txt:340 #, fuzzy, priority:280 -msgid "Show only names and status of changed files. See the description of the `--diff-filter` option on what the status letters mean. Just like `--name-only` the file names are often encoded in UTF-8." -msgstr "Zeigt nur Namen und Status der geänderten Dateien an. Siehe die Beschreibung der Option `--diff-filter`, für die Bedeutung der Statuszeichen." +msgid "" +"Show only names and status of changed files. See the description of the " +"`--diff-filter` option on what the status letters mean. Just like `--name-" +"only` the file names are often encoded in UTF-8." +msgstr "" +"Zeigt nur Namen und Status der geänderten Dateien an. Siehe die Beschreibung" +" der Option `--diff-filter`, für die Bedeutung der Statuszeichen." #. type: Labeled list #: en/diff-options.txt:341 @@ -4710,11 +6115,31 @@ msgstr "--submodule[=]" #. type: Plain text #: en/diff-options.txt:352 #, priority:280 -msgid "Specify how differences in submodules are shown. When specifying `--submodule=short` the 'short' format is used. This format just shows the names of the commits at the beginning and end of the range. When `--submodule` or `--submodule=log` is specified, the 'log' format is used. This format lists the commits in the range like linkgit:git-submodule[1] `summary` does. When `--submodule=diff` is specified, the 'diff' format is used. This format shows an inline diff of the changes in the submodule contents between the commit range. Defaults to `diff.submodule` or the 'short' format if the config option is unset." -msgstr "Gibt an, wie die Unterschiede in den Submodulen dargestellt werden. Bei der Angabe von `--submodule=short` wird das 'kurze' Format verwendet. Dieses Format zeigt nur die Namen der Commits am Anfang und Ende des Bereichs an. Wenn `--submodule` oder `--submodule=log` angegeben ist, wird das 'log' Format verwendet. Dieses Format listet die Commits im Bereich auf, wie es linkgit:git-submodule[1] `summary` macht. Wenn `--submodule=diff` angegeben ist, wird das 'diff'-Format verwendet. Dieses Format zeigt eine Inline-Differenz der Änderungen in den Submodul-Inhalten zwischen den Commits des Bereichs an. Die Voreinstellung ist `diff.submodule` oder das 'kurze' Format, wenn die Konfigurations-Option nicht gesetzt ist." - -#. type: Labeled list -#: en/diff-options.txt:353 en/git-branch.txt:145 en/git-for-each-ref.txt:66 en/git-grep.txt:193 en/git-show-branch.txt:118 en/git-tag.txt:125 +msgid "" +"Specify how differences in submodules are shown. When specifying " +"`--submodule=short` the 'short' format is used. This format just shows the " +"names of the commits at the beginning and end of the range. When " +"`--submodule` or `--submodule=log` is specified, the 'log' format is used. " +"This format lists the commits in the range like linkgit:git-submodule[1] " +"`summary` does. When `--submodule=diff` is specified, the 'diff' format is " +"used. This format shows an inline diff of the changes in the submodule " +"contents between the commit range. Defaults to `diff.submodule` or the " +"'short' format if the config option is unset." +msgstr "" +"Gibt an, wie die Unterschiede in den Submodulen dargestellt werden. Bei der " +"Angabe von `--submodule=short` wird das 'kurze' Format verwendet. Dieses " +"Format zeigt nur die Namen der Commits am Anfang und Ende des Bereichs an. " +"Wenn `--submodule` oder `--submodule=log` angegeben ist, wird das 'log' " +"Format verwendet. Dieses Format listet die Commits im Bereich auf, wie es " +"linkgit:git-submodule[1] `summary` macht. Wenn `--submodule=diff` angegeben" +" ist, wird das 'diff'-Format verwendet. Dieses Format zeigt eine Inline-" +"Differenz der Änderungen in den Submodul-Inhalten zwischen den Commits des " +"Bereichs an. Die Voreinstellung ist `diff.submodule` oder das 'kurze' " +"Format, wenn die Konfigurations-Option nicht gesetzt ist." + +#. type: Labeled list +#: en/diff-options.txt:353 en/git-branch.txt:145 en/git-for-each-ref.txt:66 +#: en/git-grep.txt:193 en/git-show-branch.txt:118 en/git-tag.txt:125 #, no-wrap, priority:280 msgid "--color[=]" msgstr "--color[=]" @@ -4722,8 +6147,13 @@ msgstr "--color[=]" #. type: Plain text #: en/diff-options.txt:357 #, priority:280 -msgid "Show colored diff. `--color` (i.e. without '=') is the same as `--color=always`. '' can be one of `always`, `never`, or `auto`." -msgstr "Farbige Diffs anzeigen. `--color` (also ohne '=') ist gleichbedeutend mit `--color=always` (immer). ' kann einen der folgenden Werte annehmen: `always` (immer), `never` (nie) oder `auto` (automatisch)." +msgid "" +"Show colored diff. `--color` (i.e. without '=') is the same as " +"`--color=always`. '' can be one of `always`, `never`, or `auto`." +msgstr "" +"Farbige Diffs anzeigen. `--color` (also ohne '=') ist gleichbedeutend" +" mit `--color=always` (immer). ' kann einen der folgenden Werte " +"annehmen: `always` (immer), `never` (nie) oder `auto` (automatisch)." #. type: Plain text #: en/diff-options.txt:360 @@ -4736,7 +6166,8 @@ msgstr "" "\t`color.ui` und `color.diff` geändert werden.\n" #. type: Labeled list -#: en/diff-options.txt:362 en/git-branch.txt:150 en/git-grep.txt:197 en/git-show-branch.txt:123 +#: en/diff-options.txt:362 en/git-branch.txt:150 en/git-grep.txt:197 +#: en/git-show-branch.txt:123 #, ignore-same, no-wrap, priority:280 msgid "--no-color" msgstr "--no-color" @@ -4775,7 +6206,9 @@ msgstr "Verschobene Codezeilen sind unterschiedlich eingefärbt." #: en/diff-options.txt:373 #, no-wrap, priority:280 msgid "\tIt can be changed by the `diff.colorMoved` configuration setting.\n" -msgstr "\tDies kann mit der Konfigurationsoption `diff.colorMoved` geändert werden.\n" +msgstr "" +"\tDies kann mit der Konfigurationsoption `diff.colorMoved` geändert " +"werden.\n" #. type: Plain text #: en/diff-options.txt:377 @@ -4810,8 +6243,12 @@ msgstr "default" #. type: Plain text #: en/diff-options.txt:384 #, priority:280 -msgid "Is a synonym for `zebra`. This may change to a more sensible mode in the future." -msgstr "Ein Synonym für `zebra`. Das könnte zukünftig zu einem sensibleren Modus geändert werden." +msgid "" +"Is a synonym for `zebra`. This may change to a more sensible mode in the " +"future." +msgstr "" +"Ein Synonym für `zebra`. Das könnte zukünftig zu einem sensibleren Modus " +"geändert werden." #. type: Labeled list #: en/diff-options.txt:384 en/diff-options.txt:453 @@ -4822,8 +6259,20 @@ msgstr "plain" #. type: Plain text #: en/diff-options.txt:391 #, priority:280 -msgid "Any line that is added in one location and was removed in another location will be colored with 'color.diff.newMoved'. Similarly 'color.diff.oldMoved' will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation." -msgstr "Jede Zeile, die an einer Stelle hinzugefügt wird und an einer anderen Stelle entfernt wurde, wird mit 'color.diff.newMoved' eingefärbt. In ähnlicher Weise wird 'color.diff.oldMoved' für entfernte Zeilen verwendet, die an einer anderen Stelle im Diff hinzugefügt werden. Dieser Modus nimmt jede verschobene Zeile auf, aber er ist nicht sehr nützlich bei einer Überprüfung, um festzustellen, ob ein Codeblock ohne Permutation verschoben wurde." +msgid "" +"Any line that is added in one location and was removed in another location " +"will be colored with 'color.diff.newMoved'. Similarly 'color.diff.oldMoved'" +" will be used for removed lines that are added somewhere else in the diff. " +"This mode picks up any moved line, but it is not very useful in a review to " +"determine if a block of code was moved without permutation." +msgstr "" +"Jede Zeile, die an einer Stelle hinzugefügt wird und an einer anderen Stelle" +" entfernt wurde, wird mit 'color.diff.newMoved' eingefärbt. In ähnlicher " +"Weise wird 'color.diff.oldMoved' für entfernte Zeilen verwendet, die an " +"einer anderen Stelle im Diff hinzugefügt werden. Dieser Modus nimmt jede " +"verschobene Zeile auf, aber er ist nicht sehr nützlich bei einer " +"Überprüfung, um festzustellen, ob ein Codeblock ohne Permutation verschoben " +"wurde." #. type: Labeled list #: en/diff-options.txt:391 @@ -4834,8 +6283,15 @@ msgstr "blocks" #. type: Plain text #: en/diff-options.txt:396 #, priority:280 -msgid "Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are painted using either the 'color.diff.{old,new}Moved' color. Adjacent blocks cannot be told apart." -msgstr "Blöcke von verschobenem Text mit mindestens 20 alphanumerischen Zeichen werden begierig erkannt. Die erkannten Blöcke werden entweder mit der Farbe 'color.diff.{old,new}Moved' dargestellt. Benachbarte Blöcke können nicht unterschieden werden." +msgid "" +"Blocks of moved text of at least 20 alphanumeric characters are detected " +"greedily. The detected blocks are painted using either the " +"'color.diff.{old,new}Moved' color. Adjacent blocks cannot be told apart." +msgstr "" +"Blöcke von verschobenem Text mit mindestens 20 alphanumerischen Zeichen " +"werden begierig erkannt. Die erkannten Blöcke werden entweder mit der Farbe " +"'color.diff.{old,new}Moved' dargestellt. Benachbarte Blöcke können nicht " +"unterschieden werden." #. type: Labeled list #: en/diff-options.txt:396 @@ -4846,8 +6302,16 @@ msgstr "zebra" #. type: Plain text #: en/diff-options.txt:401 #, priority:280 -msgid "Blocks of moved text are detected as in 'blocks' mode. The blocks are painted using either the 'color.diff.{old,new}Moved' color or 'color.diff.{old,new}MovedAlternative'. The change between the two colors indicates that a new block was detected." -msgstr "Blöcke von verschobenem Text werden wie im 'blocks' Modus erkannt. Die Blöcke werden entweder mit der Farbe 'color.diff.{old,new}Moved' oder 'color.diff.{old,new}MovedAlternative' dargestellt. Der Wechsel zwischen den beiden Farben zeigt an, dass ein neuer Block erkannt wurde." +msgid "" +"Blocks of moved text are detected as in 'blocks' mode. The blocks are " +"painted using either the 'color.diff.{old,new}Moved' color or " +"'color.diff.{old,new}MovedAlternative'. The change between the two colors " +"indicates that a new block was detected." +msgstr "" +"Blöcke von verschobenem Text werden wie im 'blocks' Modus erkannt. Die " +"Blöcke werden entweder mit der Farbe 'color.diff.{old,new}Moved' oder " +"'color.diff.{old,new}MovedAlternative' dargestellt. Der Wechsel zwischen den" +" beiden Farben zeigt an, dass ein neuer Block erkannt wurde." #. type: Labeled list #: en/diff-options.txt:401 @@ -4858,8 +6322,16 @@ msgstr "dimmed-zebra" #. type: Plain text #: en/diff-options.txt:406 #, priority:280 -msgid "Similar to 'zebra', but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting. `dimmed_zebra` is a deprecated synonym." -msgstr "Ähnlich wie 'zebra', aber es werden zusätzlich uninteressante Teile des verschobenen Codes abgedunkelt. Die Grenzzeilen zweier benachbarter Blöcke werden als interessant betrachtet, der Rest ist uninteressant. `dimmed_zebra` ist ein veraltetes Substitut." +msgid "" +"Similar to 'zebra', but additional dimming of uninteresting parts of moved " +"code is performed. The bordering lines of two adjacent blocks are considered" +" interesting, the rest is uninteresting. `dimmed_zebra` is a deprecated " +"synonym." +msgstr "" +"Ähnlich wie 'zebra', aber es werden zusätzlich uninteressante Teile des " +"verschobenen Codes abgedunkelt. Die Grenzzeilen zweier benachbarter Blöcke " +"werden als interessant betrachtet, der Rest ist uninteressant. " +"`dimmed_zebra` ist ein veraltetes Substitut." #. type: Labeled list #: en/diff-options.txt:408 @@ -4870,8 +6342,13 @@ msgstr "--no-color-moved" #. type: Plain text #: en/diff-options.txt:411 #, priority:280 -msgid "Turn off move detection. This can be used to override configuration settings. It is the same as `--color-moved=no`." -msgstr "Schaltet die Erkennung von Verschiebungen aus. Damit können Einstellungen der Konfiguration außer Kraft gesetzt werden. Es ist gleichbedeutend mit `--color-moved=no`." +msgid "" +"Turn off move detection. This can be used to override configuration " +"settings. It is the same as `--color-moved=no`." +msgstr "" +"Schaltet die Erkennung von Verschiebungen aus. Damit können Einstellungen " +"der Konfiguration außer Kraft gesetzt werden. Es ist gleichbedeutend mit " +"`--color-moved=no`." #. type: Labeled list #: en/diff-options.txt:412 @@ -4882,14 +6359,20 @@ msgstr "--color-moved-ws=" #. type: Plain text #: en/diff-options.txt:415 #, priority:280 -msgid "This configures how whitespace is ignored when performing the move detection for `--color-moved`." -msgstr "Damit wird konfiguriert, wie Leerzeichen bei der Erkennung von Verschiebungen bei `--color-moved` ignoriert werden." +msgid "" +"This configures how whitespace is ignored when performing the move detection" +" for `--color-moved`." +msgstr "" +"Damit wird konfiguriert, wie Leerzeichen bei der Erkennung von " +"Verschiebungen bei `--color-moved` ignoriert werden." #. type: Plain text #: en/diff-options.txt:417 #, no-wrap, priority:280 msgid "\tIt can be set by the `diff.colorMovedWS` configuration setting.\n" -msgstr "\tDies kann mit der Konfigurationsoption `diff.colorMovedWS` eingestellt werden.\n" +msgstr "" +"\tDies kann mit der Konfigurationsoption `diff.colorMovedWS` eingestellt " +"werden.\n" #. type: Plain text #: en/diff-options.txt:419 @@ -4924,8 +6407,14 @@ msgstr "ignore-space-change" #. type: Plain text #: en/diff-options.txt:429 en/diff-options.txt:785 #, priority:280 -msgid "Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent." -msgstr "Veränderungen in der Anzahl der Leerzeichen ignorieren. Dadurch werden Leerzeichen am Zeilenende ignoriert und alle anderen Zeilenfolgen mit einem oder mehreren Leerzeichen als gleichwertig betrachtet." +msgid "" +"Ignore changes in amount of whitespace. This ignores whitespace at line " +"end, and considers all other sequences of one or more whitespace characters " +"to be equivalent." +msgstr "" +"Veränderungen in der Anzahl der Leerzeichen ignorieren. Dadurch werden " +"Leerzeichen am Zeilenende ignoriert und alle anderen Zeilenfolgen mit einem " +"oder mehreren Leerzeichen als gleichwertig betrachtet." #. type: Labeled list #: en/diff-options.txt:429 en/merge-strategies.txt:42 @@ -4936,8 +6425,13 @@ msgstr "ignore-all-space" #. type: Plain text #: en/diff-options.txt:432 #, priority:280 -msgid "Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none." -msgstr "Ignoriert Leerzeichen beim Vergleichen von Zeilen. Dadurch werden Unterschiede selbst dann ignoriert, wenn eine Zeile Leerzeichen enthält, während die andere Zeile keine Leerzeichen enthält." +msgid "" +"Ignore whitespace when comparing lines. This ignores differences even if one" +" line has whitespace where the other line has none." +msgstr "" +"Ignoriert Leerzeichen beim Vergleichen von Zeilen. Dadurch werden " +"Unterschiede selbst dann ignoriert, wenn eine Zeile Leerzeichen enthält, " +"während die andere Zeile keine Leerzeichen enthält." #. type: Labeled list #: en/diff-options.txt:432 @@ -4948,8 +6442,15 @@ msgstr "allow-indentation-change" #. type: Plain text #: en/diff-options.txt:437 #, priority:280 -msgid "Initially ignore any whitespace in the move detection, then group the moved code blocks only into a block if the change in whitespace is the same per line. This is incompatible with the other modes." -msgstr "Ignoriert zunächst alle Leerzeichen bei der Erkennung von Verschiebungen und gruppiert dann die verschobenen Codeblöcke nur dann zu einem Block, wenn die Änderung des Leerzeichens pro Zeile gleich ist. Dieser Modus ist mit den anderen Modi inkompatibel." +msgid "" +"Initially ignore any whitespace in the move detection, then group the moved " +"code blocks only into a block if the change in whitespace is the same per " +"line. This is incompatible with the other modes." +msgstr "" +"Ignoriert zunächst alle Leerzeichen bei der Erkennung von Verschiebungen und" +" gruppiert dann die verschobenen Codeblöcke nur dann zu einem Block, wenn " +"die Änderung des Leerzeichens pro Zeile gleich ist. Dieser Modus ist mit den" +" anderen Modi inkompatibel." #. type: Labeled list #: en/diff-options.txt:439 @@ -4960,8 +6461,13 @@ msgstr "--no-color-moved-ws" #. type: Plain text #: en/diff-options.txt:443 #, priority:280 -msgid "Do not ignore whitespace when performing move detection. This can be used to override configuration settings. It is the same as `--color-moved-ws=no`." -msgstr "Keine Leerzeichen bei der Erkennung von Verschiebungen ignorieren. Dadurch können Einstellungen der Konfiguration überschrieben werden. Das entspricht der Option `--color-moved-ws=no`." +msgid "" +"Do not ignore whitespace when performing move detection. This can be used to" +" override configuration settings. It is the same as `--color-moved-ws=no`." +msgstr "" +"Keine Leerzeichen bei der Erkennung von Verschiebungen ignorieren. Dadurch " +"können Einstellungen der Konfiguration überschrieben werden. Das entspricht " +"der Option `--color-moved-ws=no`." #. type: Labeled list #: en/diff-options.txt:444 @@ -4972,20 +6478,33 @@ msgstr "--word-diff[=]" #. type: Plain text #: en/diff-options.txt:449 #, priority:280 -msgid "Show a word diff, using the to delimit changed words. By default, words are delimited by whitespace; see `--word-diff-regex` below. The defaults to 'plain', and must be one of:" -msgstr "Zeigt ein Wort-Diff an, wobei der verwendet wird, um geänderte Wörter abzugrenzen. Standardmäßig werden Wörter durch Leerzeichen abgegrenzt. Siehe `--word-diff-regex` weiter unten. Der ist standardmäßig auf 'plain' gesetzt und muss einer der folgenden Werte sein:" +msgid "" +"Show a word diff, using the to delimit changed words. By default, " +"words are delimited by whitespace; see `--word-diff-regex` below. The " +" defaults to 'plain', and must be one of:" +msgstr "" +"Zeigt ein Wort-Diff an, wobei der verwendet wird, um geänderte " +"Wörter abzugrenzen. Standardmäßig werden Wörter durch Leerzeichen " +"abgegrenzt. Siehe `--word-diff-regex` weiter unten. Der ist " +"standardmäßig auf 'plain' gesetzt und muss einer der folgenden Werte sein:" #. type: Plain text #: en/diff-options.txt:453 #, priority:280 msgid "Highlight changed words using only colors. Implies `--color`." -msgstr "Geänderte Wörter nur farblich hervorheben. Impliziert die Option `--color`." +msgstr "" +"Geänderte Wörter nur farblich hervorheben. Impliziert die Option `--color`." #. type: Plain text #: en/diff-options.txt:457 #, priority:280 -msgid "Show words as `[-removed-]` and `{+added+}`. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous." -msgstr "Wörter als `[-removed-]` und `{+added+}` anzeigen. Macht keinen Versuch, die Trennzeichen auszublenden, wenn sie in der Eingabe erscheinen, sodass die Ausgabe mehrdeutig sein kann." +msgid "" +"Show words as `[-removed-]` and `{+added+}`. Makes no attempts to escape " +"the delimiters if they appear in the input, so the output may be ambiguous." +msgstr "" +"Wörter als `[-removed-]` und `{+added+}` anzeigen. Macht keinen Versuch, " +"die Trennzeichen auszublenden, wenn sie in der Eingabe erscheinen, sodass " +"die Ausgabe mehrdeutig sein kann." #. type: Labeled list #: en/diff-options.txt:457 @@ -4996,8 +6515,19 @@ msgstr "porcelain" #. type: Plain text #: en/diff-options.txt:464 #, priority:280 -msgid "Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the usual unified diff format, starting with a `+`/`-`/` ` character at the beginning of the line and extending to the end of the line. Newlines in the input are represented by a tilde `~` on a line of its own." -msgstr "Verwendet ein spezielles zeilenbasiertes Format, das für den Einsatz in Skripten vorgesehen ist. Hinzugefügte, entfernte und unveränderte Programm-Läufe werden im üblichen vereinheitlichten diff-Format ausgegeben, jeweils beginnend mit einem `+`/`-`/` ` Zeichen am Zeilenanfang und sich bis zum Zeilenende fortsetzend. Zeilenumbrüche in der Eingabe werden durch eine Tilde `~` in einer eigenen Zeile dargestellt." +msgid "" +"Use a special line-based format intended for script consumption. " +"Added/removed/unchanged runs are printed in the usual unified diff format, " +"starting with a `+`/`-`/` ` character at the beginning of the line and " +"extending to the end of the line. Newlines in the input are represented by " +"a tilde `~` on a line of its own." +msgstr "" +"Verwendet ein spezielles zeilenbasiertes Format, das für den Einsatz in " +"Skripten vorgesehen ist. Hinzugefügte, entfernte und unveränderte Programm-" +"Läufe werden im üblichen vereinheitlichten diff-Format ausgegeben, jeweils " +"beginnend mit einem `+`/`-`/` ` Zeichen am Zeilenanfang und sich bis zum " +"Zeilenende fortsetzend. Zeilenumbrüche in der Eingabe werden durch eine " +"Tilde `~` in einer eigenen Zeile dargestellt." #. type: Labeled list #: en/diff-options.txt:464 en/git-daemon.txt:131 en/git-submodule.txt:178 @@ -5014,8 +6544,13 @@ msgstr "Den Wort-Diff wieder deaktivieren." #. type: Plain text #: en/diff-options.txt:470 #, priority:280 -msgid "Note that despite the name of the first mode, color is used to highlight the changed parts in all modes if enabled." -msgstr "Beachten Sie, dass trotz des Namens des ersten Modus die Farbe verwendet wird, um veränderte Teile in allen Modi hervorzuheben, falls sie aktiviert sind." +msgid "" +"Note that despite the name of the first mode, color is used to highlight the" +" changed parts in all modes if enabled." +msgstr "" +"Beachten Sie, dass trotz des Namens des ersten Modus die Farbe verwendet " +"wird, um veränderte Teile in allen Modi hervorzuheben, falls sie aktiviert " +"sind." #. type: Labeled list #: en/diff-options.txt:471 @@ -5026,26 +6561,58 @@ msgstr "--word-diff-regex=" #. type: Plain text #: en/diff-options.txt:475 #, priority:280 -msgid "Use to decide what a word is, instead of considering runs of non-whitespace to be a word. Also implies `--word-diff` unless it was already enabled." -msgstr "Verwendet , um zu entscheiden, was ein Wort ist, anstatt eine Reihe von Nicht-Leerzeichen als ein Wort zu betrachten. Es impliziert auch `--word-diff`, es sei denn, es wurde bereits aktiviert." +msgid "" +"Use to decide what a word is, instead of considering runs of non-" +"whitespace to be a word. Also implies `--word-diff` unless it was already " +"enabled." +msgstr "" +"Verwendet , um zu entscheiden, was ein Wort ist, anstatt eine Reihe " +"von Nicht-Leerzeichen als ein Wort zu betrachten. Es impliziert auch " +"`--word-diff`, es sei denn, es wurde bereits aktiviert." #. type: Plain text #: en/diff-options.txt:483 #, priority:280 -msgid "Every non-overlapping match of the is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append `|[^[:space:]]` to your regular expression to make sure that it matches all non-whitespace characters. A match that contains a newline is silently truncated(!) at the newline." -msgstr "Jede nicht überlappende Übereinstimmung der wird als ein Wort betrachtet. Alles, was zwischen diesen Übereinstimmungen liegt, wird als Leerraum betrachtet und bei der Suche nach Unterschieden ignoriert(!). Sie könnten an Ihren regulären Ausdruck `|[^[:space:]]` anhängen, um sicherzustellen, dass er mit allen Nicht-Leerzeichen übereinstimmt. Eine Übereinstimmung, die einen Zeilenumbruch enthält, wird an diesem Zeilenumbruch stillschweigend abgeschnitten(!)." +msgid "" +"Every non-overlapping match of the is considered a word. Anything " +"between these matches is considered whitespace and ignored(!) for the " +"purposes of finding differences. You may want to append `|[^[:space:]]` to " +"your regular expression to make sure that it matches all non-whitespace " +"characters. A match that contains a newline is silently truncated(!) at the" +" newline." +msgstr "" +"Jede nicht überlappende Übereinstimmung der wird als ein Wort " +"betrachtet. Alles, was zwischen diesen Übereinstimmungen liegt, wird als " +"Leerraum betrachtet und bei der Suche nach Unterschieden ignoriert(!). Sie " +"könnten an Ihren regulären Ausdruck `|[^[:space:]]` anhängen, um " +"sicherzustellen, dass er mit allen Nicht-Leerzeichen übereinstimmt. Eine " +"Übereinstimmung, die einen Zeilenumbruch enthält, wird an diesem " +"Zeilenumbruch stillschweigend abgeschnitten(!)." #. type: Plain text #: en/diff-options.txt:486 #, priority:280 -msgid "For example, `--word-diff-regex=.` will treat each character as a word and, correspondingly, show differences character by character." -msgstr "Zum Beispiel wird `--word-diff-regex=.` jedes Zeichen als ein Wort behandeln und dementsprechend Zeichen für Zeichen Unterschiede aufzeigen." +msgid "" +"For example, `--word-diff-regex=.` will treat each character as a word and, " +"correspondingly, show differences character by character." +msgstr "" +"Zum Beispiel wird `--word-diff-regex=.` jedes Zeichen als ein Wort behandeln" +" und dementsprechend Zeichen für Zeichen Unterschiede aufzeigen." #. type: Plain text #: en/diff-options.txt:491 #, priority:280 -msgid "The regex can also be set via a diff driver or configuration option, see linkgit:gitattributes[5] or linkgit:git-config[1]. Giving it explicitly overrides any diff driver or configuration setting. Diff drivers override configuration settings." -msgstr "Der Regex (regulärer Ausdruck) kann auch über einen Diff-Treiber oder eine Konfigurations-Option gesetzt werden, siehe linkgit:gitattributes[5] oder linkgit:git-config[1]. Wenn Sie ihn angeben, wird jede Diff-Treiber- oder Konfigurations-Option explizit überschrieben. Diff-Treiber setzen Konfigurations-Einstellungen außer Kraft." +msgid "" +"The regex can also be set via a diff driver or configuration option, see " +"linkgit:gitattributes[5] or linkgit:git-config[1]. Giving it explicitly " +"overrides any diff driver or configuration setting. Diff drivers override " +"configuration settings." +msgstr "" +"Der Regex (regulärer Ausdruck) kann auch über einen Diff-Treiber oder eine " +"Konfigurations-Option gesetzt werden, siehe linkgit:gitattributes[5] oder " +"linkgit:git-config[1]. Wenn Sie ihn angeben, wird jede Diff-Treiber- oder " +"Konfigurations-Option explizit überschrieben. Diff-Treiber setzen " +"Konfigurations-Einstellungen außer Kraft." #. type: Labeled list #: en/diff-options.txt:492 @@ -5056,8 +6623,12 @@ msgstr "--color-words[=]" #. type: Plain text #: en/diff-options.txt:495 #, priority:280 -msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word-diff-regex=`." -msgstr "Äquivalent zu `--word-diff=color` plus (wenn ein Regex angegeben wurde) `--word-diff-regex=`." +msgid "" +"Equivalent to `--word-diff=color` plus (if a regex was specified) `--word-" +"diff-regex=`." +msgstr "" +"Äquivalent zu `--word-diff=color` plus (wenn ein Regex angegeben wurde) " +"`--word-diff-regex=`." #. type: Labeled list #: en/diff-options.txt:497 en/git-status.txt:143 @@ -5068,8 +6639,12 @@ msgstr "--no-renames" #. type: Plain text #: en/diff-options.txt:500 #, priority:280 -msgid "Turn off rename detection, even when the configuration file gives the default to do so." -msgstr "Schaltet die Erkennung umbenannter Dateien aus, auch wenn dies per Konfigurationsdatei eingeschaltet wurde." +msgid "" +"Turn off rename detection, even when the configuration file gives the " +"default to do so." +msgstr "" +"Schaltet die Erkennung umbenannter Dateien aus, auch wenn dies per " +"Konfigurationsdatei eingeschaltet wurde." #. type: Labeled list #: en/diff-options.txt:501 @@ -5092,7 +6667,14 @@ msgstr "--check" #. type: Plain text #: en/diff-options.txt:514 #, priority:280 -msgid "Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by `core.whitespace` configuration. By default, trailing whitespaces (including lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible with --exit-code." +msgid "" +"Warn if changes introduce conflict markers or whitespace errors. What are " +"considered whitespace errors is controlled by `core.whitespace` " +"configuration. By default, trailing whitespaces (including lines that " +"consist solely of whitespaces) and a space character that is immediately " +"followed by a tab character inside the initial indent of the line are " +"considered whitespace errors. Exits with non-zero status if problems are " +"found. Not compatible with --exit-code." msgstr "" #. type: Labeled list @@ -5104,8 +6686,22 @@ msgstr "--ws-error-highlight=" #. type: Plain text #: en/diff-options.txt:524 #, priority:280 -msgid "Highlight whitespace errors in the `context`, `old` or `new` lines of the diff. Multiple values are separated by comma, `none` resets previous values, `default` reset the list to `new` and `all` is a shorthand for `old,new,context`. When this option is not given, and the configuration variable `diff.wsErrorHighlight` is not set, only whitespace errors in `new` lines are highlighted. The whitespace errors are colored with `color.diff.whitespace`." -msgstr "Hervorheben von Fehlern mit Leerzeichen in den Zeilen `context`, `old` oder `new` des Diffs. Mehrfachwerte werden durch Kommas getrennt, `none` setzt vorherige Werte zurück, `default` setzt die Liste auf `new` zurück und `all` ist eine Kurzform für `old,new,context`. Wenn diese Option nicht angegeben ist und die Konfigurationsvariable `diff.wsErrorHighlight` nicht gesetzt ist, werden nur Leerzeichenfehler in `new` (neuen) Zeilen hervorgehoben. Die Whitespace-Fehler werden mit `color.diff.whitespace` eingefärbt." +msgid "" +"Highlight whitespace errors in the `context`, `old` or `new` lines of the " +"diff. Multiple values are separated by comma, `none` resets previous " +"values, `default` reset the list to `new` and `all` is a shorthand for " +"`old,new,context`. When this option is not given, and the configuration " +"variable `diff.wsErrorHighlight` is not set, only whitespace errors in `new`" +" lines are highlighted. The whitespace errors are colored with " +"`color.diff.whitespace`." +msgstr "" +"Hervorheben von Fehlern mit Leerzeichen in den Zeilen `context`, `old` oder " +"`new` des Diffs. Mehrfachwerte werden durch Kommas getrennt, `none` setzt " +"vorherige Werte zurück, `default` setzt die Liste auf `new` zurück und `all`" +" ist eine Kurzform für `old,new,context`. Wenn diese Option nicht angegeben" +" ist und die Konfigurationsvariable `diff.wsErrorHighlight` nicht gesetzt " +"ist, werden nur Leerzeichenfehler in `new` (neuen) Zeilen hervorgehoben. Die" +" Whitespace-Fehler werden mit `color.diff.whitespace` eingefärbt." #. type: Labeled list #: en/diff-options.txt:527 @@ -5116,8 +6712,14 @@ msgstr "--full-index" #. type: Plain text #: en/diff-options.txt:531 #, priority:280 -msgid "Instead of the first handful of characters, show the full pre- and post-image blob object names on the \"index\" line when generating patch format output." -msgstr "Anstelle der ersten paar Zeichen zeigt die \"Index\"-Zeile bei der Ausgabe im Patch-Format die vollständigen Pre- und Post-Image-Objektnamen des Blobs an." +msgid "" +"Instead of the first handful of characters, show the full pre- and post-" +"image blob object names on the \"index\" line when generating patch format " +"output." +msgstr "" +"Anstelle der ersten paar Zeichen zeigt die \"Index\"-Zeile bei der Ausgabe " +"im Patch-Format die vollständigen Pre- und Post-Image-Objektnamen des Blobs " +"an." #. type: Labeled list #: en/diff-options.txt:532 en/git-apply.txt:161 @@ -5128,11 +6730,14 @@ msgstr "--binary" #. type: Plain text #: en/diff-options.txt:535 #, priority:280 -msgid "In addition to `--full-index`, output a binary diff that can be applied with `git-apply`." +msgid "" +"In addition to `--full-index`, output a binary diff that can be applied with" +" `git-apply`." msgstr "" #. type: Labeled list -#: en/diff-options.txt:539 en/git-ls-files.txt:184 en/git-ls-tree.txt:72 en/git-show-ref.txt:65 +#: en/diff-options.txt:539 en/git-ls-files.txt:184 en/git-ls-tree.txt:72 +#: en/git-show-ref.txt:65 #, no-wrap, priority:280 msgid "--abbrev[=]" msgstr "--abbrev[=]" @@ -5140,7 +6745,14 @@ msgstr "--abbrev[=]" #. type: Plain text #: en/diff-options.txt:548 #, priority:280 -msgid "Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header lines, show the shortest prefix that is at least '' hexdigits long that uniquely refers the object. In diff-patch output format, `--full-index` takes higher precedence, i.e. if `--full-index` is specified, full blob names will be shown regardless of `--abbrev`. Non default number of digits can be specified with `--abbrev=`." +msgid "" +"Instead of showing the full 40-byte hexadecimal object name in diff-raw " +"format output and diff-tree header lines, show the shortest prefix that is " +"at least '' hexdigits long that uniquely refers the object. In diff-" +"patch output format, `--full-index` takes higher precedence, i.e. if " +"`--full-index` is specified, full blob names will be shown regardless of " +"`--abbrev`. Non default number of digits can be specified with " +"`--abbrev=`." msgstr "" #. type: Labeled list @@ -5158,19 +6770,36 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:553 #, priority:280 -msgid "Break complete rewrite changes into pairs of delete and create. This serves two purposes:" +msgid "" +"Break complete rewrite changes into pairs of delete and create. This serves " +"two purposes:" msgstr "" #. type: Plain text #: en/diff-options.txt:563 #, priority:280 -msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)." +msgid "" +"It affects the way a change that amounts to a total rewrite of a file not as" +" a series of deletion and insertion mixed together with a very few lines " +"that happen to match textually as the context, but as a single deletion of " +"everything old followed by a single insertion of everything new, and the " +"number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%`" +" specifies that less than 30% of the original should remain in the result " +"for Git to consider it a total rewrite (i.e. otherwise the resulting patch " +"will be a series of deletion and insertion mixed together with context " +"lines)." msgstr "" #. type: Plain text #: en/diff-options.txt:571 #, priority:280 -msgid "When used with -M, a totally-rewritten file is also considered as the source of a rename (usually -M only considers a file that disappeared as the source of a rename), and the number `n` controls this aspect of the -B option (defaults to 50%). `-B20%` specifies that a change with addition and deletion compared to 20% or more of the file's size are eligible for being picked up as a possible source of a rename to another file." +msgid "" +"When used with -M, a totally-rewritten file is also considered as the source" +" of a rename (usually -M only considers a file that disappeared as the " +"source of a rename), and the number `n` controls this aspect of the -B " +"option (defaults to 50%). `-B20%` specifies that a change with addition and " +"deletion compared to 20% or more of the file's size are eligible for being " +"picked up as a possible source of a rename to another file." msgstr "" #. type: Labeled list @@ -5230,7 +6859,9 @@ msgstr "--find-copies[=]" #. type: Plain text #: en/diff-options.txt:596 #, priority:280 -msgid "Detect copies as well as renames. See also `--find-copies-harder`. If `n` is specified, it has the same meaning as for `-M`." +msgid "" +"Detect copies as well as renames. See also `--find-copies-harder`. If `n` " +"is specified, it has the same meaning as for `-M`." msgstr "" #. type: Labeled list @@ -5242,7 +6873,12 @@ msgstr "--find-copies-harder" #. type: Plain text #: en/diff-options.txt:605 #, priority:280 -msgid "For performance reasons, by default, `-C` option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command inspect unmodified files as candidates for the source of copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one `-C` option has the same effect." +msgid "" +"For performance reasons, by default, `-C` option finds copies only if the " +"original file of the copy was modified in the same changeset. This flag " +"makes the command inspect unmodified files as candidates for the source of " +"copy. This is a very expensive operation for large projects, so use it with" +" caution. Giving more than one `-C` option has the same effect." msgstr "" #. type: Labeled list @@ -5260,13 +6896,21 @@ msgstr "--irreversible-delete" #. type: Plain text #: en/diff-options.txt:615 #, priority:280 -msgid "Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and `/dev/null`. The resulting patch is not meant to be applied with `patch` or `git apply`; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lacks enough information to apply such a patch in reverse, even manually, hence the name of the option." +msgid "" +"Omit the preimage for deletes, i.e. print only the header but not the diff " +"between the preimage and `/dev/null`. The resulting patch is not meant to be" +" applied with `patch` or `git apply`; this is solely for people who want to " +"just concentrate on reviewing the text after the change. In addition, the " +"output obviously lacks enough information to apply such a patch in reverse, " +"even manually, hence the name of the option." msgstr "" #. type: Plain text #: en/diff-options.txt:618 #, priority:280 -msgid "When used together with `-B`, omit also the preimage in the deletion part of a delete/create pair." +msgid "" +"When used together with `-B`, omit also the preimage in the deletion part of" +" a delete/create pair." msgstr "" #. type: Labeled list @@ -5278,7 +6922,16 @@ msgstr "-l" #. type: Plain text #: en/diff-options.txt:631 #, priority:280 -msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources. (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.) For N sources and destinations, this exhaustive check is O(N^2). This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number. Defaults to diff.renameLimit. Note that a value of 0 is treated as unlimited." +msgid "" +"The `-M` and `-C` options involve some preliminary steps that can detect " +"subsets of renames/copies cheaply, followed by an exhaustive fallback " +"portion that compares all remaining unpaired destinations to all relevant " +"sources. (For renames, only remaining unpaired sources are relevant; for " +"copies, all original sources are relevant.) For N sources and destinations," +" this exhaustive check is O(N^2). This option prevents the exhaustive " +"portion of rename/copy detection from running if the number of " +"source/destination files involved exceeds the specified number. Defaults to" +" diff.renameLimit. Note that a value of 0 is treated as unlimited." msgstr "" #. type: Labeled list @@ -5290,19 +6943,31 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:644 #, ignore-ellipsis, priority:280 -msgid "Select only files that are Added (`A`), Copied (`C`), Deleted (`D`), Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, submodule, ...) changed (`T`), are Unmerged (`U`), are Unknown (`X`), or have had their pairing Broken (`B`). Any combination of the filter characters (including none) can be used. When `*` (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected." +msgid "" +"Select only files that are Added (`A`), Copied (`C`), Deleted (`D`), " +"Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, " +"submodule, ...) changed (`T`), are Unmerged (`U`), are Unknown (`X`), or " +"have had their pairing Broken (`B`). Any combination of the filter " +"characters (including none) can be used. When `*` (All-or-none) is added to" +" the combination, all paths are selected if there is any file that matches " +"other criteria in the comparison; if there is no file that matches other " +"criteria, nothing is selected." msgstr "" #. type: Plain text #: en/diff-options.txt:647 #, priority:280 -msgid "Also, these upper-case letters can be downcased to exclude. E.g. `--diff-filter=ad` excludes added and deleted paths." +msgid "" +"Also, these upper-case letters can be downcased to exclude. E.g. `--diff-" +"filter=ad` excludes added and deleted paths." msgstr "" #. type: Plain text #: en/diff-options.txt:650 #, priority:280 -msgid "Note that not all diffs can feature all types. For instance, copied and renamed entries cannot appear if detection for those types is disabled." +msgid "" +"Note that not all diffs can feature all types. For instance, copied and " +"renamed entries cannot appear if detection for those types is disabled." msgstr "" #. type: Labeled list @@ -5314,13 +6979,20 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:655 #, priority:280 -msgid "Look for differences that change the number of occurrences of the specified string (i.e. addition/deletion) in a file. Intended for the scripter's use." +msgid "" +"Look for differences that change the number of occurrences of the specified " +"string (i.e. addition/deletion) in a file. Intended for the scripter's use." msgstr "" #. type: Plain text #: en/diff-options.txt:661 #, priority:280 -msgid "It is useful when you're looking for an exact block of code (like a struct), and want to know the history of that block since it first came into being: use the feature iteratively to feed the interesting block in the preimage back into `-S`, and keep going until you get the very first version of the block." +msgid "" +"It is useful when you're looking for an exact block of code (like a struct)," +" and want to know the history of that block since it first came into being: " +"use the feature iteratively to feed the interesting block in the preimage " +"back into `-S`, and keep going until you get the very first version of the " +"block." msgstr "" #. type: Plain text @@ -5338,13 +7010,17 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:667 #, priority:280 -msgid "Look for differences whose patch text contains added/removed lines that match ." +msgid "" +"Look for differences whose patch text contains added/removed lines that " +"match ." msgstr "" #. type: Plain text #: en/diff-options.txt:671 #, priority:280 -msgid "To illustrate the difference between `-S --pickaxe-regex` and `-G`, consider a commit with the following diff in the same file:" +msgid "" +"To illustrate the difference between `-S --pickaxe-regex` and " +"`-G`, consider a commit with the following diff in the same file:" msgstr "" #. type: delimited block - @@ -5359,19 +7035,25 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:681 #, priority:280 -msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)." +msgid "" +"While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log " +"-S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of " +"occurrences of that string did not change)." msgstr "" #. type: Plain text #: en/diff-options.txt:684 #, priority:280 -msgid "Unless `--text` is supplied patches of binary files without a textconv filter will be ignored." +msgid "" +"Unless `--text` is supplied patches of binary files without a textconv " +"filter will be ignored." msgstr "" #. type: Plain text #: en/diff-options.txt:687 #, priority:280 -msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information." +msgid "" +"See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information." msgstr "" #. type: Labeled list @@ -5383,13 +7065,18 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:693 #, priority:280 -msgid "Look for differences that change the number of occurrences of the specified object. Similar to `-S`, just the argument is different in that it doesn't search for a specific string but for a specific object id." +msgid "" +"Look for differences that change the number of occurrences of the specified " +"object. Similar to `-S`, just the argument is different in that it doesn't " +"search for a specific string but for a specific object id." msgstr "" #. type: Plain text #: en/diff-options.txt:696 #, priority:280 -msgid "The object can be a blob or a submodule commit. It implies the `-t` option in `git-log` to also find trees." +msgid "" +"The object can be a blob or a submodule commit. It implies the `-t` option " +"in `git-log` to also find trees." msgstr "" #. type: Labeled list @@ -5401,7 +7088,9 @@ msgstr "--pickaxe-all" #. type: Plain text #: en/diff-options.txt:701 #, priority:280 -msgid "When `-S` or `-G` finds a change, show all the changes in that changeset, not just the files that contain the change in ." +msgid "" +"When `-S` or `-G` finds a change, show all the changes in that changeset, " +"not just the files that contain the change in ." msgstr "" #. type: Labeled list @@ -5413,7 +7102,9 @@ msgstr "--pickaxe-regex" #. type: Plain text #: en/diff-options.txt:705 #, priority:280 -msgid "Treat the given to `-S` as an extended POSIX regular expression to match." +msgid "" +"Treat the given to `-S` as an extended POSIX regular expression to " +"match." msgstr "" #. type: Labeled list @@ -5425,13 +7116,27 @@ msgstr "-O" #. type: Plain text #: en/diff-options.txt:713 #, priority:280 -msgid "Control the order in which files appear in the output. This overrides the `diff.orderFile` configuration variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`." -msgstr "Steuert die Reihenfolge der Dateien in der Ausgabe. Dies setzt die Konfigurations-Variable `diff.orderFile` außer Kraft (siehe linkgit:git-config[1]). Um `diff.orderFile` zu stornieren, benutzen Sie `-O/dev/null`." +msgid "" +"Control the order in which files appear in the output. This overrides the " +"`diff.orderFile` configuration variable (see linkgit:git-config[1]). To " +"cancel `diff.orderFile`, use `-O/dev/null`." +msgstr "" +"Steuert die Reihenfolge der Dateien in der Ausgabe. Dies setzt die " +"Konfigurations-Variable `diff.orderFile` außer Kraft (siehe linkgit:git-" +"config[1]). Um `diff.orderFile` zu stornieren, benutzen Sie `-O/dev/null`." #. type: Plain text #: en/diff-options.txt:725 #, priority:280 -msgid "The output order is determined by the order of glob patterns in . All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on. All files with pathnames that do not match any pattern are output last, as if there was an implicit match-all pattern at the end of the file. If multiple pathnames have the same rank (they match the same pattern but no earlier patterns), their output order relative to each other is the normal order." +msgid "" +"The output order is determined by the order of glob patterns in ." +" All files with pathnames that match the first pattern are output first, " +"all files with pathnames that match the second pattern (but not the first) " +"are output next, and so on. All files with pathnames that do not match any " +"pattern are output last, as if there was an implicit match-all pattern at " +"the end of the file. If multiple pathnames have the same rank (they match " +"the same pattern but no earlier patterns), their output order relative to " +"each other is the normal order." msgstr "" #. type: Plain text @@ -5443,13 +7148,17 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:731 #, priority:280 -msgid "Blank lines are ignored, so they can be used as separators for readability." +msgid "" +"Blank lines are ignored, so they can be used as separators for readability." msgstr "" #. type: Plain text #: en/diff-options.txt:735 #, priority:280 -msgid "Lines starting with a hash (\"`#`\") are ignored, so they can be used for comments. Add a backslash (\"`\\`\") to the beginning of the pattern if it starts with a hash." +msgid "" +"Lines starting with a hash (\"`#`\") are ignored, so they can be used for " +"comments. Add a backslash (\"`\\`\") to the beginning of the pattern if it " +"starts with a hash." msgstr "" #. type: Plain text @@ -5461,7 +7170,12 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:744 #, priority:280 -msgid "Patterns have the same syntax and semantics as patterns used for fnmatch(3) without the FNM_PATHNAME flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern. For example, the pattern \"`foo*bar`\" matches \"`fooasdfbar`\" and \"`foo/bar/baz/asdf`\" but not \"`foobarx`\"." +msgid "" +"Patterns have the same syntax and semantics as patterns used for fnmatch(3) " +"without the FNM_PATHNAME flag, except a pathname also matches a pattern if " +"removing any number of the final pathname components matches the pattern. " +"For example, the pattern \"`foo*bar`\" matches \"`fooasdfbar`\" and " +"\"`foo/bar/baz/asdf`\" but not \"`foobarx`\"." msgstr "" #. type: Labeled list @@ -5479,7 +7193,11 @@ msgstr "--template=" #. type: Plain text #: en/diff-options.txt:752 #, priority:280 -msgid "Discard the files before the named from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to'). These options were invented primarily for the use of the `git difftool` command, and may not be very useful otherwise." +msgid "" +"Discard the files before the named from the output (i.e. 'skip to'), " +"or move them to the end of the output (i.e. 'rotate to'). These options " +"were invented primarily for the use of the `git difftool` command, and may " +"not be very useful otherwise." msgstr "" #. type: Labeled list @@ -5491,7 +7209,9 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:757 #, priority:280 -msgid "Swap two inputs; that is, show differences from index or on-disk file to tree contents." +msgid "" +"Swap two inputs; that is, show differences from index or on-disk file to " +"tree contents." msgstr "" #. type: Labeled list @@ -5509,11 +7229,22 @@ msgstr "--no-relative" #. type: Plain text #: en/diff-options.txt:769 #, priority:280 -msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option. When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a as an argument. `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`." +msgid "" +"When run from a subdirectory of the project, it can be told to exclude " +"changes outside the directory and show pathnames relative to it with this " +"option. When you are not in a subdirectory (e.g. in a bare repository), you" +" can name which subdirectory to make the output relative to by giving a " +" as an argument. `--no-relative` can be used to countermand both " +"`diff.relative` config option and previous `--relative`." msgstr "" #. type: Labeled list -#: en/diff-options.txt:770 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:176 en/git-checkout-index.txt:39 en/git-commit.txt:67 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:71 en/git-help.txt:49 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:159 en/git-tag.txt:60 +#: en/diff-options.txt:770 en/fetch-options.txt:4 en/git-archimport.txt:99 +#: en/git-branch.txt:176 en/git-checkout-index.txt:39 en/git-commit.txt:67 +#: en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:71 +#: en/git-help.txt:49 en/git-merge-base.txt:71 en/git-merge-index.txt:26 +#: en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:159 +#: en/git-tag.txt:60 #, ignore-same, no-wrap, priority:280 msgid "-a" msgstr "-a" @@ -5555,7 +7286,8 @@ msgid "--ignore-space-change" msgstr "--ignore-space-change" #. type: Labeled list -#: en/diff-options.txt:786 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:104 en/git-hash-object.txt:31 en/git-help.txt:106 +#: en/diff-options.txt:786 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 +#: en/git-grep.txt:104 en/git-hash-object.txt:31 en/git-help.txt:106 #, ignore-same, no-wrap, priority:280 msgid "-w" msgstr "-w" @@ -5569,8 +7301,13 @@ msgstr "--ignore-all-space" #. type: Plain text #: en/diff-options.txt:791 #, fuzzy, priority:280 -msgid "Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none." -msgstr "Ignoriert Leerzeichen beim Vergleichen von Zeilen. Dadurch werden Unterschiede selbst dann ignoriert, wenn eine Zeile Leerzeichen enthält, während die andere Zeile keine Leerzeichen enthält." +msgid "" +"Ignore whitespace when comparing lines. This ignores differences even if " +"one line has whitespace where the other line has none." +msgstr "" +"Ignoriert Leerzeichen beim Vergleichen von Zeilen. Dadurch werden " +"Unterschiede selbst dann ignoriert, wenn eine Zeile Leerzeichen enthält, " +"während die andere Zeile keine Leerzeichen enthält." #. type: Labeled list #: en/diff-options.txt:792 @@ -5599,7 +7336,9 @@ msgstr "--ignore-paths=" #. type: Plain text #: en/diff-options.txt:799 #, fuzzy, priority:280 -msgid "Ignore changes whose all lines match . This option may be specified more than once." +msgid "" +"Ignore changes whose all lines match . This option may be specified " +"more than once." msgstr "Diese Option kann mehr als einmal angegeben werden." #. type: Labeled list @@ -5611,11 +7350,15 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:805 #, priority:280 -msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other. Defaults to `diff.interHunkContext` or 0 if the config option is unset." +msgid "" +"Show the context between diff hunks, up to the specified number of lines, " +"thereby fusing hunks that are close to each other. Defaults to " +"`diff.interHunkContext` or 0 if the config option is unset." msgstr "" #. type: Labeled list -#: en/diff-options.txt:806 en/git-cvsexportcommit.txt:77 en/git-grep.txt:233 en/git-restore.txt:58 +#: en/diff-options.txt:806 en/git-cvsexportcommit.txt:77 en/git-grep.txt:233 +#: en/git-restore.txt:58 #, no-wrap, priority:280 msgid "-W" msgstr "-W" @@ -5629,7 +7372,10 @@ msgstr "--function-context" #. type: Plain text #: en/diff-options.txt:812 #, priority:280 -msgid "Show whole function as context lines for each change. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." +msgid "" +"Show whole function as context lines for each change. The function names " +"are determined in the same way as `git diff` works out patch hunk headers " +"(see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "" #. type: Labeled list @@ -5641,11 +7387,26 @@ msgstr "--exit-code" #. type: Plain text #: en/diff-options.txt:819 #, priority:280 -msgid "Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and 0 means no differences." +msgid "" +"Make the program exit with codes similar to diff(1). That is, it exits with" +" 1 if there were differences and 0 means no differences." msgstr "" #. type: Labeled list -#: en/diff-options.txt:820 en/fetch-options.txt:282 en/git-am.txt:89 en/git-apply.txt:232 en/git-branch.txt:203 en/git-bundle.txt:127 en/git-checkout-index.txt:32 en/git-checkout.txt:110 en/git-clean.txt:54 en/git-clone.txt:130 en/git-commit.txt:370 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:385 en/git-gc.txt:80 en/git-grep.txt:295 en/git-imap-send.txt:37 en/git-init.txt:44 en/git-ls-remote.txt:39 en/git-notes.txt:231 en/git-prune-packed.txt:37 en/git-pull.txt:81 en/git-push.txt:387 en/git-read-tree.txt:118 en/git-rebase.txt:408 en/git-repack.txt:107 en/git-reset.txt:108 en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:82 en/git-send-email.txt:443 en/git-show-ref.txt:71 en/git-stash.txt:239 en/git-submodule.txt:277 en/git-svn.txt:671 en/git-switch.txt:143 en/git-symbolic-ref.txt:40 en/git-worktree.txt:252 en/merge-options.txt:175 en/rev-list-options.txt:252 +#: en/diff-options.txt:820 en/fetch-options.txt:282 en/git-am.txt:89 +#: en/git-apply.txt:232 en/git-branch.txt:203 en/git-bundle.txt:127 +#: en/git-checkout-index.txt:32 en/git-checkout.txt:110 en/git-clean.txt:54 +#: en/git-clone.txt:130 en/git-commit.txt:370 en/git-fast-import.txt:42 +#: en/git-fetch-pack.txt:49 en/git-format-patch.txt:385 en/git-gc.txt:80 +#: en/git-grep.txt:295 en/git-imap-send.txt:37 en/git-init.txt:44 +#: en/git-ls-remote.txt:39 en/git-notes.txt:231 en/git-prune-packed.txt:37 +#: en/git-pull.txt:81 en/git-push.txt:387 en/git-read-tree.txt:118 +#: en/git-rebase.txt:408 en/git-repack.txt:107 en/git-reset.txt:108 +#: en/git-restore.txt:67 en/git-rev-parse.txt:118 en/git-rm.txt:82 +#: en/git-send-email.txt:443 en/git-show-ref.txt:71 en/git-stash.txt:239 +#: en/git-submodule.txt:277 en/git-svn.txt:671 en/git-switch.txt:143 +#: en/git-symbolic-ref.txt:40 en/git-worktree.txt:252 en/merge-options.txt:175 +#: en/rev-list-options.txt:252 #, ignore-same, no-wrap, priority:300 msgid "--quiet" msgstr "--quiet" @@ -5665,7 +7426,10 @@ msgstr "--ext-diff" #. type: Plain text #: en/diff-options.txt:829 #, priority:280 -msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends." +msgid "" +"Allow an external diff helper to be executed. If you set an external diff " +"driver with linkgit:gitattributes[5], you need to use this option with " +"linkgit:git-log[1] and friends." msgstr "" #. type: Labeled list @@ -5695,7 +7459,14 @@ msgstr "--no-textconv" #. type: Plain text #: en/diff-options.txt:843 #, priority:280 -msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands." +msgid "" +"Allow (or disallow) external text conversion filters to be run when " +"comparing binary files. See linkgit:gitattributes[5] for details. Because " +"textconv filters are typically a one-way conversion, the resulting diff is " +"suitable for human consumption, but cannot be applied. For this reason, " +"textconv filters are enabled by default only for linkgit:git-diff[1] and " +"linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing" +" commands." msgstr "" #. type: Labeled list @@ -5707,7 +7478,18 @@ msgstr "--ignore-submodules[=]" #. type: Plain text #: en/diff-options.txt:856 #, priority:280 -msgid "Ignore changes to submodules in the diff generation. can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default. Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules." +msgid "" +"Ignore changes to submodules in the diff generation. can be either " +"\"none\", \"untracked\", \"dirty\" or \"all\", which is the default. Using " +"\"none\" will consider the submodule modified when it either contains " +"untracked or modified files or its HEAD differs from the commit recorded in " +"the superproject and can be used to override any settings of the 'ignore' " +"option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\"" +" is used submodules are not considered dirty when they only contain " +"untracked content (but they are still scanned for modified content). Using " +"\"dirty\" ignores all changes to the work tree of submodules, only changes " +"to the commits stored in the superproject are shown (this was the behavior " +"until 1.7.0). Using \"all\" hides all changes to submodules." msgstr "" #. type: Labeled list @@ -5755,7 +7537,10 @@ msgstr "--default-prefix" #. type: Plain text #: en/diff-options.txt:870 #, priority:280 -msgid "Use the default source and destination prefixes (\"a/\" and \"b/\"). This is usually the default already, but may be used to override config such as `diff.noprefix`." +msgid "" +"Use the default source and destination prefixes (\"a/\" and \"b/\"). This " +"is usually the default already, but may be used to override config such as " +"`diff.noprefix`." msgstr "" #. type: Labeled list @@ -5779,17 +7564,31 @@ msgstr "--ita-invisible-in-index" #. type: Plain text #: en/diff-options.txt:881 #, priority:280 -msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\". This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future." +msgid "" +"By default entries added by \"git add -N\" appear as an existing empty file " +"in \"git diff\" and a new file in \"git diff --cached\". This option makes " +"the entry appear as a new file in \"git diff\" and non-existent in \"git " +"diff --cached\". This option could be reverted with `--ita-visible-in-" +"index`. Both options are experimental and could be removed in future." msgstr "" #. type: Plain text #: en/diff-options.txt:883 #, priority:280 -msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]." +msgid "" +"For more detailed explanation on these common options, see also " +"linkgit:gitdiffcore[7]." msgstr "" #. type: Labeled list -#: en/fetch-options.txt:1 en/git-add.txt:131 en/git-branch.txt:177 en/git-checkout-index.txt:40 en/git-commit.txt:68 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:50 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:78 en/git-pack-redundant.txt:46 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:69 en/git-rev-parse.txt:165 en/git-send-pack.txt:38 en/git-show-branch.txt:48 en/git-stash.txt:160 en/git-submodule.txt:287 en/rev-list-options.txt:159 +#: en/fetch-options.txt:1 en/git-add.txt:131 en/git-branch.txt:177 +#: en/git-checkout-index.txt:40 en/git-commit.txt:68 en/git-describe.txt:50 +#: en/git-fetch-pack.txt:35 en/git-help.txt:50 en/git-http-push.txt:25 +#: en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:78 +#: en/git-pack-redundant.txt:46 en/git-pack-refs.txt:48 en/git-push.txt:149 +#: en/git-reflog.txt:69 en/git-rev-parse.txt:165 en/git-send-pack.txt:38 +#: en/git-show-branch.txt:48 en/git-stash.txt:160 en/git-submodule.txt:287 +#: en/rev-list-options.txt:159 #, ignore-same, no-wrap, priority:300 msgid "--all" msgstr "--all" @@ -5809,7 +7608,10 @@ msgstr "--append" #. type: Plain text #: en/fetch-options.txt:9 #, priority:220 -msgid "Append ref names and object names of fetched refs to the existing contents of `.git/FETCH_HEAD`. Without this option old data in `.git/FETCH_HEAD` will be overwritten." +msgid "" +"Append ref names and object names of fetched refs to the existing contents " +"of `.git/FETCH_HEAD`. Without this option old data in `.git/FETCH_HEAD` " +"will be overwritten." msgstr "" #. type: Labeled list @@ -5821,7 +7623,9 @@ msgstr "--atomic" #. type: Plain text #: en/fetch-options.txt:13 #, priority:220 -msgid "Use an atomic transaction to update local refs. Either all refs are updated, or on error, no refs are updated." +msgid "" +"Use an atomic transaction to update local refs. Either all refs are updated," +" or on error, no refs are updated." msgstr "" #. type: Labeled list @@ -5833,7 +7637,12 @@ msgstr "--depth=" #. type: Plain text #: en/fetch-options.txt:20 #, priority:220 -msgid "Limit fetching to the specified number of commits from the tip of each remote branch history. If fetching to a 'shallow' repository created by `git clone` with `--depth=` option (see linkgit:git-clone[1]), deepen or shorten the history to the specified number of commits. Tags for the deepened commits are not fetched." +msgid "" +"Limit fetching to the specified number of commits from the tip of each " +"remote branch history. If fetching to a 'shallow' repository created by `git" +" clone` with `--depth=` option (see linkgit:git-clone[1]), deepen or " +"shorten the history to the specified number of commits. Tags for the " +"deepened commits are not fetched." msgstr "" #. type: Labeled list @@ -5845,7 +7654,10 @@ msgstr "--deepen=" #. type: Plain text #: en/fetch-options.txt:25 #, priority:220 -msgid "Similar to --depth, except it specifies the number of commits from the current shallow boundary instead of from the tip of each remote branch history." +msgid "" +"Similar to --depth, except it specifies the number of commits from the " +"current shallow boundary instead of from the tip of each remote branch " +"history." msgstr "" #. type: Labeled list @@ -5857,7 +7669,9 @@ msgstr "--shallow-since=" #. type: Plain text #: en/fetch-options.txt:29 en/git-fetch-pack.txt:93 #, priority:220 -msgid "Deepen or shorten the history of a shallow repository to include all reachable commits after ." +msgid "" +"Deepen or shorten the history of a shallow repository to include all " +"reachable commits after ." msgstr "" #. type: Labeled list @@ -5869,7 +7683,10 @@ msgstr "--shallow-exclude=" #. type: Plain text #: en/fetch-options.txt:34 en/git-fetch-pack.txt:98 #, priority:220 -msgid "Deepen or shorten the history of a shallow repository to exclude commits reachable from a specified remote branch or tag. This option can be specified multiple times." +msgid "" +"Deepen or shorten the history of a shallow repository to exclude commits " +"reachable from a specified remote branch or tag. This option can be " +"specified multiple times." msgstr "" #. type: Labeled list @@ -5881,13 +7698,17 @@ msgstr "--unshallow" #. type: Plain text #: en/fetch-options.txt:39 #, priority:220 -msgid "If the source repository is complete, convert a shallow repository to a complete one, removing all the limitations imposed by shallow repositories." +msgid "" +"If the source repository is complete, convert a shallow repository to a " +"complete one, removing all the limitations imposed by shallow repositories." msgstr "" #. type: Plain text #: en/fetch-options.txt:42 #, priority:220 -msgid "If the source repository is shallow, fetch as much as possible so that the current repository has the same history as the source repository." +msgid "" +"If the source repository is shallow, fetch as much as possible so that the " +"current repository has the same history as the source repository." msgstr "" #. type: Labeled list @@ -5899,7 +7720,10 @@ msgstr "--update-shallow" #. type: Plain text #: en/fetch-options.txt:48 #, priority:220 -msgid "By default when fetching from a shallow repository, `git fetch` refuses refs that require updating .git/shallow. This option updates .git/shallow and accepts such refs." +msgid "" +"By default when fetching from a shallow repository, `git fetch` refuses refs" +" that require updating .git/shallow. This option updates .git/shallow and " +"accepts such refs." msgstr "" #. type: Labeled list @@ -5911,26 +7735,42 @@ msgstr "" #. type: Plain text #: en/fetch-options.txt:57 #, priority:220 -msgid "By default, Git will report, to the server, commits reachable from all local refs to find common commits in an attempt to reduce the size of the to-be-received packfile. If specified, Git will only report commits reachable from the given tips. This is useful to speed up fetches when the user knows which local ref is likely to have commits in common with the upstream ref being fetched." +msgid "" +"By default, Git will report, to the server, commits reachable from all local" +" refs to find common commits in an attempt to reduce the size of the to-be-" +"received packfile. If specified, Git will only report commits reachable from" +" the given tips. This is useful to speed up fetches when the user knows " +"which local ref is likely to have commits in common with the upstream ref " +"being fetched." msgstr "" #. type: Plain text #: en/fetch-options.txt:60 #, priority:220 -msgid "This option may be specified more than once; if so, Git will report commits reachable from any of the given commits." +msgid "" +"This option may be specified more than once; if so, Git will report commits " +"reachable from any of the given commits." msgstr "" #. type: Plain text #: en/fetch-options.txt:64 #, priority:220 -msgid "The argument to this option may be a glob on ref names, a ref, or the (possibly abbreviated) SHA-1 of a commit. Specifying a glob is equivalent to specifying this option multiple times, one for each matching ref name." +msgid "" +"The argument to this option may be a glob on ref names, a ref, or the " +"(possibly abbreviated) SHA-1 of a commit. Specifying a glob is equivalent to" +" specifying this option multiple times, one for each matching ref name." msgstr "" #. type: Plain text #: en/fetch-options.txt:68 #, fuzzy, priority:220 -msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below." -msgstr "Siehe auch die Konfigurationsvariable `fetch.negotiationAlgorithm`, die in linkgit:git-config[1] dokumentiert ist." +msgid "" +"See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration" +" variables documented in linkgit:git-config[1], and the `--negotiate-only` " +"option below." +msgstr "" +"Siehe auch die Konfigurationsvariable `fetch.negotiationAlgorithm`, die in " +"linkgit:git-config[1] dokumentiert ist." #. type: Labeled list #: en/fetch-options.txt:69 @@ -5941,17 +7781,29 @@ msgstr "--negotiate-only" #. type: Plain text #: en/fetch-options.txt:73 #, priority:220 -msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server." +msgid "" +"Do not fetch anything from the server, and instead print the ancestors of " +"the provided `--negotiation-tip=*` arguments, which we have in common with " +"the server." msgstr "" #. type: Plain text #: en/fetch-options.txt:77 #, priority:220 -msgid "This is incompatible with `--recurse-submodules=[yes|on-demand]`. Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]." +msgid "" +"This is incompatible with `--recurse-submodules=[yes|on-demand]`. " +"Internally this is used to implement the `push.negotiate` option, see " +"linkgit:git-config[1]." msgstr "" #. type: Labeled list -#: en/fetch-options.txt:78 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:373 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:203 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:174 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:117 en/git-rm.txt:53 en/git-send-email.txt:434 en/git-send-pack.txt:52 en/git-svn.txt:687 en/git-worktree.txt:231 +#: en/fetch-options.txt:78 en/git-add.txt:70 en/git-clean.txt:50 +#: en/git-commit.txt:373 en/git-http-push.txt:37 en/git-mv.txt:40 +#: en/git-notes.txt:203 en/git-p4.txt:332 en/git-prune-packed.txt:32 +#: en/git-prune.txt:37 en/git-push.txt:174 en/git-quiltimport.txt:35 +#: en/git-read-tree.txt:59 en/git-reflog.txt:117 en/git-rm.txt:53 +#: en/git-send-email.txt:434 en/git-send-pack.txt:52 en/git-svn.txt:687 +#: en/git-worktree.txt:231 #, ignore-same, no-wrap, priority:300 msgid "--dry-run" msgstr "--dry-run" @@ -5965,13 +7817,17 @@ msgstr "" #. type: Plain text #: en/fetch-options.txt:84 #, priority:220 -msgid "Print the output to standard output in an easy-to-parse format for scripts. See section OUTPUT in linkgit:git-fetch[1] for details." +msgid "" +"Print the output to standard output in an easy-to-parse format for scripts. " +"See section OUTPUT in linkgit:git-fetch[1] for details." msgstr "" #. type: Plain text #: en/fetch-options.txt:87 #, priority:220 -msgid "This is incompatible with `--recurse-submodules=[yes|on-demand]` and takes precedence over the `fetch.output` config option." +msgid "" +"This is incompatible with `--recurse-submodules=[yes|on-demand]` and takes " +"precedence over the `fetch.output` config option." msgstr "" #. type: Labeled list @@ -5983,17 +7839,35 @@ msgstr "--[no-]write-fetch-head" #. type: Plain text #: en/fetch-options.txt:95 #, priority:220 -msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`. This is the default. Passing `--no-write-fetch-head` from the command line tells Git not to write the file. Under `--dry-run` option, the file is never written." +msgid "" +"Write the list of remote refs fetched in the `FETCH_HEAD` file directly " +"under `$GIT_DIR`. This is the default. Passing `--no-write-fetch-head` " +"from the command line tells Git not to write the file. Under `--dry-run` " +"option, the file is never written." msgstr "" #. type: Labeled list -#: en/fetch-options.txt:97 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:120 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:169 en/git-mv.txt:31 en/git-notes.txt:133 en/git-push.txt:333 en/git-rebase.txt:440 en/git-repack.txt:98 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:300 en/git-switch.txt:110 en/git-tag.txt:79 en/git-update-server-info.txt:24 en/git-worktree.txt:172 +#: en/fetch-options.txt:97 en/git-add.txt:78 en/git-archimport.txt:81 +#: en/git-blame.txt:65 en/git-branch.txt:117 en/git-checkout-index.txt:35 +#: en/git-checkout.txt:120 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 +#: en/git-filter-branch.txt:208 en/git-ls-files.txt:169 en/git-mv.txt:31 +#: en/git-notes.txt:133 en/git-push.txt:333 en/git-rebase.txt:440 +#: en/git-repack.txt:98 en/git-replace.txt:60 en/git-rm.txt:48 +#: en/git-submodule.txt:300 en/git-switch.txt:110 en/git-tag.txt:79 +#: en/git-update-server-info.txt:24 en/git-worktree.txt:172 #, ignore-same, no-wrap, priority:300 msgid "-f" msgstr "-f" #. type: Labeled list -#: en/fetch-options.txt:98 en/git-add.txt:79 en/git-branch.txt:118 en/git-checkout-index.txt:36 en/git-checkout.txt:121 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:83 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:134 en/git-push.txt:334 en/git-replace.txt:61 en/git-rm.txt:49 en/git-send-email.txt:463 en/git-send-pack.txt:55 en/git-submodule.txt:301 en/git-switch.txt:111 en/git-tag.txt:80 en/git-update-server-info.txt:25 en/git-worktree.txt:173 +#: en/fetch-options.txt:98 en/git-add.txt:79 en/git-branch.txt:118 +#: en/git-checkout-index.txt:36 en/git-checkout.txt:121 en/git-clean.txt:37 +#: en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:83 +#: en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:134 +#: en/git-push.txt:334 en/git-replace.txt:61 en/git-rm.txt:49 +#: en/git-send-email.txt:463 en/git-send-pack.txt:55 en/git-submodule.txt:301 +#: en/git-switch.txt:111 en/git-tag.txt:80 en/git-update-server-info.txt:25 +#: en/git-worktree.txt:173 #, ignore-same, no-wrap, priority:300 msgid "--force" msgstr "--force" @@ -6001,7 +7875,9 @@ msgstr "--force" #. type: Plain text #: en/fetch-options.txt:101 #, priority:220 -msgid "When 'git fetch' is used with `:` refspec, it may refuse to update the local branch as discussed" +msgid "" +"When 'git fetch' is used with `:` refspec, it may refuse to update" +" the local branch as discussed" msgstr "" #. type: Plain text @@ -6025,13 +7901,17 @@ msgid "\tThis option overrides that check.\n" msgstr "" #. type: Labeled list -#: en/fetch-options.txt:110 en/git-am.txt:44 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:86 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:211 en/git-stash.txt:189 +#: en/fetch-options.txt:110 en/git-am.txt:44 en/git-cvsexportcommit.txt:67 +#: en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 +#: en/git-format-patch.txt:133 en/git-ls-files.txt:86 en/git-mailinfo.txt:29 +#: en/git-mv.txt:34 en/git-repack.txt:211 en/git-stash.txt:189 #, ignore-same, no-wrap, priority:280 msgid "-k" msgstr "-k" #. type: Labeled list -#: en/fetch-options.txt:111 en/git-am.txt:45 en/git-fetch-pack.txt:54 en/git-index-pack.txt:62 en/git-reset.txt:87 +#: en/fetch-options.txt:111 en/git-am.txt:45 en/git-fetch-pack.txt:54 +#: en/git-index-pack.txt:62 en/git-reset.txt:87 #, ignore-same, no-wrap, priority:280 msgid "--keep" msgstr "--keep" @@ -6051,7 +7931,9 @@ msgstr "--multiple" #. type: Plain text #: en/fetch-options.txt:118 #, priority:220 -msgid "Allow several and arguments to be specified. No s may be specified." +msgid "" +"Allow several and arguments to be specified. No " +"s may be specified." msgstr "" #. type: Labeled list @@ -6069,7 +7951,10 @@ msgstr "--[no-]auto-gc" #. type: Plain text #: en/fetch-options.txt:124 #, priority:220 -msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.) This is enabled by default." +msgid "" +"Run `git maintenance run --auto` at the end to perform automatic repository " +"maintenance if needed. (`--[no-]auto-gc` is a synonym.) This is enabled by " +"default." msgstr "" #. type: Labeled list @@ -6081,7 +7966,9 @@ msgstr "--[no-]write-commit-graph" #. type: Plain text #: en/fetch-options.txt:128 #, priority:220 -msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`." +msgid "" +"Write a commit-graph after fetching. This overrides the config setting " +"`fetch.writeCommitGraph`." msgstr "" #. type: Labeled list @@ -6093,7 +7980,9 @@ msgstr "--prefetch" #. type: Plain text #: en/fetch-options.txt:134 #, priority:220 -msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]." +msgid "" +"Modify the configured refspec to place all refs into the `refs/prefetch/` " +"namespace. See the `prefetch` task in linkgit:git-maintenance[1]." msgstr "" #. type: Labeled list @@ -6105,7 +7994,14 @@ msgstr "--prune" #. type: Plain text #: en/fetch-options.txt:146 #, priority:220 -msgid "Before fetching, remove any remote-tracking references that no longer exist on the remote. Tags are not subject to pruning if they are fetched only because of the default tag auto-following or due to a --tags option. However, if tags are fetched due to an explicit refspec (either on the command line or in the remote configuration, for example if the remote was cloned with the --mirror option), then they are also subject to pruning. Supplying `--prune-tags` is a shorthand for providing the tag refspec." +msgid "" +"Before fetching, remove any remote-tracking references that no longer exist " +"on the remote. Tags are not subject to pruning if they are fetched only " +"because of the default tag auto-following or due to a --tags option. " +"However, if tags are fetched due to an explicit refspec (either on the " +"command line or in the remote configuration, for example if the remote was " +"cloned with the --mirror option), then they are also subject to pruning. " +"Supplying `--prune-tags` is a shorthand for providing the tag refspec." msgstr "" #. type: Plain text @@ -6115,8 +8011,9 @@ msgid "See the PRUNING section below for more details." msgstr "" #. type: Labeled list -#: en/fetch-options.txt:150 en/git-cvsexportcommit.txt:57 en/git-grep.txt:135 en/git.txt:135 en/rev-list-options.txt:97 -#, no-wrap, priority:260 +#: en/fetch-options.txt:150 en/git-cvsexportcommit.txt:57 en/git-grep.txt:135 +#: en/git.txt:135 en/rev-list-options.txt:97 +#, no-wrap, priority:300 msgid "-P" msgstr "-P" @@ -6129,11 +8026,26 @@ msgstr "--prune-tags" #. type: Plain text #: en/fetch-options.txt:158 #, priority:220 -msgid "Before fetching, remove any local tags that no longer exist on the remote if `--prune` is enabled. This option should be used more carefully, unlike `--prune` it will remove any local references (local tags) that have been created. This option is a shorthand for providing the explicit tag refspec along with `--prune`, see the discussion about that in its documentation." -msgstr "" - -#. type: Labeled list -#: en/fetch-options.txt:164 en/git-add.txt:69 en/git-am.txt:143 en/git-blame.txt:71 en/git-checkout-index.txt:45 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:153 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:148 en/git-mailinfo.txt:68 en/git-mv.txt:39 en/git-notes.txt:202 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:173 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:419 en/git-reflog.txt:116 en/git-repack.txt:111 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:323 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:230 en/merge-options.txt:108 +msgid "" +"Before fetching, remove any local tags that no longer exist on the remote if" +" `--prune` is enabled. This option should be used more carefully, unlike " +"`--prune` it will remove any local references (local tags) that have been " +"created. This option is a shorthand for providing the explicit tag refspec " +"along with `--prune`, see the discussion about that in its documentation." +msgstr "" + +#. type: Labeled list +#: en/fetch-options.txt:164 en/git-add.txt:69 en/git-am.txt:143 +#: en/git-blame.txt:71 en/git-checkout-index.txt:45 en/git-cherry-pick.txt:92 +#: en/git-clean.txt:49 en/git-clone.txt:153 en/git-commit.txt:214 +#: en/git-format-patch.txt:118 en/git-grep.txt:148 en/git-mailinfo.txt:68 +#: en/git-mv.txt:39 en/git-notes.txt:202 en/git-p4.txt:331 +#: en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:173 +#: en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:419 +#: en/git-reflog.txt:116 en/git-repack.txt:111 en/git-revert.txt:77 +#: en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:323 +#: en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:230 +#: en/merge-options.txt:108 #, ignore-same, no-wrap, priority:300 msgid "-n" msgstr "-n" @@ -6147,7 +8059,11 @@ msgstr "--no-tags" #. type: Plain text #: en/fetch-options.txt:172 #, priority:220 -msgid "By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following. The default behavior for a remote may be specified with the remote..tagOpt setting. See linkgit:git-config[1]." +msgid "" +"By default, tags that point at objects that are downloaded from the remote " +"repository are fetched and stored locally. This option disables this " +"automatic tag following. The default behavior for a remote may be specified " +"with the remote..tagOpt setting. See linkgit:git-config[1]." msgstr "" #. type: Labeled list @@ -6159,7 +8075,13 @@ msgstr "--refetch" #. type: Plain text #: en/fetch-options.txt:181 #, priority:220 -msgid "Instead of negotiating with the server to avoid transferring commits and associated objects that are already present locally, this option fetches all objects as a fresh clone would. Use this to reapply a partial clone filter from configuration or using `--filter=` when the filter definition has changed. Automatic post-fetch maintenance will perform object database pack consolidation to remove any duplicate objects." +msgid "" +"Instead of negotiating with the server to avoid transferring commits and " +"associated objects that are already present locally, this option fetches all" +" objects as a fresh clone would. Use this to reapply a partial clone filter " +"from configuration or using `--filter=` when the filter definition has " +"changed. Automatic post-fetch maintenance will perform object database pack " +"consolidation to remove any duplicate objects." msgstr "" #. type: Labeled list @@ -6171,11 +8093,20 @@ msgstr "" #. type: Plain text #: en/fetch-options.txt:193 #, priority:220 -msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details." +msgid "" +"When fetching refs listed on the command line, use the specified refspec " +"(can be given more than once) to map the refs to remote-tracking branches, " +"instead of the values of `remote.*.fetch` configuration variables for the " +"remote repository. Providing an empty `` to the `--refmap` option " +"causes Git to ignore the configured refspecs and rely entirely on the " +"refspecs supplied as command-line arguments. See section on \"Configured " +"Remote-tracking Branches\" for details." msgstr "" #. type: Labeled list -#: en/fetch-options.txt:195 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:187 en/git-show-ref.txt:41 +#: en/fetch-options.txt:195 en/git-describe.txt:55 en/git-fsck.txt:41 +#: en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:187 +#: en/git-show-ref.txt:41 #, ignore-same, no-wrap, priority:260 msgid "--tags" msgstr "--tags" @@ -6183,7 +8114,12 @@ msgstr "--tags" #. type: Plain text #: en/fetch-options.txt:202 #, priority:220 -msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)." +msgid "" +"Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into " +"local tags with the same name), in addition to whatever else would otherwise" +" be fetched. Using this option alone does not subject tags to pruning, even" +" if --prune is used (though tags may be pruned anyway if they are also the " +"destination of an explicit refspec; see `--prune`)." msgstr "" #. type: Labeled list @@ -6195,19 +8131,35 @@ msgstr "" #. type: Plain text #: en/fetch-options.txt:214 #, priority:220 -msgid "This option controls if and under what conditions new commits of submodules should be fetched too. When recursing through submodules, `git fetch` always attempts to fetch \"changed\" submodules, that is, a submodule that has commits that are referenced by a newly fetched superproject commit but are missing in the local submodule clone. A changed submodule can be fetched as long as it is present locally e.g. in `$GIT_DIR/modules/` (see linkgit:gitsubmodules[7]); if the upstream adds a new submodule, that submodule cannot be fetched until it is cloned e.g. by `git submodule update`." +msgid "" +"This option controls if and under what conditions new commits of submodules " +"should be fetched too. When recursing through submodules, `git fetch` always" +" attempts to fetch \"changed\" submodules, that is, a submodule that has " +"commits that are referenced by a newly fetched superproject commit but are " +"missing in the local submodule clone. A changed submodule can be fetched as " +"long as it is present locally e.g. in `$GIT_DIR/modules/` (see " +"linkgit:gitsubmodules[7]); if the upstream adds a new submodule, that " +"submodule cannot be fetched until it is cloned e.g. by `git submodule " +"update`." msgstr "" #. type: Plain text #: en/fetch-options.txt:219 #, priority:220 -msgid "When set to 'on-demand', only changed submodules are fetched. When set to 'yes', all populated submodules are fetched and submodules that are both unpopulated and changed are fetched. When set to 'no', submodules are never fetched." +msgid "" +"When set to 'on-demand', only changed submodules are fetched. When set to " +"'yes', all populated submodules are fetched and submodules that are both " +"unpopulated and changed are fetched. When set to 'no', submodules are never " +"fetched." msgstr "" #. type: Plain text #: en/fetch-options.txt:223 #, priority:220 -msgid "When unspecified, this uses the value of `fetch.recurseSubmodules` if it is set (see linkgit:git-config[1]), defaulting to 'on-demand' if unset. When this option is used without any value, it defaults to 'yes'." +msgid "" +"When unspecified, this uses the value of `fetch.recurseSubmodules` if it is " +"set (see linkgit:git-config[1]), defaulting to 'on-demand' if unset. When " +"this option is used without any value, it defaults to 'yes'." msgstr "" #. type: Labeled list @@ -6231,17 +8183,24 @@ msgstr "" #. type: Plain text #: en/fetch-options.txt:233 #, priority:220 -msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])." +msgid "" +"If the `--multiple` option was specified, the different remotes will be " +"fetched in parallel. If multiple submodules are fetched, they will be " +"fetched in parallel. To control them independently, use the config settings " +"`fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])." msgstr "" #. type: Plain text #: en/fetch-options.txt:236 #, priority:220 -msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel." +msgid "" +"Typically, parallel recursive and multi-remote fetches will be faster. By " +"default fetches are performed sequentially, not in parallel." msgstr "" #. type: Labeled list -#: en/fetch-options.txt:238 en/git-checkout.txt:303 en/git-push.txt:402 en/git-restore.txt:115 en/git-switch.txt:184 +#: en/fetch-options.txt:238 en/git-checkout.txt:303 en/git-push.txt:402 +#: en/git-restore.txt:115 en/git-switch.txt:184 #, ignore-same, no-wrap, priority:280 msgid "--no-recurse-submodules" msgstr "--no-recurse-submodules" @@ -6249,7 +8208,9 @@ msgstr "--no-recurse-submodules" #. type: Plain text #: en/fetch-options.txt:241 #, priority:220 -msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)." +msgid "" +"Disable recursive fetching of submodules (this has the same effect as using " +"the `--recurse-submodules=no` option)." msgstr "" #. type: Labeled list @@ -6261,7 +8222,11 @@ msgstr "--set-upstream" #. type: Plain text #: en/fetch-options.txt:249 #, priority:220 -msgid "If the remote is fetched successfully, add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch..merge` and `branch..remote` in linkgit:git-config[1]." +msgid "" +"If the remote is fetched successfully, add upstream (tracking) reference, " +"used by argument-less linkgit:git-pull[1] and other commands. For more " +"information, see `branch..merge` and `branch..remote` in " +"linkgit:git-config[1]." msgstr "" #. type: Labeled list @@ -6273,7 +8238,10 @@ msgstr "--submodule-prefix=" #. type: Plain text #: en/fetch-options.txt:255 #, priority:220 -msgid "Prepend to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules." +msgid "" +"Prepend to paths printed in informative messages such as \"Fetching " +"submodule foo\". This option is used internally when recursing over " +"submodules." msgstr "" #. type: Labeled list @@ -6285,7 +8253,12 @@ msgstr "" #. type: Plain text #: en/fetch-options.txt:263 #, priority:220 -msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly." +msgid "" +"This option is used internally to temporarily provide a non-negative default" +" value for the --recurse-submodules option. All other methods of " +"configuring fetch's submodule recursion (such as settings in " +"linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as " +"does specifying --[no-]recurse-submodules directly." msgstr "" #. type: Labeled list @@ -6297,7 +8270,11 @@ msgstr "--update-head-ok" #. type: Plain text #: en/fetch-options.txt:272 #, priority:220 -msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it." +msgid "" +"By default 'git fetch' refuses to update the head which corresponds to the " +"current branch. This flag disables the check. This is purely for the " +"internal use for 'git pull' to communicate with 'git fetch', and unless you " +"are implementing your own Porcelain you are not supposed to use it." msgstr "" #. type: Labeled list @@ -6309,11 +8286,30 @@ msgstr "--upload-pack " #. type: Plain text #: en/fetch-options.txt:279 #, priority:220 -msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=` is passed to the command to specify non-default path for the command run on the other end." -msgstr "Wird diese Option angegeben und das anzufordernde Repository mit 'git fetch-pack' bearbeitet wurde, dann wird dem Befehl `--exec=` übergeben, um den auf der entfernten Seite auszuführenden Befehl anzugeben." - -#. type: Labeled list -#: en/fetch-options.txt:281 en/git-am.txt:88 en/git-apply.txt:231 en/git-branch.txt:202 en/git-bundle.txt:126 en/git-checkout-index.txt:31 en/git-checkout.txt:109 en/git-clean.txt:53 en/git-clone.txt:129 en/git-commit.txt:369 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:384 en/git-grep.txt:294 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:230 en/git-pack-objects.txt:211 en/git-prune-packed.txt:36 en/git-pull.txt:80 en/git-push.txt:386 en/git-read-tree.txt:117 en/git-rebase.txt:407 en/git-repack.txt:106 en/git-reset.txt:107 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:81 en/git-show-ref.txt:70 en/git-stash.txt:238 en/git-submodule.txt:276 en/git-svn.txt:670 en/git-switch.txt:142 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:251 en/merge-options.txt:174 +msgid "" +"When given, and the repository to fetch from is handled by 'git fetch-pack'," +" `--exec=` is passed to the command to specify non-default path" +" for the command run on the other end." +msgstr "" +"Wird diese Option angegeben und das anzufordernde Repository mit 'git fetch-" +"pack' bearbeitet wurde, dann wird dem Befehl `--exec=` " +"übergeben, um den auf der entfernten Seite auszuführenden Befehl anzugeben." + +#. type: Labeled list +#: en/fetch-options.txt:281 en/git-am.txt:88 en/git-apply.txt:231 +#: en/git-branch.txt:202 en/git-bundle.txt:126 en/git-checkout-index.txt:31 +#: en/git-checkout.txt:109 en/git-clean.txt:53 en/git-clone.txt:129 +#: en/git-commit.txt:369 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 +#: en/git-format-patch.txt:384 en/git-grep.txt:294 en/git-imap-send.txt:36 +#: en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 +#: en/git-merge-index.txt:35 en/git-notes.txt:230 en/git-pack-objects.txt:211 +#: en/git-prune-packed.txt:36 en/git-pull.txt:80 en/git-push.txt:386 +#: en/git-read-tree.txt:117 en/git-rebase.txt:407 en/git-repack.txt:106 +#: en/git-reset.txt:107 en/git-restore.txt:66 en/git-rev-parse.txt:117 +#: en/git-rm.txt:81 en/git-show-ref.txt:70 en/git-stash.txt:238 +#: en/git-submodule.txt:276 en/git-svn.txt:670 en/git-switch.txt:142 +#: en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 +#: en/git-update-index.txt:58 en/git-worktree.txt:251 en/merge-options.txt:174 #, ignore-same, no-wrap, priority:300 msgid "-q" msgstr "-q" @@ -6321,38 +8317,74 @@ msgstr "-q" #. type: Plain text #: en/fetch-options.txt:286 #, priority:220 -msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream." +msgid "" +"Pass --quiet to git-fetch-pack and silence any other internally used git " +"commands. Progress is not reported to the standard error stream." msgstr "" #. type: Labeled list -#: en/fetch-options.txt:287 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:49 en/git-branch.txt:191 en/git-cherry.txt:29 en/git-clone.txt:134 en/git-commit.txt:354 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:115 en/git-grep.txt:110 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:164 en/git-mv.txt:43 en/git-notes.txt:234 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:86 en/git-push.txt:392 en/git-read-tree.txt:63 en/git-rebase.txt:411 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git.txt:41 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:255 en/merge-options.txt:178 +#: en/fetch-options.txt:287 en/git-add.txt:74 en/git-apply.txt:225 +#: en/git-archimport.txt:74 en/git-archive.txt:49 en/git-branch.txt:191 +#: en/git-cherry.txt:29 en/git-clone.txt:134 en/git-commit.txt:354 +#: en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 +#: en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:115 +#: en/git-grep.txt:110 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 +#: en/git-index-pack.txt:28 en/git-ls-files.txt:164 en/git-mv.txt:43 +#: en/git-notes.txt:234 en/git-p4.txt:208 en/git-prune.txt:41 +#: en/git-pull.txt:86 en/git-push.txt:392 en/git-read-tree.txt:63 +#: en/git-rebase.txt:411 en/git-remote.txt:35 en/git-status.txt:50 +#: en/git-svn.txt:366 en/git-tag.txt:87 en/git.txt:41 +#: en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 +#: en/git-verify-tag.txt:23 en/git-worktree.txt:255 en/merge-options.txt:178 #, ignore-same, no-wrap, priority:300 msgid "-v" msgstr "-v" #. type: Labeled list -#: en/fetch-options.txt:288 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:50 en/git-branch.txt:193 en/git-clone.txt:135 en/git-commit.txt:355 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:61 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:235 en/git-p4.txt:209 en/git-pack-redundant.txt:53 en/git-prune.txt:42 en/git-pull.txt:87 en/git-push.txt:393 en/git-rebase.txt:412 en/git-reflog.txt:121 en/git-remote.txt:36 en/git-send-pack.txt:62 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:158 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:256 en/merge-options.txt:179 +#: en/fetch-options.txt:288 en/git-add.txt:75 en/git-apply.txt:226 +#: en/git-archive.txt:50 en/git-branch.txt:193 en/git-clone.txt:135 +#: en/git-commit.txt:355 en/git-count-objects.txt:22 en/git-daemon.txt:148 +#: en/git-fsck.txt:85 en/git-help.txt:61 en/git-http-push.txt:40 +#: en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:235 +#: en/git-p4.txt:209 en/git-pack-redundant.txt:53 en/git-prune.txt:42 +#: en/git-pull.txt:87 en/git-push.txt:393 en/git-rebase.txt:412 +#: en/git-reflog.txt:121 en/git-remote.txt:36 en/git-send-pack.txt:62 +#: en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:158 +#: en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 +#: en/git-verify-tag.txt:24 en/git-worktree.txt:256 en/merge-options.txt:179 #, ignore-same, no-wrap, priority:300 msgid "--verbose" msgstr "--verbose" #. type: Plain text -#: en/fetch-options.txt:290 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:181 +#: en/fetch-options.txt:290 en/git-add.txt:77 en/git-imap-send.txt:35 +#: en/merge-options.txt:181 #, priority:300 msgid "Be verbose." msgstr "Gib ausführliche Informationen aus." #. type: Labeled list -#: en/fetch-options.txt:292 en/git-bundle.txt:114 en/git-checkout.txt:113 en/git-clone.txt:139 en/git-format-patch.txt:412 en/git-pack-objects.txt:189 en/git-prune.txt:45 en/git-push.txt:396 en/git-restore.txt:70 en/git-submodule.txt:280 en/git-switch.txt:146 en/merge-options.txt:182 +#: en/fetch-options.txt:292 en/git-bundle.txt:114 en/git-checkout.txt:113 +#: en/git-clone.txt:139 en/git-format-patch.txt:412 +#: en/git-pack-objects.txt:189 en/git-prune.txt:45 en/git-push.txt:396 +#: en/git-restore.txt:70 en/git-submodule.txt:280 en/git-switch.txt:146 +#: en/merge-options.txt:182 #, ignore-same, no-wrap, priority:300 msgid "--progress" msgstr "--progress" #. type: Plain text -#: en/fetch-options.txt:297 en/git-bundle.txt:119 en/git-pack-objects.txt:194 en/git-push.txt:401 +#: en/fetch-options.txt:297 en/git-bundle.txt:119 en/git-pack-objects.txt:194 +#: en/git-push.txt:401 #, priority:220 -msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal." -msgstr "Der Fortschritt wird standardmäßig auf der Standardfehlerausgabe angezeigt, wenn diese an ein Terminal angebunden ist, außer wenn -q angegeben ist. Dieses Flag erzwingt die Fortschrittsanzeige auch ohne Terminalanbindung." +msgid "" +"Progress status is reported on the standard error stream by default when it " +"is attached to a terminal, unless -q is specified. This flag forces progress" +" status even if the standard error stream is not directed to a terminal." +msgstr "" +"Der Fortschritt wird standardmäßig auf der Standardfehlerausgabe angezeigt, " +"wenn diese an ein Terminal angebunden ist, außer wenn -q angegeben ist. " +"Dieses Flag erzwingt die Fortschrittsanzeige auch ohne Terminalanbindung." #. type: Labeled list #: en/fetch-options.txt:298 en/git-ls-remote.txt:75 en/git-push.txt:216 @@ -6369,8 +8401,19 @@ msgstr "--server-option=