From d63f0c479183e0fc782512c729bbd839dbe13c65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Date: Mon, 15 Jul 2024 22:15:07 +0200 Subject: [PATCH] update po files with v2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jean-Noël Avila --- GIT-VERSION-FILE | 2 +- po/documentation.de.po | 9222 ++++++++++++++++------------- po/documentation.es.po | 9269 ++++++++++++++++------------- po/documentation.es_MX.po | 8933 +++++++++++++++------------- po/documentation.fr.po | 9727 ++++++++++++++++++------------- po/documentation.hu.po | 8920 +++++++++++++++------------- po/documentation.id.po | 8924 +++++++++++++++------------- po/documentation.is.po | 9060 ++++++++++++++++------------- po/documentation.it.po | 8972 +++++++++++++++------------- po/documentation.ja.po | 9222 ++++++++++++++++------------- po/documentation.ko.po | 9061 ++++++++++++++++------------- po/documentation.mr.po | 8935 +++++++++++++++------------- po/documentation.nb_NO.po | 8920 +++++++++++++++------------- po/documentation.nl.po | 8913 +++++++++++++++------------- po/documentation.pl.po | 8931 +++++++++++++++------------- po/documentation.pot | 9421 +++++++++++++++++------------- po/documentation.pt_BR.po | 9978 +++++++++++++++++++------------- po/documentation.pt_PT.po | 8917 +++++++++++++++------------- po/documentation.ro.po | 9059 ++++++++++++++++------------- po/documentation.ru.po | 8980 +++++++++++++++------------- po/documentation.sk.po | 8917 +++++++++++++++------------- po/documentation.tr.po | 8934 +++++++++++++++------------- po/documentation.uk.po | 8920 +++++++++++++++------------- po/documentation.vi.po | 8917 +++++++++++++++------------- po/documentation.zh_HANS-CN.po | 9818 ++++++++++++++++++------------- po/documentation.zh_HANT.po | 9025 ++++++++++++++++------------- 26 files changed, 128809 insertions(+), 99088 deletions(-) diff --git a/GIT-VERSION-FILE b/GIT-VERSION-FILE index 32361196..8ef71a22 100644 --- a/GIT-VERSION-FILE +++ b/GIT-VERSION-FILE @@ -1 +1 @@ -GIT_VERSION = 2.43.0 +GIT_VERSION = 2.46.0 diff --git a/po/documentation.de.po b/po/documentation.de.po index be9183ed..611a7cd2 100644 --- a/po/documentation.de.po +++ b/po/documentation.de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2024-02-10 18:59+0100\n" +"POT-Creation-Date: 2024-07-15 22:01+0200\n" "PO-Revision-Date: 2024-01-13 13:54+0000\n" "Last-Translator: Ettore Atalan \n" "Language-Team: Matthias Aßhauer \n" @@ -22,7 +22,7 @@ msgstr "" "X-Generator: Weblate 5.4-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:781 en/git-instaweb.txt:45 en/git-ls-remote.txt:24 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" @@ -34,7 +34,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via th 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:421 en/git-fsck.txt:38 en/git-rebase.txt:591 #, ignore-same, no-wrap, priority:100 msgid "--root" msgstr "--root" @@ -83,8 +83,8 @@ msgid "'' and '' are optional. `-L ` or `-L ,` spans f 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:207 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 +#: en/blame-options.txt:23 en/git-archive.txt:45 en/git-branch.txt:181 en/git-checkout.txt:207 en/git-config.txt:304 en/git-grep.txt:164 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:100 en/git-var.txt:21 +#, ignore-same, no-wrap, priority:260 msgid "-l" msgstr "-l" @@ -132,7 +132,7 @@ msgid "Walk history forward instead of backward. Instead of showing the revision 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:375 en/git-describe.txt:122 en/rev-list-options.txt:129 #, ignore-same, no-wrap, priority:260 msgid "--first-parent" msgstr "--first-parent" @@ -144,7 +144,7 @@ msgid "Follow only the first parent commit upon seeing a merge commit. This opti msgstr "" #. type: Labeled list -#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:136 en/git-add.txt:96 en/git-cat-file.txt:55 en/git-checkout.txt:278 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:76 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:136 en/git-add.txt:96 en/git-cat-file.txt:55 en/git-checkout.txt:278 en/git-commit.txt:73 en/git-cvsexportcommit.txt:41 en/git-grep.txt:217 en/git-instaweb.txt:41 en/git-merge-file.txt:76 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:129 #, ignore-same, no-wrap, priority:300 msgid "-p" msgstr "-p" @@ -321,7 +321,7 @@ msgid "Color line annotations depending on the age of the line in the default fo 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 +#: en/blame-options.txt:148 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:60 en/git-grep.txt:122 en/git.txt:50 #, ignore-same, no-wrap, priority:100 msgid "-h" msgstr "-h" @@ -521,8 +521,9 @@ msgstr "linkgit:git-whatchanged[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:48 -#, priority:100 -msgid "Show logs with difference each commit introduces." +#, fuzzy, priority:100 +#| msgid "Show logs with difference each commit introduces." +msgid "Show logs with differences each commit introduces." msgstr "Logs mit dem Unterschied, den jeder Commit einführt, anzeigen." #. type: Plain text @@ -538,7 +539,7 @@ 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 +#: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:134 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-config[1]" msgstr "linkgit:git-config[1]" @@ -550,7 +551,7 @@ 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 +#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1588 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-fast-export[1]" msgstr "linkgit:git-fast-export[1]" @@ -586,7 +587,7 @@ msgid "Rewrite branches." msgstr "Branches umschreiben." #. type: Labeled list -#: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:132 +#: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:131 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-mergetool[1]" msgstr "linkgit:git-mergetool[1]" @@ -636,35 +637,47 @@ msgstr "Reflog-Informationen verwalten." #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:25 #, ignore-same, no-wrap, priority:100 +msgid "linkgit:git-refs[1]" +msgstr "linkgit:git-refs[1]" + +#. type: Plain text +#: en/cmds-ancillarymanipulators.txt:27 +#, priority:100 +msgid "Low-level access to refs." +msgstr "" + +#. type: Labeled list +#: en/cmds-ancillarymanipulators.txt:28 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-remote[1]" msgstr "linkgit:git-remote[1]" #. type: Plain text -#: en/cmds-ancillarymanipulators.txt:27 +#: en/cmds-ancillarymanipulators.txt:30 #, priority:100 msgid "Manage set of tracked repositories." msgstr "Einen Satz entfernter Repositories verwalten." #. type: Labeled list -#: en/cmds-ancillarymanipulators.txt:28 +#: en/cmds-ancillarymanipulators.txt:31 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-repack[1]" msgstr "linkgit:git-repack[1]" #. type: Plain text -#: en/cmds-ancillarymanipulators.txt:30 +#: en/cmds-ancillarymanipulators.txt:33 #, priority:100 msgid "Pack unpacked objects in a repository." msgstr "Ungepackte Objekte in einem Repository packen." #. type: Labeled list -#: en/cmds-ancillarymanipulators.txt:31 +#: en/cmds-ancillarymanipulators.txt:34 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-replace[1]" msgstr "linkgit:git-replace[1]" #. type: Plain text -#: en/cmds-ancillarymanipulators.txt:33 +#: en/cmds-ancillarymanipulators.txt:36 #, priority:100 msgid "Create, list, delete refs to replace objects." msgstr "Referenzen für ersetzende Objekte erstellen, auflisten, löschen." @@ -1009,7 +1022,7 @@ msgid "A Git Glossary." msgstr "gitglossary - Ein GIT-Glossar" #. type: Plain text -#: en/cmds-guide.txt:22 en/git-upload-pack.txt:61 +#: en/cmds-guide.txt:22 en/git-upload-pack.txt:92 #, ignore-same, no-wrap, priority:100 msgid "linkgit:gitnamespaces[7]" msgstr "linkgit:gitnamespaces[7]" @@ -1237,7 +1250,7 @@ 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." #. type: Labeled list -#: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:129 +#: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:128 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-diff[1]" msgstr "linkgit:git-diff[1]" @@ -1453,7 +1466,7 @@ msgid "Restore working tree files." msgstr "Dateien im Arbeitsverzeichnis wiederherstellen." #. type: Plain text -#: en/cmds-mainporcelain.txt:94 en/git-cherry-pick.txt:240 +#: en/cmds-mainporcelain.txt:94 en/git-cherry-pick.txt:256 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-revert[1]" msgstr "linkgit:git-revert[1]" @@ -1617,9 +1630,10 @@ msgstr "linkgit:git-cat-file[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:3 -#, priority:100 -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." +#, fuzzy, priority:100 +#| msgid "git-cat-file - Provide content or type and size information for repository objects" +msgid "Provide contents or details of repository objects." +msgstr "git-cat-file - Inhalt oder Informationen zu Typ und Größe für Repository-Objekte bereitstellen" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:4 @@ -1814,7 +1828,7 @@ msgid "Show packed archive index." msgstr "Gepackten Archiv-Index anzeigen." #. type: Plain text -#: en/cmds-plumbinginterrogators.txt:52 en/git-for-each-ref.txt:499 +#: en/cmds-plumbinginterrogators.txt:52 en/git-for-each-ref.txt:504 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-show-ref[1]" msgstr "linkgit:git-show-ref[1]" @@ -1917,8 +1931,9 @@ msgstr "linkgit:git-hash-object[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:15 -#, priority:100 -msgid "Compute object ID and optionally creates a blob from a file." +#, fuzzy, priority:100 +#| msgid "Compute object ID and optionally creates a blob from a file." +msgid "Compute object ID and optionally create an object from a file." msgstr "Von einer Datei die Objekt-ID berechnen und optional ein Blob erstellen." #. type: Labeled list @@ -2032,59 +2047,71 @@ msgstr "Verzeichnisinformationen in den Index einlesen." #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:43 #, ignore-same, no-wrap, priority:100 +msgid "linkgit:git-replay[1]" +msgstr "linkgit:git-replay[1]" + +#. type: Plain text +#: en/cmds-plumbingmanipulators.txt:45 +#, priority:100 +msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too." +msgstr "" + +#. type: Labeled list +#: en/cmds-plumbingmanipulators.txt:46 +#, ignore-same, no-wrap, priority:100 msgid "linkgit:git-symbolic-ref[1]" msgstr "linkgit:git-symbolic-ref[1]" #. type: Plain text -#: en/cmds-plumbingmanipulators.txt:45 +#: en/cmds-plumbingmanipulators.txt:48 #, priority:100 msgid "Read, modify and delete symbolic refs." msgstr "Symbolische Referenzen lesen, ändern und löschen." #. type: Labeled list -#: en/cmds-plumbingmanipulators.txt:46 +#: en/cmds-plumbingmanipulators.txt:49 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-unpack-objects[1]" msgstr "linkgit:git-unpack-objects[1]" #. type: Plain text -#: en/cmds-plumbingmanipulators.txt:48 +#: en/cmds-plumbingmanipulators.txt:51 #, priority:100 msgid "Unpack objects from a packed archive." msgstr "Objekte aus einem gepackten Archiv entpacken." #. type: Labeled list -#: en/cmds-plumbingmanipulators.txt:49 +#: en/cmds-plumbingmanipulators.txt:52 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-update-index[1]" msgstr "linkgit:git-update-index[1]" #. type: Plain text -#: en/cmds-plumbingmanipulators.txt:51 +#: en/cmds-plumbingmanipulators.txt:54 #, priority:100 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 +#: en/cmds-plumbingmanipulators.txt:55 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-update-ref[1]" msgstr "linkgit:git-update-ref[1]" #. type: Plain text -#: en/cmds-plumbingmanipulators.txt:54 +#: en/cmds-plumbingmanipulators.txt:57 #, priority:100 msgid "Update the object name stored in a ref safely." msgstr "Den Objektnamen, der in einer Referenz gespeichert ist, sicher aktualisieren." #. type: Labeled list -#: en/cmds-plumbingmanipulators.txt:55 +#: en/cmds-plumbingmanipulators.txt:58 #, ignore-same, no-wrap, priority:100 msgid "linkgit:git-write-tree[1]" msgstr "linkgit:git-write-tree[1]" #. type: Plain text -#: en/cmds-plumbingmanipulators.txt:57 +#: en/cmds-plumbingmanipulators.txt:60 #, priority:100 msgid "Create a tree object from the current index." msgstr "Tree-Objekt vom aktuellen Index erstellen." @@ -2438,7 +2465,7 @@ 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 +#: en/cmds-userinterfaces.txt:1 en/git-archive.txt:240 #, ignore-same, no-wrap, priority:100 msgid "linkgit:gitattributes[5]" msgstr "linkgit:gitattributes[5]" @@ -2474,7 +2501,7 @@ 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 +#: en/cmds-userinterfaces.txt:10 en/git-clean.txt:150 en/git-status.txt:526 #, ignore-same, no-wrap, priority:280 msgid "linkgit:gitignore[5]" msgstr "linkgit:gitignore[5]" @@ -2559,46 +2586,46 @@ msgid "Syntax" msgstr "Syntax" #. type: Plain text -#: en/config.txt:28 +#: en/config.txt:29 #, fuzzy, 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." -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." +msgid "The syntax is fairly flexible and permissive. Whitespace characters, which in this context are the space character (SP) and the horizontal tabulation (HT), 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 +#: en/config.txt:36 #, fuzzy, 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." 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 +#: en/config.txt:40 #, fuzzy, 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:" 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 +#: en/config.txt:43 #, no-wrap, priority:100 msgid "\t[section \"subsection\"]\n" msgstr "\t[Gruppe \"Untergruppe\"]\n" #. type: Plain text -#: en/config.txt:53 +#: en/config.txt:54 #, 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." #. type: Plain text -#: en/config.txt:58 +#: en/config.txt:59 #, 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." #. type: Plain text -#: en/config.txt:65 +#: en/config.txt:66 #, fuzzy, 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." 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." @@ -2606,214 +2633,215 @@ msgstr "Alle anderen Zeilen (und der Rest der Zeile nach der Gruppenüberschrift #. 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." +#, priority:100 +msgid "Whitespace characters surrounding `name`, `=` and `value` are discarded. Internal whitespace characters within 'value' are retained verbatim. Comments starting with either `#` or `;` and extending to the end of line are discarded. A line that defines a value can be continued to the next line by ending it with a backslash (`\\`); the backslash and the end-of-line characters are discarded." +msgstr "" #. 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 `\\`." +#: en/config.txt:78 +#, fuzzy, priority:100 +#| msgid "Inside double quotes, double quote `\"` and backslash `\\` characters must be escaped: use `\\\"` for `\"` and `\\\\` for `\\`." +msgid "If `value` needs to contain leading or trailing whitespace characters, it must be enclosed in double quotation marks (`\"`). Inside double quotation marks, 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 +#: en/config.txt:83 #, fuzzy, 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." 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 +#: en/config.txt:86 #, no-wrap, priority:100 msgid "Includes" msgstr "Includes (Dateieinbettungen)" #. type: Plain text -#: en/config.txt:91 +#: en/config.txt:93 #, 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." #. type: Plain text -#: en/config.txt:96 +#: en/config.txt:98 #, placeholders:'include.path', 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." #. type: Plain text -#: en/config.txt:102 +#: en/config.txt:104 #, fuzzy, 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." 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 +#: en/config.txt:106 #, no-wrap, priority:100 msgid "Conditional includes" msgstr "Bedingte Includes" #. type: Plain text -#: en/config.txt:109 +#: en/config.txt:111 #, 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." #. type: Plain text -#: en/config.txt:113 +#: en/config.txt:115 #, 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:" #. type: Labeled list -#: en/config.txt:114 +#: en/config.txt:116 #, ignore-same, no-wrap, priority:100 msgid "`gitdir`" msgstr "`gitdir`" #. type: Plain text -#: en/config.txt:119 +#: en/config.txt:121 #, 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." #. type: Plain text -#: en/config.txt:125 +#: en/config.txt:127 #, fuzzy, placeholders:'$GIT_DIR', 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 .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 +#: en/config.txt:131 #, placeholders:'linkgit:gitignore[5]', 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:" #. type: Plain text -#: en/config.txt:132 +#: en/config.txt:134 #, 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." #. type: Plain text -#: en/config.txt:135 +#: en/config.txt:137 #, 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." #. type: Plain text -#: en/config.txt:139 +#: en/config.txt:141 #, 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." #. type: Plain text -#: en/config.txt:143 +#: en/config.txt:145 #, 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." #. type: Labeled list -#: en/config.txt:144 +#: en/config.txt:146 #, no-wrap, priority:100 msgid "`gitdir/i`" msgstr "`gitdir/i`" #. type: Plain text -#: en/config.txt:147 +#: en/config.txt:149 #, 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)" #. type: Labeled list -#: en/config.txt:148 +#: en/config.txt:150 #, ignore-same, no-wrap, priority:100 msgid "`onbranch`" msgstr "`onbranch`" #. type: Plain text -#: en/config.txt:155 +#: en/config.txt:157 #, fuzzy, 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." 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 +#: en/config.txt:163 #, 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." #. type: Labeled list -#: en/config.txt:162 +#: en/config.txt:164 #, no-wrap, priority:100 msgid "`hasconfig:remote.*.url:`" msgstr "" #. type: Plain text -#: en/config.txt:170 +#: en/config.txt:172 #, 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." #. type: Plain text -#: en/config.txt:173 +#: en/config.txt:175 #, priority:100 msgid "Files included by this option (directly or indirectly) are not allowed to contain remote URLs." msgstr "" #. type: Plain text -#: en/config.txt:184 +#: en/config.txt:186 #, 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)." msgstr "" #. type: Plain text -#: en/config.txt:188 +#: en/config.txt:190 #, 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." msgstr "" #. type: Plain text -#: en/config.txt:190 +#: en/config.txt:192 #, 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`:" #. type: Plain text -#: en/config.txt:192 +#: en/config.txt:194 #, placeholders:'$GIT_DIR', priority:100 msgid "Symlinks in `$GIT_DIR` are not resolved before matching." msgstr "Symlinks in `$GIT_DIR` werden vor dem Abgleich nicht ausgewertet." #. type: Plain text -#: en/config.txt:197 +#: en/config.txt:199 #, placeholders:'$GIT_DIR', 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." #. type: Plain text -#: en/config.txt:202 +#: en/config.txt:204 #, 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." #. type: Plain text -#: en/config.txt:205 +#: en/config.txt:207 #, 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." #. type: Title ~ -#: en/config.txt:207 en/git-rev-parse.txt:396 en/git-rev-parse.txt:452 +#: en/config.txt:209 en/git-rev-parse.txt:419 en/git-rev-parse.txt:475 #, no-wrap, priority:100 msgid "Example" msgstr "Beispiel" #. type: delimited block - -#: en/config.txt:214 +#: en/config.txt:216 #, no-wrap, priority:100 msgid "" "# Core variables\n" @@ -2827,7 +2855,7 @@ msgstr "" "\tfilemode = false\n" #. type: delimited block - -#: en/config.txt:219 +#: en/config.txt:221 #, no-wrap, priority:100 msgid "" "# Our diff algorithm\n" @@ -2841,7 +2869,7 @@ msgstr "" "\trenames = true\n" #. type: delimited block - -#: en/config.txt:223 +#: en/config.txt:225 #, fuzzy, no-wrap, priority:100 msgid "" "[branch \"devel\"]\n" @@ -2853,7 +2881,7 @@ msgstr "" "\tmerge = refs/heads/devel\n" #. type: delimited block - -#: en/config.txt:228 +#: en/config.txt:230 #, no-wrap, placeholders:'kernel.org', priority:100 msgid "" "# Proxy settings\n" @@ -2867,7 +2895,7 @@ msgstr "" "\tgitProxy=default-proxy ; für den Rest\n" #. type: delimited block - -#: en/config.txt:233 +#: en/config.txt:235 #, no-wrap, placeholders:'foo.inc':'foo.inc':'foo.inc':'foo.inc':'foo.inc':'$HOME', priority:100 msgid "" "[include]\n" @@ -2881,7 +2909,7 @@ msgstr "" "\tpath = ~/foo.inc ; finde \"foo.inc\" im `$HOME` Verzeichnis\n" #. type: delimited block - -#: en/config.txt:237 +#: en/config.txt:239 #, no-wrap, placeholders:'$GIT_DIR':'foo.inc', priority:100 msgid "" "; include if $GIT_DIR is /path/to/foo/.git\n" @@ -2893,7 +2921,7 @@ msgstr "" "\tpath = /Pfad/zu/foo.inc\n" #. type: delimited block - -#: en/config.txt:241 +#: en/config.txt:243 #, no-wrap, placeholders:'foo.inc', priority:100 msgid "" "; include for all repositories inside /path/to/group\n" @@ -2905,7 +2933,7 @@ msgstr "" "\tpath = /Pfad/zu/foo.inc\n" #. type: delimited block - -#: en/config.txt:245 +#: en/config.txt:247 #, no-wrap, placeholders:'$HOME':'foo.inc', priority:100 msgid "" "; include for all repositories inside $HOME/to/group\n" @@ -2917,7 +2945,7 @@ msgstr "" "\tpath = /Pfad/zu/foo.inc\n" #. type: delimited block - -#: en/config.txt:251 +#: en/config.txt:253 #, no-wrap, placeholders:'foo.inc', priority:100 msgid "" "; relative paths are always relative to the including\n" @@ -2933,7 +2961,7 @@ msgstr "" "\tpath = foo.inc\n" #. type: delimited block - -#: en/config.txt:256 +#: en/config.txt:258 #, no-wrap, placeholders:'foo.inc', priority:100 msgid "" "; include only if we are in a worktree where foo-branch is\n" @@ -2947,7 +2975,7 @@ msgstr "" "\tpath = foo.inc\n" #. type: delimited block - -#: en/config.txt:264 +#: en/config.txt:266 #, no-wrap, placeholders:'foo.inc', priority:100 msgid "" "; include only if a remote with the given URL exists (note\n" @@ -2960,37 +2988,37 @@ msgid "" msgstr "" #. type: Title ~ -#: en/config.txt:267 +#: en/config.txt:269 #, no-wrap, priority:100 msgid "Values" msgstr "Werte" #. type: Plain text -#: en/config.txt:272 +#: en/config.txt:274 #, 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." #. type: Labeled list -#: en/config.txt:273 +#: en/config.txt:275 #, no-wrap, priority:100 msgid "boolean" msgstr "boolean" #. type: Plain text -#: en/config.txt:278 +#: en/config.txt:280 #, 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." #. type: Labeled list -#: en/config.txt:279 +#: en/config.txt:281 #, no-wrap, priority:100 msgid "true" msgstr "true" #. type: Plain text -#: en/config.txt:282 +#: en/config.txt:284 #, fuzzy, priority:100 msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= ` is taken as true." msgstr "" @@ -2998,132 +3026,132 @@ msgstr "" "definiert ist, wird als wahr angenommen.\n" #. type: Labeled list -#: en/config.txt:283 +#: en/config.txt:285 #, no-wrap, priority:100 msgid "false" msgstr "false" #. type: Plain text -#: en/config.txt:285 +#: en/config.txt:287 #, 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`," #. type: Plain text -#: en/config.txt:289 +#: en/config.txt:291 #, placeholders:'`--type=bool`', 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." #. type: Labeled list -#: en/config.txt:290 +#: en/config.txt:292 #, no-wrap, priority:100 msgid "integer" msgstr "integer" #. type: Plain text -#: en/config.txt:294 +#: en/config.txt:296 #, 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." #. type: Labeled list -#: en/config.txt:295 en/diff-options.txt:451 en/git-for-each-ref.txt:187 +#: en/config.txt:297 en/diff-options.txt:452 en/git-for-each-ref.txt:190 #, ignore-same, no-wrap, priority:280 msgid "color" msgstr "color" #. type: Plain text -#: en/config.txt:299 +#: en/config.txt:301 #, fuzzy, 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." 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 +#: en/config.txt:307 #, 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`." #. type: Plain text -#: en/config.txt:309 +#: en/config.txt:311 #, 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\")." msgstr "" #. type: Plain text -#: en/config.txt:313 +#: en/config.txt:315 #, 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\"." msgstr "" #. type: Plain text -#: en/config.txt:318 +#: en/config.txt:321 #, fuzzy, 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`." -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`." +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`, or 12-bit RGB values like `#f1b`, which is equivalent to the 24-bit color `#ff11bb`." 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 +#: en/config.txt:328 #, fuzzy, 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)." 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 +#: en/config.txt:333 #, 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." msgstr "" #. type: Plain text -#: en/config.txt:333 +#: en/config.txt:336 #, 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." #. type: Plain text -#: en/config.txt:342 +#: en/config.txt:345 #, fuzzy, placeholders:'color.decorate.branch':'--decorate`', 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." 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 +#: en/config.txt:346 #, no-wrap, priority:100 msgid "pathname" msgstr "pathname" #. type: Plain text -#: en/config.txt:349 +#: en/config.txt:352 #, placeholders:'$HOME', 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." #. type: Plain text -#: en/config.txt:358 +#: en/config.txt:361 #, 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`." msgstr "" #. type: Title ~ -#: en/config.txt:361 +#: en/config.txt:364 #, no-wrap, priority:100 msgid "Variables" msgstr "Variablen" #. type: Plain text -#: en/config.txt:366 +#: en/config.txt:369 #, fuzzy, 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." 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 +#: en/config.txt:374 #, fuzzy, 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." 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." @@ -3143,58 +3171,69 @@ msgid "add.ignore-errors (deprecated)" msgstr "" #. type: Plain text -#: en/config/add.txt:8 +#: en/config/add.txt:7 #, placeholders:'`--ignore-errors`':'linkgit:git-add[1]':'add.ignore', priority:300 msgid "Tells 'git add' to continue adding files when some files cannot be added due to indexing errors. Equivalent to the `--ignore-errors` option of linkgit:git-add[1]. `add.ignore-errors` is deprecated, as it does not follow the usual naming convention for configuration variables." msgstr "" -#. type: Labeled list -#: en/config/add.txt:9 -#, no-wrap, placeholders:'add.interactive.useBuiltin', priority:300 -msgid "add.interactive.useBuiltin" -msgstr "" - -#. type: Plain text -#: en/config/add.txt:13 -#, placeholders:'linkgit:git-add[1]', priority:300 -msgid "Unused configuration variable. Used in Git versions v2.25.0 to v2.36.0 to enable the built-in version of linkgit:git-add[1]'s interactive mode, which then became the default in Git versions v2.37.0 to v2.39.0." -msgstr "" - #. type: Labeled list #: en/config/clone.txt:1 #, fuzzy, no-wrap, placeholders:'clone.defaultRemoteName', priority:300 #| msgid "merge.defaultToUpstream" -msgid "clone.defaultRemoteName" +msgid "`clone.defaultRemoteName`" msgstr "merge.defaultToUpstream" #. type: Plain text -#: en/config/clone.txt:5 -#, placeholders:'`--origin`':'linkgit:git-clone[1]', priority:300 -msgid "The name of the remote to create when cloning a repository. Defaults to `origin`, and can be overridden by passing the `--origin` command-line option to linkgit:git-clone[1]." +#: en/config/clone.txt:4 +#, priority:300 +msgid "The name of the remote to create when cloning a repository. Defaults to `origin`." +msgstr "" + +#. type: Plain text +#: en/config/clone.txt:7 +#, no-wrap, placeholders:'`--origin`', priority:300 +msgid "" +"\tIt can be overridden by passing the `--origin` command-line\n" +"\toption.\n" +msgstr "" + +#. type: Plain text +#: en/config/clone.txt:11 +#, no-wrap, placeholders:'`--origin`':'linkgit:git-clone[1]', priority:300 +msgid "" +"\tIt can be overridden by passing the `--origin` command-line\n" +"\toption to linkgit:git-clone[1].\n" msgstr "" #. type: Labeled list -#: en/config/clone.txt:6 +#: en/config/clone.txt:13 #, fuzzy, no-wrap, placeholders:'clone.rejectShallow', priority:300 #| msgid "--[no-]reject-shallow" -msgid "clone.rejectShallow" +msgid "`clone.rejectShallow`" msgstr "--[no-]reject-shallow" #. type: Plain text -#: en/config/clone.txt:9 -#, placeholders:'`--reject-shallow`':'linkgit:git-clone[1]', priority:300 -msgid "Reject cloning a repository if it is a shallow one; this can be overridden by passing the `--reject-shallow` option on the command line. See linkgit:git-clone[1]" +#: en/config/clone.txt:16 +#, placeholders:'`--reject-shallow`', priority:300 +msgid "Reject cloning a repository if it is a shallow one; this can be overridden by passing the `--reject-shallow` option on the command line." msgstr "" +#. type: Plain text +#: en/config/clone.txt:18 +#, fuzzy, no-wrap, placeholders:'linkgit:git-clone[1]', priority:300 +#| msgid "linkgit:git-clone[1]" +msgid "\tSee linkgit:git-clone[1].\n" +msgstr "linkgit:git-clone[1]" + #. type: Labeled list -#: en/config/clone.txt:10 +#: en/config/clone.txt:20 #, fuzzy, no-wrap, placeholders:'clone.filterSubmodules', priority:300 #| msgid "--also-filter-submodules" -msgid "clone.filterSubmodules" +msgid "`clone.filterSubmodules`" msgstr "--also-filter-submodules" #. type: Plain text -#: en/config/clone.txt:13 +#: en/config/clone.txt:23 #, placeholders:'`--filter`':'linkgit:git-rev-list[1]':'`--recurse-submodules`', priority:300 msgid "If a partial clone filter is provided (see `--filter` in linkgit:git-rev-list[1]) and `--recurse-submodules` is used, also apply the filter to submodules." msgstr "" @@ -3417,393 +3456,443 @@ msgstr "" #. type: Labeled list #: en/config/diff.txt:82 #, ignore-same, no-wrap, priority:280 +msgid "diff.trustExitCode" +msgstr "diff.trustExitCode" + +#. type: Plain text +#: en/config/diff.txt:90 +#, placeholders:'diff.external', priority:280 +msgid "If this boolean value is set to true then the `diff.external` command is expected to return exit code 0 if it considers the input files to be equal or 1 if it considers them to be different, like `diff(1)`. If it is set to false, which is the default, then the command is expected to return exit code 0 regardless of equality. Any other exit code causes Git to report a fatal error." +msgstr "" + +#. type: Labeled list +#: en/config/diff.txt:91 +#, ignore-same, no-wrap, priority:280 msgid "diff.ignoreSubmodules" msgstr "diff.ignoreSubmodules" #. type: Plain text -#: en/config/diff.txt:94 +#: en/config/diff.txt:103 #, placeholders:'--ignore-submodules':'git diff-files':'status.submoduleSummary':'--ignore-submodules', priority:280 msgid "Sets the default value of --ignore-submodules. Note that this affects only 'git diff' Porcelain, and not lower level 'diff' commands such as 'git diff-files'. 'git checkout' and 'git switch' also honor this setting when reporting uncommitted changes. Setting it to 'all' disables the submodule summary normally shown by 'git commit' and 'git status' when `status.submoduleSummary` is set unless it is overridden by using the --ignore-submodules command-line option. The 'git submodule' commands are not affected by this setting. By default this is set to untracked so that any untracked submodules are ignored." msgstr "" #. type: Labeled list -#: en/config/diff.txt:95 +#: en/config/diff.txt:104 #, ignore-same, no-wrap, priority:280 msgid "diff.mnemonicPrefix" msgstr "diff.mnemonicPrefix" #. type: Plain text -#: en/config/diff.txt:100 +#: en/config/diff.txt:109 #, priority:280 msgid "If set, 'git diff' uses a prefix pair that is different from the standard \"a/\" and \"b/\" depending on what is being compared. When this configuration is in effect, reverse diff output also swaps the order of the prefixes:" msgstr "" #. type: Labeled list -#: en/config/diff.txt:100 +#: en/config/diff.txt:109 #, fuzzy, no-wrap, priority:280 #| msgid "`gvimdiff`" msgid "`git diff`" msgstr "`gvimdiff`" #. type: Plain text -#: en/config/diff.txt:102 +#: en/config/diff.txt:111 #, fuzzy, priority:280 #| msgid "compares the index and the files on the filesystem." msgid "compares the (i)ndex and the (w)ork tree;" msgstr "vergleicht den Index mit den Dateien auf dem Dateisystem." #. type: Labeled list -#: en/config/diff.txt:102 +#: en/config/diff.txt:111 #, fuzzy, no-wrap, placeholders:'HEAD', priority:280 msgid "`git diff HEAD`" msgstr "`git push origin master`" #. type: Plain text -#: en/config/diff.txt:104 +#: en/config/diff.txt:113 #, priority:280 msgid "compares a (c)ommit and the (w)ork tree;" msgstr "" #. type: Labeled list -#: en/config/diff.txt:104 +#: en/config/diff.txt:113 #, fuzzy, no-wrap, placeholders:'--cached`', priority:280 msgid "`git diff --cached`" msgstr "$ git diff --cached\n" #. type: Plain text -#: en/config/diff.txt:106 +#: en/config/diff.txt:115 #, fuzzy, priority:280 #| msgid "compares the and the index." msgid "compares a (c)ommit and the (i)ndex;" msgstr "vergleicht mit dem Index." #. type: Labeled list -#: en/config/diff.txt:106 +#: en/config/diff.txt:115 #, no-wrap, placeholders:'HEAD', priority:280 msgid "`git diff HEAD:file1 file2`" msgstr "" #. type: Plain text -#: en/config/diff.txt:108 +#: en/config/diff.txt:117 #, priority:280 msgid "compares an (o)bject and a (w)ork tree entity;" msgstr "" #. type: Labeled list -#: en/config/diff.txt:108 +#: en/config/diff.txt:117 #, fuzzy, no-wrap, placeholders:'--no-index', priority:280 #| msgid "git-diff-index(1)" msgid "`git diff --no-index a b`" msgstr "git-diff-index(1)" #. type: Plain text -#: en/config/diff.txt:110 +#: en/config/diff.txt:119 #, priority:280 msgid "compares two non-git things (1) and (2)." msgstr "" #. type: Labeled list -#: en/config/diff.txt:111 +#: en/config/diff.txt:120 #, ignore-same, no-wrap, priority:280 -msgid "diff.noprefix" -msgstr "diff.noprefix" +msgid "diff.noPrefix" +msgstr "diff.noPrefix" #. type: Plain text -#: en/config/diff.txt:113 +#: en/config/diff.txt:122 #, fuzzy, priority:280 msgid "If set, 'git diff' does not show any source or destination prefix." msgstr "keine Quell- oder Ziel-Präfixe anzeigen" #. type: Labeled list -#: en/config/diff.txt:114 +#: en/config/diff.txt:123 +#, ignore-same, no-wrap, priority:280 +msgid "diff.srcPrefix" +msgstr "diff.srcPrefix" + +#. type: Plain text +#: en/config/diff.txt:125 +#, fuzzy, priority:280 +msgid "If set, 'git diff' uses this source prefix. Defaults to \"a/\"." +msgstr "keine Quell- oder Ziel-Präfixe anzeigen" + +#. type: Labeled list +#: en/config/diff.txt:126 +#, ignore-same, no-wrap, priority:280 +msgid "diff.dstPrefix" +msgstr "diff.dstPrefix" + +#. type: Plain text +#: en/config/diff.txt:128 +#, fuzzy, priority:280 +msgid "If set, 'git diff' uses this destination prefix. Defaults to \"b/\"." +msgstr "keine Quell- oder Ziel-Präfixe anzeigen" + +#. type: Labeled list +#: en/config/diff.txt:129 #, ignore-same, no-wrap, priority:280 msgid "diff.relative" msgstr "diff.relative" #. type: Plain text -#: en/config/diff.txt:117 +#: en/config/diff.txt:132 #, priority:280 msgid "If set to 'true', 'git diff' does not show changes outside of the directory and show pathnames relative to the current directory." msgstr "" #. type: Labeled list -#: en/config/diff.txt:118 +#: en/config/diff.txt:133 #, ignore-same, no-wrap, priority:280 msgid "diff.orderFile" msgstr "diff.orderFile" #. type: Plain text -#: en/config/diff.txt:123 +#: en/config/diff.txt:138 #, placeholders:'linkgit:git-diff[1]':'diff.orderFile', priority:280 msgid "File indicating how to order files within a diff. See the '-O' option to linkgit:git-diff[1] for details. If `diff.orderFile` is a relative pathname, it is treated as relative to the top of the working tree." msgstr "" #. type: Labeled list -#: en/config/diff.txt:124 +#: en/config/diff.txt:139 #, ignore-same, no-wrap, priority:280 msgid "diff.renameLimit" msgstr "diff.renameLimit" #. type: Plain text -#: en/config/diff.txt:129 +#: en/config/diff.txt:144 #, placeholders:'`-l`', priority:280 msgid "The number of files to consider in the exhaustive portion of copy/rename detection; equivalent to the 'git diff' option `-l`. If not set, the default value is currently 1000. This setting has no effect if rename detection is turned off." msgstr "" #. type: Labeled list -#: en/config/diff.txt:130 +#: en/config/diff.txt:145 #, ignore-same, no-wrap, priority:280 msgid "diff.renames" msgstr "diff.renames" #. type: Plain text -#: en/config/diff.txt:138 +#: en/config/diff.txt:153 #, placeholders:'linkgit:git-diff[1]':'linkgit:git-log[1]':'linkgit:git-diff-files[1]', priority:280 msgid "Whether and how Git detects renames. If set to \"false\", rename detection is disabled. If set to \"true\", basic rename detection is enabled. If set to \"copies\" or \"copy\", Git will detect copies, as well. Defaults to true. Note that this affects only 'git diff' Porcelain like linkgit:git-diff[1] and linkgit:git-log[1], and not lower level commands such as linkgit:git-diff-files[1]." msgstr "" #. type: Labeled list -#: en/config/diff.txt:139 +#: en/config/diff.txt:154 #, ignore-same, no-wrap, priority:280 msgid "diff.suppressBlankEmpty" msgstr "diff.suppressBlankEmpty" #. type: Plain text -#: en/config/diff.txt:142 +#: en/config/diff.txt:157 #, priority:280 msgid "A boolean to inhibit the standard behavior of printing a space before each empty output line. Defaults to false." msgstr "" #. type: Labeled list -#: en/config/diff.txt:143 +#: en/config/diff.txt:158 #, ignore-same, no-wrap, priority:280 msgid "diff.submodule" msgstr "diff.submodule" #. type: Plain text -#: en/config/diff.txt:150 +#: en/config/diff.txt:165 #, fuzzy, placeholders:'linkgit:git-submodule[1]', 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." msgid "Specify the format in which differences in submodules are shown. The \"short\" format just shows the names of the commits at the beginning and end of the range. The \"log\" format lists the commits in the range like linkgit:git-submodule[1] `summary` does. The \"diff\" format shows an inline diff of the changed contents of the submodule. Defaults to \"short\"." 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/config/diff.txt:151 +#: en/config/diff.txt:166 #, ignore-same, no-wrap, priority:280 msgid "diff.wordRegex" msgstr "diff.wordRegex" #. type: Plain text -#: en/config/diff.txt:156 +#: en/config/diff.txt:171 #, priority:280 msgid "A POSIX Extended Regular Expression used to determine what is a \"word\" when performing word-by-word difference calculations. Character sequences that match the regular expression are \"words\", all other characters are *ignorable* whitespace." msgstr "" #. type: Labeled list -#: en/config/diff.txt:157 +#: en/config/diff.txt:172 #, no-wrap, priority:280 msgid "diff..command" msgstr "" #. type: Plain text -#: en/config/diff.txt:160 +#: en/config/diff.txt:175 #, placeholders:'linkgit:gitattributes[5]', priority:280 msgid "The custom diff driver command. See linkgit:gitattributes[5] for details." msgstr "" #. type: Labeled list -#: en/config/diff.txt:161 +#: en/config/diff.txt:176 +#, fuzzy, no-wrap, priority:280 +#| msgid "merge..name" +msgid "diff..trustExitCode" +msgstr "merge..name" + +#. type: Plain text +#: en/config/diff.txt:184 +#, priority:280 +msgid "If this boolean value is set to true then the `diff..command` command is expected to return exit code 0 if it considers the input files to be equal or 1 if it considers them to be different, like `diff(1)`. If it is set to false, which is the default, then the command is expected to return exit code 0 regardless of equality. Any other exit code causes Git to report a fatal error." +msgstr "" + +#. type: Labeled list +#: en/config/diff.txt:185 #, fuzzy, no-wrap, priority:280 #| msgid "merge..name" msgid "diff..xfuncname" msgstr "merge..name" #. type: Plain text -#: en/config/diff.txt:165 +#: en/config/diff.txt:189 #, placeholders:'linkgit:gitattributes[5]', priority:280 msgid "The regular expression that the diff driver should use to recognize the hunk header. A built-in pattern may also be used. See linkgit:gitattributes[5] for details." msgstr "" #. type: Labeled list -#: en/config/diff.txt:166 +#: en/config/diff.txt:190 #, fuzzy, no-wrap, priority:280 #| msgid "merge..name" msgid "diff..binary" msgstr "merge..name" #. type: Plain text -#: en/config/diff.txt:169 +#: en/config/diff.txt:193 #, placeholders:'linkgit:gitattributes[5]', priority:280 msgid "Set this option to true to make the diff driver treat files as binary. See linkgit:gitattributes[5] for details." msgstr "" #. type: Labeled list -#: en/config/diff.txt:170 +#: en/config/diff.txt:194 #, no-wrap, priority:280 msgid "diff..textconv" msgstr "" #. type: Plain text -#: en/config/diff.txt:175 +#: en/config/diff.txt:199 #, placeholders:'linkgit:gitattributes[5]', priority:280 msgid "The command that the diff driver should call to generate the text-converted version of a file. The result of the conversion is used to generate a human-readable diff. See linkgit:gitattributes[5] for details." msgstr "" #. type: Labeled list -#: en/config/diff.txt:176 +#: en/config/diff.txt:200 #, no-wrap, priority:280 msgid "diff..wordRegex" msgstr "" #. type: Plain text -#: en/config/diff.txt:180 +#: en/config/diff.txt:204 #, placeholders:'linkgit:gitattributes[5]', priority:280 msgid "The regular expression that the diff driver should use to split words in a line. See linkgit:gitattributes[5] for details." msgstr "" #. type: Labeled list -#: en/config/diff.txt:181 +#: en/config/diff.txt:205 #, no-wrap, priority:280 msgid "diff..cachetextconv" msgstr "" #. type: Plain text -#: en/config/diff.txt:184 +#: en/config/diff.txt:208 #, placeholders:'linkgit:gitattributes[5]', priority:280 msgid "Set this option to true to make the diff driver cache the text conversion outputs. See linkgit:gitattributes[5] for details." msgstr "" #. type: Labeled list -#: en/config/diff.txt:187 +#: en/config/diff.txt:211 #, ignore-same, no-wrap, priority:280 msgid "diff.indentHeuristic" msgstr "diff.indentHeuristic" #. type: Plain text -#: en/config/diff.txt:190 +#: en/config/diff.txt:214 #, fuzzy, priority:280 #| msgid "Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default." msgid "Set this option to `false` to disable the default heuristics that shift diff hunk boundaries to make patches easier to read." 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/config/diff.txt:191 +#: en/config/diff.txt:215 #, ignore-same, no-wrap, priority:280 msgid "diff.algorithm" msgstr "diff.algorithm" #. type: Plain text -#: en/config/diff.txt:193 en/diff-options.txt:196 +#: en/config/diff.txt:217 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:" #. type: Labeled list -#: en/config/diff.txt:195 en/diff-options.txt:198 +#: en/config/diff.txt:219 en/diff-options.txt:198 #, ignore-same, no-wrap, priority:280 msgid "`default`, `myers`" msgstr "`default`, `myers`" #. type: Plain text -#: en/config/diff.txt:197 en/diff-options.txt:200 +#: en/config/diff.txt:221 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." #. type: Labeled list -#: en/config/diff.txt:197 en/diff-options.txt:200 +#: en/config/diff.txt:221 en/diff-options.txt:200 #, ignore-same, no-wrap, priority:280 msgid "`minimal`" msgstr "`minimal`" #. type: Plain text -#: en/config/diff.txt:200 en/diff-options.txt:177 en/diff-options.txt:203 +#: en/config/diff.txt:224 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." #. type: Labeled list -#: en/config/diff.txt:200 en/diff-options.txt:203 +#: en/config/diff.txt:224 en/diff-options.txt:203 #, ignore-same, no-wrap, priority:280 msgid "`patience`" msgstr "`patience`" #. type: Plain text -#: en/config/diff.txt:202 en/diff-options.txt:205 +#: en/config/diff.txt:226 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." #. type: Labeled list -#: en/config/diff.txt:202 en/diff-options.txt:205 +#: en/config/diff.txt:226 en/diff-options.txt:205 #, ignore-same, no-wrap, priority:280 msgid "`histogram`" msgstr "`histogram`" #. type: Plain text -#: en/config/diff.txt:205 en/diff-options.txt:208 +#: en/config/diff.txt:229 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“." #. type: Labeled list -#: en/config/diff.txt:208 +#: en/config/diff.txt:232 #, ignore-same, no-wrap, priority:280 msgid "diff.wsErrorHighlight" msgstr "diff.wsErrorHighlight" #. type: Plain text -#: en/config/diff.txt:216 +#: en/config/diff.txt:240 #, fuzzy, placeholders:'color.diff.whitespace':'`--ws-error-highlight=', 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`." 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`. The whitespace errors are colored with `color.diff.whitespace`. The command line option `--ws-error-highlight=` overrides this setting." 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/config/diff.txt:217 +#: en/config/diff.txt:241 #, ignore-same, no-wrap, priority:280 msgid "diff.colorMoved" msgstr "diff.colorMoved" #. type: Plain text -#: en/config/diff.txt:223 +#: en/config/diff.txt:247 #, placeholders:'--color-moved':'linkgit:git-diff[1]', priority:280 msgid "If set to either a valid `` or a true value, moved lines in a diff are colored differently, for details of valid modes see '--color-moved' in linkgit:git-diff[1]. If simply set to true the default color mode will be used. When set to false, moved lines are not colored." msgstr "" #. type: Labeled list -#: en/config/diff.txt:224 +#: en/config/diff.txt:248 #, ignore-same, no-wrap, priority:280 msgid "diff.colorMovedWS" msgstr "diff.colorMovedWS" #. type: Plain text -#: en/config/diff.txt:227 +#: en/config/diff.txt:251 #, placeholders:'diff.colorMoved':'--color-moved-ws':'linkgit:git-diff[1]', priority:280 -msgid "When moved lines are colored using e.g. the `diff.colorMoved` setting, this option controls the `` how spaces are treated for details of valid modes see '--color-moved-ws' in linkgit:git-diff[1]." +msgid "When moved lines are colored using e.g. the `diff.colorMoved` setting, this option controls the `` how spaces are treated. For details of valid modes see '--color-moved-ws' in linkgit:git-diff[1]." msgstr "" #. type: Labeled list -#: en/config/init.txt:1 -#, no-wrap, placeholders:'init.templateDir', priority:300 -msgid "init.templateDir" -msgstr "" +#: en/config/init.txt:6 +#, fuzzy, no-wrap, placeholders:'init.templateDir', priority:300 +#| msgid "commit.template" +msgid "`init.templateDir`" +msgstr "commit.template" #. type: Plain text -#: en/config/init.txt:4 -#, fuzzy, placeholders:'linkgit:git-init[1]', priority:300 +#: en/config/init.txt:8 +#, fuzzy, placeholders:'{see-git-init}', priority:300 #| msgid "Specify the directory from which templates will be used; (See the \"TEMPLATE DIRECTORY\" section of linkgit:git-init[1].)" -msgid "Specify the directory from which templates will be copied. (See the \"TEMPLATE DIRECTORY\" section of linkgit:git-init[1].)" +msgid "Specify the directory from which templates will be copied. {see-git-init}" msgstr "Bestimmt das Verzeichnis, aus dem Templates ausgelesen werden sollen; (Siehe den Abschnitt \"TEMPLATE DIRECTORY\" in linkgit:git-init[1].)" #. type: Labeled list -#: en/config/init.txt:5 +#: en/config/init.txt:8 #, no-wrap, placeholders:'init.defaultBranch', priority:300 -msgid "init.defaultBranch" +msgid "`init.defaultBranch`" msgstr "" #. type: Plain text -#: en/config/init.txt:7 +#: en/config/init.txt:10 #, priority:300 msgid "Allows overriding the default branch name e.g. when initializing a new repository." msgstr "" @@ -4074,8 +4163,9 @@ 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`." +#, fuzzy, priority:280 +#| msgid "The standard email format as described by RFC 2822, for example `Thu, 07 Apr 2005 22:13:13 +0200`." +msgid "The standard date 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 @@ -4884,7 +4974,7 @@ msgid "When shown by `git diff-tree -c`, it compares the parents of a merge comm msgstr "" #. type: Labeled list -#: en/diff-options.txt:17 en/git-rebase.txt:420 en/merge-options.txt:109 +#: en/diff-options.txt:17 en/git-rebase.txt:428 en/merge-options.txt:109 #, ignore-same, no-wrap, priority:280 msgid "--no-stat" msgstr "--no-stat" @@ -4896,7 +4986,7 @@ 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:265 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:265 en/git-add.txt:119 en/git-am.txt:98 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" @@ -4921,8 +5011,8 @@ 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:61 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 +#: 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-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:63 en/git-status.txt:27 en/git-stripspace.txt:38 en/git-svn.txt:46 en/git-tag.txt:65 en/git-verify-pack.txt:31 en/signoff-option.txt:2 +#, ignore-same, no-wrap, priority:280 msgid "-s" msgstr "-s" @@ -4940,7 +5030,7 @@ msgid "Suppress all output from the diff machinery. Useful for commands like `gi 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:250 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:126 en/git-symbolic-ref.txt:58 +#: en/diff-options.txt:40 en/git-am.txt:83 en/git-branch.txt:131 en/git-checkout.txt:250 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:371 en/git-repack.txt:247 en/git-restore.txt:88 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:126 en/git-symbolic-ref.txt:58 #, ignore-same, no-wrap, priority:280 msgid "-m" msgstr "-m" @@ -4952,7 +5042,7 @@ msgid "Show diffs for merge commits in the default format. This is similar to '- 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:196 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" @@ -5153,7 +5243,7 @@ msgid "Generate diffs with lines of context instead of the usual three." 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 +#: en/diff-options.txt:128 en/diff-options.txt:538 #, fuzzy, no-wrap, placeholders:'`--patch`', priority:280 msgid "\tImplies `--patch`.\n" msgstr "\tDas impliziert `-p`.\n" @@ -5461,7 +5551,7 @@ 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:247 en/git-grep.txt:184 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:128 en/git-update-index.txt:180 en/git-worktree.txt:245 #, ignore-same, no-wrap, priority:280 msgid "-z" msgstr "-z" @@ -5496,57 +5586,57 @@ msgid "Without this option, pathnames with \"unusual\" characters are quoted as 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:256 en/git-grep.txt:166 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" #. type: Plain text -#: en/diff-options.txt:335 +#: en/diff-options.txt:336 #, fuzzy, placeholders:'linkgit:git-log[1]', 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." +msgid "Show only the name of each changed file in the post-image tree. 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 +#: en/diff-options.txt:337 en/git-ls-tree.txt:60 #, ignore-same, no-wrap, priority:280 msgid "--name-status" msgstr "--name-status" #. type: Plain text -#: en/diff-options.txt:340 +#: en/diff-options.txt:341 #, fuzzy, placeholders:'`--diff-filter`':'`--name-only`', 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." +msgid "Show only the name(s) and status of each changed file. 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 +#: en/diff-options.txt:342 #, no-wrap, placeholders:'--submodule', priority:280 msgid "--submodule[=]" msgstr "--submodule[=]" #. type: Plain text -#: en/diff-options.txt:352 +#: en/diff-options.txt:353 #, fuzzy, placeholders:'`--submodule=short`':'`--submodule`':'`--submodule=log`':'linkgit:git-submodule[1]':'`--submodule=diff`':'diff.submodule', 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." 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:63 en/git-grep.txt:193 en/git-show-branch.txt:118 en/git-tag.txt:125 +#: en/diff-options.txt:354 en/git-branch.txt:145 en/git-for-each-ref.txt:63 en/git-grep.txt:201 en/git-show-branch.txt:118 en/git-tag.txt:126 #, no-wrap, placeholders:'--color', priority:280 msgid "--color[=]" msgstr "--color[=]" #. type: Plain text -#: en/diff-options.txt:357 +#: en/diff-options.txt:358 #, fuzzy, placeholders:'`--color`':'`--color=always`', priority:280 #| msgid "Show colored diff. `--color` (i.e. without '=') is the same as `--color=always`. '' can be one of `always`, `never`, or `auto`." 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 +#: en/diff-options.txt:361 #, no-wrap, placeholders:'color.ui':'color.diff', priority:280 msgid "" "\tIt can be changed by the `color.ui` and `color.diff`\n" @@ -5556,49 +5646,49 @@ 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:363 en/git-branch.txt:150 en/git-grep.txt:205 en/git-show-branch.txt:123 #, ignore-same, no-wrap, priority:280 msgid "--no-color" msgstr "--no-color" #. type: Plain text -#: en/diff-options.txt:364 +#: en/diff-options.txt:365 #, priority:280 msgid "Turn off colored diff." msgstr "Farbige Diff-Ausgabe deaktivieren." #. type: Plain text -#: en/diff-options.txt:366 +#: en/diff-options.txt:367 #, no-wrap, priority:280 msgid "\tThis can be used to override configuration settings.\n" msgstr "\tHiermit können Konfigurationseinstellungen überschrieben werden.\n" #. type: Plain text -#: en/diff-options.txt:368 +#: en/diff-options.txt:369 #, no-wrap, placeholders:'`--color=never`', priority:280 msgid "\tIt is the same as `--color=never`.\n" msgstr "\tEs entspricht `--color=never`.\n" #. type: Labeled list -#: en/diff-options.txt:369 +#: en/diff-options.txt:370 #, no-wrap, placeholders:'--color-moved', priority:280 msgid "--color-moved[=]" msgstr "--color-moved[=]" #. type: Plain text -#: en/diff-options.txt:371 +#: en/diff-options.txt:372 #, priority:280 msgid "Moved lines of code are colored differently." msgstr "Verschobene Codezeilen sind unterschiedlich eingefärbt." #. type: Plain text -#: en/diff-options.txt:373 +#: en/diff-options.txt:374 #, no-wrap, placeholders:'diff.colorMoved', 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" #. type: Plain text -#: en/diff-options.txt:377 +#: en/diff-options.txt:378 #, no-wrap, priority:280 msgid "" "\tThe defaults to 'no' if the option is not given\n" @@ -5610,421 +5700,421 @@ msgstr "" "\tDer Modus muss einer der folgenden Werte sein:\n" #. type: Labeled list -#: en/diff-options.txt:379 en/diff-options.txt:421 +#: en/diff-options.txt:380 en/diff-options.txt:422 #, ignore-same, no-wrap, priority:280 msgid "no" msgstr "no" #. type: Plain text -#: en/diff-options.txt:381 +#: en/diff-options.txt:382 #, priority:280 msgid "Moved lines are not highlighted." msgstr "Verschobene Zeilen werden nicht hervorgehoben." #. type: Labeled list -#: en/diff-options.txt:381 en/git-commit.txt:252 +#: en/diff-options.txt:382 en/git-commit.txt:252 #, ignore-same, no-wrap, priority:280 msgid "default" msgstr "default" #. type: Plain text -#: en/diff-options.txt:384 +#: en/diff-options.txt:385 #, 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." #. type: Labeled list -#: en/diff-options.txt:384 en/diff-options.txt:453 +#: en/diff-options.txt:385 en/diff-options.txt:454 #, ignore-same, no-wrap, priority:280 msgid "plain" msgstr "plain" #. type: Plain text -#: en/diff-options.txt:391 +#: en/diff-options.txt:392 #, fuzzy, placeholders:'color.diff.newMoved':'color.diff.oldMoved', 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." 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 +#: en/diff-options.txt:392 #, ignore-same, no-wrap, priority:280 msgid "blocks" msgstr "blocks" #. type: Plain text -#: en/diff-options.txt:396 +#: en/diff-options.txt:397 #, fuzzy, placeholders:'color.diff', 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." 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 +#: en/diff-options.txt:397 #, ignore-same, no-wrap, priority:280 msgid "zebra" msgstr "zebra" #. type: Plain text -#: en/diff-options.txt:401 +#: en/diff-options.txt:402 #, placeholders:'color.diff':'color.diff', 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." #. type: Labeled list -#: en/diff-options.txt:401 +#: en/diff-options.txt:402 #, ignore-same, no-wrap, priority:280 msgid "dimmed-zebra" msgstr "dimmed-zebra" #. type: Plain text -#: en/diff-options.txt:406 +#: en/diff-options.txt:407 #, fuzzy, placeholders:'dimmed_zebra', 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." 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 +#: en/diff-options.txt:409 #, ignore-same, no-wrap, priority:280 msgid "--no-color-moved" msgstr "--no-color-moved" #. type: Plain text -#: en/diff-options.txt:411 +#: en/diff-options.txt:412 #, placeholders:'`--color-moved=no`', 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`." #. type: Labeled list -#: en/diff-options.txt:412 +#: en/diff-options.txt:413 #, no-wrap, placeholders:'--color-moved-ws=', priority:280 msgid "--color-moved-ws=" msgstr "--color-moved-ws=" #. type: Plain text -#: en/diff-options.txt:415 +#: en/diff-options.txt:416 #, placeholders:'`--color-moved`', 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." #. type: Plain text -#: en/diff-options.txt:417 +#: en/diff-options.txt:418 #, no-wrap, placeholders:'diff.colorMovedWS', 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" #. type: Plain text -#: en/diff-options.txt:419 +#: en/diff-options.txt:420 #, no-wrap, priority:280 msgid "\tThese modes can be given as a comma separated list:\n" msgstr "\tDiese Modi können als kommagetrennte Liste eingegeben werden:\n" #. type: Plain text -#: en/diff-options.txt:423 +#: en/diff-options.txt:424 #, priority:280 msgid "Do not ignore whitespace when performing move detection." msgstr "Ignoriert keine Leerzeichen bei der Erkennung von Verschiebungen." #. type: Labeled list -#: en/diff-options.txt:423 en/merge-strategies.txt:43 +#: en/diff-options.txt:424 en/merge-strategies.txt:43 #, ignore-same, no-wrap, priority:280 msgid "ignore-space-at-eol" msgstr "ignore-space-at-eol" #. type: Plain text -#: en/diff-options.txt:425 en/diff-options.txt:779 +#: en/diff-options.txt:426 en/diff-options.txt:780 #, priority:280 msgid "Ignore changes in whitespace at EOL." msgstr "Änderungen der Leerzeichen am Zeilenende (EOL) ignorieren." #. type: Labeled list -#: en/diff-options.txt:425 en/merge-strategies.txt:41 +#: en/diff-options.txt:426 en/merge-strategies.txt:41 #, ignore-same, no-wrap, priority:280 msgid "ignore-space-change" msgstr "ignore-space-change" #. type: Plain text -#: en/diff-options.txt:429 en/diff-options.txt:785 +#: en/diff-options.txt:430 en/diff-options.txt:786 #, fuzzy, 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." 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 +#: en/diff-options.txt:430 en/merge-strategies.txt:42 #, ignore-same, no-wrap, priority:280 msgid "ignore-all-space" msgstr "ignore-all-space" #. type: Plain text -#: en/diff-options.txt:432 en/diff-options.txt:791 +#: en/diff-options.txt:433 en/diff-options.txt:792 #, 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." #. type: Labeled list -#: en/diff-options.txt:432 +#: en/diff-options.txt:433 #, ignore-same, no-wrap, priority:280 msgid "allow-indentation-change" msgstr "allow-indentation-change" #. type: Plain text -#: en/diff-options.txt:437 +#: en/diff-options.txt:438 #, 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." #. type: Labeled list -#: en/diff-options.txt:439 +#: en/diff-options.txt:440 #, ignore-same, no-wrap, priority:280 msgid "--no-color-moved-ws" msgstr "--no-color-moved-ws" #. type: Plain text -#: en/diff-options.txt:443 +#: en/diff-options.txt:444 #, placeholders:'`--color-moved-ws=no`', 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`." #. type: Labeled list -#: en/diff-options.txt:444 +#: en/diff-options.txt:445 #, no-wrap, placeholders:'--word-diff', priority:280 msgid "--word-diff[=]" msgstr "--word-diff[=]" #. type: Plain text -#: en/diff-options.txt:449 +#: en/diff-options.txt:450 #, fuzzy, placeholders:'`--word-diff-regex`', 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:" 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 +#: en/diff-options.txt:454 #, fuzzy, placeholders:'`--color`', priority:280 #| msgid "Highlight changed words using only colors. Implies `--color`." msgid "Highlight changed words using only colors. Implies `--color`." msgstr "Geänderte Wörter nur farblich hervorheben. Impliziert die Option `--color`." #. type: Plain text -#: en/diff-options.txt:457 +#: en/diff-options.txt:458 #, fuzzy, 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." 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 +#: en/diff-options.txt:458 #, ignore-same, no-wrap, priority:280 msgid "porcelain" msgstr "porcelain" #. type: Plain text -#: en/diff-options.txt:464 +#: en/diff-options.txt:465 #, fuzzy, 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." 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 +#: en/diff-options.txt:465 en/git-daemon.txt:131 en/git-submodule.txt:178 #, ignore-same, no-wrap, priority:280 msgid "none" msgstr "none" #. type: Plain text -#: en/diff-options.txt:466 +#: en/diff-options.txt:467 #, priority:280 msgid "Disable word diff again." msgstr "Den Wort-Diff wieder deaktivieren." #. type: Plain text -#: en/diff-options.txt:470 +#: en/diff-options.txt:471 #, 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." #. type: Labeled list -#: en/diff-options.txt:471 +#: en/diff-options.txt:472 #, no-wrap, placeholders:'--word-diff-regex=', priority:280 msgid "--word-diff-regex=" msgstr "--word-diff-regex=" #. type: Plain text -#: en/diff-options.txt:475 +#: en/diff-options.txt:476 #, fuzzy, placeholders:'`--word-diff`', 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." 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 +#: en/diff-options.txt:484 #, fuzzy, 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." 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 +#: en/diff-options.txt:487 #, placeholders:'`--word-diff-regex=', 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." #. type: Plain text -#: en/diff-options.txt:491 +#: en/diff-options.txt:492 #, fuzzy, placeholders:'linkgit:gitattributes[5]':'linkgit:git-config[1]', 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." 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 +#: en/diff-options.txt:493 #, no-wrap, placeholders:'--color-words', priority:280 msgid "--color-words[=]" msgstr "--color-words[=]" #. type: Plain text -#: en/diff-options.txt:495 +#: en/diff-options.txt:496 #, placeholders:'`--word-diff=color`':'`--word-diff-regex=', 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=`." #. type: Labeled list -#: en/diff-options.txt:497 en/git-status.txt:143 +#: en/diff-options.txt:498 en/git-status.txt:145 #, ignore-same, no-wrap, priority:280 msgid "--no-renames" msgstr "--no-renames" #. type: Plain text -#: en/diff-options.txt:500 +#: en/diff-options.txt:501 #, 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." #. type: Labeled list -#: en/diff-options.txt:501 +#: en/diff-options.txt:502 #, ignore-same, no-wrap, priority:280 msgid "--[no-]rename-empty" msgstr "--[no-]rename-empty" #. type: Plain text -#: en/diff-options.txt:503 +#: en/diff-options.txt:504 #, priority:280 msgid "Whether to use empty blobs as rename source." msgstr "" #. type: Labeled list -#: en/diff-options.txt:505 en/git-apply.txt:58 +#: en/diff-options.txt:506 en/git-apply.txt:58 #, ignore-same, no-wrap, priority:280 msgid "--check" msgstr "--check" #. type: Plain text -#: en/diff-options.txt:514 +#: en/diff-options.txt:515 #, placeholders:'core.whitespace':'--exit-code', 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." msgstr "" #. type: Labeled list -#: en/diff-options.txt:515 +#: en/diff-options.txt:516 #, no-wrap, placeholders:'--ws-error-highlight=', priority:280 msgid "--ws-error-highlight=" msgstr "--ws-error-highlight=" #. type: Plain text -#: en/diff-options.txt:524 +#: en/diff-options.txt:525 #, fuzzy, placeholders:'diff.wsErrorHighlight':'color.diff.whitespace', 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`." 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 +#: en/diff-options.txt:528 #, ignore-same, no-wrap, priority:280 msgid "--full-index" msgstr "--full-index" #. type: Plain text -#: en/diff-options.txt:531 +#: en/diff-options.txt:532 #, 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." #. type: Labeled list -#: en/diff-options.txt:532 en/git-apply.txt:161 +#: en/diff-options.txt:533 en/git-apply.txt:161 #, ignore-same, no-wrap, priority:280 msgid "--binary" msgstr "--binary" #. type: Plain text -#: en/diff-options.txt:535 +#: en/diff-options.txt:536 #, placeholders:'`--full-index`':'git-apply', priority:280 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:186 en/git-ls-tree.txt:72 en/git-show-ref.txt:79 +#: en/diff-options.txt:540 en/git-ls-files.txt:186 en/git-ls-tree.txt:72 en/git-show-ref.txt:81 #, no-wrap, placeholders:'--abbrev', priority:280 msgid "--abbrev[=]" msgstr "--abbrev[=]" #. type: Plain text -#: en/diff-options.txt:548 +#: en/diff-options.txt:549 #, placeholders:'`--full-index`':'`--full-index`':'`--abbrev`':'`--abbrev=', 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=`." msgstr "" #. type: Labeled list -#: en/diff-options.txt:549 +#: en/diff-options.txt:550 #, no-wrap, priority:280 msgid "-B[][/]" msgstr "" #. type: Labeled list -#: en/diff-options.txt:550 +#: en/diff-options.txt:551 #, no-wrap, placeholders:'--break-rewrites', priority:280 msgid "--break-rewrites[=[][/]]" msgstr "" #. type: Plain text -#: en/diff-options.txt:553 +#: en/diff-options.txt:554 #, priority:280 msgid "Break complete rewrite changes into pairs of delete and create. This serves two purposes:" msgstr "" #. type: Plain text -#: en/diff-options.txt:563 +#: en/diff-options.txt:564 #, 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)." msgstr "" #. type: Plain text -#: en/diff-options.txt:571 +#: en/diff-options.txt:572 #, 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." msgstr "" #. type: Labeled list -#: en/diff-options.txt:572 +#: en/diff-options.txt:573 #, no-wrap, priority:280 msgid "-M[]" msgstr "-M[]" #. type: Labeled list -#: en/diff-options.txt:573 en/git-status.txt:147 +#: en/diff-options.txt:574 en/git-status.txt:149 #, no-wrap, placeholders:'--find-renames', priority:280 msgid "--find-renames[=]" msgstr "--find-renames[=]" #. type: Plain text -#: en/diff-options.txt:576 +#: en/diff-options.txt:577 #, fuzzy, no-wrap, priority:280 msgid "\tDetect renames.\n" msgstr "Umbenennungen erkennen" #. type: Plain text -#: en/diff-options.txt:581 +#: en/diff-options.txt:582 #, no-wrap, placeholders:'`--follow`', priority:280 msgid "" "\tIf generating diffs, detect and report renames for each commit.\n" @@ -6033,7 +6123,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/diff-options.txt:591 +#: en/diff-options.txt:592 #, no-wrap, priority:280 msgid "" "\tIf `n` is specified, it is a threshold on the similarity\n" @@ -6048,139 +6138,139 @@ msgid "" msgstr "" #. type: Labeled list -#: en/diff-options.txt:592 +#: en/diff-options.txt:593 #, no-wrap, priority:280 msgid "-C[]" msgstr "-C[]" #. type: Labeled list -#: en/diff-options.txt:593 +#: en/diff-options.txt:594 #, no-wrap, placeholders:'--find-copies', priority:280 msgid "--find-copies[=]" msgstr "--find-copies[=]" #. type: Plain text -#: en/diff-options.txt:596 +#: en/diff-options.txt:597 #, placeholders:'`--find-copies-harder`', 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`." msgstr "" #. type: Labeled list -#: en/diff-options.txt:597 en/git-svn.txt:626 +#: en/diff-options.txt:598 en/git-svn.txt:626 #, ignore-same, no-wrap, priority:280 msgid "--find-copies-harder" msgstr "--find-copies-harder" #. type: Plain text -#: en/diff-options.txt:605 +#: en/diff-options.txt:606 #, placeholders:'`-C`':'`-C`', 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." msgstr "" #. type: Labeled list -#: en/diff-options.txt:606 en/git-branch.txt:104 en/git-http-push.txt:45 +#: en/diff-options.txt:607 en/git-branch.txt:104 en/git-http-push.txt:45 #, ignore-same, no-wrap, priority:280 msgid "-D" msgstr "-D" #. type: Labeled list -#: en/diff-options.txt:607 +#: en/diff-options.txt:608 #, ignore-same, no-wrap, priority:280 msgid "--irreversible-delete" msgstr "--irreversible-delete" #. type: Plain text -#: en/diff-options.txt:615 +#: en/diff-options.txt:616 #, 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." msgstr "" #. type: Plain text -#: en/diff-options.txt:618 +#: en/diff-options.txt:619 #, placeholders:'`-B`', priority:280 msgid "When used together with `-B`, omit also the preimage in the deletion part of a delete/create pair." msgstr "" #. type: Labeled list -#: en/diff-options.txt:619 en/git-svn.txt:625 +#: en/diff-options.txt:620 en/git-svn.txt:625 #, no-wrap, priority:280 msgid "-l" msgstr "-l" #. type: Plain text -#: en/diff-options.txt:631 +#: en/diff-options.txt:632 #, placeholders:'`-M`':'`-C`':'diff.renameLimit', 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." msgstr "" #. type: Labeled list -#: en/diff-options.txt:633 +#: en/diff-options.txt:634 #, ignore-ellipsis, no-wrap, placeholders:'--diff-filter=[(A|C|D|M|R|T|U|X|B)', priority:280 msgid "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "" #. type: Plain text -#: en/diff-options.txt:644 +#: en/diff-options.txt:645 #, 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." msgstr "" #. type: Plain text -#: en/diff-options.txt:647 +#: en/diff-options.txt:648 #, placeholders:'`--diff-filter=ad`', priority:280 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 +#: en/diff-options.txt:651 #, 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." msgstr "" #. type: Labeled list -#: en/diff-options.txt:651 +#: en/diff-options.txt:652 #, fuzzy, no-wrap, priority:280 msgid "-S" msgstr "" #. type: Plain text -#: en/diff-options.txt:655 +#: en/diff-options.txt:656 #, 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." msgstr "" #. type: Plain text -#: en/diff-options.txt:661 +#: en/diff-options.txt:662 #, placeholders:'`-S`', 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." msgstr "" #. type: Plain text -#: en/diff-options.txt:663 +#: en/diff-options.txt:664 #, priority:280 msgid "Binary files are searched as well." msgstr "" #. type: Labeled list -#: en/diff-options.txt:664 +#: en/diff-options.txt:665 #, fuzzy, no-wrap, priority:280 msgid "-G" msgstr "" #. type: Plain text -#: en/diff-options.txt:667 +#: en/diff-options.txt:668 #, priority:280 msgid "Look for differences whose patch text contains added/removed lines that match ." msgstr "" #. type: Plain text -#: en/diff-options.txt:671 +#: en/diff-options.txt:672 #, placeholders:'--pickaxe-regex`', priority:280 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 - -#: en/diff-options.txt:676 +#: en/diff-options.txt:677 #, ignore-ellipsis, no-wrap, priority:280 msgid "" "+ return frotz(nitfol, two->ptr, 1, 0);\n" @@ -6189,428 +6279,428 @@ msgid "" msgstr "" #. type: Plain text -#: en/diff-options.txt:681 +#: en/diff-options.txt:682 #, placeholders:'--pickaxe-regex`', 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)." msgstr "" #. type: Plain text -#: en/diff-options.txt:684 +#: en/diff-options.txt:685 #, placeholders:'`--text`', priority:280 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 +#: en/diff-options.txt:688 #, placeholders:'linkgit:gitdiffcore[7]', priority:280 msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information." msgstr "" #. type: Labeled list -#: en/diff-options.txt:688 +#: en/diff-options.txt:689 #, no-wrap, placeholders:'--find-object=', priority:280 msgid "--find-object=" msgstr "" #. type: Plain text -#: en/diff-options.txt:693 +#: en/diff-options.txt:694 #, placeholders:'`-S`', 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." msgstr "" #. type: Plain text -#: en/diff-options.txt:696 +#: en/diff-options.txt:697 #, placeholders:'`-t`':'git-log', 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." msgstr "" #. type: Labeled list -#: en/diff-options.txt:697 +#: en/diff-options.txt:698 #, ignore-same, no-wrap, priority:280 msgid "--pickaxe-all" msgstr "--pickaxe-all" #. type: Plain text -#: en/diff-options.txt:701 +#: en/diff-options.txt:702 #, placeholders:'`-S`':'`-G`', 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 ." msgstr "" #. type: Labeled list -#: en/diff-options.txt:702 +#: en/diff-options.txt:703 #, ignore-same, no-wrap, priority:280 msgid "--pickaxe-regex" msgstr "--pickaxe-regex" #. type: Plain text -#: en/diff-options.txt:705 +#: en/diff-options.txt:706 #, placeholders:'`-S`', priority:280 msgid "Treat the given to `-S` as an extended POSIX regular expression to match." msgstr "" #. type: Labeled list -#: en/diff-options.txt:708 en/git-mergetool.txt:96 +#: en/diff-options.txt:709 en/git-mergetool.txt:96 #, no-wrap, priority:280 msgid "-O" msgstr "-O" #. type: Plain text -#: en/diff-options.txt:713 +#: en/diff-options.txt:714 #, fuzzy, placeholders:'diff.orderFile':'linkgit:git-config[1]':'diff.orderFile', 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`." 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 +#: en/diff-options.txt:726 #, 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." msgstr "" #. type: Plain text -#: en/diff-options.txt:727 +#: en/diff-options.txt:728 #, priority:280 msgid " is parsed as follows:" msgstr "" #. type: Plain text -#: en/diff-options.txt:731 +#: en/diff-options.txt:732 #, priority:280 msgid "Blank lines are ignored, so they can be used as separators for readability." msgstr "" #. type: Plain text -#: en/diff-options.txt:735 +#: en/diff-options.txt:736 #, 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." msgstr "" #. type: Plain text -#: en/diff-options.txt:737 +#: en/diff-options.txt:738 #, priority:280 msgid "Each other line contains a single pattern." msgstr "" #. type: Plain text -#: en/diff-options.txt:744 +#: en/diff-options.txt:745 #, placeholders:'FNM_PATHNAME', 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`\"." msgstr "" #. type: Labeled list -#: en/diff-options.txt:745 en/git-difftool.txt:41 +#: en/diff-options.txt:746 en/git-difftool.txt:41 #, fuzzy, no-wrap, placeholders:'--skip-to=', priority:280 msgid "--skip-to=" msgstr "--output=" #. type: Labeled list -#: en/diff-options.txt:746 en/git-difftool.txt:37 +#: en/diff-options.txt:747 en/git-difftool.txt:37 #, fuzzy, no-wrap, placeholders:'--rotate-to=', priority:280 msgid "--rotate-to=" msgstr "--template=" #. type: Plain text -#: en/diff-options.txt:752 +#: en/diff-options.txt:753 #, 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." msgstr "" #. type: Labeled list -#: en/diff-options.txt:754 en/git-apply.txt:105 en/git-cvsimport.txt:168 +#: en/diff-options.txt:755 en/git-apply.txt:105 en/git-cvsimport.txt:168 #, ignore-same, no-wrap, priority:280 msgid "-R" msgstr "-R" #. type: Plain text -#: en/diff-options.txt:757 +#: en/diff-options.txt:758 #, priority:280 msgid "Swap two inputs; that is, show differences from index or on-disk file to tree contents." msgstr "" #. type: Labeled list -#: en/diff-options.txt:759 +#: en/diff-options.txt:760 #, no-wrap, placeholders:'--relative', priority:280 msgid "--relative[=]" msgstr "--relative[=]" #. type: Labeled list -#: en/diff-options.txt:760 +#: en/diff-options.txt:761 #, ignore-same, no-wrap, priority:280 msgid "--no-relative" msgstr "--no-relative" #. type: Plain text -#: en/diff-options.txt:769 +#: en/diff-options.txt:770 #, placeholders:'`--no-relative`':'diff.relative':'`--relative`', 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`." msgstr "" #. type: Labeled list -#: en/diff-options.txt:770 en/fetch-options.txt:5 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:771 en/fetch-options.txt:5 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:79 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:61 #, ignore-same, no-wrap, priority:280 msgid "-a" msgstr "-a" #. type: Labeled list -#: en/diff-options.txt:771 en/git-grep.txt:72 +#: en/diff-options.txt:772 en/git-grep.txt:80 #, ignore-same, no-wrap, priority:280 msgid "--text" msgstr "--text" #. type: Plain text -#: en/diff-options.txt:773 +#: en/diff-options.txt:774 #, fuzzy, priority:280 msgid "Treat all files as text." msgstr "alle Dateien als Text behandeln" #. type: Labeled list -#: en/diff-options.txt:774 +#: en/diff-options.txt:775 #, ignore-same, no-wrap, priority:280 msgid "--ignore-cr-at-eol" msgstr "--ignore-cr-at-eol" #. type: Plain text -#: en/diff-options.txt:776 +#: en/diff-options.txt:777 #, priority:280 msgid "Ignore carriage-return at the end of line when doing a comparison." msgstr "" #. type: Labeled list -#: en/diff-options.txt:777 +#: en/diff-options.txt:778 #, ignore-same, no-wrap, priority:280 msgid "--ignore-space-at-eol" msgstr "--ignore-space-at-eol" #. type: Labeled list -#: en/diff-options.txt:781 en/git-am.txt:119 en/git-apply.txt:183 +#: en/diff-options.txt:782 en/git-am.txt:125 en/git-apply.txt:183 #, ignore-same, no-wrap, priority:280 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:787 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:112 en/git-hash-object.txt:31 en/git-help.txt:106 #, ignore-same, no-wrap, priority:280 msgid "-w" msgstr "-w" #. type: Labeled list -#: en/diff-options.txt:787 +#: en/diff-options.txt:788 #, ignore-same, no-wrap, priority:280 msgid "--ignore-all-space" msgstr "--ignore-all-space" #. type: Labeled list -#: en/diff-options.txt:792 +#: en/diff-options.txt:793 #, ignore-same, no-wrap, priority:280 msgid "--ignore-blank-lines" msgstr "--ignore-blank-lines" #. type: Plain text -#: en/diff-options.txt:794 +#: en/diff-options.txt:795 #, fuzzy, priority:280 msgid "Ignore changes whose lines are all blank." msgstr "Änderungen in leeren Zeilen ignorieren" #. type: Labeled list -#: en/diff-options.txt:795 +#: en/diff-options.txt:796 #, fuzzy, no-wrap, priority:280 msgid "-I" msgstr "" #. type: Labeled list -#: en/diff-options.txt:796 +#: en/diff-options.txt:797 #, fuzzy, no-wrap, placeholders:'--ignore-matching-lines=', priority:280 msgid "--ignore-matching-lines=" msgstr "--ignore-paths=" #. type: Plain text -#: en/diff-options.txt:799 +#: en/diff-options.txt:800 #, fuzzy, priority:280 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 -#: en/diff-options.txt:800 +#: en/diff-options.txt:801 #, no-wrap, placeholders:'--inter-hunk-context=', priority:280 msgid "--inter-hunk-context=" msgstr "" #. type: Plain text -#: en/diff-options.txt:805 +#: en/diff-options.txt:806 #, placeholders:'diff.interHunkContext', 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." 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:807 en/git-cvsexportcommit.txt:77 en/git-grep.txt:241 en/git-restore.txt:58 #, ignore-same, no-wrap, priority:280 msgid "-W" msgstr "-W" #. type: Labeled list -#: en/diff-options.txt:807 en/git-grep.txt:234 +#: en/diff-options.txt:808 en/git-grep.txt:242 #, ignore-same, no-wrap, priority:280 msgid "--function-context" msgstr "--function-context" #. type: Plain text -#: en/diff-options.txt:812 +#: en/diff-options.txt:813 #, placeholders:'linkgit:gitattributes[5]', 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])." msgstr "" #. type: Labeled list -#: en/diff-options.txt:815 en/git-ls-remote.txt:48 +#: en/diff-options.txt:816 en/git-ls-remote.txt:50 #, ignore-same, no-wrap, priority:280 msgid "--exit-code" msgstr "--exit-code" #. type: Plain text -#: en/diff-options.txt:819 +#: en/diff-options.txt:820 #, 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." msgstr "" #. type: Labeled list -#: en/diff-options.txt:820 en/fetch-options.txt:283 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:112 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:45 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:85 en/git-stash.txt:239 en/git-submodule.txt:277 en/git-svn.txt:671 en/git-switch.txt:148 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 +#: en/diff-options.txt:821 en/fetch-options.txt:283 en/git-am.txt:95 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:112 en/git-clean.txt:58 en/git-commit.txt:372 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:401 en/git-gc.txt:80 en/git-grep.txt:303 en/git-imap-send.txt:37 en/git-ls-remote.txt:41 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:416 en/git-repack.txt:107 en/git-reset.txt:108 en/git-restore.txt:67 en/git-rev-parse.txt:129 en/git-rm.txt:82 en/git-send-email.txt:445 en/git-show-ref.txt:87 en/git-stash.txt:239 en/git-submodule.txt:277 en/git-svn.txt:671 en/git-switch.txt:148 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:280 msgid "--quiet" msgstr "--quiet" #. type: Plain text -#: en/diff-options.txt:822 -#, placeholders:'`--exit-code`', priority:280 -msgid "Disable all output of the program. Implies `--exit-code`." +#: en/diff-options.txt:828 +#, placeholders:'`--exit-code`':'diff.trustExitCode':'GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE', priority:280 +msgid "Disable all output of the program. Implies `--exit-code`. Disables execution of external diff helpers whose exit code is not trusted, i.e. their respective configuration option `diff.trustExitCode` or `diff..trustExitCode` or environment variable `GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE` is false." msgstr "" #. type: Labeled list -#: en/diff-options.txt:825 +#: en/diff-options.txt:831 #, ignore-same, no-wrap, priority:280 msgid "--ext-diff" msgstr "--ext-diff" #. type: Plain text -#: en/diff-options.txt:829 +#: en/diff-options.txt:835 #, placeholders:'linkgit:gitattributes[5]':'linkgit:git-log[1]', 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." msgstr "" #. type: Labeled list -#: en/diff-options.txt:830 +#: en/diff-options.txt:836 #, ignore-same, no-wrap, priority:280 msgid "--no-ext-diff" msgstr "--no-ext-diff" #. type: Plain text -#: en/diff-options.txt:832 +#: en/diff-options.txt:838 #, priority:280 msgid "Disallow external diff drivers." msgstr "" #. type: Labeled list -#: en/diff-options.txt:833 en/git-cat-file.txt:72 en/git-grep.txt:75 +#: en/diff-options.txt:839 en/git-cat-file.txt:72 en/git-grep.txt:83 #, ignore-same, no-wrap, priority:280 msgid "--textconv" msgstr "--textconv" #. type: Labeled list -#: en/diff-options.txt:834 en/git-grep.txt:78 +#: en/diff-options.txt:840 en/git-grep.txt:86 #, ignore-same, no-wrap, priority:280 msgid "--no-textconv" msgstr "--no-textconv" #. type: Plain text -#: en/diff-options.txt:843 +#: en/diff-options.txt:849 #, placeholders:'linkgit:gitattributes[5]':'linkgit:git-diff[1]':'linkgit:git-log[1]':'linkgit:git-format-patch[1]', 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." msgstr "" #. type: Labeled list -#: en/diff-options.txt:844 en/git-status.txt:87 +#: en/diff-options.txt:850 en/git-status.txt:89 #, no-wrap, placeholders:'--ignore-submodules', priority:280 msgid "--ignore-submodules[=]" msgstr "--ignore-submodules[=]" #. type: Plain text -#: en/diff-options.txt:856 +#: en/diff-options.txt:862 #, placeholders:'HEAD':'linkgit:git-config[1]':'linkgit:gitmodules[5]', 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." msgstr "" #. type: Labeled list -#: en/diff-options.txt:857 +#: en/diff-options.txt:863 #, no-wrap, placeholders:'--src-prefix=', priority:280 msgid "--src-prefix=" msgstr "--src-prefix=" #. type: Plain text -#: en/diff-options.txt:859 +#: en/diff-options.txt:865 #, fuzzy, priority:280 msgid "Show the given source prefix instead of \"a/\"." msgstr "den gegebenen Quell-Präfix statt \"a/\" anzeigen" #. type: Labeled list -#: en/diff-options.txt:860 +#: en/diff-options.txt:866 #, no-wrap, placeholders:'--dst-prefix=', priority:280 msgid "--dst-prefix=" msgstr "--dst-prefix=" #. type: Plain text -#: en/diff-options.txt:862 +#: en/diff-options.txt:868 #, fuzzy, priority:280 msgid "Show the given destination prefix instead of \"b/\"." msgstr "den gegebenen Ziel-Präfix statt \"b/\" anzeigen" #. type: Labeled list -#: en/diff-options.txt:863 +#: en/diff-options.txt:869 #, ignore-same, no-wrap, priority:280 msgid "--no-prefix" msgstr "--no-prefix" #. type: Plain text -#: en/diff-options.txt:865 +#: en/diff-options.txt:871 #, fuzzy, priority:280 msgid "Do not show any source or destination prefix." msgstr "keine Quell- oder Ziel-Präfixe anzeigen" #. type: Labeled list -#: en/diff-options.txt:866 +#: en/diff-options.txt:872 #, ignore-same, no-wrap, priority:280 msgid "--default-prefix" msgstr "--default-prefix" #. type: Plain text -#: en/diff-options.txt:870 -#, placeholders:'diff.noprefix', 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`." +#: en/diff-options.txt:877 +#, placeholders:'diff.noprefix':'diff.srcPrefix':'diff.dstPrefix':'diff.mnemonicPrefix':'git-config', priority:280 +msgid "Use the default source and destination prefixes (\"a/\" and \"b/\"). This overrides configuration variables such as `diff.noprefix`, `diff.srcPrefix`, `diff.dstPrefix`, and `diff.mnemonicPrefix` (see `git-config`(1))." msgstr "" #. type: Labeled list -#: en/diff-options.txt:871 +#: en/diff-options.txt:878 #, no-wrap, placeholders:'--line-prefix=', priority:280 msgid "--line-prefix=" msgstr "--line-prefix=" #. type: Plain text -#: en/diff-options.txt:873 +#: en/diff-options.txt:880 #, fuzzy, priority:280 msgid "Prepend an additional prefix to every line of output." msgstr "einen zusätzlichen Präfix bei jeder Ausgabezeile voranstellen" #. type: Labeled list -#: en/diff-options.txt:874 +#: en/diff-options.txt:881 #, ignore-same, no-wrap, priority:280 msgid "--ita-invisible-in-index" msgstr "--ita-invisible-in-index" #. type: Plain text -#: en/diff-options.txt:881 +#: en/diff-options.txt:888 #, placeholders:'--cached':'--cached':'`--ita-visible-in-index`', 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." msgstr "" #. type: Plain text -#: en/diff-options.txt:883 +#: en/diff-options.txt:890 #, placeholders:'linkgit:gitdiffcore[7]', priority:280 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]." msgstr "" @@ -6628,7 +6718,7 @@ msgid "Fetch all remotes. This overrides the configuration variable `fetch.all`. msgstr "" #. type: Labeled list -#: en/fetch-options.txt:6 +#: en/fetch-options.txt:6 en/git-config.txt:114 #, ignore-same, no-wrap, priority:220 msgid "--append" msgstr "--append" @@ -6676,8 +6766,8 @@ msgid "Similar to --depth, except it specifies the number of commits from the cu msgstr "" #. type: Labeled list -#: en/fetch-options.txt:27 en/git-clone.txt:252 en/git-fetch-pack.txt:90 -#, no-wrap, placeholders:'--shallow-since=', priority:300 +#: en/fetch-options.txt:27 en/git-fetch-pack.txt:90 +#, no-wrap, placeholders:'--shallow-since=', priority:220 msgid "--shallow-since=" msgstr "--shallow-since=" @@ -6688,8 +6778,8 @@ msgid "Deepen or shorten the history of a shallow repository to include all reac msgstr "" #. type: Labeled list -#: en/fetch-options.txt:31 en/git-clone.txt:255 en/git-fetch-pack.txt:94 -#, no-wrap, placeholders:'--shallow-exclude=', priority:300 +#: en/fetch-options.txt:31 en/git-fetch-pack.txt:94 +#, no-wrap, placeholders:'--shallow-exclude=', priority:220 msgid "--shallow-exclude=" msgstr "--shallow-exclude=" @@ -6779,7 +6869,7 @@ msgid "This is incompatible with `--recurse-submodules=[yes|on-demand]`. Interna msgstr "" #. type: Labeled list -#: en/fetch-options.txt:79 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:79 en/git-add.txt:70 en/git-clean.txt:52 en/git-commit.txt:375 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:120 en/git-rm.txt:53 en/git-send-email.txt:436 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" @@ -6815,13 +6905,13 @@ msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly u msgstr "" #. type: Labeled list -#: en/fetch-options.txt:98 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:122 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:171 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:115 en/git-tag.txt:79 en/git-update-server-info.txt:24 en/git-worktree.txt:172 +#: en/fetch-options.txt:98 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:122 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:171 en/git-mv.txt:31 en/git-notes.txt:133 en/git-push.txt:333 en/git-rebase.txt:448 en/git-repack.txt:98 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:300 en/git-switch.txt:115 en/git-tag.txt:80 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:99 en/git-add.txt:79 en/git-branch.txt:118 en/git-checkout-index.txt:36 en/git-checkout.txt:123 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:116 en/git-tag.txt:80 en/git-update-server-info.txt:25 en/git-worktree.txt:173 +#: en/fetch-options.txt:99 en/git-add.txt:79 en/git-branch.txt:118 en/git-checkout-index.txt:36 en/git-checkout.txt:123 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:465 en/git-send-pack.txt:55 en/git-submodule.txt:301 en/git-switch.txt:116 en/git-tag.txt:81 en/git-update-server-info.txt:25 en/git-worktree.txt:173 #, ignore-same, no-wrap, priority:300 msgid "--force" msgstr "--force" @@ -6943,7 +7033,7 @@ msgid "See the PRUNING section below for more details." msgstr "" #. type: Labeled list -#: en/fetch-options.txt:151 en/git-cvsexportcommit.txt:57 en/git-grep.txt:135 en/git.txt:135 en/rev-list-options.txt:97 +#: en/fetch-options.txt:151 en/git-cvsexportcommit.txt:57 en/git-grep.txt:143 en/git.txt:136 en/rev-list-options.txt:97 #, ignore-same, no-wrap, priority:260 msgid "-P" msgstr "-P" @@ -6961,14 +7051,14 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote msgstr "" #. type: Labeled list -#: en/fetch-options.txt:165 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 +#: en/fetch-options.txt:165 en/git-add.txt:69 en/git-am.txt:152 en/git-blame.txt:71 en/git-checkout-index.txt:45 en/git-cherry-pick.txt:92 en/git-clean.txt:51 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:156 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:427 en/git-reflog.txt:119 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" #. type: Labeled list -#: en/fetch-options.txt:167 en/git-clone.txt:270 -#, ignore-same, no-wrap, priority:300 +#: en/fetch-options.txt:167 +#, ignore-same, no-wrap, priority:220 msgid "--no-tags" msgstr "--no-tags" @@ -7017,8 +7107,8 @@ msgstr "" #. type: Labeled list #: en/fetch-options.txt:205 #, ignore-same, no-wrap, priority:220 -msgid "--recurse-submodules[=yes|on-demand|no]" -msgstr "--recurse-submodules[=yes|on-demand|no]" +msgid "--recurse-submodules[=(yes|on-demand|no)]" +msgstr "--recurse-submodules[=(yes|on-demand|no)]" #. type: Plain text #: en/fetch-options.txt:215 @@ -7129,8 +7219,8 @@ msgid "By default 'git fetch' refuses to update the head which corresponds to th msgstr "" #. type: Labeled list -#: en/fetch-options.txt:275 en/git-clone.txt:219 -#, no-wrap, placeholders:'--upload-pack', priority:300 +#: en/fetch-options.txt:275 +#, no-wrap, placeholders:'--upload-pack', priority:220 msgid "--upload-pack " msgstr "--upload-pack " @@ -7141,8 +7231,8 @@ msgid "When given, and the repository to fetch from is handled by 'git fetch-pac 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:282 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:111 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:44 en/git-ls-remote.txt:38 en/git-merge-file.txt:80 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:84 en/git-stash.txt:238 en/git-submodule.txt:276 en/git-svn.txt:670 en/git-switch.txt:147 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 +#: en/fetch-options.txt:282 en/git-am.txt:94 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:111 en/git-clean.txt:57 en/git-commit.txt:371 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:400 en/git-grep.txt:302 en/git-imap-send.txt:36 en/git-ls-remote.txt:40 en/git-merge-file.txt:80 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:415 en/git-repack.txt:106 en/git-reset.txt:107 en/git-restore.txt:66 en/git-rev-parse.txt:128 en/git-rm.txt:81 en/git-show-ref.txt:86 en/git-stash.txt:238 en/git-submodule.txt:276 en/git-svn.txt:670 en/git-switch.txt:147 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:251 en/merge-options.txt:174 +#, ignore-same, no-wrap, priority:280 msgid "-q" msgstr "-q" @@ -7153,13 +7243,13 @@ msgid "Pass --quiet to git-fetch-pack and silence any other internally used git msgstr "" #. type: Labeled list -#: en/fetch-options.txt:288 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:166 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:288 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-commit.txt:356 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:118 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:166 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:419 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:88 en/git.txt:42 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:289 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:289 en/git-add.txt:75 en/git-apply.txt:226 en/git-archive.txt:50 en/git-branch.txt:193 en/git-commit.txt:357 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:420 en/git-reflog.txt:124 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:159 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" @@ -7171,8 +7261,8 @@ msgid "Be verbose." msgstr "Gib ausführliche Informationen aus." #. type: Labeled list -#: en/fetch-options.txt:293 en/git-bundle.txt:114 en/git-checkout.txt:115 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:151 en/merge-options.txt:182 -#, ignore-same, no-wrap, priority:300 +#: en/fetch-options.txt:293 en/git-bundle.txt:114 en/git-checkout.txt:115 en/git-format-patch.txt:428 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:151 en/merge-options.txt:182 +#, ignore-same, no-wrap, priority:280 msgid "--progress" msgstr "--progress" @@ -7183,20 +7273,20 @@ msgid "Progress status is reported on the standard error stream by default when 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:299 en/git-ls-remote.txt:75 en/git-push.txt:216 +#: en/fetch-options.txt:299 en/git-ls-remote.txt:77 en/git-push.txt:216 #, no-wrap, priority:220 msgid "-o