diff --git a/po/documentation.de.po b/po/documentation.de.po index 611a7cd2..594cdc5c 100644 --- a/po/documentation.de.po +++ b/po/documentation.de.po @@ -126,7 +126,7 @@ msgstr "--reverse .." #. type: Plain text #: en/blame-options.txt:39 -#, fuzzy, placeholders:'--reverse':'--reverse':'HEAD', priority:100 +#, fuzzy, placeholders:'--reverse':'--reverse':'HEAD`', priority:100 #| msgid "Walk history forward instead of backward. Instead of showing the revision in which a line appeared, this shows the last revision in which a line has existed. This requires a range of revision like START..END where the path to blame exists in START. `git blame --reverse START` is taken as `git blame --reverse START..HEAD` for convenience." msgid "Walk history forward instead of backward. Instead of showing the revision in which a line appeared, this shows the last revision in which a line has existed. This requires a range of revision like START..END where the path to blame exists in START. `git blame --reverse START` is taken as `git blame --reverse START..HEAD` for convenience." msgstr "Den Verlauf vorwärts statt rückwärts durchgehen. Anstatt die erste Revision anzuzeigen, in der eine Zeile erschien, wird die letzte Revision angezeigt, in der die Zeile noch existierte. Dies erfordert einen Revisionsbereich wie ANFANG..ENDE, wobei die gesuchte Stelle in ANFANG existieren muss. `git blame --reverse ANFANG` ist die Abkürzung für `git blame --reverse ANFANG..HEAD`." @@ -206,7 +206,7 @@ msgstr "--contents " #. type: Plain text #: en/blame-options.txt:70 -#, placeholders:'HEAD', priority:100 +#, priority:100 msgid "Annotate using the contents from the named file, starting from if it is specified, and HEAD otherwise. You may specify '-' to make the command read from the standard input for the file contents." msgstr "" @@ -1449,7 +1449,7 @@ msgstr "linkgit:git-reset[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:90 -#, placeholders:'HEAD', priority:100 +#, priority:100 msgid "Reset current HEAD to the specified state." msgstr "Aktuellen HEAD zu einem spezifizierten Zustand setzen." @@ -2568,7 +2568,7 @@ msgstr "KONFIGURATIONSDATEI" #. type: Plain text #: en/config.txt:12 -#, placeholders:'config.worktree':'linkgit:git-worktree[1]':'$HOME', priority:100 +#, placeholders:'config.worktree':'linkgit:git-worktree[1]':'`$HOME', priority:100 msgid "The Git configuration file contains a number of variables that affect the Git commands' behavior. The files `.git/config` and optionally `config.worktree` (see the \"CONFIGURATION FILE\" section of linkgit:git-worktree[1]) in each repository are used to store the configuration for that repository, and `$HOME/.gitconfig` is used to store a per-user configuration as fallback values for the `.git/config` file. The file `/etc/gitconfig` can be used to store a system-wide default configuration." msgstr "Die Git-Konfigurationsdatei enthält eine Reihe von Variablen, die das Verhalten der Git-Befehle beeinflussen. Die Dateien `.git/config` und optional `config.worktree` (siehe den Abschnitt „KONFIGURATIONSDATEI“ in linkgit:git-worktree[1]) in jedem Repository werden verwendet, um die Konfiguration für dieses Repository zu speichern. Mit `$HOME/.gitconfig` wird außerdem pro Benutzer eine Konfiguration als Fallback-Werte für die Datei `.git/config` gespeichert. Die Datei `/etc/gitconfig` kann verwendet werden, um eine systemweite Standardkonfiguration zu sichern." @@ -2709,7 +2709,7 @@ msgstr "Die Daten, die dem Schlüsselwort `gitdir:` folgen, werden als Glob-Patt #. type: Plain text #: en/config.txt:127 -#, fuzzy, placeholders:'$GIT_DIR', priority:100 +#, 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" @@ -2812,13 +2812,13 @@ msgstr "Noch ein paar Anmerkungen zum Vergleichen über `gitdir` und `gitdir/i`: #. type: Plain text #: en/config.txt:194 -#, placeholders:'$GIT_DIR', priority:100 +#, 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:199 -#, placeholders:'$GIT_DIR', priority:100 +#, 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." @@ -2896,7 +2896,7 @@ msgstr "" #. type: delimited block - #: en/config.txt:235 -#, no-wrap, placeholders:'foo.inc':'foo.inc':'foo.inc':'foo.inc':'foo.inc':'$HOME', priority:100 +#, no-wrap, placeholders:'foo.inc':'foo.inc':'foo.inc':'foo.inc':'foo.inc':'`$HOME`', priority:100 msgid "" "[include]\n" "\tpath = /path/to/foo.inc ; include by absolute path\n" @@ -2934,7 +2934,7 @@ msgstr "" #. type: delimited block - #: en/config.txt:247 -#, no-wrap, placeholders:'$HOME':'foo.inc', priority:100 +#, no-wrap, placeholders:'foo.inc', priority:100 msgid "" "; include for all repositories inside $HOME/to/group\n" "[includeIf \"gitdir:~/to/group/\"]\n" @@ -3127,7 +3127,7 @@ msgstr "pathname" #. type: Plain text #: en/config.txt:352 -#, placeholders:'$HOME', priority:100 +#, 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." @@ -3505,7 +3505,7 @@ msgstr "vergleicht den Index mit den Dateien auf dem Dateisystem." #. type: Labeled list #: en/config/diff.txt:111 -#, fuzzy, no-wrap, placeholders:'HEAD', priority:280 +#, fuzzy, no-wrap, placeholders:'HEAD`', priority:280 msgid "`git diff HEAD`" msgstr "`git push origin master`" @@ -3530,7 +3530,7 @@ msgstr "vergleicht mit dem Index." #. type: Labeled list #: en/config/diff.txt:115 -#, no-wrap, placeholders:'HEAD', priority:280 +#, no-wrap, priority:280 msgid "`git diff HEAD:file1 file2`" msgstr "" @@ -5428,7 +5428,7 @@ msgstr "--stat[=[,[,]]]" #. type: Plain text #: en/diff-options.txt:229 -#, fuzzy, ignore-ellipsis, placeholders:'diff.statNameWidth':'`--stat-graph-width=':'diff.statGraphWidth':'`--stat`':'`--stat-graph-width`':'diff.statNameWidth':'diff.statGraphWidth':'git format-patch', priority:280 +#, fuzzy, ignore-ellipsis, placeholders:'diff.statNameWidth':'`--stat-graph-width=':'diff.statGraphWidth':'`--stat`':'`--stat-graph-width`':'diff.statNameWidth':'diff.statGraphWidth':'git format-patch`', priority:280 #| msgid "Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by ``. The width of the filename part can be limited by giving another width `` after a comma. The width of the graph part can be limited by using `--stat-graph-width=` (affects all commands generating a stat graph) or by setting `diff.statGraphWidth=` (does not affect `git format-patch`). By giving a third parameter ``, you can limit the output to the first `` lines, followed by `...` if there are more." msgid "Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by ``. The width of the filename part can be limited by giving another width `` after a comma or by setting `diff.statNameWidth=`. The width of the graph part can be limited by using `--stat-graph-width=` or by setting `diff.statGraphWidth=`. Using `--stat` or `--stat-graph-width` affects all commands generating a stat graph, while setting `diff.statNameWidth` or `diff.statGraphWidth` does not affect `git format-patch`. By giving a third parameter ``, you can limit the output to the first `` lines, followed by `...` if there are more." msgstr "Erzeugt ein Diffstat. Standardmäßig wird so viel Platz wie nötig für den Dateinamen und der Rest für den Graphen-Teil verwendet. Die maximale Breite ist auf die Terminalbreite voreingestellt (oder 80 Spalten, wenn kein Terminal angeschlossen ist). Sie kann durch `` überschrieben werden. Die Breite des Dateinamenteils kann durch die Angabe einer anderen Breite `` nach einem Komma begrenzt werden. Die Breite des Graphen-Teils kann durch die Verwendung von `--stat-graph-width=` (betrifft alle Befehle, die einen stat-Graphen erzeugen) oder durch die Einstellung von `diff.statGraphWidth=` (betrifft nicht den `git format-patch`) begrenzt werden. Indem Sie einen dritten Parameter `` angeben, können Sie die Ausgabe auf die ersten `` Zeilen beschränken, gefolgt von `...`, falls es noch mehr sind." @@ -6049,7 +6049,7 @@ msgstr "--binary" #. type: Plain text #: en/diff-options.txt:536 -#, placeholders:'`--full-index`':'git-apply', priority:280 +#, 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 "" @@ -6310,7 +6310,7 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:697 -#, placeholders:'`-t`':'git-log', priority:280 +#, 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 "" @@ -6623,7 +6623,7 @@ msgstr "--ignore-submodules[=]" #. type: Plain text #: en/diff-options.txt:862 -#, placeholders:'HEAD':'linkgit:git-config[1]':'linkgit:gitmodules[5]', priority:280 +#, placeholders:'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 "" @@ -6671,7 +6671,7 @@ msgstr "--default-prefix" #. type: Plain text #: en/diff-options.txt:877 -#, placeholders:'diff.noprefix':'diff.srcPrefix':'diff.dstPrefix':'diff.mnemonicPrefix':'git-config', priority:280 +#, 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 "" @@ -6725,7 +6725,7 @@ msgstr "--append" #. type: Plain text #: en/fetch-options.txt:10 -#, placeholders:'.git/FETCH_HEAD':'.git/FETCH_HEAD', priority:220 +#, placeholders:'`.git/FETCH_HEAD`':'`.git/FETCH_HEAD`', priority:220 msgid "Append ref names and object names of fetched refs to the existing contents of `.git/FETCH_HEAD`. Without this option old data in `.git/FETCH_HEAD` will be overwritten." msgstr "" @@ -6900,7 +6900,7 @@ msgstr "--[no-]write-fetch-head" #. type: Plain text #: en/fetch-options.txt:96 -#, placeholders:'FETCH_HEAD':'$GIT_DIR':'`--no-write-fetch-head`':'`--dry-run`', priority:220 +#, placeholders:'FETCH_HEAD':'`$GIT_DIR`':'`--no-write-fetch-head`':'`--dry-run`', priority:220 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`. This is the default. Passing `--no-write-fetch-head` from the command line tells Git not to write the file. Under `--dry-run` option, the file is never written." msgstr "" @@ -7112,7 +7112,7 @@ msgstr "--recurse-submodules[=(yes|on-demand|no)]" #. type: Plain text #: en/fetch-options.txt:215 -#, placeholders:'$GIT_DIR':'linkgit:gitsubmodules[7]', priority:220 +#, placeholders:'`$GIT_DIR/modules/`':'linkgit:gitsubmodules[7]', priority:220 msgid "This option controls if and under what conditions new commits of submodules should be fetched too. When recursing through submodules, `git fetch` always attempts to fetch \"changed\" submodules, that is, a submodule that has commits that are referenced by a newly fetched superproject commit but are missing in the local submodule clone. A changed submodule can be fetched as long as it is present locally e.g. in `$GIT_DIR/modules/` (see linkgit:gitsubmodules[7]); if the upstream adds a new submodule, that submodule cannot be fetched until it is cloned e.g. by `git submodule update`." msgstr "" @@ -7377,7 +7377,7 @@ msgstr "ÜBERSICHT" #. type: Plain text #: en/gitignore.txt:11 -#, placeholders:'$XDG_CONFIG_HOME':'$GIT_DIR':'.gitignore', priority:100 +#, placeholders:'$XDG_CONFIG_HOME/git/ignore':'$GIT_DIR/info/exclude':'.gitignore', priority:100 msgid "$XDG_CONFIG_HOME/git/ignore, $GIT_DIR/info/exclude, .gitignore" msgstr "" @@ -7407,13 +7407,13 @@ msgstr "" #. type: Plain text #: en/gitignore.txt:36 -#, placeholders:'.gitignore':'.gitignore':'.gitignore', priority:100 +#, placeholders:'`.gitignore`':'`.gitignore`':'`.gitignore`', priority:100 msgid "Patterns read from a `.gitignore` file in the same directory as the path, or in any parent directory (up to the top-level of the working tree), with patterns in the higher level files being overridden by those in lower level files down to the directory containing the file. These patterns match relative to the location of the `.gitignore` file. A project normally includes such `.gitignore` files in its repository, containing patterns for files generated as part of the project build." msgstr "" #. type: Plain text #: en/gitignore.txt:38 -#, placeholders:'$GIT_DIR', priority:100 +#, placeholders:'`$GIT_DIR/info/exclude`', priority:100 msgid "Patterns read from `$GIT_DIR/info/exclude`." msgstr "" @@ -7431,19 +7431,19 @@ msgstr "" #. type: Plain text #: en/gitignore.txt:48 -#, placeholders:'.gitignore', priority:100 +#, placeholders:'`.gitignore`', priority:100 msgid "Patterns which should be version-controlled and distributed to other repositories via clone (i.e., files that all developers will want to ignore) should go into a `.gitignore` file." msgstr "" #. type: Plain text #: en/gitignore.txt:54 -#, placeholders:'$GIT_DIR', priority:100 +#, placeholders:'`$GIT_DIR/info/exclude`', priority:100 msgid "Patterns which are specific to a particular repository but which do not need to be shared with other related repositories (e.g., auxiliary files that live inside the repository but are specific to one user's workflow) should go into the `$GIT_DIR/info/exclude` file." msgstr "" #. type: Plain text #: en/gitignore.txt:61 -#, placeholders:'core.excludesFile':'$XDG_CONFIG_HOME':'$XDG_CONFIG_HOME':'$HOME', priority:100 +#, placeholders:'core.excludesFile':'$XDG_CONFIG_HOME/git/ignore':'$XDG_CONFIG_HOME':'$HOME', priority:100 msgid "Patterns which a user wants Git to ignore in all situations (e.g., backup or temporary files generated by the user's editor of choice) generally go into a file specified by `core.excludesFile` in the user's `~/.gitconfig`. Its default value is $XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/ignore is used instead." msgstr "" @@ -7486,13 +7486,13 @@ msgstr "" #. type: Plain text #: en/gitignore.txt:93 -#, placeholders:'.gitignore', priority:100 +#, placeholders:'`.gitignore`', priority:100 msgid "The slash \"`/`\" is used as the directory separator. Separators may occur at the beginning, middle or end of the `.gitignore` search pattern." msgstr "" #. type: Plain text #: en/gitignore.txt:98 -#, placeholders:'.gitignore':'.gitignore', priority:100 +#, placeholders:'`.gitignore`':'`.gitignore`', priority:100 msgid "If there is a separator at the beginning or middle (or both) of the pattern, then the pattern is relative to the directory level of the particular `.gitignore` file itself. Otherwise the pattern may also match at any level below the `.gitignore` level." msgstr "" @@ -7504,7 +7504,7 @@ msgstr "" #. type: Plain text #: en/gitignore.txt:107 -#, placeholders:'.gitignore', priority:100 +#, placeholders:'`.gitignore`', priority:100 msgid "For example, a pattern `doc/frotz/` matches `doc/frotz` directory, but not `a/doc/frotz` directory; however `frotz/` matches `frotz` and `a/frotz` that is a directory (all paths are relative from the `.gitignore` file)." msgstr "" @@ -7528,7 +7528,7 @@ msgstr "" #. type: Plain text #: en/gitignore.txt:126 -#, placeholders:'.gitignore', priority:100 +#, placeholders:'`.gitignore`', priority:100 msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"`abc`\", relative to the location of the `.gitignore` file, with infinite depth." msgstr "" @@ -7552,7 +7552,7 @@ msgstr "KONFIGURATION" #. type: Plain text #: en/gitignore.txt:141 -#, placeholders:'core.excludesFile':'$GIT_DIR':'$GIT_DIR', priority:100 +#, placeholders:'core.excludesFile':'`$GIT_DIR/info/exclude`':'`$GIT_DIR/info/exclude`', priority:100 msgid "The optional configuration variable `core.excludesFile` indicates a path to a file containing patterns of file names to exclude, similar to `$GIT_DIR/info/exclude`. Patterns in the exclude file are used in addition to those in `$GIT_DIR/info/exclude`." msgstr "" @@ -7570,13 +7570,13 @@ msgstr "" #. type: Plain text #: en/gitignore.txt:152 -#, placeholders:'--cached':'.gitignore', priority:100 +#, placeholders:'--cached':'`.gitignore`', priority:100 msgid "To stop tracking a file that is currently tracked, use 'git rm --cached' to remove the file from the index. The filename can then be added to the `.gitignore` file to stop the file from being reintroduced in later commits." msgstr "" #. type: Plain text #: en/gitignore.txt:156 -#, placeholders:'.gitignore', priority:100 +#, placeholders:'`.gitignore`', priority:100 msgid "Git does not follow symbolic links when accessing a `.gitignore` file in the working tree. This keeps behavior consistent when the file is accessed from the index or a tree versus from the filesystem." msgstr "" @@ -7600,7 +7600,7 @@ msgstr "" #. type: Plain text #: en/gitignore.txt:176 -#, placeholders:'.gitignore', priority:100 +#, placeholders:'`.gitignore`', priority:100 msgid "The pattern `doc/frotz` and `/doc/frotz` have the same effect in any `.gitignore` file. In other words, a leading slash is not relevant if there is already a middle slash in the pattern." msgstr "" @@ -8178,7 +8178,7 @@ msgstr "status" #. type: Plain text #: en/git-add.txt:273 -#, fuzzy, placeholders:'HEAD', priority:300 +#, fuzzy, priority:300 #| msgid "This shows the change between HEAD and index (i.e. what will be committed if you say `git commit`), and between index and working tree files (i.e. what you could stage further before `git commit` using `git add`) for each path. A sample output looks like this:" msgid "This shows the change between HEAD and index (i.e. what will be committed if you say `git commit`), and between index and working tree files (i.e. what you could stage further before `git commit` using `git add`) for each path. A sample output looks like this:" msgstr "Zeigt den Unterschied zwischen HEAD und dem Index (also was committet wird, wenn man `git commit` ausführt), sowie zwischen dem Index und den Dateien im Arbeitsbereich (also was man vor einem `git commit` mittels `git-add` hinzufügen könnte) für jeden Pfad. Eine Beispielausgabe:" @@ -8201,7 +8201,7 @@ msgstr "" #. type: Plain text #: en/git-add.txt:289 -#, fuzzy, placeholders:'foo.png':'HEAD', priority:300 +#, fuzzy, placeholders:'foo.png', priority:300 #| msgid "It shows that foo.png has differences from HEAD (but that is binary so line count cannot be shown) and there is no difference between indexed copy and the working tree version (if the working tree version were also different, 'binary' would have been shown in place of 'nothing'). The other file, git-add{litdd}interactive.perl, has 403 lines added and 35 lines deleted if you commit what is in the index, but working tree file has further modifications (one addition and one deletion)." msgid "It shows that foo.png has differences from HEAD (but that is binary so line count cannot be shown) and there is no difference between indexed copy and the working tree version (if the working tree version were also different, 'binary' would have been shown in place of 'nothing'). The other file, add-interactive.c, has 403 lines added and 35 lines deleted if you commit what is in the index, but working tree file has further modifications (one addition and one deletion)." msgstr "Es zeigt sich, dass foo.png im Vergleich mit dem HEAD geändert wurde, (da es sich um eine Binärdatei handelt wird keine Zeilenanzahl gezeigt), und dass kein Unterschied zwischen dem Index und der Version im Arbeitsbereich besteht (Wäre diese ebenfalls unterschiedlich, würde 'binary' anstatt 'nothing' angezeigt werden). Die andere Datei, git-add{litdd}interactive.perl, hat 403 hinzugefügte und 35 gelöschte Zeilen, wenn man das commited was sich aktuell im Index befindet, und im Arbeitsbereich befinden sich weitere Änderungen (1 Zeile hinzugefügt, 1 Zeile gelöscht)." @@ -8267,7 +8267,7 @@ msgstr "revert" #. type: Plain text #: en/git-add.txt:324 -#, fuzzy, placeholders:'HEAD', priority:300 +#, fuzzy, priority:300 #| msgid "This has a very similar UI to 'update', and the staged information for selected paths are reverted to that of the HEAD version. Reverting new paths makes them untracked." msgid "This has a very similar UI to 'update', and the staged information for selected paths are reverted to that of the HEAD version. Reverting new paths makes them untracked." msgstr "Diese Option ist sehr ähnlich zu 'update', nur wird die im Index gespeicherte Änderungsinformation für die ausgewählten Dateien auf die im HEAD gespeicherte Version zurückgesetzt. Werden neue Dateien zurückgesetzt, so wird die Information darüber aus Git wieder entfernt." @@ -8367,7 +8367,7 @@ msgstr "diff" #. type: Plain text #: en/git-add.txt:364 -#, placeholders:'HEAD', priority:300 +#, priority:300 msgid "This lets you review what will be committed (i.e. between HEAD and index)." msgstr "Zeigt die Änderungen an, die committet werden würden (also zwischen HEAD und Index)." @@ -8423,7 +8423,7 @@ msgstr "Geänderter Inhalt wird durch \"-\" Zeilen (entfernen des alten Inhalts) #. type: Plain text #: en/git-add.txt:404 -#, fuzzy, placeholders:'HEAD', priority:300 +#, fuzzy, priority:300 #| msgid "There are also more complex operations that can be performed. But beware that because the patch is applied only to the index and not the working tree, the working tree will appear to \"undo\" the change in the index. For example, introducing a new line into the index that is in neither the HEAD nor the working tree will stage the new line for commit, but the line will appear to be reverted in the working tree." msgid "There are also more complex operations that can be performed. But beware that because the patch is applied only to the index and not the working tree, the working tree will appear to \"undo\" the change in the index. For example, introducing a new line into the index that is in neither the HEAD nor the working tree will stage the new line for commit, but the line will appear to be reverted in the working tree." msgstr "Es gibt auch komplexere Operationen, die durchgeführt werden könnten. Aber Vorsicht: Da der Patch nur auf den Index und nicht auf den Arbeitsbereich angewendet wird, scheint es, als würde der Arbeitsbereich die Änderung im Index \"rückgängig machen\". Wenn zum Beispiel eine neue Zeile in den Index eingefügt wird, die sich weder im HEAD noch im Arbeitsbereich befindet, wird sie für einen Commit bereitgestellt, aber diese Zeile erscheint im Arbeitsbereich als zurückgesetzt." @@ -8965,7 +8965,7 @@ msgstr "--quit" #. type: Plain text #: en/git-am.txt:210 -#, placeholders:'HEAD', priority:100 +#, priority:100 msgid "Abort the patching operation but keep HEAD and the index untouched." msgstr "" @@ -9409,7 +9409,7 @@ msgstr "" #. type: Plain text #: en/git-apply.txt:203 -#, placeholders:'git-apply', priority:100 +#, placeholders:'git-apply`', priority:100 msgid "By default, the command outputs warning messages but applies the patch. When `git-apply` is used for statistics and not applying a patch, it defaults to `nowarn`." msgstr "" @@ -9499,7 +9499,7 @@ msgstr "" #. type: Plain text #: en/git-apply.txt:248 -#, placeholders:'git-gui':'git-gui':'git-gui':'git-gui':'--directory=modules':'git-gui', priority:100 +#, placeholders:'git-gui':'git-gui':'git-gui':'git-gui':'--directory=modules':'git-gui`', priority:100 msgid "For example, a patch that talks about updating `a/git-gui.sh` to `b/git-gui.sh` can be applied to the file in the working tree `modules/git-gui/git-gui.sh` by running `git apply --directory=modules/git-gui`." msgstr "" @@ -10052,13 +10052,13 @@ msgstr "" #. type: Plain text #: en/git-archive.txt:187 -#, placeholders:'.gitattributes':'.gitattributes':'.gitattributes':'`--worktree-attributes`':'$GIT_DIR', priority:100 +#, placeholders:'`.gitattributes`':'`.gitattributes`':'`.gitattributes`':'`--worktree-attributes`':'`$GIT_DIR/info/attributes`', priority:100 msgid "Note that attributes are by default taken from the `.gitattributes` files in the tree that is being archived. If you want to tweak the way the output is generated after the fact (e.g. you committed without adding an appropriate export-ignore in its `.gitattributes`), adjust the checked out `.gitattributes` file as necessary and use `--worktree-attributes` option. Alternatively you can keep necessary attributes that should apply while archiving any tree in your `$GIT_DIR/info/attributes` file." msgstr "" #. type: Labeled list #: en/git-archive.txt:190 -#, no-wrap, placeholders:'--format=tar':'--prefix=junk':'HEAD', priority:100 +#, no-wrap, placeholders:'--format=tar':'--prefix=junk', priority:100 msgid "`git archive --format=tar --prefix=junk/ HEAD | (cd /var/tmp/ && tar xf -)`" msgstr "" @@ -10118,7 +10118,7 @@ msgstr "" #. type: Labeled list #: en/git-archive.txt:213 -#, no-wrap, placeholders:'--format=zip':'--prefix=git-docs':'HEAD':'docs.zip', priority:100 +#, no-wrap, placeholders:'--format=zip':'--prefix=git-docs':'docs.zip', priority:100 msgid "`git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > git-1.4.0-docs.zip`" msgstr "" @@ -10130,7 +10130,7 @@ msgstr "" #. type: Labeled list #: en/git-archive.txt:218 -#, no-wrap, placeholders:'latest.zip':'HEAD', priority:100 +#, no-wrap, placeholders:'latest.zip':'HEAD`', priority:100 msgid "`git archive -o latest.zip HEAD`" msgstr "" @@ -10142,7 +10142,7 @@ msgstr "" #. type: Labeled list #: en/git-archive.txt:224 -#, no-wrap, placeholders:'latest.tar':'--prefix=build':'--add-file=configure':'--prefix=':'HEAD', priority:100 +#, no-wrap, placeholders:'latest.tar':'--prefix=build':'--add-file=configure':'--prefix=':'HEAD`', priority:100 msgid "`git archive -o latest.tar --prefix=build/ --add-file=configure --prefix= HEAD`" msgstr "" @@ -10307,7 +10307,7 @@ msgstr "" #. type: Plain text #: en/git-bisect.txt:102 -#, placeholders:'HEAD', priority:100 +#, priority:100 msgid "After a bisect session, to clean up the bisection state and return to the original HEAD, issue the following command:" msgstr "" @@ -10337,7 +10337,7 @@ msgstr "$ git bisect reset \n" #. type: Plain text #: en/git-bisect.txt:121 -#, placeholders:'HEAD', priority:100 +#, placeholders:'HEAD`', priority:100 msgid "For example, `git bisect reset bisect/bad` will check out the first bad revision, while `git bisect reset HEAD` will leave you on the current bisection commit and avoid switching commits at all." msgstr "" @@ -10543,7 +10543,7 @@ msgstr "Zum Beispiel:" #. type: delimited block - #: en/git-bisect.txt:259 -#, no-wrap, placeholders:'--hard':'HEAD', priority:100 +#, no-wrap, placeholders:'--hard', priority:100 msgid "" "$ git bisect good/bad\t\t\t# previous round was good or bad.\n" "Bisecting: 337 revisions left to test after this (roughly 9 steps)\n" @@ -10743,13 +10743,13 @@ msgstr "" #. type: Plain text #: en/git-bisect.txt:390 -#, placeholders:'HEAD', priority:100 +#, priority:100 msgid "Automatically bisect a broken build between v1.2 and HEAD:" msgstr "" #. type: delimited block - #: en/git-bisect.txt:395 -#, no-wrap, placeholders:'HEAD':'HEAD', priority:100 +#, no-wrap, priority:100 msgid "" "$ git bisect start HEAD v1.2 -- # HEAD is bad, v1.2 is good\n" "$ git bisect run make # \"make\" builds the app\n" @@ -10758,13 +10758,13 @@ msgstr "" #. type: Plain text #: en/git-bisect.txt:398 -#, placeholders:'HEAD', priority:100 +#, priority:100 msgid "Automatically bisect a test failure between origin and HEAD:" msgstr "" #. type: delimited block - #: en/git-bisect.txt:403 -#, no-wrap, placeholders:'HEAD':'HEAD', priority:100 +#, no-wrap, priority:100 msgid "" "$ git bisect start HEAD origin -- # HEAD is bad, origin is good\n" "$ git bisect run make test # \"make test\" builds and tests\n" @@ -10779,7 +10779,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect.txt:415 -#, no-wrap, placeholders:'test.sh':'check_test_case':'HEAD':'HEAD':'test.sh', priority:100 +#, no-wrap, placeholders:'test.sh':'check_test_case':'test.sh', priority:100 msgid "" "$ cat ~/test.sh\n" "#!/bin/sh\n" @@ -10852,13 +10852,13 @@ msgstr "" #. type: Plain text #: en/git-bisect.txt:458 -#, placeholders:'git cherry-pick', priority:100 +#, placeholders:'git cherry-pick`', priority:100 msgid "This applies modifications from a hot-fix branch before each test run, e.g. in case your build or test environment changed so that older revisions may need a fix which newer ones have already. (Make sure the hot-fix branch is based off a commit which is contained in all revisions which you are bisecting, so that the merge does not pull in too much, or use `git cherry-pick` instead of `git merge`.)" msgstr "" #. type: delimited block - #: en/git-bisect.txt:465 -#, no-wrap, placeholders:'HEAD':'HEAD':'check_test_case', priority:100 +#, no-wrap, placeholders:'check_test_case', priority:100 msgid "" "$ git bisect start HEAD HEAD~10 -- # culprit is among the last 10\n" "$ git bisect run sh -c \"make || exit 125; ~/check_test_case.sh\"\n" @@ -10879,7 +10879,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect.txt:481 -#, ignore-ellipsis, no-wrap, placeholders:'HEAD':'--no-checkout':'git for-each-ref':'--format=':'git rev-list':'--objects':'BISECT_HEAD':'--not':'$GOOD':'git pack-objects':'--stdout':'$rc', priority:100 +#, ignore-ellipsis, no-wrap, placeholders:'--no-checkout':'git for-each-ref':'--format=':'git rev-list':'--objects':'BISECT_HEAD':'--not':'$GOOD':'git pack-objects':'--stdout':'$rc', priority:100 msgid "" "$ git bisect start HEAD [ ... ] --no-checkout\n" "$ git bisect run sh -c '\n" @@ -10911,7 +10911,7 @@ msgstr "" #. type: delimited block - #: en/git-bisect.txt:495 -#, no-wrap, placeholders:'HEAD':'HEAD', priority:100 +#, no-wrap, priority:100 msgid "" "$ git bisect start\n" "$ git bisect new HEAD # current commit is marked as new\n" @@ -10926,7 +10926,7 @@ msgstr "oder:" #. type: delimited block - #: en/git-bisect.txt:502 -#, no-wrap, placeholders:'--term-old':'--term-new':'HEAD', priority:100 +#, no-wrap, placeholders:'--term-old':'--term-new', priority:100 msgid "" "$ git bisect start --term-old broken --term-new fixed\n" "$ git bisect fixed\n" @@ -11441,14 +11441,14 @@ msgstr "" #. type: Plain text #: en/git-branch.txt:55 -#, fuzzy, placeholders:'`--contains`':'`--no-contains`':'`--merged`':'`--no-merged`':'HEAD', priority:260 +#, fuzzy, placeholders:'`--contains`':'`--no-contains`':'`--merged`':'`--no-merged`':'`HEAD`', priority:260 #| msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)." msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)." msgstr "Mittels '--contains' werden nur die Branches angezeigt, die den benannten Commit beinhalten (mit anderen Worten: die Branches, deren letzter Commit direkt oder indirekt darauf beruht), mit `--no-contains` das Gegenteil. Mit '--merged' werden alle Branches angezeigt, die in den benannten Commit zusammengeführt (merged) wurden (mit anderen Worten die Branches, die vom benannten Commit aus erreichbar sind). Mit '--no-merged' werden nur Branches angezeigt, die nicht in den angegebenen Commit zusammengeführt wurden. Gibt man das Argument nicht an, wird standardmäßig 'HEAD' (also der letze Commit des aktuellen Branches) verwendet." #. type: Plain text #: en/git-branch.txt:62 -#, ignore-ellipsis, placeholders:'HEAD':'HEAD', priority:260 +#, ignore-ellipsis, placeholders:'`HEAD`':'`HEAD`', priority:260 msgid "The command's second form creates a new branch head named which points to the current `HEAD`, or if given. As a special case, for , you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`." msgstr "" @@ -11506,7 +11506,7 @@ msgstr "--delete" #. type: Plain text #: en/git-branch.txt:103 -#, placeholders:'HEAD':'`--track`':'`--set-upstream-to`', priority:260 +#, placeholders:'`HEAD`':'`--track`':'`--set-upstream-to`', priority:260 msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`." msgstr "" @@ -11684,7 +11684,7 @@ msgstr "--show-current" #. type: Plain text #: en/git-branch.txt:190 -#, placeholders:'HEAD', priority:260 +#, priority:260 msgid "Print the name of the current branch. In detached HEAD state, nothing is printed." msgstr "" @@ -11696,7 +11696,7 @@ msgstr "-vv" #. type: Plain text #: en/git-branch.txt:201 -#, placeholders:'HEAD', priority:260 +#, priority:260 msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show `). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)." msgstr "" @@ -11846,7 +11846,7 @@ msgstr "--contains []" #. type: Plain text #: en/git-branch.txt:290 -#, placeholders:'HEAD':'`--list`', priority:260 +#, placeholders:'`--list`', priority:260 msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`." msgstr "Zeige nur die Branches an, die den angegebenen Commit enthalten (HEAD, falls nichts angegeben wird). Impliziert `--list`." @@ -11858,7 +11858,7 @@ msgstr "--no-contains []" #. type: Plain text #: en/git-branch.txt:294 -#, placeholders:'HEAD':'`--list`', priority:260 +#, placeholders:'`--list`', priority:260 msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`." msgstr "Zeige nur die Branches an, die den angegebenen Commit nicht enthalten (HEAD, falls nichts angegeben wird). Impliziert `--list`." @@ -11870,7 +11870,7 @@ msgstr "--merged []" #. type: Plain text #: en/git-branch.txt:298 -#, fuzzy, placeholders:'HEAD':'`--list`', priority:260 +#, fuzzy, placeholders:'`--list`', priority:260 msgid "Only list branches whose tips are reachable from the specified commit (HEAD if not specified). Implies `--list`." msgstr "Zeige nur die Branches an, deren Spitze vom angegebenen Commit erreichbar ist (HEAD, falls nichts angegeben wird). Impliziert `--list`, inkompatibel mit `--no-merged`." @@ -11882,7 +11882,7 @@ msgstr "--no-merged []" #. type: Plain text #: en/git-branch.txt:302 -#, fuzzy, placeholders:'HEAD':'`--list`', priority:260 +#, fuzzy, placeholders:'`--list`', priority:260 msgid "Only list branches whose tips are not reachable from the specified commit (HEAD if not specified). Implies `--list`." msgstr "Zeige nur die Branches an, deren Spitze vom angegebenen Commit nicht erreichbar ist (HEAD, falls nichts angegeben wird). Impliziert `--list`, inkompatibel mit `--merged`." @@ -11907,7 +11907,7 @@ msgstr "" #. type: Plain text #: en/git-branch.txt:313 -#, fuzzy, placeholders:'HEAD', priority:260 +#, fuzzy, priority:260 #| msgid "The new branch head will point to this commit. It may be given as a branch name, a commit-id, or a tag. If this option is omitted, the current HEAD will be used instead." msgid "The new branch head will point to this commit. It may be given as a branch name, a commit-id, or a tag. If this option is omitted, the current HEAD will be used instead." msgstr "Der neu erzeugte Branch wird auf diesen Commit verweisen, wobei es sich dabei um den Hash eines Commits, den Namen eines anderen Branches oder eine Markierung (tag) handeln kann. Wird dieser Parameter nicht angegeben, so wird der aktuelle HEAD als Ausgangspunkt verwendet." @@ -11945,7 +11945,7 @@ msgstr "" #. type: Plain text #: en/git-branch.txt:332 -#, ignore-ellipsis, placeholders:'--sort=':'git for-each-ref':'branch.sort':'HEAD':'linkgit:git-config[1]', priority:260 +#, ignore-ellipsis, placeholders:'--sort=':'git for-each-ref`':'branch.sort':'linkgit:git-config[1]', priority:260 msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. You may use the --sort= option multiple times, in which case the last key becomes the primary key. The keys supported are the same as those in `git for-each-ref`. Sort order defaults to the value configured for the `branch.sort` variable if it exists, or to sorting based on the full refname (including `refs/...` prefix). This lists detached HEAD (if present) first, then local branches and finally remote-tracking branches. See linkgit:git-config[1]." msgstr "" @@ -12097,13 +12097,13 @@ msgstr "`--no-contains ` macht das Gegenteil davon, d.h. findet Branches #. type: Plain text #: en/git-branch.txt:414 -#, placeholders:'`--merged`':'HEAD', priority:260 +#, placeholders:'`--merged`', priority:260 msgid "`--merged` is used to find all branches which can be safely deleted, since those branches are fully contained by HEAD." msgstr "`--merged` wird verwendet um festzustellen, welche Entwicklungszweige (branches) ohne Informationen zu verlieren gelöscht werden können, da diese sowieso vollständig in HEAD enthalten sind." #. type: Plain text #: en/git-branch.txt:417 -#, placeholders:'`--no-merged`':'HEAD':'HEAD', priority:260 +#, placeholders:'`--no-merged`', priority:260 msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD." msgstr "`--no-merged` wird verwendet um Entwicklungszweige (branches) zu finden die Kandidaten für eine Zusammenführung (merge) in den HEAD sind, da diese noch nicht vollständig in HEAD beinhaltet sind." @@ -12250,7 +12250,7 @@ msgstr "--no-suffix" #. type: Plain text #: en/git-bugreport.txt:61 -#, placeholders:'git-bugreport-':'`--no-suffix`':'git-bugreport', priority:100 +#, placeholders:'git-bugreport-':'`--no-suffix`':'git-bugreport`', priority:100 msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-'. This should take the form of a strftime(3) format string; the current local time will be used. `--no-suffix` disables the suffix and the file is just named `git-bugreport` without any disambiguation measure." msgstr "" @@ -12513,7 +12513,7 @@ msgstr "" #. type: delimited block - #: en/git-bundle.txt:171 -#, no-wrap, placeholders:'HEAD.bundle':'git rev-parse':'HEAD':'yesterday.bundle', priority:100 +#, no-wrap, placeholders:'HEAD.bundle':'git rev-parse':'yesterday.bundle', priority:100 msgid "" "$ git bundle create HEAD.bundle $(git rev-parse HEAD)\n" "fatal: Refusing to create empty bundle.\n" @@ -12616,7 +12616,7 @@ msgstr "" #. type: Plain text #: en/git-bundle.txt:247 -#, placeholders:'$GIT_DIR', priority:100 +#, placeholders:'$GIT_DIR/config', priority:100 msgid "This will define a remote called \"origin\" in the resulting repository that lets you fetch and pull from the bundle. The $GIT_DIR/config file in R2 will have an entry like this:" msgstr "" @@ -13104,7 +13104,7 @@ msgstr "" #. type: Plain text #: en/git-cat-file.txt:202 -#, placeholders:'HEAD', priority:80 +#, priority:80 msgid "This option does not (currently) work correctly when an object in the index is specified (e.g. `:link` instead of `HEAD:link`) rather than one in the tree." msgstr "" @@ -13133,7 +13133,7 @@ msgstr "" #. type: Plain text #: en/git-cat-file.txt:217 -#, placeholders:'HEAD':'git cat-file':'--batch`', priority:80 +#, placeholders:'git cat-file':'--batch`', priority:80 msgid "For a regular file `f`, `echo HEAD:f | git cat-file --batch` would print" msgstr "" @@ -13145,13 +13145,13 @@ msgstr "" #. type: Plain text #: en/git-cat-file.txt:225 -#, placeholders:'HEAD':'git cat-file':'--batch':'--follow-symlinks`':'HEAD':'HEAD', priority:80 +#, placeholders:'git cat-file':'--batch':'--follow-symlinks`', priority:80 msgid "And `echo HEAD:link | git cat-file --batch --follow-symlinks` would print the same thing, as would `HEAD:dir/link`, as they both point at `HEAD:f`." msgstr "" #. type: Plain text #: en/git-cat-file.txt:228 -#, placeholders:'`--follow-symlinks`':'HEAD', priority:80 +#, placeholders:'`--follow-symlinks`', priority:80 msgid "Without `--follow-symlinks`, these would print data about the symlink itself. In the case of `HEAD:link`, you would see" msgstr "" @@ -13533,7 +13533,7 @@ msgstr "" #. type: Plain text #: en/git-check-attr.txt:29 -#, placeholders:'.gitattributes', priority:100 +#, placeholders:'`.gitattributes`', priority:100 msgid "Consider `.gitattributes` in the index only, ignoring the working tree." msgstr "" @@ -13866,7 +13866,7 @@ msgstr "" #. type: Plain text #: en/git-check-ignore.txt:84 -#, placeholders:'core.excludesFile':'.git/info/exclude', priority:80 +#, placeholders:'core.excludesFile':'`.git/info/exclude`', priority:80 msgid " is the path of a file being queried, is the matching pattern, is the pattern's source file, and is the line number of the pattern within that source. If the pattern contained a \"`!`\" prefix or \"`/`\" suffix, it will be preserved in the output. will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file." msgstr "" @@ -14119,7 +14119,7 @@ msgstr "" #. type: Plain text #: en/git-checkout-index.txt:85 -#, placeholders:'git checkout-index':'git checkout-index':'git checkout-index', priority:80 +#, placeholders:'git checkout-index`':'git checkout-index':'git checkout-index', priority:80 msgid "Just doing `git checkout-index` does nothing. You probably meant `git checkout-index -a`. And if you want to force it, you want `git checkout-index -f -a`." msgstr "" @@ -14239,7 +14239,7 @@ msgstr "" #. type: Plain text #: en/git-checkout-index.txt:167 -#, placeholders:'git checkout-index', priority:80 +#, placeholders:'git checkout-index`', priority:80 msgid "`git checkout-index` will \"export\" the index into the specified directory." msgstr "" @@ -14303,7 +14303,7 @@ msgstr "" #. type: Plain text #: en/git-checkout.txt:27 -#, fuzzy, placeholders:'HEAD', priority:240 +#, fuzzy, placeholders:'`HEAD`', priority:240 #| msgid "Updates files in the working tree to match the version in the index or the specified tree. If no pathspec was given, 'git checkout' will also update `HEAD` to set the specified branch as the current branch." msgid "Updates files in the working tree to match the version in the index or the specified tree. If no pathspec was given, 'git checkout' will also update `HEAD` to set the specified branch as the current branch." msgstr "Aktualisiert Dateien im Arbeitsbereich, so dass sie mit der im Index oder im angegebenen Verzeichnisbaum enthaltenen Version übereinstimmen. Wenn keine Pfadspezifikation angegeben wurde, wird 'git checkout' auch `HEAD` aktualisieren, um den angegebenen Branch als aktuellen Branch zu setzen." @@ -14316,7 +14316,7 @@ msgstr "'git checkout' []" #. type: Plain text #: en/git-checkout.txt:34 -#, placeholders:'HEAD', priority:240 +#, placeholders:'`HEAD`', priority:240 msgid "To prepare for working on ``, switch to it by updating the index and the files in the working tree, and by pointing `HEAD` at the branch. Local modifications to the files in the working tree are kept, so that they can be committed to the ``." msgstr "Um sich auf die Arbeit an `` vorzubereiten, wechseln Sie dorthin, indem Sie den Index und die Dateien im Arbeitsbereich aktualisieren und auf `HEAD` des Branchs zeigen. Lokale Änderungen an den Dateien im Arbeitsbereich werden beibehalten, so dass sie an den `` übergeben werden können." @@ -14388,20 +14388,20 @@ msgstr "'git checkout' [--detach] " #. type: Plain text #: en/git-checkout.txt:79 -#, fuzzy, placeholders:'HEAD':'HEAD', priority:240 +#, fuzzy, placeholders:'`HEAD`', priority:240 #| msgid "Prepare to work on top of ``, by detaching `HEAD` at it (see \"DETACHED HEAD\" section), and updating the index and the files in the working tree. Local modifications to the files in the working tree are kept, so that the resulting working tree will be the state recorded in the commit plus the local modifications." msgid "Prepare to work on top of ``, by detaching `HEAD` at it (see \"DETACHED HEAD\" section), and updating the index and the files in the working tree. Local modifications to the files in the working tree are kept, so that the resulting working tree will be the state recorded in the commit plus the local modifications." msgstr "Bereiten Sie sich darauf vor, die Arbeit oberhalb von `` zu beginnen, indem Sie `HEAD` davon abtrennen (siehe den Abschnitt „DETACHED HEAD“) und den Index und die Dateien im Arbeitsbereich aktualisieren. Lokale Modifikationen an den Dateien im Arbeitsbereich bleiben erhalten, so dass der resultierende Arbeitsbereich dem im Commit protokollierten Zustand plus den lokalen Modifikationen entspricht." #. type: Plain text #: en/git-checkout.txt:83 -#, placeholders:'`--detach`':'HEAD':'HEAD', priority:240 +#, placeholders:'`--detach`':'`HEAD`':'`HEAD`', priority:240 msgid "When the `` argument is a branch name, the `--detach` option can be used to detach `HEAD` at the tip of the branch (`git checkout ` would check out that branch without detaching `HEAD`)." msgstr "Wenn das Argument `` ein Branch-Name ist, kann die Option `--detach` verwendet werden, um `HEAD` an der Spitze des Branches abzulösen (`git checkout ` würde diesen Branch auschecken, ohne `HEAD` abzukoppeln)." #. type: Plain text #: en/git-checkout.txt:85 -#, fuzzy, placeholders:'HEAD', priority:240 +#, fuzzy, placeholders:'`HEAD`', priority:240 msgid "Omitting `` detaches `HEAD` at the tip of the current branch." msgstr "Bezeichnet die Spitze des aktuellen Entwicklungszweigs." @@ -14464,7 +14464,7 @@ msgstr "Der Fortschritt wird standardmäßig auf der Standardfehlerausgabe angez #. type: Plain text #: en/git-checkout.txt:128 -#, fuzzy, placeholders:'HEAD', priority:240 +#, fuzzy, placeholders:'`HEAD`', priority:240 msgid "When switching branches, proceed even if the index or the working tree differs from `HEAD`, and even if there are untracked files in the way. This is used to throw away local changes and any untracked files or directories that are in the way." msgstr "Zweig wechseln, selbst wenn der Arbeitsbereich sich vom `HEAD` unterscheidet. Dies wird verwendet um lokale Änderungen wegzuwerfen." @@ -14598,7 +14598,7 @@ msgstr "--detach" #. type: Plain text #: en/git-checkout.txt:218 -#, placeholders:'HEAD', priority:240 +#, priority:240 msgid "Rather than checking out a branch to work on it, check out a commit for inspection and discardable experiments. This is the default behavior of `git checkout ` when `` is not a branch name. See the \"DETACHED HEAD\" section below for details." msgstr "" @@ -14634,7 +14634,7 @@ msgstr "" #. type: Plain text #: en/git-checkout.txt:249 -#, fuzzy, placeholders:'$GIT_DIR', priority:240 +#, fuzzy, placeholders:'`$GIT_DIR/info/sparse-checkout`', priority:240 msgid "In sparse checkout mode, `git checkout -- ` would update only entries matched by `` and sparse patterns in `$GIT_DIR/info/sparse-checkout`. This option ignores the sparse patterns and adds back any files in ``." msgstr "Im Sparse-Checkout-Modus werden standardmäßig nur Einträge aktualisiert, die mit `` und einzelnen Pattern in $GIT_DIR/info/sparse-checkout übereinstimmen. Diese Option ignoriert die einzelnen Pattern und stellt alle Dateien in `` vorbehaltlos wieder her." @@ -14732,7 +14732,7 @@ msgstr "" #. type: Plain text #: en/git-checkout.txt:313 -#, placeholders:'`--recurse-submodules`':'`-f`':'`--no-recurse-submodules`':'linkgit:git-submodule[1]':'HEAD', priority:240 +#, placeholders:'`--recurse-submodules`':'`-f`':'`--no-recurse-submodules`':'linkgit:git-submodule[1]':'`HEAD`', priority:240 msgid "Using `--recurse-submodules` will update the content of all active submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout will fail unless `-f` is used. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodule." msgstr "" @@ -14769,19 +14769,19 @@ msgstr "" #. type: Plain text #: en/git-checkout.txt:341 -#, placeholders:'HEAD', priority:240 +#, placeholders:'`HEAD`', priority:240 msgid "Branch to checkout; if it refers to a branch (i.e., a name that, when prepended with \"refs/heads/\", is a valid ref), then that branch is checked out. Otherwise, if it refers to a valid commit, your `HEAD` becomes \"detached\" and you are no longer on any branch (see below for details)." msgstr "" #. type: Plain text #: en/git-checkout.txt:345 -#, placeholders:'{-N}':'{-1}', priority:240 +#, placeholders:'{-N}`':'{-1}`', priority:240 msgid "You can use the `@{-N}` syntax to refer to the N-th last branch/commit checked out using \"git checkout\" operation. You may also specify `-` which is synonymous to `@{-1}`." msgstr "" #. type: Plain text #: en/git-checkout.txt:349 en/git-switch.txt:58 -#, ignore-ellipsis, placeholders:'HEAD', priority:240 +#, ignore-ellipsis, placeholders:'`HEAD`', priority:240 msgid "As a special case, you may use `A...B` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`." msgstr "" @@ -14799,13 +14799,13 @@ msgstr "Name for the new branch." #. type: Plain text #: en/git-checkout.txt:356 -#, placeholders:'HEAD', priority:240 +#, placeholders:'`HEAD`', priority:240 msgid "The name of a commit at which to start the new branch; see linkgit:git-branch[1] for details. Defaults to `HEAD`." msgstr "" #. type: Plain text #: en/git-checkout.txt:360 en/git-checkout.txt:368 en/git-restore.txt:47 -#, ignore-ellipsis, placeholders:'HEAD', priority:280 +#, ignore-ellipsis, placeholders:'`HEAD`', priority:280 msgid "As a special case, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`." msgstr "" @@ -14829,19 +14829,19 @@ msgstr "Mehr Details finden Sie im 'pathspec'-Eintrag in linkgit:gitglossary[7]. #. type: Title - #: en/git-checkout.txt:378 -#, no-wrap, placeholders:'HEAD', priority:240 +#, no-wrap, priority:240 msgid "DETACHED HEAD" msgstr "" #. type: Plain text #: en/git-checkout.txt:382 -#, placeholders:'HEAD', priority:240 +#, placeholders:'`HEAD`', priority:240 msgid "`HEAD` normally refers to a named branch (e.g. `master`). Meanwhile, each branch refers to a specific commit. Let's look at a repo with three commits, one of them tagged, and with branch `master` checked out:" msgstr "" #. type: delimited block - #: en/git-checkout.txt:391 -#, no-wrap, placeholders:'HEAD':'a---b---c', priority:240 +#, no-wrap, placeholders:'a---b---c', priority:240 msgid "" " HEAD (refers to branch 'master')\n" " |\n" @@ -14854,7 +14854,7 @@ msgstr "" #. type: Plain text #: en/git-checkout.txt:398 -#, placeholders:'HEAD', priority:240 +#, placeholders:'`HEAD`', priority:240 msgid "When a commit is created in this state, the branch is updated to refer to the new commit. Specifically, 'git commit' creates a new commit `d`, whose parent is commit `c`, and then updates branch `master` to refer to new commit `d`. `HEAD` still refers to branch `master` and so indirectly now refers to commit `d`:" msgstr "" @@ -14866,7 +14866,7 @@ msgstr "$ edit; git add; git commit\n" #. type: delimited block - #: en/git-checkout.txt:409 -#, no-wrap, placeholders:'HEAD':'a---b---c---d', priority:240 +#, no-wrap, placeholders:'a---b---c---d', priority:240 msgid "" " HEAD (refers to branch 'master')\n" " |\n" @@ -14895,7 +14895,7 @@ msgstr "" #. type: delimited block - #: en/git-checkout.txt:427 -#, no-wrap, placeholders:'HEAD':'a---b---c---d', priority:240 +#, no-wrap, placeholders:'a---b---c---d', priority:240 msgid "" " HEAD (refers to commit 'b')\n" " |\n" @@ -14908,13 +14908,13 @@ msgstr "" #. type: Plain text #: en/git-checkout.txt:433 -#, placeholders:'HEAD':'HEAD':'HEAD', priority:240 +#, placeholders:'`HEAD`':'`HEAD`':'`HEAD`', priority:240 msgid "Notice that regardless of which checkout command we use, `HEAD` now refers directly to commit `b`. This is known as being in detached `HEAD` state. It means simply that `HEAD` refers to a specific commit, as opposed to referring to a named branch. Let's see what happens when we create a commit:" msgstr "" #. type: delimited block - #: en/git-checkout.txt:446 -#, no-wrap, placeholders:'HEAD':'a---b---c---d', priority:240 +#, no-wrap, placeholders:'a---b---c---d', priority:240 msgid "" " HEAD (refers to commit 'e')\n" " |\n" @@ -14929,13 +14929,13 @@ msgstr "" #. type: Plain text #: en/git-checkout.txt:450 -#, placeholders:'HEAD', priority:240 +#, placeholders:'`HEAD`', priority:240 msgid "There is now a new commit `e`, but it is referenced only by `HEAD`. We can of course add yet another commit in this state:" msgstr "" #. type: delimited block - #: en/git-checkout.txt:463 -#, no-wrap, placeholders:'HEAD':'e---f':'a---b---c---d', priority:240 +#, no-wrap, placeholders:'e---f':'a---b---c---d', priority:240 msgid "" "\t HEAD (refers to commit 'f')\n" "\t |\n" @@ -14962,7 +14962,7 @@ msgstr "$ git checkout master\n" #. type: delimited block - #: en/git-checkout.txt:478 -#, no-wrap, placeholders:'HEAD':'e---f':'a---b---c---d', priority:240 +#, no-wrap, placeholders:'e---f':'a---b---c---d', priority:240 msgid "" " HEAD (refers to branch 'master')\n" " e---f |\n" @@ -14997,31 +14997,31 @@ msgstr "" #. type: Plain text #: en/git-checkout.txt:494 -#, placeholders:'HEAD':'HEAD', priority:240 +#, placeholders:'`HEAD`':'`HEAD`', priority:240 msgid "creates a new branch `foo`, which refers to commit `f`, and then updates `HEAD` to refer to branch `foo`. In other words, we'll no longer be in detached `HEAD` state after this command." msgstr "" #. type: Plain text #: en/git-checkout.txt:496 -#, placeholders:'HEAD', priority:240 +#, placeholders:'`HEAD`', priority:240 msgid "similarly creates a new branch `foo`, which refers to commit `f`, but leaves `HEAD` detached." msgstr "" #. type: Plain text #: en/git-checkout.txt:498 -#, placeholders:'HEAD', priority:240 +#, placeholders:'`HEAD`', priority:240 msgid "creates a new tag `foo`, which refers to commit `f`, leaving `HEAD` detached." msgstr "" #. type: Plain text #: en/git-checkout.txt:503 -#, placeholders:'HEAD', priority:240 +#, placeholders:'`HEAD`', priority:240 msgid "If we have moved away from commit `f`, then we must first recover its object name (typically by using git reflog), and then we can create a reference to it. For example, to see the last two commits to which `HEAD` referred, we can use either of these commands:" msgstr "" #. type: delimited block - #: en/git-checkout.txt:507 -#, no-wrap, placeholders:'HEAD':'HEAD', priority:240 +#, no-wrap, priority:240 msgid "" "$ git reflog -2 HEAD # or\n" "$ git log -g -2 HEAD\n" @@ -15260,7 +15260,7 @@ msgstr "" #. type: Plain text #: en/git-check-ref-format.txt:27 -#, placeholders:'$GIT_DIR':'$GIT_DIR':'$GIT_DIR', priority:100 +#, placeholders:'`$GIT_DIR/refs/heads`':'`$GIT_DIR/refs/tags`':'`$GIT_DIR/packed-refs`', priority:100 msgid "A reference is used in Git to specify branches and tags. A branch head is stored in the `refs/heads` hierarchy, while a tag is stored in the `refs/tags` hierarchy of the ref namespace (typically in `$GIT_DIR/refs/heads` and `$GIT_DIR/refs/tags` directories or, as entries in file `$GIT_DIR/packed-refs` if refs are packed by `git gc`)." msgstr "" @@ -15362,7 +15362,7 @@ msgstr "" #. type: Plain text #: en/git-check-ref-format.txt:98 -#, placeholders:'`--branch`':'HEAD':'git check-ref-format':'--branch':'git check-ref-format':'`--branch`':'{-n}':'{-1}', priority:100 +#, placeholders:'`--branch`':'git check-ref-format':'--branch':'git check-ref-format':'`--branch`':'{-n}`':'{-1}`', priority:100 msgid "With the `--branch` option, the command takes a name and checks if it can be used as a valid branch name (e.g. when creating a new branch). But be cautious when using the previous checkout syntax that may refer to a detached HEAD state. The rule `git check-ref-format --branch $name` implements may be stricter than what `git check-ref-format refs/heads/$name` says (e.g. a dash may appear at the beginning of a ref component, but it is explicitly forbidden at the beginning of a branch name). When run with the `--branch` option in a repository, the input is first expanded for the ``previous checkout syntax'' `@{-n}`. For example, `@{-1}` is a way to refer the last thing that was checked out using \"git switch\" or \"git checkout\" operation. This option should be used by porcelains to accept this syntax anywhere a branch name is expected, so they can act as if you typed the branch name. As an exception note that, the ``previous checkout operation'' might result in a commit object name when the N-th last thing checked out was not a branch." msgstr "" @@ -15451,7 +15451,7 @@ msgstr "" #. type: Plain text #: en/git-cherry-pick.txt:21 -#, placeholders:'HEAD', priority:100 +#, priority:100 msgid "Given one or more existing commits, apply the change each one introduces, recording a new commit for each. This requires your working tree to be clean (no modifications from the HEAD commit)." msgstr "" @@ -15463,7 +15463,7 @@ msgstr "" #. type: Plain text #: en/git-cherry-pick.txt:27 -#, placeholders:'HEAD', priority:100 +#, placeholders:'`HEAD`', priority:100 msgid "The current branch and `HEAD` pointer stay at the last commit successfully made." msgstr "" @@ -15571,7 +15571,7 @@ msgstr "--no-commit" #. type: Plain text #: en/git-cherry-pick.txt:101 -#, placeholders:'HEAD', priority:100 +#, priority:100 msgid "Usually the command automatically creates a sequence of commits. This flag applies the changes necessary to cherry-pick each named commit to your working tree and the index, without making any commit. In addition, when this option is used, your index does not have to match the HEAD commit. The cherry-pick is done against the beginning state of your index." msgstr "" @@ -15595,7 +15595,7 @@ msgstr "--ff" #. type: Plain text #: en/git-cherry-pick.txt:123 -#, placeholders:'HEAD', priority:100 +#, priority:100 msgid "If the current HEAD is the same as the parent of the cherry-pick'ed commit, then a fast forward to this commit will be performed." msgstr "" @@ -15715,13 +15715,13 @@ msgstr "" #. type: Labeled list #: en/git-cherry-pick.txt:189 -#, no-wrap, placeholders:'git cherry-pick':'HEAD', priority:100 +#, no-wrap, placeholders:'git cherry-pick', priority:100 msgid "`git cherry-pick ^HEAD master`" msgstr "" #. type: Plain text #: en/git-cherry-pick.txt:193 -#, placeholders:'HEAD', priority:100 +#, priority:100 msgid "Apply the changes introduced by all commits that are ancestors of master but not of HEAD to produce new commits." msgstr "" @@ -15775,7 +15775,7 @@ msgstr "" #. type: Plain text #: en/git-cherry-pick.txt:223 -#, placeholders:'HEAD':'HEAD':'HEAD', priority:100 +#, priority:100 msgid "If history is linear and HEAD is an ancestor of next, update the working tree and advance the HEAD pointer to match next. Otherwise, apply the changes introduced by those commits that are in next but not HEAD to the current branch, creating a new commit for each new change." msgstr "" @@ -15881,7 +15881,7 @@ msgstr "Upstream" #. type: Plain text #: en/git-cherry.txt:35 -#, placeholders:'HEAD', priority:100 +#, priority:100 msgid "Upstream branch to search for equivalent commits. Defaults to the upstream branch of HEAD." msgstr "" @@ -15893,7 +15893,7 @@ msgstr "" #. type: Plain text #: en/git-cherry.txt:38 -#, placeholders:'HEAD', priority:100 +#, priority:100 msgid "Working branch; defaults to HEAD." msgstr "" @@ -16352,7 +16352,7 @@ msgstr "`--local`" #. type: Plain text #: en/git-clone.txt:53 -#, fuzzy, placeholders:'HEAD', priority:300 +#, fuzzy, placeholders:'`HEAD`', priority:300 #| msgid "When the repository to clone from is on a local machine, this flag bypasses the normal \"Git aware\" transport mechanism and clones the repository by making a copy of HEAD and everything under objects and refs directories. The files under `.git/objects/` directory are hardlinked to save space when possible." msgid "When the repository to clone from is on a local machine, this flag bypasses the normal \"Git aware\" transport mechanism and clones the repository by making a copy of `HEAD` and everything under objects and refs directories. The files under `.git/objects/` directory are hardlinked to save space when possible." msgstr "Ist das zu klonende Projektarchiv lokal auf der Maschine, kann durch dieses Flag der normale Git-Transportmechanismus umgangen werden und es wird ein einfacher Kopiervorgang von 'HEAD' und allen unter den 'objects' und 'refs' Verzeichnissen gelegenen Daten durchgeführt. Die Dateien unter '.git/objects/' werden zum Platzsparen mittels hard link referenziert anstatt sie physikalisch zu kopieren." @@ -16366,7 +16366,7 @@ msgstr "Wenn das Repository als lokaler Pfad angegeben wird (z.B. `/Pfad/zum/Rep #. type: Plain text #: en/git-clone.txt:65 -#, placeholders:'$GIT_DIR', priority:300 +#, placeholders:'`$GIT_DIR/objects`', priority:300 msgid "If the repository's `$GIT_DIR/objects` has symbolic links or is a symbolic link, the clone will fail. This is a security measure to prevent the unintentional copying of files by dereferencing the symbolic links." msgstr "" @@ -16567,7 +16567,7 @@ msgstr "`--no-checkout`" #. type: Plain text #: en/git-clone.txt:156 -#, placeholders:'HEAD', priority:300 +#, priority:300 msgid "No checkout of HEAD is performed after the clone is complete." msgstr "Unterdrückt das Abrufen (checkout) von HEAD, nachdem das Klonen fertig ist." @@ -16592,7 +16592,7 @@ msgstr "`--bare`" #. type: Plain text #: en/git-clone.txt:173 -#, fuzzy, placeholders:'$GIT_DIR':'`--no-checkout`', priority:300 +#, fuzzy, placeholders:'`$GIT_DIR`':'`--no-checkout`', priority:300 #| msgid "Make a 'bare' Git repository. That is, instead of creating `` and placing the administrative files in `/.git`, make the `` itself the `$GIT_DIR`. This obviously implies the `--no-checkout` because there is nowhere to check out the working tree. Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to `refs/remotes/origin/`. When this option is used, neither remote-tracking branches nor the related configuration variables are created." msgid "Make a 'bare' Git repository. That is, instead of creating __ and placing the administrative files in __`/.git`, make the __ itself the `$GIT_DIR`. This obviously implies the `--no-checkout` because there is nowhere to check out the working tree. Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to `refs/remotes/origin/`. When this option is used, neither remote-tracking branches nor the related configuration variables are created." msgstr "Erstellt ein `bare` Git-Repository. D.h. anstatt ein `` zu erstellen und die Verwaltungsdateien in `/.git` abzulegen, wird aus dem `` selbst das `$GIT_DIR`. Dies impliziert offensichtlich `--no-checkout`, weil es nirgendwo eine Möglichkeit gibt, das Arbeitsbereich auszuchecken. Auch die Branch-Heads auf der Remote-Seite werden direkt auf die entsprechenden lokalen Branch-Heads kopiert, ohne sie auf `refs/remotes/origin/` abzubilden. Wenn diese Option verwendet wird, werden weder Remote-Tracking-Branches noch die zugehörigen Konfigurationsvariablen erstellt." @@ -16685,7 +16685,7 @@ msgstr "--branch " #. type: Plain text #: en/git-clone.txt:217 -#, fuzzy, placeholders:'HEAD':'HEAD':'`--branch`':'HEAD', priority:300 +#, fuzzy, placeholders:'`--branch`', priority:300 #| msgid "Instead of pointing the newly created HEAD to the branch pointed to by the cloned repository's HEAD, point to `` branch instead. In a non-bare repository, this is the branch that will be checked out. `--branch` can also take tags and detaches the HEAD at that commit in the resulting repository." msgid "Instead of pointing the newly created HEAD to the branch pointed to by the cloned repository's HEAD, point to __ branch instead. In a non-bare repository, this is the branch that will be checked out. `--branch` can also take tags and detaches the HEAD at that commit in the resulting repository." msgstr "Anstatt dass der neu erstellte HEAD auf den Branch zeigt, auf den der HEAD des geklonten Repositorys zeigt, verweist er stattdessen auf den Branch ``. In einem „non-bare“ Repository ist dies der Branch, der ausgecheckt wird. `--branch` kann auch Tags übernehmen und HEAD im resultierenden Repository von diesem Commit abtrennen." @@ -16799,7 +16799,7 @@ msgstr "--[no-]single-branch" #. type: Plain text #: en/git-clone.txt:269 -#, fuzzy, placeholders:'`--branch`':'HEAD':'HEAD':'`--single-branch`', priority:300 +#, fuzzy, placeholders:'`--branch`':'`HEAD`':'`HEAD`':'`--single-branch`', priority:300 #| msgid "Clone only the history leading to the tip of a single branch, either specified by the `--branch` option or the primary branch remote's `HEAD` points at. Further fetches into the resulting repository will only update the remote-tracking branch for the branch this option was used for the initial cloning. If the HEAD at the remote did not point at any branch when `--single-branch` clone was made, no remote-tracking branch is created." msgid "Clone only the history leading to the tip of a single branch, either specified by the `--branch` option or the primary branch remote's `HEAD` points at. Further fetches into the resulting repository will only update the remote-tracking branch for the branch this option was used for the initial cloning. If the `HEAD` at the remote did not point at any branch when `--single-branch` clone was made, no remote-tracking branch is created." msgstr "Klont nur die Historie, die zur Spitze eines einzelnen Branchs gehört, entweder spezifiziert durch die `--branch`-Option oder den primären Branch auf den der Remote-`HEAD` zeigt. Nachfolgende Fetches in das resultierende Repository werden nur den Remote-Tracking-Branch für den Branch aktualisieren, auf dem diese Option für das anfängliche Klonen verwendet wurde. Wenn der HEAD des Remote-Repositorys auf keinen Branch zeigte, als mit `--single-branch` geklont wurde, wird kein Remote-Tracking-Branch erzeugt." @@ -16824,7 +16824,7 @@ msgstr "Kann in Verbindung mit `--single-branch` verwendet werden, um einen Bran #. type: Labeled list #: en/git-clone.txt:282 -#, fuzzy, no-wrap, placeholders:'`--recurse-submodules`':'{empty}', priority:300 +#, fuzzy, no-wrap, placeholders:'`--recurse-submodules`':'`{empty}', priority:300 #| msgid "--recurse-submodules[=]" msgid "`--recurse-submodules`[`=`{empty}____]" msgstr "--recurse-submodules[=]" @@ -17235,7 +17235,7 @@ msgstr "" #. type: Plain text #: en/git-commit-tree.txt:44 -#, placeholders:'HEAD':'.git/HEAD', priority:80 +#, placeholders:'`.git/HEAD`', priority:80 msgid "Normally a commit would identify a new \"HEAD\" state, and while Git doesn't care where you save the note about that state, in practice we tend to just write the result to the file that is pointed at by `.git/HEAD`, so that we can always see what the last committed state was." msgstr "" @@ -17388,7 +17388,7 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:28 -#, placeholders:'HEAD':'HEAD':'linkgit:git-checkout[1]', priority:280 +#, placeholders:'linkgit:git-checkout[1]', priority:280 msgid "Create a new commit containing the current contents of the index and the given log message describing the changes. The new commit is a direct child of HEAD, usually the tip of the current branch, and the branch is updated to point to it (unless no branch is associated with the working tree, in which case HEAD is \"detached\" as described in linkgit:git-checkout[1])." msgstr "" @@ -17830,7 +17830,7 @@ msgstr "Der Befehl entspricht in etwa:" #. type: delimited block - #: en/git-commit.txt:289 -#, ignore-ellipsis, no-wrap, placeholders:'--soft':'HEAD':'ORIG_HEAD', priority:280 +#, ignore-ellipsis, no-wrap, placeholders:'--soft':'ORIG_HEAD', priority:280 msgid "" "\t$ git reset --soft HEAD^\n" "\t$ ... do something else to come up with the right tree ...\n" @@ -17950,7 +17950,7 @@ msgstr "Die Voreinstellung kann über die Konfigurations-Variable `status.showUn #. type: Plain text #: en/git-commit.txt:366 -#, fuzzy, placeholders:'HEAD':'commit.verbose':'linkgit:git-config[1]', priority:280 +#, fuzzy, placeholders:'commit.verbose':'linkgit:git-config[1]', priority:280 #| msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]." msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]." msgstr "Zeigt das vereinheitlichte Diff zwischen dem HEAD-Commit und dem Inhalt am Ende der Commit-Nachrichtenvorlage an, um dem Benutzer bei der Beschreibung des Commits zu helfen, indem er die Änderungen im Commit anzeigt. Beachten Sie, dass die Zeilen dieser Diff-Ausgabe nicht mit einem '#' vorangestellt sind. Diese Diff-Variante wird nicht Teil der Commit-Beschreibung sein. Siehe auch die Konfigurations-Variable `commit.verbose` in linkgit:git-config[1]." @@ -18207,7 +18207,7 @@ msgstr "Dieser Befehl kann die folgenden Hooks (Einsprungpunkte) aufrufen: `comm #. type: Labeled list #: en/git-commit.txt:575 -#, no-wrap, placeholders:'$GIT_DIR':'COMMIT_EDITMSG', priority:280 +#, no-wrap, placeholders:'`$GIT_DIR':'COMMIT_EDITMSG', priority:280 msgid "`$GIT_DIR/COMMIT_EDITMSG`" msgstr "`$GIT_DIR/COMMIT_EDITMSG`" @@ -18515,13 +18515,13 @@ msgstr "--global" #. type: Plain text #: en/git-config.txt:152 -#, placeholders:'$XDG_CONFIG_HOME', priority:100 +#, placeholders:'`$XDG_CONFIG_HOME/git/config`', priority:100 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't." msgstr "Bei Schreib-Optionen: schreibt in die globale `~/.gitconfig` Datei anstatt in die `.git/config` des Repositorys, schreibt in die `$XDG_CONFIG_HOME/git/config` Datei, wenn diese Datei existiert und die `~/.gitconfig` Datei nicht." #. type: Plain text #: en/git-config.txt:155 -#, placeholders:'$XDG_CONFIG_HOME', priority:100 +#, placeholders:'`$XDG_CONFIG_HOME/git/config`', priority:100 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files." msgstr "Bei Lese-Optionen: Liest nur aus der globalen `~/.gitconfig` und aus `$XDG_CONFIG_HOME/git/config`, statt aus allen verfügbaren Dateien." @@ -18539,13 +18539,13 @@ msgstr "--system" #. type: Plain text #: en/git-config.txt:162 -#, placeholders:'$(prefix)', priority:100 +#, placeholders:'`$(prefix)', priority:100 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`." msgstr "Bei Schreib-Optionen: schreibt in die systemweite `$(prefix)/etc/gitconfig` Datei, anstatt im Repository auf `.git/config`." #. type: Plain text #: en/git-config.txt:165 -#, placeholders:'$(prefix)', priority:100 +#, placeholders:'`$(prefix)', priority:100 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files." msgstr "Bei Lese-Optionen: nur aus systemweitem `$(prefix)/etc/gitconfig` lesen, nicht aus allen verfügbaren Dateien." @@ -18576,7 +18576,7 @@ msgstr "--worktree" #. type: Plain text #: en/git-config.txt:185 -#, placeholders:'`--local`':'$GIT_DIR':'config.worktree':'extensions.worktreeConfig':'`--local`':'$GIT_DIR':'$GIT_COMMON_DIR':'$GIT_DIR':'linkgit:git-worktree[1]':'extensions.worktreeConfig', priority:100 +#, placeholders:'`--local`':'`$GIT_DIR/config':'extensions.worktreeConfig':'`--local`':'`$GIT_DIR`':'`$GIT_COMMON_DIR`':'`$GIT_DIR/worktrees/':'linkgit:git-worktree[1]':'extensions.worktreeConfig', priority:100 msgid "Similar to `--local` except that `$GIT_DIR/config.worktree` is read from or written to if `extensions.worktreeConfig` is enabled. If not it's the same as `--local`. Note that `$GIT_DIR` is equal to `$GIT_COMMON_DIR` for the main working tree, but is of the form `$GIT_DIR/worktrees//` for other working trees. See linkgit:git-worktree[1] to learn how to enable `extensions.worktreeConfig`." msgstr "" @@ -18667,7 +18667,7 @@ msgstr "'bool-or-int': entsprechend der obigen Beschreibung entweder nach 'bool' #. type: Plain text #: en/git-config.txt:226 -#, fuzzy, placeholders:'$HOME':'section.variable', priority:100 +#, fuzzy, placeholders:'`$HOME`':'section.variable', priority:100 #| msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)" msgid "'path': canonicalize by expanding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)" msgstr "'path': kanonisieren durch Hinzufügen einer führenden `~` zum Wert von `$HOME` und `~user` zum Home-Verzeichnis für den angegebenen Benutzer. Dieser Spezifizierer hat keine Auswirkung, wenn ein Wert gesetzt wird (aber Sie können `git config section.variable ~/` von der Kommandozeile aus benutzen, um Ihre Shell die Erweiterung durchführen zu lassen)" @@ -19005,7 +19005,7 @@ msgstr "Systemweite Konfigurationsdatei." #. type: Plain text #: en/git-config.txt:358 en/git-config.txt:408 -#, no-wrap, placeholders:'$XDG_CONFIG_HOME', priority:100 +#, no-wrap, placeholders:'$XDG_CONFIG_HOME/git/config', priority:100 msgid "$XDG_CONFIG_HOME/git/config" msgstr "$XDG_CONFIG_HOME/git/config" @@ -19029,7 +19029,7 @@ msgstr "" #. type: Plain text #: en/git-config.txt:367 en/git-config.txt:413 -#, no-wrap, placeholders:'$GIT_DIR', priority:100 +#, no-wrap, placeholders:'$GIT_DIR/config', priority:100 msgid "$GIT_DIR/config" msgstr "$GIT_DIR/config" @@ -19041,13 +19041,13 @@ msgstr "Spezifische Konfigurationsdatei für das Repository." #. type: Plain text #: en/git-config.txt:370 en/git-config.txt:416 -#, no-wrap, placeholders:'$GIT_DIR':'config.worktree', priority:100 +#, no-wrap, placeholders:'$GIT_DIR/config', priority:100 msgid "$GIT_DIR/config.worktree" msgstr "$GIT_DIR/config.worktree" #. type: Plain text #: en/git-config.txt:373 -#, placeholders:'extensions.worktreeConfig':'$GIT_DIR', priority:100 +#, placeholders:'extensions.worktreeConfig':'$GIT_DIR/config', priority:100 msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config." msgstr "Diese Angabe ist optional und wird nur durchsucht, wenn `extensions.worktreeConfig` in $GIT_DIR/config vorhanden ist." @@ -19618,7 +19618,7 @@ msgstr "" #. type: Plain text #: en/git-count-objects.txt:35 -#, placeholders:'git prune-packed', priority:80 +#, placeholders:'git prune-packed`', priority:80 msgid "prune-packable: the number of loose objects that are also present in the packs. These objects could be pruned using `git prune-packed`." msgstr "" @@ -19684,7 +19684,7 @@ msgstr "" #. type: Plain text #: en/git-credential-cache--daemon.txt:23 -#, placeholders:'git-credential-cache', priority:90 +#, placeholders:'git-credential-cache`', priority:90 msgid "This command listens on the Unix domain socket specified by `` for `git-credential-cache` clients. Clients may store and retrieve credentials. Each credential is held for a timeout specified by the client; once no credentials are held, the daemon exits." msgstr "" @@ -19744,7 +19744,7 @@ msgstr "--socket " #. type: Plain text #: en/git-credential-cache.txt:46 -#, placeholders:'$XDG_CACHE_HOME':'git-credential-cache':'git-credential-cache', priority:90 +#, placeholders:'`$XDG_CACHE_HOME/git/credential/socket`':'git-credential-cache':'git-credential-cache', priority:90 msgid "Use `` to contact a running cache daemon (or start a new cache daemon if one is not started). Defaults to `$XDG_CACHE_HOME/git/credential/socket` unless `~/.git-credential-cache/` exists in which case `~/.git-credential-cache/socket` is used instead. If your home directory is on a network-mounted filesystem, you may need to change this to a local filesystem. You must specify an absolute path." msgstr "" @@ -19847,7 +19847,7 @@ msgstr "--file=" #. type: Plain text #: en/git-credential-store.txt:42 -#, placeholders:'git-credentials':'$XDG_CONFIG_HOME':'git-credentials':'$XDG_CONFIG_HOME':'<>', priority:100 +#, placeholders:'git-credentials`':'`$XDG_CONFIG_HOME/git/credentials`':'git-credentials`':'`$XDG_CONFIG_HOME/git/credentials`':'<>', priority:100 msgid "Use `` to lookup and store credentials. The file will have its filesystem permissions set to prevent other users on the system from reading it, but it will not be encrypted or otherwise protected. If not specified, credentials will be searched for from `~/.git-credentials` and `$XDG_CONFIG_HOME/git/credentials`, and credentials will be written to `~/.git-credentials` if it exists, or `$XDG_CONFIG_HOME/git/credentials` if it exists and the former does not. See also <>." msgstr "" @@ -19871,13 +19871,13 @@ msgstr "" #. type: Labeled list #: en/git-credential-store.txt:53 -#, fuzzy, no-wrap, placeholders:'$XDG_CONFIG_HOME', priority:100 +#, fuzzy, no-wrap, placeholders:'$XDG_CONFIG_HOME/git/credentials', priority:100 msgid "$XDG_CONFIG_HOME/git/credentials" msgstr "$XDG_CONFIG_HOME/git/config" #. type: Plain text #: en/git-credential-store.txt:59 -#, placeholders:'$XDG_CONFIG_HOME':'$HOME':'git-credentials', priority:100 +#, placeholders:'$XDG_CONFIG_HOME':'`$HOME':'git-credentials`', priority:100 msgid "Second user-specific credentials file. If '$XDG_CONFIG_HOME' is not set or empty, `$HOME/.config/git/credentials` will be used. Any credentials stored in this file will not be used if `~/.git-credentials` has a matching credential as well. It is a good idea not to create this file if you sometimes use older versions of Git that do not support it." msgstr "" @@ -19889,7 +19889,7 @@ msgstr "" #. type: Plain text #: en/git-credential-store.txt:67 -#, placeholders:'git-credentials', priority:100 +#, placeholders:'git-credentials`', priority:100 msgid "Credential storage will by default write to the first existing file in the list. If none of these files exist, `~/.git-credentials` will be created and written to." msgstr "" @@ -19926,7 +19926,7 @@ msgstr "" #. type: Plain text #: en/git-credential-store.txt:92 -#, placeholders:'git-credentials', priority:100 +#, placeholders:'git-credentials`', priority:100 msgid "The `.git-credentials` file is stored in plaintext. Each credential is stored on its own line as a URL like:" msgstr "" @@ -20587,7 +20587,7 @@ msgstr "git-cvsimport – Retten Sie Ihre Daten aus einem anderen SCM, das die L #. type: Plain text #: en/git-cvsimport.txt:17 -#, no-wrap, placeholders:'HEAD', priority:90 +#, no-wrap, priority:90 msgid "" "'git cvsimport' [-o ] [-h] [-v] [-d ]\n" "\t [-A ] [-p ] [-P ]\n" @@ -20688,13 +20688,13 @@ msgstr "" #. type: Labeled list #: en/git-cvsimport.txt:76 -#, no-wrap, placeholders:'HEAD', priority:90 +#, no-wrap, priority:90 msgid "-o " msgstr "" #. type: Plain text #: en/git-cvsimport.txt:84 -#, placeholders:'HEAD':'HEAD':'HEAD', priority:90 +#, placeholders:'`HEAD`':'`HEAD`':'`HEAD`', priority:90 msgid "When no remote is specified (via -r) the `HEAD` branch from CVS is imported to the 'origin' branch within the Git repository, as `HEAD` already has a special meaning for Git. When a remote is specified the `HEAD` branch is named remotes//master mirroring 'git clone' behaviour. Use this option if you want to import into a different branch." msgstr "" @@ -20864,7 +20864,7 @@ msgstr "" #. type: Plain text #: en/git-cvsimport.txt:163 -#, placeholders:'$GIT_DIR', priority:90 +#, placeholders:'`$GIT_DIR/cvs-authors`', priority:90 msgid "For convenience, this data is saved to `$GIT_DIR/cvs-authors` each time the '-A' option is provided and read from that same file each time 'git cvsimport' is run." msgstr "" @@ -20876,7 +20876,7 @@ msgstr "" #. type: Plain text #: en/git-cvsimport.txt:173 -#, placeholders:'$GIT_DIR', priority:90 +#, placeholders:'`$GIT_DIR/cvs-revisions`', priority:90 msgid "Generate a `$GIT_DIR/cvs-revisions` file containing a mapping from CVS revision numbers to newly-created Git commit IDs. The generated file will contain one line for each (filename, revision) pair imported; each line will look like" msgstr "" @@ -20936,7 +20936,7 @@ msgstr "" #. type: Plain text #: en/git-cvsimport.txt:204 -#, placeholders:'HEAD', priority:90 +#, priority:90 msgid "If any files were ever \"cvs import\"ed more than once (e.g., import of more than one vendor release) the HEAD contains the wrong content." msgstr "" @@ -21216,7 +21216,7 @@ msgstr "" #. type: delimited block - #: en/git-cvsserver.txt:119 -#, no-wrap, placeholders:'$VfF6EoPYCJEYcVQwATgOP':'$znZIcumu1tNLATgV2l6e1', priority:90 +#, no-wrap, placeholders:'$VfF6EoPYCJEYcVQwATgOP':'$znZIcumu1tNLATgV2l6e1/m', priority:90 msgid "" " myuser:sqkNi8zPf01HI\n" " myuser:$1$9K7FzU28$VfF6EoPYCJEYcVQwATgOP/\n" @@ -21385,7 +21385,7 @@ msgstr "" #. type: Plain text #: en/git-cvsserver.txt:244 -#, placeholders:'git-cvsserver':'git-cvsserver', priority:90 +#, placeholders:'git-cvsserver':'git-cvsserver`', priority:90 msgid "The database cannot be reliably regenerated in a consistent form after the branch it is tracking has changed. Example: For merged branches, 'git-cvsserver' only tracks one branch of development, and after a 'git merge' an incrementally updated database may track a different branch than a database regenerated from scratch, causing inconsistent CVS revision numbers. `git-cvsserver` has no way of knowing which branch it would have picked if it had been run incrementally pre-merge. So if you have to fully or partially (from old backup) regenerate the database, you should be suspicious of pre-existing CVS sandboxes." msgstr "" @@ -21613,7 +21613,7 @@ msgstr "" #. type: Plain text #: en/git-cvsserver.txt:337 -#, placeholders:'HEAD', priority:90 +#, placeholders:'`HEAD`', priority:90 msgid "Pick `HEAD` when it asks what branch/tag to check out. Untick the \"launch commit wizard\" to avoid committing the .project file." msgstr "" @@ -21963,7 +21963,7 @@ msgstr "--syslog" #. type: Plain text #: en/git-daemon.txt:131 -#, placeholders:'git-daemon', priority:100 +#, placeholders:'git-daemon`', priority:100 msgid "Write to syslog, using the `git-daemon` identifier." msgstr "" @@ -22059,7 +22059,7 @@ msgstr "" #. type: Plain text #: en/git-daemon.txt:181 -#, placeholders:'$HOME', priority:100 +#, placeholders:'`$HOME`', priority:100 msgid "Like many programs that switch user id, the daemon does not reset environment variables such as `$HOME` when it runs git programs, e.g. `upload-pack` and `receive-pack`. When using this option, you may also want to set and export `HOME` to point at the home directory of `` before starting the daemon, and make sure any Git configuration files in that directory are readable by ``." msgstr "" @@ -22119,7 +22119,7 @@ msgstr "--access-hook=" #. type: Plain text #: en/git-daemon.txt:215 -#, placeholders:'$REMOTE_ADDR':'$REMOTE_PORT', priority:100 +#, placeholders:'$REMOTE_ADDR':'`$REMOTE_PORT`', priority:100 msgid "Every time a client connects, first run an external command specified by the with service name (e.g. \"upload-pack\"), path to the repository, hostname (%H), canonical hostname (%CH), IP address (%IP), and TCP port (%P) as its command-line arguments. The external command can decide to decline the service by exiting with a non-zero status (or to allow it by exiting with a zero status). It can also look at the $REMOTE_ADDR and `$REMOTE_PORT` environment variables to learn about the requestor when making this decision." msgstr "" @@ -22131,7 +22131,7 @@ msgstr "" #. type: Plain text #: en/git-daemon.txt:226 -#, placeholders:'git-daemon':'`--strict-paths`', priority:100 +#, placeholders:'git-daemon`':'`--strict-paths`', priority:100 msgid "The remaining arguments provide a list of directories. If any directories are specified, then the `git-daemon` process will serve a requested directory only if it is contained in one of these directories. If `--strict-paths` is specified, then the requested directory must match one of these directories exactly." msgstr "" @@ -22284,7 +22284,7 @@ msgstr "" #. type: Plain text #: en/git-daemon.txt:324 -#, placeholders:'--remote':'HEAD', priority:100 +#, placeholders:'--remote':'`HEAD`', priority:100 msgid "To enable 'git archive --remote' and disable 'git fetch' against a repository, have the following in the configuration file in the repository (that is the file 'config' next to `HEAD`, 'refs' and 'objects')." msgstr "" @@ -22338,7 +22338,7 @@ msgstr "" #. type: Plain text #: en/git-describe.txt:34 -#, placeholders:'HEAD', priority:260 +#, priority:260 msgid "If the given object refers to a blob, it will be described as `:`, such that the blob can be found at `` in the ``, which itself describes the first commit in which this blob occurs in a reverse revision walk from HEAD." msgstr "" @@ -22350,7 +22350,7 @@ msgstr "..." #. type: Plain text #: en/git-describe.txt:39 -#, placeholders:'HEAD', priority:260 +#, priority:260 msgid "Commit-ish object names to describe. Defaults to HEAD if omitted." msgstr "" @@ -22368,7 +22368,7 @@ msgstr "" #. type: Plain text #: en/git-describe.txt:49 -#, placeholders:'HEAD':'HEAD':'`--broken', priority:260 +#, placeholders:'`--broken', priority:260 msgid "Describe the state of the working tree. When the working tree matches HEAD, the output is the same as \"git describe HEAD\". If the working tree has local modification \"-dirty\" is appended to it. If a repository is corrupt and Git cannot determine if there is local modification, Git will error out, unless `--broken' is given, which appends the suffix \"-broken\" instead." msgstr "" @@ -22542,7 +22542,7 @@ msgstr "" #. type: Plain text #: en/git-describe.txt:165 -#, no-wrap, placeholders:'--all':'--abbrev=4':'HEAD', priority:260 +#, no-wrap, placeholders:'--all':'--abbrev=4', priority:260 msgid "" "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n" "\theads/lt/describe-7-g975b\n" @@ -22714,7 +22714,7 @@ msgstr "--merge-base" #. type: Plain text #: en/git-diff-index.txt:36 -#, placeholders:'HEAD', priority:80 +#, priority:80 msgid "Instead of comparing directly, use the merge base between and HEAD instead. must be a commit." msgstr "" @@ -22750,7 +22750,7 @@ msgstr "" #. type: Plain text #: en/git-diff-index.txt:58 -#, no-wrap, placeholders:'HEAD':'git write-tree', priority:80 +#, no-wrap, placeholders:'git write-tree', priority:80 msgid "" "\tshow me the differences between HEAD and the current index\n" "\tcontents (the ones I'd write using 'git write-tree')\n" @@ -22764,19 +22764,19 @@ msgstr "" #. type: Plain text #: en/git-diff-index.txt:65 -#, fuzzy, no-wrap, placeholders:'git diff-index':'--cached':'HEAD', priority:80 +#, fuzzy, no-wrap, placeholders:'git diff-index':'--cached', priority:80 msgid "\tgit diff-index --cached HEAD\n" msgstr "$ git diff --cached\n" #. type: Plain text #: en/git-diff-index.txt:70 -#, placeholders:'git-commit':'git diff-files':'git diff-index', priority:80 +#, placeholders:'git-commit':'git diff-files`':'git diff-index', priority:80 msgid "Example: let's say I had renamed `commit.c` to `git-commit.c`, and I had done an `update-index` to make that effective in the index file. `git diff-files` wouldn't show anything at all, since the index file matches my working directory. But doing a 'git diff-index' does:" msgstr "" #. type: Plain text #: en/git-diff-index.txt:74 -#, no-wrap, placeholders:'git diff-index':'--cached':'HEAD':'git-commit', priority:80 +#, no-wrap, placeholders:'git diff-index':'--cached':'git-commit', priority:80 msgid "" " torvalds@ppc970:~/git> git diff-index --cached HEAD\n" " :100644 000000 4161aecc6700a2eb579e842af0b7f22b98443f74 0000000000000000000000000000000000000000 D\tcommit.c\n" @@ -22815,7 +22815,7 @@ msgstr "" #. type: Plain text #: en/git-diff-index.txt:94 -#, no-wrap, placeholders:'HEAD', priority:80 +#, no-wrap, priority:80 msgid "" " show me the differences between HEAD and the currently checked out\n" " tree - index contents _and_ files that aren't up to date\n" @@ -22835,7 +22835,7 @@ msgstr "" #. type: Plain text #: en/git-diff-index.txt:107 -#, no-wrap, placeholders:'git diff-index':'--abbrev':'HEAD', priority:80 +#, no-wrap, placeholders:'git diff-index':'--abbrev', priority:80 msgid "" " torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD\n" " :100644 100644 7476bb5ba 000000000 M\tkernel/sched.c\n" @@ -22975,7 +22975,7 @@ msgstr "" #. type: Plain text #: en/git-difftool.txt:76 -#, placeholders:'`-t`':'`--tool`':'diff.tool':'$LOCAL':'$REMOTE':'$MERGED':'$BASE':'$MERGED', priority:100 +#, placeholders:'`-t`':'`--tool`':'diff.tool':'`$LOCAL`':'`$REMOTE`':'`$MERGED`':'`$BASE`':'`$MERGED`', priority:100 msgid "When 'git difftool' is invoked with this tool (either through the `-t` or `--tool` option or the `diff.tool` configuration variable) the configured command line will be invoked with the following variables available: `$LOCAL` is set to the name of the temporary file containing the contents of the diff pre-image and `$REMOTE` is set to the name of the temporary file containing the contents of the diff post-image. `$MERGED` is the name of the file which is being compared. `$BASE` is provided for compatibility with custom merge tool commands and has the same value as `$MERGED`." msgstr "" @@ -23023,7 +23023,7 @@ msgstr "" #. type: Plain text #: en/git-difftool.txt:95 -#, placeholders:'git-difftool':'$LOCAL':'$REMOTE':'$BASE', priority:100 +#, placeholders:'git-difftool':'$LOCAL':'$REMOTE`':'`$BASE`', priority:100 msgid "Specify a custom command for viewing diffs. 'git-difftool' ignores the configured defaults and runs ` $LOCAL $REMOTE` when this option is specified. Additionally, `$BASE` is set in the environment." msgstr "" @@ -23323,14 +23323,14 @@ msgstr "'git diff' [] --cached [] [--] [...]" #. type: Plain text #: en/git-diff.txt:52 -#, fuzzy, placeholders:'HEAD':'HEAD':'--staged':'--cached', priority:280 +#, fuzzy, placeholders:'--staged':'--cached', priority:280 #| msgid "This form is to view the changes you staged for the next commit relative to the named . Typically you would want comparison with the latest commit, so if you do not give , it defaults to HEAD. If HEAD does not exist (e.g. unborn branches) and is not given, it shows all staged changes. --staged is a synonym of --cached." msgid "This form is to view the changes you staged for the next commit relative to the named . Typically you would want comparison with the latest commit, so if you do not give , it defaults to HEAD. If HEAD does not exist (e.g. unborn branches) and is not given, it shows all staged changes. --staged is a synonym of --cached." msgstr "Auf diese Art können Sie sich die Änderungen ansehen, die Sie für den nächsten Commit, relativ zu dem angegebenen , vorgenommen haben. Normalerweise werden Sie einen Vergleich mit dem letzten Commit sehen wollen. Wenn Sie also den nicht angeben, wird standardmäßig HEAD verwendet. Wenn HEAD nicht existiert (z.B. wegen noch nicht erstelltem Branch) und nicht angegeben wird, zeigt dies alle Änderungen in der Staging-Area an. --staged ist ein Synonym für --cached." #. type: Plain text #: en/git-diff.txt:56 -#, placeholders:'--merge-base':'HEAD':'--cached':'--merge-base':'--cached':'git merge-base':'HEAD', priority:280 +#, placeholders:'--merge-base':'--cached':'--merge-base':'--cached':'git merge-base', priority:280 msgid "If --merge-base is given, instead of using , use the merge base of and HEAD. `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`." msgstr "" @@ -23342,14 +23342,14 @@ msgstr "'git diff' [] [--] [...]" #. type: Plain text #: en/git-diff.txt:64 -#, fuzzy, placeholders:'HEAD', priority:280 +#, fuzzy, priority:280 #| msgid "This form is to view the changes you have in your working tree relative to the named . You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch." msgid "This form is to view the changes you have in your working tree relative to the named . You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch." msgstr "Zeigt die Unterschiede zwischen dem Arbeitsbereich und dem angegebenen an. Sie können HEAD verwenden, um ihn mit dem letzten Commit zu vergleichen oder den Namen eines Branchs, um ihn mit der Spitze eines anderen Branchs zu vergleichen." #. type: Plain text #: en/git-diff.txt:68 -#, placeholders:'--merge-base':'HEAD':'--merge-base':'git merge-base':'HEAD', priority:280 +#, placeholders:'--merge-base':'--merge-base':'git merge-base', priority:280 msgid "If --merge-base is given, instead of using , use the merge base of and HEAD. `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`." msgstr "" @@ -23391,7 +23391,7 @@ msgstr "'git diff' [] .. [--] [...]" #. type: Plain text #: en/git-diff.txt:93 -#, fuzzy, placeholders:'HEAD', priority:280 +#, fuzzy, priority:280 msgid "This is synonymous to the earlier form (without the `..`) for viewing the changes between two arbitrary . If on one side is omitted, it will have the same effect as using HEAD instead." msgstr "Dieser Aufruf bewirkt das Gleiche wie der vorherige. Wird auf einer Seite weggelassen, so wird HEAD genommen." @@ -23403,7 +23403,7 @@ msgstr "'git diff' [] \\... [--] [...]" #. type: Plain text #: en/git-diff.txt:101 -#, fuzzy, ignore-ellipsis, placeholders:'git merge-base':'HEAD', priority:280 +#, fuzzy, ignore-ellipsis, placeholders:'git merge-base', priority:280 msgid "This form is to view the changes on the branch containing and up to the second , starting at a common ancestor of both . `git diff A...B` is equivalent to `git diff $(git merge-base A B) B`. You can omit any one of , which has the same effect as using HEAD instead." msgstr "Dieser Befehl zeigt die Änderungen auf dem Branch an, der den zweiten enthält, beginnend mit einem gemeinsamen Vorfahren beider s, bis zum zweiten . \"git diff A\\...B\" ist äquivalent zu \"git diff $(git merge-base A B) B\". Sie können einen der beiden s weglassen, wodurch stattdessen HEAD eingesetzt wird." @@ -23459,7 +23459,7 @@ msgstr "Diverse Methoden zum Überprüfen ihres Arbeitsbereichs" #. type: delimited block - #: en/git-diff.txt:160 -#, fuzzy, no-wrap, placeholders:'--cached':'HEAD':'AUTO_MERGE', priority:280 +#, fuzzy, no-wrap, placeholders:'--cached':'AUTO_MERGE', priority:280 #| msgid "" #| "$ git diff <1>\n" #| "$ git diff --cached <2>\n" @@ -23507,7 +23507,7 @@ msgstr "Vergleichen beliebiger Commits" #. type: delimited block - #: en/git-diff.txt:176 -#, no-wrap, placeholders:'HEAD':'HEAD':'HEAD', priority:280 +#, no-wrap, priority:280 msgid "" "$ git diff test <1>\n" "$ git diff HEAD -- ./test <2>\n" @@ -24230,7 +24230,7 @@ msgstr "--recurse-submodules[= from the values used in the from to those used in the to . The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule." msgstr "" @@ -26590,7 +26590,7 @@ msgstr "..." #. type: Plain text #: en/git-fetch-pack.txt:125 -#, placeholders:'$GIT_DIR':'HEAD', priority:90 +#, placeholders:'$GIT_DIR', priority:90 msgid "The remote heads to update from. This is relative to $GIT_DIR (e.g. \"HEAD\", \"refs/heads/master\"). When unspecified, update from all heads the remote side has." msgstr "" @@ -26652,7 +26652,7 @@ msgstr "" #. type: Plain text #: en/git-fetch.txt:44 -#, placeholders:'.git/FETCH_HEAD':'linkgit:git-pull[1]', priority:220 +#, placeholders:'`.git/FETCH_HEAD`':'linkgit:git-pull[1]', priority:220 msgid "The names of refs that are fetched, together with the object names they point at, are written to `.git/FETCH_HEAD`. This information may be used by scripts or other git commands, such as linkgit:git-pull[1]." msgstr "" @@ -27083,7 +27083,7 @@ msgstr "" #. type: Plain text #: en/git-fetch.txt:310 -#, placeholders:'--recurse-submodules':'$GIT_DIR', priority:220 +#, placeholders:'--recurse-submodules':'`$GIT_DIR/modules/`', priority:220 msgid "Using --recurse-submodules can only fetch new commits in submodules that are present locally e.g. in `$GIT_DIR/modules/`. If the upstream adds a new submodule, that submodule cannot be fetched until it is cloned e.g. by `git submodule update`. This is expected to be fixed in a future Git version." msgstr "" @@ -27168,7 +27168,7 @@ msgstr "" #. type: Plain text #: en/git-filter-branch.txt:84 -#, placeholders:'$GIT_COMMIT':'GIT_AUTHOR_NAME':'GIT_AUTHOR_EMAIL':'GIT_AUTHOR_DATE':'GIT_COMMITTER_NAME':'GIT_COMMITTER_EMAIL':'GIT_COMMITTER_DATE':'linkgit:git-commit-tree[1]', priority:90 +#, placeholders:'`$GIT_COMMIT`':'GIT_AUTHOR_NAME':'GIT_AUTHOR_EMAIL':'GIT_AUTHOR_DATE':'GIT_COMMITTER_NAME':'GIT_COMMITTER_EMAIL':'GIT_COMMITTER_DATE':'linkgit:git-commit-tree[1]', priority:90 msgid "The filters are applied in the order as listed below. The argument is always evaluated in the shell context using the 'eval' command (with the notable exception of the commit filter, for technical reasons). Prior to that, the `$GIT_COMMIT` environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, and GIT_COMMITTER_DATE are taken from the current commit and exported to the environment, in order to affect the author and committer identities of the replacement commit created by linkgit:git-commit-tree[1] after the filters have run." msgstr "" @@ -27414,7 +27414,7 @@ msgstr "" #. type: delimited block - #: en/git-filter-branch.txt:254 -#, no-wrap, placeholders:'git filter-branch':'--tree-filter':'HEAD', priority:90 +#, no-wrap, placeholders:'git filter-branch':'--tree-filter', priority:90 msgid "git filter-branch --tree-filter 'rm filename' HEAD\n" msgstr "" @@ -27432,13 +27432,13 @@ msgstr "" #. type: delimited block - #: en/git-filter-branch.txt:268 -#, no-wrap, placeholders:'git filter-branch':'--index-filter':'--cached':'--ignore-unmatch':'HEAD', priority:90 +#, no-wrap, placeholders:'git filter-branch':'--index-filter':'--cached':'--ignore-unmatch', priority:90 msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n" msgstr "" #. type: Plain text #: en/git-filter-branch.txt:271 -#, placeholders:'HEAD', priority:90 +#, priority:90 msgid "Now, you will get the rewritten history saved in HEAD." msgstr "" @@ -27468,7 +27468,7 @@ msgstr "" #. type: delimited block - #: en/git-filter-branch.txt:289 -#, no-wrap, placeholders:'git filter-branch':'--parent-filter':'HEAD', priority:90 +#, no-wrap, placeholders:'git filter-branch':'--parent-filter', priority:90 msgid "git filter-branch --parent-filter 'sed \"s/^\\$/-p /\"' HEAD\n" msgstr "" @@ -27480,7 +27480,7 @@ msgstr "" #. type: delimited block - #: en/git-filter-branch.txt:299 -#, no-wrap, placeholders:'git filter-branch':'--parent-filter':'$GIT_COMMIT':'HEAD', priority:90 +#, no-wrap, placeholders:'git filter-branch':'--parent-filter':'$GIT_COMMIT', priority:90 msgid "" "git filter-branch --parent-filter \\\n" "\t'test $GIT_COMMIT = && echo \"-p \" || cat' HEAD\n" @@ -27494,7 +27494,7 @@ msgstr "" #. type: delimited block - #: en/git-filter-branch.txt:306 -#, no-wrap, placeholders:'--graft':'$commit':'$graft':'git filter-branch':'$graft':'HEAD', priority:90 +#, no-wrap, placeholders:'--graft':'$commit':'$graft':'git filter-branch':'$graft', priority:90 msgid "" "git replace --graft $commit-id $graft-id\n" "git filter-branch $graft-id..HEAD\n" @@ -27508,7 +27508,7 @@ msgstr "" #. type: delimited block - #: en/git-filter-branch.txt:318 -#, no-wrap, placeholders:'git filter-branch':'--commit-filter':'$GIT_AUTHOR_NAME':'skip_commit':'git commit-tree':'HEAD', priority:90 +#, no-wrap, placeholders:'git filter-branch':'--commit-filter':'$GIT_AUTHOR_NAME':'skip_commit':'git commit-tree', priority:90 msgid "" "git filter-branch --commit-filter '\n" "\tif [ \"$GIT_AUTHOR_NAME\" = \"Darl McBribe\" ];\n" @@ -27576,7 +27576,7 @@ msgstr "" #. type: delimited block - #: en/git-filter-branch.txt:364 -#, no-wrap, placeholders:'git filter-branch':'--msg-filter':'bugzilla.org':'HEAD':'HEAD', priority:90 +#, no-wrap, placeholders:'git filter-branch':'--msg-filter':'bugzilla.org', priority:90 msgid "" "git filter-branch --msg-filter '\n" "\tcat &&\n" @@ -27661,7 +27661,7 @@ msgstr "" #. type: delimited block - #: en/git-filter-branch.txt:418 -#, no-wrap, placeholders:'git filter-branch':'--index-filter':'git ls-files':'GIT_INDEX_FILE':'$GIT_INDEX_FILE':'git update-index':'--index-info':'$GIT_INDEX_FILE':'$GIT_INDEX_FILE':'HEAD', priority:90 +#, no-wrap, placeholders:'git filter-branch':'--index-filter':'git ls-files':'GIT_INDEX_FILE':'$GIT_INDEX_FILE':'git update-index':'--index-info':'$GIT_INDEX_FILE':'$GIT_INDEX_FILE', priority:90 msgid "" "git filter-branch --index-filter \\\n" "\t'git ls-files -s | sed \"s-\\t\\\"*-&newsubdir/-\" |\n" @@ -28217,7 +28217,7 @@ msgstr "--merged[=]" #. type: Plain text #: en/git-for-each-ref.txt:83 -#, fuzzy, placeholders:'HEAD', priority:80 +#, fuzzy, priority:80 msgid "Only list refs whose tips are reachable from the specified commit (HEAD if not specified)." msgstr "Zeige nur jene Entwicklungszweige (branches) an, welche die angegebene Eintragung (commit) enthalten." @@ -28229,7 +28229,7 @@ msgstr "--no-merged[=]" #. type: Plain text #: en/git-for-each-ref.txt:87 -#, fuzzy, placeholders:'HEAD', priority:80 +#, fuzzy, priority:80 msgid "Only list refs whose tips are not reachable from the specified commit (HEAD if not specified)." msgstr "Zeige nur jene Entwicklungszweige (branches) an, welche die angegebene Eintragung (commit) enthalten." @@ -28241,7 +28241,7 @@ msgstr "--contains[=]" #. type: Plain text #: en/git-for-each-ref.txt:91 -#, fuzzy, placeholders:'HEAD', priority:80 +#, fuzzy, priority:80 msgid "Only list refs which contain the specified commit (HEAD if not specified)." msgstr "Zeige nur jene Entwicklungszweige (branches) an, welche die angegebene Eintragung (commit) enthalten." @@ -28253,7 +28253,7 @@ msgstr "--no-contains[=]" #. type: Plain text #: en/git-for-each-ref.txt:95 -#, fuzzy, placeholders:'HEAD', priority:80 +#, fuzzy, priority:80 msgid "Only list refs which don't contain the specified commit (HEAD if not specified)." msgstr "Zeige nur jene Entwicklungszweige (branches) an, welche die angegebene Eintragung (commit) enthalten." @@ -28277,7 +28277,7 @@ msgstr "--include-root-refs" #. type: Plain text #: en/git-for-each-ref.txt:110 -#, placeholders:'HEAD', priority:80 +#, priority:80 msgid "List root refs (HEAD and pseudorefs) apart from regular refs." msgstr "" @@ -28397,19 +28397,19 @@ msgstr "" #. type: Plain text #: en/git-for-each-ref.txt:185 -#, placeholders:'{push}':'{push}', priority:80 +#, placeholders:'{push}`':'{push}`', priority:80 msgid "The name of a local ref which represents the `@{push}` location for the displayed ref. Respects `:short`, `:lstrip`, `:rstrip`, `:track`, `:trackshort`, `:remotename`, and `:remoteref` options as `upstream` does. Produces an empty string if no `@{push}` ref is configured." msgstr "" #. type: Labeled list #: en/git-for-each-ref.txt:186 en/git.txt:440 -#, no-wrap, placeholders:'HEAD', priority:100 +#, no-wrap, priority:100 msgid "HEAD" msgstr "HEAD" #. type: Plain text #: en/git-for-each-ref.txt:189 -#, placeholders:'HEAD', priority:80 +#, priority:80 msgid "'*' if HEAD matches current ref (the checked out branch), ' ' otherwise." msgstr "" @@ -28439,7 +28439,7 @@ msgstr "diff" #. type: Plain text #: en/git-for-each-ref.txt:223 -#, ignore-ellipsis, placeholders:'HEAD':'HEAD', priority:80 +#, ignore-ellipsis, priority:80 msgid "Used as %(if)...%(then)...%(end) or %(if)...%(then)...%(else)...%(end). If there is an atom with value or string literal after the %(if) then everything after the %(then) is printed, else if the %(else) atom is used, then everything after %(else) is printed. We ignore space when evaluating the string before %(then), this is useful when we use the %(HEAD) atom which prints either \"*\" or \" \" and we want to apply the 'if' condition only on the 'HEAD' ref. Append \":equals=\" or \":notequals=\" to compare the value between the %(if:...) and %(then) atoms with the given string." msgstr "" @@ -28830,7 +28830,7 @@ msgstr "" #. type: delimited block - #: en/git-for-each-ref.txt:411 -#, no-wrap, placeholders:'git for-each-ref':'--shell':'--format=':'$entry':'$ref', priority:80 +#, no-wrap, placeholders:'git for-each-ref':'--shell':'--format=':'$entry':'$ref`', priority:80 msgid "" "git for-each-ref --shell --format=\"ref=%(refname)\" refs/heads | \\\n" "while read entry\n" @@ -28929,7 +28929,7 @@ msgstr "" #. type: delimited block - #: en/git-for-each-ref.txt:472 -#, no-wrap, placeholders:'git for-each-ref':'--format=':'HEAD', priority:80 +#, no-wrap, placeholders:'git for-each-ref':'--format=', priority:80 msgid "git for-each-ref --format=\"%(if)%(HEAD)%(then)* %(else) %(end)%(refname:short)\" refs/heads/\n" msgstr "" @@ -29072,7 +29072,7 @@ msgstr "" #. type: Plain text #: en/git-format-patch.txt:104 -#, placeholders:'`--thread`':'git-format-patch', priority:100 +#, placeholders:'`--thread`':'git-format-patch`', priority:100 msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-ID` header to reference." msgstr "" @@ -29246,7 +29246,7 @@ msgstr "" #. type: Plain text #: en/git-format-patch.txt:181 -#, placeholders:'git send-email':'git format-patch':'git send-email', priority:100 +#, placeholders:'git send-email':'git format-patch`':'git send-email`', priority:100 msgid "Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`." msgstr "" @@ -29445,7 +29445,7 @@ msgstr "" #. type: Plain text #: en/git-format-patch.txt:297 -#, placeholders:'git send-email':'git send-email', priority:100 +#, placeholders:'git send-email`':'git send-email`', priority:100 msgid "Note that this option is only useful if you are actually sending the emails and want to identify yourself as the sender, but retain the original author (and `git am` will correctly pick up the in-body header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`." msgstr "" @@ -29781,7 +29781,7 @@ msgstr "" #. type: Plain text #: en/git-format-patch.txt:511 -#, placeholders:'$SHA1':'$magic_timestamp', priority:100 +#, placeholders:'$SHA1':'$magic_timestamp`', priority:100 msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above." msgstr "" @@ -30378,7 +30378,7 @@ msgstr "--full" #. type: Plain text #: en/git-fsck.txt:63 -#, placeholders:'GIT_OBJECT_DIRECTORY':'$GIT_DIR':'GIT_ALTERNATE_OBJECT_DIRECTORIES':'$GIT_DIR':'$GIT_DIR':'--no-full', priority:100 +#, placeholders:'GIT_OBJECT_DIRECTORY':'$GIT_DIR/objects':'GIT_ALTERNATE_OBJECT_DIRECTORIES':'$GIT_DIR/objects/info/alternates':'$GIT_DIR/objects/pack':'--no-full', priority:100 msgid "Check not just objects in GIT_OBJECT_DIRECTORY ($GIT_DIR/objects), but also the ones found in alternate object pools listed in GIT_ALTERNATE_OBJECT_DIRECTORIES or $GIT_DIR/objects/info/alternates, and in packed Git archives found in $GIT_DIR/objects/pack and corresponding pack subdirectories in alternate object pools. This is now default; you can turn it off with --no-full." msgstr "" @@ -30438,7 +30438,7 @@ msgstr "--name-objects" #. type: Plain text #: en/git-fsck.txt:99 -#, placeholders:'linkgit:git-rev-parse[1]':'HEAD':'{1234567890}', priority:100 +#, placeholders:'linkgit:git-rev-parse[1]':'{1234567890}', priority:100 msgid "When displaying names of reachable objects, in addition to the SHA-1 also display a name that describes *how* they are reachable, compatible with linkgit:git-rev-parse[1], e.g. `HEAD@{1234567890}~25^2:src/`." msgstr "" @@ -30546,7 +30546,7 @@ msgstr "GIT_OBJECT_DIRECTORY" #. type: Plain text #: en/git-fsck.txt:172 -#, placeholders:'$GIT_DIR', priority:100 +#, placeholders:'$GIT_DIR/objects', priority:100 msgid "used to specify the object database root (usually $GIT_DIR/objects)" msgstr "" @@ -30904,7 +30904,7 @@ msgstr "--no-exclude-standard" #. type: Plain text #: en/git-grep.txt:66 -#, placeholders:'.gitignore':'`--untracked`', priority:100 +#, placeholders:'`.gitignore`':'`--untracked`', priority:100 msgid "Also search in ignored files by not honoring the `.gitignore` mechanism. Only useful with `--untracked`." msgstr "" @@ -30916,7 +30916,7 @@ msgstr "--exclude-standard" #. type: Plain text #: en/git-grep.txt:71 -#, placeholders:'.gitignore':'`--no-index`', priority:100 +#, placeholders:'`.gitignore`':'`--no-index`', priority:100 msgid "Do not pay attention to ignored files specified via the `.gitignore` mechanism. Only useful when searching files in the current directory with `--no-index`." msgstr "" @@ -31930,7 +31930,7 @@ msgstr "--no-external-commands" #. type: Plain text #: en/git-help.txt:56 -#, placeholders:'`--all`':'$PATH', priority:100 +#, placeholders:'`--all`':'`$PATH`', priority:100 msgid "When used with `--all`, exclude the listing of external \"git-*\" commands found in the `$PATH`." msgstr "" @@ -31990,7 +31990,7 @@ msgstr "" #. type: Plain text #: en/git-help.txt:81 -#, placeholders:'.git/info/exclude':'linkgit:gitrepository-layout[5]':'linkgit:gitmailmap[5]', priority:100 +#, placeholders:'`.git/info/exclude`':'linkgit:gitrepository-layout[5]':'linkgit:gitmailmap[5]', priority:100 msgid "In-repository file interfaces such as `.git/info/exclude` are documented here (see linkgit:gitrepository-layout[5]), as well as in-tree configuration such as `.mailmap` (see linkgit:gitmailmap[5])." msgstr "" @@ -32361,7 +32361,7 @@ msgstr "" #. type: Plain text #: en/git-http-backend.txt:72 -#, placeholders:'$hostname':'bar.git':'bar.git', priority:100 +#, placeholders:'$hostname/git/foo/bar':'bar.git', priority:100 msgid "All of the following examples map `http://$hostname/git/foo/bar.git` to `/var/www/git/foo/bar.git`." msgstr "" @@ -32441,7 +32441,7 @@ msgstr "" #. type: Plain text #: en/git-http-backend.txt:121 -#, placeholders:'mod_rewrite':'git-receive-pack', priority:100 +#, placeholders:'mod_rewrite':'git-receive-pack`', priority:100 msgid "If you do not have `mod_rewrite` available to match against the query string, it is sufficient to just protect `git-receive-pack` itself, like:" msgstr "" @@ -32489,7 +32489,7 @@ msgstr "" #. type: delimited block - #: en/git-http-backend.txt:165 -#, no-wrap, placeholders:'HEAD':'{2}':'{38}':'{40}':'git-core':'git-http-backend', priority:100 +#, no-wrap, placeholders:'{2}':'{38}':'{40}':'git-core':'git-http-backend', priority:100 msgid "" "ScriptAliasMatch \\\n" "\t\"(?x)^/git/(.*/(HEAD | \\\n" @@ -32556,7 +32556,7 @@ msgstr "" #. type: delimited block - #: en/git-http-backend.txt:205 -#, no-wrap, placeholders:'{2}':'{38}':'{40}':'HEAD':'git-core':'git-http-backend':'gitweb.cgi', priority:100 +#, no-wrap, placeholders:'{2}':'{38}':'{40}':'git-core':'git-http-backend':'gitweb.cgi', priority:100 msgid "" "AliasMatch ^/git/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$ /var/www/git/$1\n" "AliasMatch ^/git/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /var/www/git/$1\n" @@ -32704,7 +32704,7 @@ msgstr "" #. type: Plain text #: en/git-http-backend.txt:290 -#, placeholders:'GIT_PROTOCOL':'HTTP_GIT_PROTOCOL':'git-http-backend':'GIT_PROTOCOL', priority:100 +#, placeholders:'GIT_PROTOCOL':'HTTP_GIT_PROTOCOL':'git-http-backend`':'GIT_PROTOCOL', priority:100 msgid "Clients may probe for optional protocol capabilities (like the v2 protocol) using the `Git-Protocol` HTTP header. In order to support these, the contents of that header must appear in the `GIT_PROTOCOL` environment variable. Most webservers will pass this header to the CGI via the `HTTP_GIT_PROTOCOL` variable, and `git-http-backend` will automatically copy that to `GIT_PROTOCOL`. However, some webservers may be more selective about which headers they'll pass, in which case they need to be configured explicitly (see the mention of `Git-Protocol` in the Apache config from the earlier EXAMPLES section)." msgstr "" @@ -32788,7 +32788,7 @@ msgstr "-w " #. type: Plain text #: en/git-http-fetch.txt:36 -#, placeholders:'$GIT_DIR', priority:100 +#, placeholders:'$GIT_DIR/refs/', priority:100 msgid "Writes the commit-id into the specified filename under $GIT_DIR/refs/ on the local end after the transfer is complete." msgstr "" @@ -32896,13 +32896,13 @@ msgstr "" #. type: Plain text #: en/git-http-push.txt:49 -#, placeholders:'HEAD', priority:100 +#, priority:100 msgid "Remove from remote repository. The specified branch cannot be the remote HEAD. If -d is specified, the following other conditions must also be met:" msgstr "" #. type: Plain text #: en/git-http-push.txt:51 -#, placeholders:'HEAD', priority:100 +#, priority:100 msgid "Remote HEAD must resolve to an object that exists locally" msgstr "" @@ -32914,7 +32914,7 @@ msgstr "" #. type: Plain text #: en/git-http-push.txt:53 -#, placeholders:'HEAD', priority:100 +#, priority:100 msgid "Specified branch is an ancestor of the remote HEAD" msgstr "" @@ -33473,13 +33473,13 @@ msgstr "Dieser Befehl erzeugt ein leeres Git-Repository – im Grunde ein `.git` #. type: Plain text #: en/git-init.txt:30 -#, placeholders:'$GIT_DIR', priority:300 +#, placeholders:'`$GIT_DIR`', priority:300 msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository." msgstr "Wenn die Umgebungsvariable `$GIT_DIR` gesetzt ist, dann gibt sie einen Pfad an, der anstelle von `./.git` für die Basis des Repositorys verwendet werden soll." #. type: Plain text #: en/git-init.txt:35 -#, fuzzy, placeholders:'$GIT_OBJECT_DIRECTORY':'$GIT_DIR', priority:300 +#, fuzzy, placeholders:'`$GIT_OBJECT_DIRECTORY`':'`$GIT_DIR/objects`', priority:300 #| msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used." msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath; otherwise, the default `$GIT_DIR/objects` directory is used." msgstr "Wenn das Objektverzeichnis über die Umgebungsvariable `$GIT_OBJECT_DIRECTORY` angegeben wird, werden die SHA1-Verzeichnisse darunter angelegt – andernfalls wird das Standardverzeichnis `$GIT_DIR/objects` verwendet." @@ -33546,7 +33546,7 @@ msgstr "--separate-git-dir=" #. type: Plain text #: en/git-init.txt:78 -#, fuzzy, placeholders:'$GIT_DIR', priority:300 +#, fuzzy, placeholders:'`$GIT_DIR`', priority:300 #| msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository. This file acts as filesystem-agnostic Git symbolic link to the repository." msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository. This file acts as a filesystem-agnostic Git symbolic link to the repository." msgstr "Anstatt das Repository als ein Verzeichnis entweder nach `$GIT_DIR` oder `./.git/` zu initialisieren, wird hier eine Textdatei erstellt, die den Pfad zum eigentlichen Repository enthält. Diese Datei fungiert als symbolischer Git-Link zum Repository, der vom Dateisystem unabhängig ist." @@ -33587,7 +33587,7 @@ msgstr "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]" #. type: Plain text #: en/git-init.txt:97 -#, fuzzy, placeholders:'core.sharedRepository':'$GIT_DIR', priority:300 +#, fuzzy, placeholders:'core.sharedRepository':'`$GIT_DIR`', priority:300 #| msgid "Specify that the Git repository is to be shared amongst several users. This allows users belonging to the same group to push into that repository. When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions. When not specified, Git will use permissions reported by umask(2)." msgid "Specify that the Git repository is to be shared amongst several users. This allows users belonging to the same group to push into that repository. When specified, the config variable `core.sharedRepository` is set so that files and directories under `$GIT_DIR` are created with the requested permissions. When not specified, Git will use permissions reported by `umask`(2)." msgstr "Bestimmt, dass das Git-Repository von mehreren Benutzern gemeinsam genutzt werden soll. Dadurch können Benutzer, die derselben Gruppe angehören, in dieses Repository pushen. Falls spezifiziert, wird die config-Variable \"core.sharedRepository\" so angelegt, dass Dateien und Verzeichnisse unter `$GIT_DIR` mit den angeforderten Berechtigungen erstellt werden. Wenn nichts angegeben ist, wird Git die von umask(2) gelieferten Berechtigungen verwenden." @@ -33695,7 +33695,7 @@ msgstr "TEMPLATE DIRECTORY" #. type: Plain text #: en/git-init.txt:148 -#, placeholders:'$GIT_DIR', priority:300 +#, placeholders:'`$GIT_DIR`', priority:300 msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created." msgstr "Dateien und Verzeichnisse im Template-Verzeichnis, deren Name nicht mit einem Punkt beginnt, werden nach der Erstellung in das `$GIT_DIR` kopiert." @@ -33713,7 +33713,7 @@ msgstr "dem Argument, das mit der Option `--template` angegeben wurde;" #. type: Plain text #: en/git-init.txt:154 -#, placeholders:'$GIT_TEMPLATE_DIR', priority:300 +#, placeholders:'`$GIT_TEMPLATE_DIR`', priority:300 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;" msgstr "dem Inhalt der Umgebungs-Variablen `$GIT_TEMPLATE_DIR`;" @@ -34238,7 +34238,7 @@ msgstr "--no-divider" #. type: Plain text #: en/git-interpret-trailers.txt:185 -#, placeholders:'`---`':'git format-patch', priority:100 +#, placeholders:'`---`':'git format-patch`', priority:100 msgid "Do not treat `---` as the end of the commit message. Use this when you know your input contains just the commit message itself (and not an email or the output of `git format-patch`)." msgstr "" @@ -34724,7 +34724,7 @@ msgstr "" #. type: delimited block - #: en/git-interpret-trailers.txt:486 -#, no-wrap, placeholders:'HEAD':'--oneline':'--format=':'--abbrev-commit':'--abbrev=14':'trailer.see.key':'trailer.see.ifExists':'trailer.see.ifMissing':'trailer.see.cmd':'git interpret-trailers':'--trailer=see':'msg.txt', priority:100 +#, no-wrap, placeholders:'--oneline':'--format=':'--abbrev-commit':'--abbrev=14':'trailer.see.key':'trailer.see.ifExists':'trailer.see.ifMissing':'trailer.see.cmd':'git interpret-trailers':'--trailer=see':'msg.txt', priority:100 msgid "" "see: HEAD~2\n" "$ cat ~/bin/glog-ref\n" @@ -34868,7 +34868,7 @@ msgstr "" #. type: Plain text #: en/git-log.txt:58 -#, placeholders:'HEAD', priority:260 +#, placeholders:'`HEAD`', priority:260 msgid "If none of these options or config settings are given, then references are used as decoration if they match `HEAD`, `refs/heads/`, `refs/remotes/`, `refs/stash/`, or `refs/tags/`." msgstr "" @@ -34941,7 +34941,7 @@ msgstr "--revision " #. type: Plain text #: en/git-log.txt:102 -#, placeholders:'HEAD':'HEAD':'HEAD':'linkgit:gitrevisions[7]', priority:260 +#, placeholders:'`HEAD`':'HEAD`':'`HEAD`':'linkgit:gitrevisions[7]', priority:260 msgid "Show only commits in the specified revision range. When no is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit). `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell , see the 'Specifying Ranges' section of linkgit:gitrevisions[7]." msgstr "" @@ -35760,7 +35760,7 @@ msgstr "" #. type: Plain text #: en/git-ls-files.txt:319 -#, placeholders:'--exclude-per-directory=':'git ls-files':'.gitignore', priority:80 +#, placeholders:'--exclude-per-directory=':'git ls-files':'`.gitignore`', priority:80 msgid "The command-line flag --exclude-per-directory= specifies a name of the file in each directory 'git ls-files' examines, normally `.gitignore`. Files in deeper directories take precedence. Patterns are ordered in the same order they appear in the files." msgstr "" @@ -35772,19 +35772,19 @@ msgstr "" #. type: Plain text #: en/git-ls-files.txt:330 -#, placeholders:'`--exclude-standard`':'`--exclude-standard`':'`--exclude-per-directory=':'.gitignore', priority:80 +#, placeholders:'`--exclude-standard`':'`--exclude-standard`':'`--exclude-per-directory=':'.gitignore`', priority:80 msgid "Generally, you should be able to use `--exclude-standard` when you want the exclude rules applied the same way as what Porcelain commands do. To emulate what `--exclude-standard` specifies, you can give `--exclude-per-directory=.gitignore`, and then specify:" msgstr "" #. type: Plain text #: en/git-ls-files.txt:333 -#, placeholders:'core.excludesfile':'$XDG_CONFIG_HOME', priority:80 +#, placeholders:'core.excludesfile':'`$XDG_CONFIG_HOME/git/ignore`', priority:80 msgid "The file specified by the `core.excludesfile` configuration variable, if exists, or the `$XDG_CONFIG_HOME/git/ignore` file." msgstr "" #. type: Plain text #: en/git-ls-files.txt:335 -#, placeholders:'$GIT_DIR', priority:80 +#, placeholders:'`$GIT_DIR/info/exclude`', priority:80 msgid "The `$GIT_DIR/info/exclude` file." msgstr "" @@ -35850,7 +35850,7 @@ msgstr "--refs" #. type: Plain text #: en/git-ls-remote.txt:39 -#, placeholders:'HEAD', priority:100 +#, placeholders:'`HEAD`', priority:100 msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output." msgstr "" @@ -35898,7 +35898,7 @@ msgstr "--symref" #. type: Plain text #: en/git-ls-remote.txt:66 -#, placeholders:'HEAD', priority:100 +#, priority:100 msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref. Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote." msgstr "" @@ -35959,7 +35959,7 @@ msgstr "" #. type: delimited block - #: en/git-ls-remote.txt:128 -#, no-wrap, placeholders:'git ls-remote':'HEAD', priority:100 +#, no-wrap, placeholders:'git ls-remote', priority:100 msgid "" "$ git ls-remote\n" "27d43aaaf50ef0ae014b88bba294f93658016a2e\tHEAD\n" @@ -36044,7 +36044,7 @@ msgstr "" #. type: Plain text #: en/git-ls-tree.txt:35 -#, placeholders:'git ls-tree':'HEAD':'HEAD':'git ls-tree':'HEAD':'HEAD':'--full-tree', priority:80 +#, placeholders:'git ls-tree':'`HEAD`':'git ls-tree':'`HEAD`':'--full-tree', priority:80 msgid "the behaviour is similar to that of \"/bin/ls\" in that the '' is taken as relative to the current working directory. E.g. when you are in a directory 'sub' that has a directory 'dir', you can run 'git ls-tree -r HEAD dir' to list the contents of the tree (that is `sub/dir` in `HEAD`). You don't want to give a tree that is not at the root level (e.g. `git ls-tree -r HEAD:sub dir`) in this case, as that would result in asking for `sub/sub/dir` in the `HEAD` commit. However, the current working directory can be ignored by passing --full-tree option." msgstr "" @@ -37375,7 +37375,7 @@ msgstr "" #. type: Plain text #: en/git-mergetool.txt:60 -#, placeholders:'`-t`':'`--tool`':'merge.tool':'$BASE':'$LOCAL':'$REMOTE':'$MERGED', priority:240 +#, placeholders:'`-t`':'`--tool`':'merge.tool':'`$BASE`':'`$LOCAL`':'`$REMOTE`':'`$MERGED`', priority:240 msgid "When 'git mergetool' is invoked with this tool (either through the `-t` or `--tool` option or the `merge.tool` configuration variable), the configured command line will be invoked with `$BASE` set to the name of a temporary file containing the common base for the merge, if available; `$LOCAL` set to the name of a temporary file containing the contents of the file on the current branch; `$REMOTE` set to the name of a temporary file containing the contents of the file to be merged, and `$MERGED` set to the name of the file to which the merge tool should write the result of the merge resolution." msgstr "" @@ -38064,7 +38064,7 @@ msgstr "" #. type: Plain text #: en/git-merge.txt:80 -#, placeholders:'git fmt-merge-msg', priority:240 +#, placeholders:'git fmt-merge-msg`', priority:240 msgid "The `git fmt-merge-msg` command can be used to give a good default for automated `git merge` invocations. The automated message can include the branch description." msgstr "" @@ -38130,7 +38130,7 @@ msgstr "" #. type: Plain text #: en/git-merge.txt:139 -#, placeholders:'FETCH_HEAD':'.git/FETCH_HEAD', priority:240 +#, placeholders:'FETCH_HEAD':'`.git/FETCH_HEAD`', priority:240 msgid "When `FETCH_HEAD` (and no other commit) is specified, the branches recorded in the `.git/FETCH_HEAD` file by the previous invocation of `git fetch` for merging are merged to the current branch." msgstr "" @@ -38148,13 +38148,13 @@ msgstr "" #. type: Plain text #: en/git-merge.txt:156 -#, placeholders:'HEAD':'HEAD', priority:240 +#, placeholders:'`HEAD`', priority:240 msgid "To avoid recording unrelated changes in the merge commit, `git pull` and `git merge` will also abort if there are any changes registered in the index relative to the `HEAD` commit. (Special narrow exceptions to this rule may exist depending on which merge strategy is in use, but generally, the index must match HEAD.)" msgstr "" #. type: Plain text #: en/git-merge.txt:159 -#, placeholders:'HEAD', priority:240 +#, placeholders:'`HEAD`', priority:240 msgid "If all named commits are already ancestors of `HEAD`, `git merge` will exit early with the message \"Already up to date.\"" msgstr "" @@ -38166,7 +38166,7 @@ msgstr "" #. type: Plain text #: en/git-merge.txt:171 -#, placeholders:'HEAD', priority:240 +#, placeholders:'`HEAD`', priority:240 msgid "Often the current branch head is an ancestor of the named commit. This is the most common case especially when invoked from `git pull`: you are tracking an upstream repository, you have committed no local changes, and now you want to update to a newer upstream revision. In this case, a new commit is not needed to store the combined history; instead, the `HEAD` (along with the index) is updated to point at the named commit, without creating an extra merge commit." msgstr "" @@ -38190,7 +38190,7 @@ msgstr "" #. type: Plain text #: en/git-merge.txt:185 -#, placeholders:'HEAD', priority:240 +#, placeholders:'`HEAD`', priority:240 msgid "A merged version reconciling the changes from all branches to be merged is committed, and your `HEAD`, index, and working tree are updated to it. It is possible to have modifications in the working tree as long as they do not overlap; the update will preserve them." msgstr "" @@ -38202,7 +38202,7 @@ msgstr "" #. type: Plain text #: en/git-merge.txt:190 -#, placeholders:'HEAD', priority:240 +#, placeholders:'`HEAD`', priority:240 msgid "The `HEAD` pointer stays the same." msgstr "" @@ -38220,7 +38220,7 @@ msgstr "" #. type: Plain text #: en/git-merge.txt:199 -#, placeholders:'HEAD':'MERGE_HEAD':'git ls-files', priority:240 +#, placeholders:'`HEAD`':'MERGE_HEAD':'git ls-files', priority:240 msgid "For conflicting paths, the index file records up to three versions: stage 1 stores the version from the common ancestor, stage 2 from `HEAD`, and stage 3 from `MERGE_HEAD` (you can inspect the stages with `git ls-files -u`). The working tree files contain the result of the merge operation; i.e. 3-way merge results with familiar conflict markers `<<<` `===` `>>>`." msgstr "" @@ -38232,7 +38232,7 @@ msgstr "" #. type: Plain text #: en/git-merge.txt:207 -#, placeholders:'HEAD', priority:240 +#, placeholders:'`HEAD`', priority:240 msgid "No other changes are made. In particular, the local modifications you had before you started merge will stay the same and the index entries for them stay as they were, i.e. matching `HEAD`." msgstr "" @@ -38392,7 +38392,7 @@ msgstr "" #. type: Plain text #: en/git-merge.txt:328 -#, placeholders:'HEAD':'--abort`', priority:240 +#, placeholders:'`HEAD`':'--abort`', priority:240 msgid "Decide not to merge. The only clean-ups you need are to reset the index file to the `HEAD` commit to reverse 2. and to clean up working tree changes made by 2. and 3.; `git merge --abort` can be used for this." msgstr "" @@ -38416,19 +38416,19 @@ msgstr "" #. type: Plain text #: en/git-merge.txt:345 -#, placeholders:'HEAD':'MERGE_HEAD':'AUTO_MERGE', priority:240 +#, placeholders:'`HEAD`':'MERGE_HEAD':'AUTO_MERGE', priority:240 msgid "Look at the diffs. `git diff` will show a three-way diff, highlighting changes from both the `HEAD` and `MERGE_HEAD` versions. `git diff AUTO_MERGE` will show what changes you've made so far to resolve textual conflicts." msgstr "" #. type: Plain text #: en/git-merge.txt:349 -#, placeholders:'--merge':'HEAD':'MERGE_HEAD', priority:240 +#, placeholders:'--merge':'`HEAD`':'MERGE_HEAD', priority:240 msgid "Look at the diffs from each branch. `git log --merge -p ` will show diffs first for the `HEAD` version and then the `MERGE_HEAD` version." msgstr "" #. type: Plain text #: en/git-merge.txt:354 -#, placeholders:'HEAD':'MERGE_HEAD', priority:240 +#, placeholders:'`HEAD`':'MERGE_HEAD', priority:240 msgid "Look at the originals. `git show :1:filename` shows the common ancestor, `git show :2:filename` shows the `HEAD` version, and `git show :3:filename` shows the `MERGE_HEAD` version." msgstr "" @@ -38847,7 +38847,7 @@ msgstr "" #. type: Plain text #: en/git-name-rev.txt:79 -#, placeholders:'--tags':'git-describe', priority:100 +#, placeholders:'--tags':'git-describe`', priority:100 msgid "Instead of printing both the SHA-1 and the name, print only the name. If given with --tags the usual tag prefix of \"tags/\" is also omitted from the name, matching the output of `git-describe` more closely." msgstr "" @@ -38951,7 +38951,7 @@ msgstr "" #. type: Plain text #: en/git-notes.txt:45 -#, placeholders:'git format-patch':'`--notes`', priority:280 +#, placeholders:'git format-patch`':'`--notes`', priority:280 msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line." msgstr "" @@ -38987,7 +38987,7 @@ msgstr "add" #. type: Plain text #: en/git-notes.txt:71 -#, placeholders:'HEAD':'`-f`':'`-m`':'`-F`':'`--separator`', priority:280 +#, placeholders:'`-f`':'`-m`':'`-F`':'`--separator`', priority:280 msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand). If you specify multiple `-m` and `-F`, a blank line will be inserted between the messages. Use the `--separator` option to insert other delimiters." msgstr "" @@ -38999,7 +38999,7 @@ msgstr "copy" #. type: Plain text #: en/git-notes.txt:78 -#, placeholders:'HEAD', priority:280 +#, priority:280 msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list ) `" msgstr "" @@ -39029,13 +39029,13 @@ msgstr "append" #. type: Plain text #: en/git-notes.txt:96 -#, placeholders:'`-m`':'`-F`':'HEAD':'`--separator`', priority:280 +#, placeholders:'`-m`':'`-F`':'`--separator`', priority:280 msgid "Append new message(s) given by `-m` or `-F` options to an existing note, or add them as a new note if one does not exist, for the object (defaults to HEAD). When appending to an existing note, a blank line is added before each new message as an inter-paragraph separator. The separator can be customized with the `--separator` option." msgstr "" #. type: Plain text #: en/git-notes.txt:99 -#, placeholders:'HEAD', priority:280 +#, priority:280 msgid "Edit the notes for a given object (defaults to HEAD)." msgstr "" @@ -39047,7 +39047,7 @@ msgstr "show" #. type: Plain text #: en/git-notes.txt:102 -#, placeholders:'HEAD', priority:280 +#, priority:280 msgid "Show the notes for a given object (defaults to HEAD)." msgstr "" @@ -39065,7 +39065,7 @@ msgstr "" #. type: Plain text #: en/git-notes.txt:117 -#, placeholders:'.git/NOTES_MERGE_WORKTREE':'--commit':'--abort', priority:280 +#, placeholders:'`.git/NOTES_MERGE_WORKTREE`':'--commit':'--abort', priority:280 msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'." msgstr "" @@ -39077,7 +39077,7 @@ msgstr "remove" #. type: Plain text #: en/git-notes.txt:123 -#, placeholders:'HEAD', priority:280 +#, priority:280 msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand." msgstr "" @@ -39288,7 +39288,7 @@ msgstr "" #. type: Plain text #: en/git-notes.txt:276 -#, placeholders:'.git/NOTES_MERGE_WORKTREE':'--commit':'--abort', priority:280 +#, placeholders:'`.git/NOTES_MERGE_WORKTREE`':'--commit':'--abort', priority:280 msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'." msgstr "" @@ -39354,7 +39354,7 @@ msgstr "" #. type: delimited block - #: en/git-notes.txt:325 -#, no-wrap, placeholders:'git hash-object':'a.out':'--ref=built':'--allow-empty':'$blob':'HEAD', priority:280 +#, no-wrap, placeholders:'git hash-object':'a.out':'--ref=built':'--allow-empty':'$blob', priority:280 msgid "" "$ cc *.c\n" "$ blob=$(git hash-object -w a.out)\n" @@ -39363,7 +39363,7 @@ msgstr "" #. type: Plain text #: en/git-notes.txt:332 -#, placeholders:'--ref=built':'a.out':'HEAD', priority:280 +#, placeholders:'--ref=built':'a.out':'HEAD`', priority:280 msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them." msgstr "" @@ -39726,7 +39726,7 @@ msgstr "" #. type: Plain text #: en/git-p4.txt:182 -#, placeholders:'HEAD', priority:90 +#, priority:90 msgid "The git commit is created relative to the current origin revision (HEAD by default). A parent commit is created based on the origin, and then the unshelve commit is created based on that." msgstr "" @@ -40023,7 +40023,7 @@ msgstr "--origin " #. type: Plain text #: en/git-p4.txt:316 -#, placeholders:'HEAD', priority:90 +#, placeholders:'`HEAD`', priority:90 msgid "Upstream location from which commits are identified to submit to p4. By default, this is the most recent p4 commit reachable from `HEAD`." msgstr "" @@ -41611,7 +41611,7 @@ msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] ..." #. type: Plain text #: en/git-pack-redundant.txt:21 -#, placeholders:'git pack-redundant', priority:80 +#, placeholders:'git pack-redundant`', priority:80 msgid "`git pack-redundant` has been deprecated and is scheduled for removal in a future version of Git. Because it can only remove entire duplicate packs and not individual duplicate objects, it is generally not a useful tool for reducing repository size. You are better off using `git gc` to do so, which will put objects into a new pack, removing duplicates." msgstr "" @@ -41689,25 +41689,25 @@ msgstr "" #. type: Plain text #: en/git-pack-refs.txt:24 -#, placeholders:'$GIT_DIR', priority:80 +#, placeholders:'`$GIT_DIR/refs`', priority:80 msgid "Traditionally, tips of branches and tags (collectively known as 'refs') were stored one file per ref in a (sub)directory under `$GIT_DIR/refs` directory. While many branch tips tend to be updated often, most tags and some branch tips are never updated. When a repository has hundreds or thousands of tags, this one-file-per-ref format both wastes storage and hurts performance." msgstr "" #. type: Plain text #: en/git-pack-refs.txt:31 -#, placeholders:'$GIT_DIR':'$GIT_DIR', priority:80 +#, placeholders:'`$GIT_DIR/packed-refs`':'`$GIT_DIR/refs`', priority:80 msgid "This command is used to solve the storage and performance problem by storing the refs in a single file, `$GIT_DIR/packed-refs`. When a ref is missing from the traditional `$GIT_DIR/refs` directory hierarchy, it is looked up in this file and used if found." msgstr "" #. type: Plain text #: en/git-pack-refs.txt:34 -#, placeholders:'$GIT_DIR', priority:80 +#, placeholders:'`$GIT_DIR/refs`', priority:80 msgid "Subsequent updates to branches always create new files under `$GIT_DIR/refs` directory hierarchy." msgstr "" #. type: Plain text #: en/git-pack-refs.txt:43 -#, placeholders:'`--all`':'git pack-refs':'--all`':'`--all`', priority:80 +#, placeholders:'`--all`':'git pack-refs`':'--all`':'`--all`', priority:80 msgid "A recommended practice to deal with a repository with too many refs is to pack its refs with `--all` once, and occasionally run `git pack-refs`. Tags are by definition stationary and are not expected to change. Branch heads will be packed with the initial `pack-refs --all`, but only the currently active branch heads will become unpacked, and the next `pack-refs` (without `--all`) will leave them unpacked." msgstr "" @@ -41719,7 +41719,7 @@ msgstr "" #. type: Plain text #: en/git-pack-refs.txt:62 -#, placeholders:'$GIT_DIR', priority:80 +#, placeholders:'`$GIT_DIR/refs`', priority:80 msgid "The command usually removes loose refs under `$GIT_DIR/refs` hierarchy after packing them. This option tells it not to." msgstr "" @@ -41913,7 +41913,7 @@ msgstr "" #. type: Plain text #: en/git-prune-packed.txt:19 -#, placeholders:'$GIT_OBJECT_DIRECTORY', priority:100 +#, placeholders:'`$GIT_OBJECT_DIRECTORY`', priority:100 msgid "This program searches the `$GIT_OBJECT_DIRECTORY` for all objects that currently exist in a pack file as well as in the independent object directories." msgstr "" @@ -42269,13 +42269,13 @@ msgstr "" #. type: Plain text #: en/git-pull.txt:160 -#, placeholders:'$GIT_DIR', priority:220 +#, placeholders:'`$GIT_DIR/remotes/', priority:220 msgid "In order to determine what URL to use to fetch from, the value of the configuration `remote..url` is consulted and if there is not any such variable, the value on the `URL:` line in `$GIT_DIR/remotes/` is used." msgstr "" #. type: Plain text #: en/git-pull.txt:169 -#, placeholders:'$GIT_DIR', priority:220 +#, placeholders:'`$GIT_DIR/remotes/', priority:220 msgid "In order to determine what remote branches to fetch (and optionally store in the remote-tracking branches) when the command is run without any refspec parameters on the command line, values of the configuration variable `remote..fetch` are consulted, and if there aren't any, `$GIT_DIR/remotes/` is consulted and its `Pull:` lines are used. In addition to the refspec formats described in the OPTIONS section, you can have a globbing refspec that looks like this:" msgstr "" @@ -42305,7 +42305,7 @@ msgstr "" #. type: Plain text #: en/git-pull.txt:191 -#, placeholders:'$GIT_DIR', priority:220 +#, placeholders:'`$GIT_DIR/remotes/', priority:220 msgid "When no refspec was given on the command line, then `git pull` uses the refspec from the configuration or `$GIT_DIR/remotes/`. In such cases, the following rules apply:" msgstr "" @@ -42343,7 +42343,7 @@ msgstr "$ git log -p\n" #. type: Plain text #: en/git-pull.txt:216 -#, placeholders:'HEAD':'linkgit:git-config[1]', priority:220 +#, placeholders:'linkgit:git-config[1]', priority:220 msgid "Normally the branch merged in is the HEAD of the remote repository, but the choice is determined by the branch..remote and branch..merge options; see linkgit:git-config[1] for details." msgstr "" @@ -42471,7 +42471,7 @@ msgstr "" #. type: Plain text #: en/git-push.txt:65 -#, placeholders:'HEAD':'linkgit:gitrevisions[7]', priority:220 +#, placeholders:'`HEAD`':'linkgit:gitrevisions[7]', priority:220 msgid "The is often the name of the branch you would want to push, but it can be any arbitrary \"SHA-1 expression\", such as `master~4` or `HEAD` (see linkgit:gitrevisions[7])." msgstr "" @@ -43200,7 +43200,7 @@ msgstr "" #. type: Plain text #: en/git-push.txt:620 -#, placeholders:'remote.origin.push':'HEAD', priority:220 +#, placeholders:'remote.origin.push':'HEAD`', priority:220 msgid "For example, to default to pushing only the current branch to `origin` use `git config remote.origin.push HEAD`. Any valid (like the ones in the examples below) can be configured as the default for `git push origin`." msgstr "" @@ -43230,7 +43230,7 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:633 -#, fuzzy, no-wrap, placeholders:'HEAD', priority:220 +#, fuzzy, no-wrap, placeholders:'HEAD`', priority:220 msgid "`git push origin HEAD`" msgstr "`git push origin master`" @@ -43272,7 +43272,7 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:658 -#, fuzzy, no-wrap, placeholders:'HEAD', priority:220 +#, fuzzy, no-wrap, priority:220 msgid "`git push origin HEAD:master`" msgstr "`git push origin master`" @@ -43418,7 +43418,7 @@ msgstr "" #. type: Plain text #: en/git-quiltimport.txt:51 -#, placeholders:'$QUILT_PATCHES', priority:90 +#, placeholders:'`$QUILT_PATCHES`', priority:90 msgid "The default for the patch directory is 'patches' or the value of the `$QUILT_PATCHES` environment variable." msgstr "" @@ -43436,7 +43436,7 @@ msgstr "" #. type: Plain text #: en/git-quiltimport.txt:58 -#, placeholders:'$QUILT_SERIES', priority:90 +#, placeholders:'`$QUILT_SERIES`', priority:90 msgid "The default for the series file is /series or the value of the `$QUILT_SERIES` environment variable." msgstr "" @@ -43519,7 +43519,7 @@ msgstr "--no-dual-color" #. type: Plain text #: en/git-range-diff.txt:55 -#, placeholders:'git range-diff', priority:100 +#, placeholders:'git range-diff`', priority:100 msgid "When the commit diffs differ, `git range-diff` recreates the original diffs' coloring, and adds outer -/+ diff markers with the *background* being red/green to make it easier to see e.g. when there was a change in what exact lines were added." msgstr "" @@ -43537,7 +43537,7 @@ msgstr "" #. type: Plain text #: en/git-range-diff.txt:75 -#, placeholders:'git range-diff', priority:100 +#, placeholders:'git range-diff`', priority:100 msgid "Set the creation/deletion cost fudge factor to ``. Defaults to 60. Try a larger value if `git range-diff` erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case. See the ``Algorithm`` section below for an explanation of why this is needed." msgstr "" @@ -43615,7 +43615,7 @@ msgstr "" #. type: Plain text #: en/git-range-diff.txt:108 -#, placeholders:'git range-diff':'linkgit:git-diff[1]':'`--color=[':'`--no-color`', priority:100 +#, placeholders:'git range-diff`':'linkgit:git-diff[1]':'`--color=[':'`--no-color`', priority:100 msgid "`git range-diff` also accepts the regular diff options (see linkgit:git-diff[1]), most notably the `--color=[]` and `--no-color` options. These options are used when generating the \"diff between patches\", i.e. to compare the author, commit message and diff of corresponding old/new commits. There is currently no means to tweak most of the diff options passed to `git log` when generating those patches." msgstr "" @@ -43657,7 +43657,7 @@ msgstr "" #. type: Plain text #: en/git-range-diff.txt:146 -#, placeholders:'git range-diff', priority:100 +#, placeholders:'git range-diff`', priority:100 msgid "A typical output of `git range-diff` would look like this:" msgstr "" @@ -43997,7 +43997,7 @@ msgstr "--index-output=" #. type: Plain text #: en/git-read-tree.txt:102 -#, placeholders:'$GIT_INDEX_FILE', priority:80 +#, placeholders:'`$GIT_INDEX_FILE`', priority:80 msgid "Instead of writing the results out to `$GIT_INDEX_FILE`, write the resulting index in the named file. While the command is operating, the original index file is locked with the same mechanism as usual. The file must allow to be rename(2)ed into from a temporary file that is created next to the usual index file; typically this means it needs to be on the same filesystem as the index file itself, and you need write permission to the directories the index file and index output file are located in." msgstr "" @@ -44009,7 +44009,7 @@ msgstr "--[no-]recurse-submodules" #. type: Plain text #: en/git-read-tree.txt:108 -#, placeholders:'--recurse-submodules':'HEAD', priority:80 +#, placeholders:'--recurse-submodules', priority:80 msgid "Using --recurse-submodules will update the content of all active submodules according to the commit recorded in the superproject by calling read-tree recursively, also setting the submodules' HEAD to be detached at that commit." msgstr "" @@ -44348,7 +44348,7 @@ msgstr "" #. type: delimited block - #: en/git-read-tree.txt:333 -#, no-wrap, placeholders:'git rev-parse':'--verify':'HEAD':'git checkout-index':'$JC', priority:80 +#, no-wrap, placeholders:'git rev-parse':'--verify':'git checkout-index':'$JC', priority:80 msgid "" "$ JC=`git rev-parse --verify \"HEAD^0\"`\n" "$ git checkout-index -f -u -a $JC\n" @@ -44370,13 +44370,13 @@ msgstr "" #. type: Plain text #: en/git-read-tree.txt:348 -#, placeholders:'HEAD':'$JC':'$JC', priority:80 +#, placeholders:'$JC':'$JC', priority:80 msgid "Your work tree is still based on your HEAD ($JC), but you have some edits since. Three-way merge makes sure that you have not added or modified index entries since $JC, and if you haven't, then does the right thing. So with the following sequence:" msgstr "" #. type: delimited block - #: en/git-read-tree.txt:354 -#, no-wrap, placeholders:'git read-tree':'git merge-base':'$JC':'$LT':'$JC':'$LT':'git merge-index':'git-merge-one-file':'git commit-tree':'git write-tree':'$JC':'$LT', priority:80 +#, no-wrap, placeholders:'git read-tree':'git merge-base':'$JC':'$LT`':'$JC':'$LT':'git merge-index':'git-merge-one-file':'git commit-tree':'git write-tree`':'$JC':'$LT', priority:80 msgid "" "$ git read-tree -m -u `git merge-base $JC $LT` $JC $LT\n" "$ git merge-index git-merge-one-file -a\n" @@ -44422,7 +44422,7 @@ msgstr "" #. type: Plain text #: en/git-read-tree.txt:399 -#, ignore-ellipsis, placeholders:'git read-tree':'$GIT_DIR':'git read-tree':'.gitignore', priority:80 +#, ignore-ellipsis, placeholders:'git read-tree':'`$GIT_DIR/info/sparse-checkout`':'git read-tree':'.gitignore', priority:80 msgid "'git read-tree' and other merge-based commands ('git merge', 'git checkout'...) can help maintaining the skip-worktree bitmap and working directory update. `$GIT_DIR/info/sparse-checkout` is used to define the skip-worktree reference bitmap. When 'git read-tree' needs to update the working directory, it resets the skip-worktree bit in the index based on this file, which uses the same syntax as .gitignore files. If an entry matches a pattern in this file, or the entry corresponds to a file present in the working tree, then skip-worktree will not be set on that entry. Otherwise, skip-worktree will be set." msgstr "" @@ -44434,7 +44434,7 @@ msgstr "" #. type: Plain text #: en/git-read-tree.txt:407 -#, placeholders:'$GIT_DIR', priority:80 +#, placeholders:'`$GIT_DIR/info/sparse-checkout`', priority:80 msgid "While `$GIT_DIR/info/sparse-checkout` is usually used to specify what files are in, you can also specify what files are _not_ in, using negate patterns. For example, to remove the file `unwanted`:" msgstr "" @@ -44448,7 +44448,7 @@ msgstr "" #. type: Plain text #: en/git-read-tree.txt:419 -#, placeholders:'$GIT_DIR', priority:80 +#, placeholders:'`$GIT_DIR/info/sparse-checkout`', priority:80 msgid "Another tricky thing is fully repopulating the working directory when you no longer want sparse checkout. You cannot just disable \"sparse checkout\" because skip-worktree bits are still in the index and your working directory is still sparsely populated. You should re-populate the working directory with the `$GIT_DIR/info/sparse-checkout` file content as follows:" msgstr "" @@ -44507,7 +44507,7 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:35 -#, placeholders:'HEAD':'fork_point':'HEAD':'`--fork-point`':'`--fork-point`':'HEAD':'`--root`', priority:100 +#, placeholders:'HEAD`':'fork_point':'HEAD`':'`--fork-point`':'`--fork-point`':'HEAD`':'`--root`', priority:100 msgid "All changes made by commits in the current branch but that are not in `` are saved to a temporary area. This is the same set of commits that would be shown by `git log ..HEAD`; or by `git log 'fork_point'..HEAD`, if `--fork-point` is active (see the description on `--fork-point` below); or by `git log HEAD`, if the `--root` option is specified." msgstr "" @@ -44519,13 +44519,13 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:47 -#, placeholders:'ORIG_HEAD':'{1}':'linkgit:gitrevisions[7]', priority:100 +#, placeholders:'ORIG_HEAD':'{1}`':'linkgit:gitrevisions[7]', priority:100 msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])." msgstr "" #. type: Plain text #: en/git-rebase.txt:53 -#, placeholders:'HEAD':'HEAD', priority:100 +#, placeholders:'`HEAD`', priority:100 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)." msgstr "" @@ -44818,13 +44818,13 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:229 -#, placeholders:'HEAD':'HEAD':'HEAD', priority:100 +#, placeholders:'`HEAD`':'`HEAD`', priority:100 msgid "Abort the rebase operation and reset HEAD to the original branch. If `` was provided when the rebase operation was started, then `HEAD` will be reset to ``. Otherwise `HEAD` will be reset to where it was when the rebase operation was started." msgstr "" #. type: Plain text #: en/git-rebase.txt:235 -#, placeholders:'HEAD':'`--autostash`', priority:100 +#, placeholders:'`HEAD`':'`--autostash`', priority:100 msgid "Abort the rebase operation but `HEAD` is not reset back to the original branch. The index and working tree are also left unchanged as a result. If a temporary stash entry was created using `--autostash`, it will be saved to the stash list." msgstr "" @@ -44866,7 +44866,7 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:255 -#, ignore-ellipsis, placeholders:'HEAD', priority:100 +#, ignore-ellipsis, priority:100 msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD." msgstr "" @@ -44908,13 +44908,13 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:284 -#, placeholders:'HEAD', priority:100 +#, placeholders:'`HEAD`', priority:100 msgid "Working branch; defaults to `HEAD`." msgstr "" #. type: Plain text #: en/git-rebase.txt:289 -#, placeholders:'git-am', priority:100 +#, placeholders:'git-am`', priority:100 msgid "Use applying strategies to rebase (calling `git-am` internally). This option may become a no-op in the future once the merge backend handles everything the apply one does." msgstr "" @@ -45872,13 +45872,13 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:932 -#, placeholders:'HEAD':'HEAD', priority:100 +#, placeholders:'`HEAD`', priority:100 msgid "For example, if you want to reorder the last 5 commits, such that what was `HEAD~4` becomes the new `HEAD`. To achieve that, you would call `git rebase` like this:" msgstr "" #. type: delimited block - #: en/git-rebase.txt:935 -#, fuzzy, no-wrap, placeholders:'HEAD', priority:100 +#, fuzzy, no-wrap, priority:100 msgid "$ git rebase -i HEAD~5\n" msgstr "$ git log -g -2 HEAD\n" @@ -45907,7 +45907,7 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:952 -#, placeholders:'HEAD', priority:100 +#, placeholders:'`HEAD`', priority:100 msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current `HEAD` is \"B\", and call" msgstr "" @@ -46000,7 +46000,7 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:1016 -#, placeholders:'HEAD':'HEAD', priority:100 +#, placeholders:'`HEAD`', priority:100 msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the `HEAD` is rewound by one, and the index follows suit. However, the working tree stays the same." msgstr "" @@ -46204,7 +46204,7 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:1142 -#, placeholders:'{1}':'linkgit:git-reflog[1]', priority:100 +#, placeholders:'{1}`':'linkgit:git-reflog[1]', priority:100 msgid "With the 'subsystem' reflog: after `git fetch`, the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)" msgstr "" @@ -46326,19 +46326,19 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:1224 -#, placeholders:'HEAD', priority:100 +#, priority:100 msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/