diff --git a/po/documentation.fr.po b/po/documentation.fr.po index 7654c4e5..5249c3d7 100644 --- a/po/documentation.fr.po +++ b/po/documentation.fr.po @@ -1,6 +1,6 @@ # msgid "" -msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2024-02-10 18:59+0100\nPO-Revision-Date: 2024-02-24 13:40+0000\nLast-Translator: Jean-Noël Avila \nLanguage-Team: LANGUAGE \nLanguage: fr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 5.5-dev\n" +msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2024-02-10 18:59+0100\nPO-Revision-Date: 2024-03-05 03:38+0000\nLast-Translator: Jean-Noël Avila \nLanguage-Team: LANGUAGE \nLanguage: fr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 5.5-dev\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:780 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:180 en/git-status.txt:31 @@ -45287,19 +45287,19 @@ msgstr "Si votre branche était basée sur __ mais qu'__ a été r #: en/git-rebase.txt:477 #, priority:100 msgid "Ignore whitespace differences when trying to reconcile differences. Currently, each backend implements an approximation of this behavior:" -msgstr "" +msgstr "Ignorer les différences d'espace blanc en essayant de concilier les différences. Actuellement, chaque backend met en œuvre une approximation de ce comportement :" #. type: Labeled list #: en/git-rebase.txt:478 #, no-wrap, priority:100 msgid "apply backend" -msgstr "" +msgstr "appliquer le backend" #. type: Plain text #: en/git-rebase.txt:484 #, priority:100 msgid "When applying a patch, ignore changes in whitespace in context lines. Unfortunately, this means that if the \"old\" lines being replaced by the patch differ only in whitespace from the existing file, you will get a merge conflict instead of a successful patch application." -msgstr "" +msgstr "Lors de l'application d'une rustine, ignorer les modifications d'espace blanc dans les lignes de contexte. Malheureusement, cela signifie que si les lignes « anciennes » remplacées par la rustine ne diffèrent que par des espace blanc du fichier existant, vous obtiendrez un conflit de fusion au lieu d'une application correcte réussie." #. type: Labeled list #: en/git-rebase.txt:485 @@ -45311,7 +45311,7 @@ msgstr "backend de fusion" #: en/git-rebase.txt:490 #, priority:100 msgid "Treat lines with only whitespace changes as unchanged when merging. Unfortunately, this means that any patch hunks that were intended to modify whitespace and nothing else will be dropped, even if the other side had no changes that conflicted." -msgstr "" +msgstr "Traiter les lignes avec seulement des modifications d'espace blanc comme inchangées lors de la fusion. Malheureusement, cela signifie que toutes les sections de rustine qui étaient destinés à modifier les espaces blancs et rien d'autre seront abandonnés, même si l'autre côté n'avait aucune modification susceptible de générer un conflit." #. type: Labeled list #: en/git-rebase.txt:491 @@ -45347,25 +45347,25 @@ msgstr "Au lieu d'utiliser la date d'auteur du commit d'origine, utiliser la dat #: en/git-rebase.txt:515 #, priority:100, placeholders:'--interactive' msgid "Add a `Signed-off-by` trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added." -msgstr "" +msgstr "Ajouter une ligne terminale `Signed-off-by` à tous les commits rebasés. Notez que si `--interactive` est donné alors seulement les commits marqués pour être sélectionnés, modifiés ou reformulés auront la ligne terminale ajoutée." #. type: Plain text #: en/git-rebase.txt:523 #, priority:100 msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)." -msgstr "" +msgstr "Faire une liste des commits qui sont sur le point d'être rebasés. Laisser l'utilisateur modifier cette liste avant de rebaser. Ce mode peut également être utilisé pour scinder les commits (voir SCINDER LES COMMITS ci-dessous)." #. type: Plain text #: en/git-rebase.txt:527 #, priority:100, placeholders:'rebase.instructionFormat' msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the commit hash prepended to the format." -msgstr "" +msgstr "Le format de la liste de commits peut être modifié en définissant l'option de configuration rebase.instructionFormat. Un format d'instruction personnalisé aura automatiquement le hash de commit préfixé au format." #. type: Labeled list #: en/git-rebase.txt:531 #, no-wrap, priority:100, placeholders:'--rebase-merges[=(rebase-cousins|no-rebase-cousins)]' msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]" -msgstr "" +msgstr "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]" #. type: Labeled list #: en/git-rebase.txt:532 @@ -45377,7 +45377,7 @@ msgstr "--no-rebase-merges" #: en/git-rebase.txt:542 #, priority:100, placeholders:'--rebase-merges':'--no-rebase-merges':'rebase.rebaseMerges':'--rebase-merges' msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually. `--no-rebase-merges` can be used to countermand both the `rebase.rebaseMerges` config option and a previous `--rebase-merges`." -msgstr "" +msgstr "Par défaut, un rebasage va simplement abandonner les commits de fusion de la liste de todo, et mettre les commits rebasés en une seule branche linéaire. Avec `--rebase-merges`, le rebasage tentera plutôt de préserver la structure de ramification dans les commits qui doivent être rebasés, en recréant les commits de fusion. Tout conflit de fusion résolu ou toute modification manuelle dans ces commits de fusion devra être résolu/reappliqué manuellement. `--no-rebase-merges` peut être utilisé pour contrecarrer à la fois l'option de config `rebase.rebaseMerges` et un `--rebase-merges` précédent." #. type: Plain text #: en/git-rebase.txt:551 @@ -45413,43 +45413,43 @@ msgstr "" #: en/git-rebase.txt:564 #, priority:100 msgid "Append \"exec \" after each line creating a commit in the final history. `` will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1." -msgstr "" +msgstr "Ajouter \"exec \" après chaque ligne créant un commit dans l'historique final. __ sera interprété comme une ou plusieurs commandes de shell. Toute commande qui échoue interrompra le rebasage, avec le code de sortie 1." #. type: Plain text #: en/git-rebase.txt:567 #, priority:100, placeholders:'--exec' msgid "You may execute several commands by either using one instance of `--exec` with several commands:" -msgstr "" +msgstr "Vous pouvez exécuter plusieurs commandes en utilisant une instance de `--exec` avec plusieurs commandes :" #. type: Plain text #: en/git-rebase.txt:569 #, ignore-ellipsis, no-wrap, priority:100, placeholders:'--exec' msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n" -msgstr "" +msgstr "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n" #. type: Plain text #: en/git-rebase.txt:571 #, priority:100, placeholders:'--exec' msgid "or by giving more than one `--exec`:" -msgstr "" +msgstr "ou en donnant plus d'un `--exec` :" #. type: Plain text #: en/git-rebase.txt:573 #, ignore-ellipsis, no-wrap, priority:100, placeholders:'--exec':'--exec':'--exec' msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n" -msgstr "" +msgstr "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n" #. type: Plain text #: en/git-rebase.txt:577 #, priority:100, placeholders:'--autosquash' msgid "If `--autosquash` is used, `exec` lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series." -msgstr "" +msgstr "Si `--autosquash` est utilisé, les lignes `exec` ne seront pas ajoutées pour les commits intermédiaires, et n'apparaîtront qu'à la fin de chaque série squash/fixup." #. type: Plain text #: en/git-rebase.txt:580 #, priority:100, placeholders:'--interactive':'--interactive' msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`." -msgstr "" +msgstr "Cela utilise la machinerie `--interactive` interne, mais elle peut être exécutée sans un `--interactive` explicite." #. type: Plain text #: en/git-rebase.txt:587 @@ -45491,7 +45491,7 @@ msgstr "" #: en/git-rebase.txt:613 #, priority:100, placeholders:'rebase.autoSquash':'--no-autosquash' msgid "Settting configuration variable `rebase.autoSquash` to true enables auto-squashing by default for interactive rebase. The `--no-autosquash` option can be used to override that setting." -msgstr "" +msgstr "Définir la variable de configuration `rebase.autoSquash` à true permet l'application d'autosquash par défaut pour le rebasage interactif. L'option `--no-autosquash` peut être utilisée pour remplacer ce réglage." #. type: Labeled list #: en/git-rebase.txt:616 en/merge-options.txt:191 @@ -45527,13 +45527,13 @@ msgstr "--no-reschedule-failed-exec" #: en/git-rebase.txt:628 #, priority:100, placeholders:'--exec' msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)." -msgstr "" +msgstr "Reprogrammer automatiquement les commandes `exec` qui ont échoué. Cela n'a de sens qu'en mode interactif (ou lorsqu'une option `--exec ' a été fournie)." #. type: Plain text #: en/git-rebase.txt:633 #, priority:100, placeholders:'rebase.rescheduleFailedExec':'linkgit:git-config[1]' msgid "This option applies once a rebase is started. It is preserved for the whole rebase based on, in order, the command line option provided to the initial `git rebase`, the `rebase.rescheduleFailedExec` configuration (see linkgit:git-config[1] or \"CONFIGURATION\" below), or it defaults to false." -msgstr "" +msgstr "Cette option s'applique une fois qu'un rebasage est lancé. Il est conservé pour l'ensemble du rebasage en fonction, dans l'ordre, de l'option de ligne de commande fournie au `git rebase` initial, la configuration `rebase.rescheduleFailedExec` (voir linkgit:git-config[1] ou \"CONFIGURATION\" ci-dessous), ou par défaut false (faux)." #. type: Plain text #: en/git-rebase.txt:639 @@ -45629,25 +45629,25 @@ msgstr "--[no-]reapply-cherry-picks lorsqu'utilisé sans --keep-base" #: en/git-rebase.txt:674 #, priority:100, placeholders:'--root':'--onto' msgid "--root when used without --onto" -msgstr "" +msgstr "--root lorsqu'il est utilisé sans --onto" #. type: Plain text #: en/git-rebase.txt:676 #, priority:100 msgid "In addition, the following pairs of options are incompatible:" -msgstr "" +msgstr "En outre, les paires d'options suivantes sont incompatibles :" #. type: Plain text #: en/git-rebase.txt:678 #, priority:100, placeholders:'--keep-base':'--onto' msgid "--keep-base and --onto" -msgstr "" +msgstr "--keep-base et --onto" #. type: Plain text #: en/git-rebase.txt:679 #, priority:100, placeholders:'--keep-base':'--root' msgid "--keep-base and --root" -msgstr "" +msgstr "--keep-base et --root" #. type: Plain text #: en/git-rebase.txt:680 @@ -45659,7 +45659,7 @@ msgstr "--fork-point et --root" #: en/git-rebase.txt:682 #, no-wrap, priority:100 msgid "BEHAVIORAL DIFFERENCES" -msgstr "" +msgstr "DIFFÉRENCES DE COMPORTEMENT" #. type: Plain text #: en/git-rebase.txt:691 diff --git a/po/documentation.ja.po b/po/documentation.ja.po index ff4fc8ef..665aba22 100644 --- a/po/documentation.ja.po +++ b/po/documentation.ja.po @@ -3,19 +3,7 @@ # FIRST AUTHOR , YEAR. # msgid "" -msgstr "" -"Project-Id-Version: git-manpages-l 10n\n" -"Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2024-02-10 18:59+0100\n" -"PO-Revision-Date: 2024-02-15 18:02+0000\n" -"Last-Translator: yajamon \n" -"Language-Team: Japanese\n" -"Language: ja\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 5.4-dev\n" +msgstr "Project-Id-Version: git-manpages-l 10n\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2024-02-10 18:59+0100\nPO-Revision-Date: 2024-03-05 03:38+0000\nLast-Translator: yajamon \nLanguage-Team: Japanese\nLanguage: ja\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 5.5-dev\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:780 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:180 en/git-status.txt:31 @@ -4962,13 +4950,13 @@ msgstr "マージコミットに対して再マージ差分出力を生成しま msgid "--no-diff-merges" msgstr "--no-diff-merges" -#. type: Plain text # ERROR: --diff-merges=off not found in translation # ERROR: --diff-merges=off not found in translation +#. type: Plain text #: en/diff-options.txt:64 -#, priority:280, fuzzy, placeholders:'--diff-merges=off' +#, placeholders:'--diff-merges=off', priority:280 msgid "Synonym for '--diff-merges=off'." -msgstr "'-diff-merges=off' の同義語。" +msgstr "'--diff-merges=off' の同義語。" #. type: Labeled list #: en/diff-options.txt:65 @@ -16317,12 +16305,12 @@ msgstr "--separate-git-dir=" msgid "Instead of placing the cloned repository where it is supposed to be, place the cloned repository at the specified directory, then make a filesystem-agnostic Git symbolic link to there. The result is Git repository can be separated from working tree." msgstr "クローンリポジトリを本来あるべき場所に置くのではなく、クローンリポジトリを指定したディレクトリに置き、そこにファイルシステムに依存しないGitシンボリックリンクを作成します。その結果、Gitリポジトリを作業ツリーから切り離すことができるようになります。" -#. type: Labeled list # ERROR: --ref-format= not found in translation +#. type: Labeled list #: en/git-clone.txt:314 -#, priority:300, no-wrap, fuzzy, placeholders:'--ref-format=' +#, no-wrap, placeholders:'--ref-format=', priority:300 msgid "--ref-format=" +msgstr "--ref-format=<フォーマット>" #. type: Plain text #: en/git-clone.txt:317 en/git-init.txt:64 @@ -38619,10 +38607,9 @@ msgstr "" #. type: Plain text #: en/git-p4.txt:207 -#, fuzzy, priority:90, placeholders:'GIT_DIR':'linkgit:git[1]' -#| msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;" +#, placeholders:'GIT_DIR':'linkgit:git[1]', priority:90 msgid "Set the `GIT_DIR` environment variable. See linkgit:git[1]." -msgstr "`$GIT_TEMPLATE_DIR` 環境変数の内容。" +msgstr "`GIT_DIR` 環境変数を設定します。 linkgit:git[1] を参照。" #. type: Plain text #: en/git-p4.txt:211 @@ -44302,10 +44289,9 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:672 -#, fuzzy, priority:100, placeholders:'--[no-]reapply-cherry-picks':'--keep-base' -#| msgid "--no-reapply-cherry-picks" +#, placeholders:'--[no-]reapply-cherry-picks':'--keep-base', priority:100 msgid "--[no-]reapply-cherry-picks when used without --keep-base" -msgstr "--no-reapply-cherry-picks" +msgstr "--[no-]reapply-cherry-picks `--keep-base` を除いて使った場合" #. type: Plain text #: en/git-rebase.txt:674 @@ -62504,14 +62490,14 @@ msgstr "非定型の <> 例：ファイルの内 msgid "[[def_branch]]branch" msgstr "[[def_branch]]ブランチ (branch)" -#. type: Plain text # ERROR: <> on a branch is referred to as the tip of that branch. The tip of the branch is <> by a branch <>, which moves forward as additional development is done on the branch. A single Git <> can track an arbitrary number of branches, but your <> is associated with just one of them (the \"current\" or \"checked out\" branch), and <> points to that branch." -msgstr "「ブランチ」とは、開発ラインのことです。あるブランチにおける最新の <> をブランチの先端と呼びます。ブランチの先端はブランチ・ <> によって参照され、ブランチ上で開発が進むにつれて前に移動します。Git <> は任意の数のブランチを監視することができますが、 <> が関連付けられているのはそのうちの一つ（現在のブランチ、またはチェックアウトされているブランチ）のみであり、 <> はそのブランチを指します。" +msgstr "「ブランチ」とは、開発ラインのことです。あるブランチにおける最新の <> をブランチの先端と呼びます。ブランチの先端はブランチ・ <> によって<>され、ブランチ上で開発が進むにつれて前に移動します。Git <> は任意の数のブランチを監視することができますが、 <> が関連付けられているのはそのうちの一つ（現在のブランチ、またはチェックアウトされているブランチ）のみであり、 <> はそのブランチを指します。" #. type: Labeled list #: en/glossary-content.txt:31 @@ -62615,8 +62601,8 @@ msgstr "[[def_commit_graph_general]]コミットグラフの概念、表現及 msgid "A synonym for the <> structure formed by the commits in the object database, <> by branch tips, using their <> of linked commits. This structure is the definitive commit graph. The graph can be represented in other ways, e.g. the <>." msgstr "<> 構造の同義語でオブジェクトデータベース内のコミット、ブランチの先端による <> 、リンクされたコミットの <> によって形成されます。この構造は、決定的なコミットグラフです。 グラフは他の方法で表現できます。例えば、<> です。" -#. type: Labeled list # ERROR: def_commit_graph_file not found in translation +#. type: Labeled list #: en/glossary-content.txt:86 #, no-wrap, priority:310, placeholders:'def_commit_graph_file' msgid "[[def_commit_graph_file]]commit-graph file" @@ -62870,14 +62856,14 @@ msgstr "Git の文脈では、 <> の同 msgid "[[def_head]]head" msgstr "[[def_head]]ヘッド (head)" -#. type: Plain text # ERROR: <> to the <> at the tip of a <>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)" -msgstr "<> の先端にある <> のことです。ヘッダは、パックされた参照を使うとき以外は、 `$GIT_DIR/refs/heads/` ディレクトリにあるファイルに格納されます。(linkgit:git-pack-refs[1] を参照してください。)" +msgstr "<>する <> の先端にある <> のことです。ヘッダは、パックされた参照を使うとき以外は、 `$GIT_DIR/refs/heads/` ディレクトリにあるファイルに格納されます。(linkgit:git-pack-refs[1] を参照してください。)" #. type: Labeled list #: en/glossary-content.txt:228 diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po index 37349fb1..280c0b2d 100644 --- a/po/documentation.zh_HANS-CN.po +++ b/po/documentation.zh_HANS-CN.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the Git package. # Matthias Aßhauer , 2019. msgid "" -msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2024-02-10 18:59+0100\nPO-Revision-Date: 2024-02-20 22:02+0000\nLast-Translator: 秃头灯笼鱼 \nLanguage-Team: LANGUAGE \nLanguage: zh_HANS-CN\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 5.5-dev\n" +msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2024-02-10 18:59+0100\nPO-Revision-Date: 2024-03-09 16:20+0000\nLast-Translator: 秃头灯笼鱼 \nLanguage-Team: LANGUAGE \nLanguage: zh_HANS-CN\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 5.5-dev\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:780 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:180 en/git-status.txt:31 @@ -13,8 +13,7 @@ msgstr "-b" #. type: Plain text #: en/blame-options.txt:4 -#, fuzzy, priority:100, placeholders:'blame.blankBoundary' -#| msgid "Show blank SHA-1 for boundary commits. This can also be controlled via the `blame.blankBoundary` config option." +#, placeholders:'blame.blankBoundary', priority:100 msgid "Show blank SHA-1 for boundary commits. This can also be controlled via the `blame.blankBoundary` config option." msgstr "为边界提交显示空白的 SHA-1。 这也可以通过 `blame.blankBoundary` 配置选项来控制。" @@ -26,8 +25,7 @@ msgstr "--root" #. type: Plain text #: en/blame-options.txt:8 -#, fuzzy, priority:100, placeholders:'blame.showRoot' -#| msgid "Do not treat root commits as boundaries. This can also be controlled via the `blame.showRoot` config option." +#, placeholders:'blame.showRoot', priority:100 msgid "Do not treat root commits as boundaries. This can also be controlled via the `blame.showRoot` config option." msgstr "不把根提交当作边界。 这也可以通过 `blame.showRoot` 配置选项来控制。" @@ -57,8 +55,7 @@ msgstr "-L :" #. type: Plain text #: en/blame-options.txt:17 -#, fuzzy, priority:100 -#| msgid "Annotate only the line range given by ',', or by the function name regex ''. May be specified multiple times. Overlapping ranges are allowed." +#, priority:100 msgid "Annotate only the line range given by ',', or by the function name regex ''. May be specified multiple times. Overlapping ranges are allowed." msgstr "仅注释由'，'或功能名称正则表达式''给出的行范围。 可以指定多次。 允许重叠范围。" @@ -112,8 +109,7 @@ msgstr "--reverse <修订>..<修订>" #. type: Plain text #: en/blame-options.txt:39 -#, fuzzy, priority:100, placeholders:'--reverse':'--reverse':'HEAD' -#| msgid "Walk history forward instead of backward. Instead of showing the revision in which a line appeared, this shows the last revision in which a line has existed. This requires a range of revision like START..END where the path to blame exists in START. `git blame --reverse START` is taken as `git blame --reverse START..HEAD` for convenience." +#, 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." msgstr "向前调用历史记录，而不向后调用历史记录。 与其显示行所在的修订，不显示行所在的最后一个修订。 这就需要进行一系列修订，例如START..END，其中的归咎路径在START中。 为方便起见，将git blame --reverse START。当作git blame --reverse START..HEAD。" @@ -155,8 +151,7 @@ msgstr "--line-porcelain" #. type: Plain text #: en/blame-options.txt:54 -#, fuzzy, priority:100, placeholders:'--porcelain' -#| msgid "Show the porcelain format, but output commit information for each line, not just the first time a commit is referenced. Implies --porcelain." +#, placeholders:'--porcelain', priority:100 msgid "Show the porcelain format, but output commit information for each line, not just the first time a commit is referenced. Implies --porcelain." msgstr "显示上层命令格式，但输出每一行的提交信息，而不仅仅是第一次引用提交时的信息。 意味着 --porcelain。" @@ -228,8 +223,7 @@ msgstr "-M[<数量>]" #. type: Plain text #: en/blame-options.txt:95 -#, fuzzy, priority:100 -#| msgid "Detect moved or copied lines within a file. When a commit moves or copies a block of lines (e.g. the original file has A and then B, and the commit changes it to B and then A), the traditional 'blame' algorithm notices only half of the movement and typically blames the lines that were moved up (i.e. B) to the parent and assigns blame to the lines that were moved down (i.e. A) to the child commit. With this option, both groups of lines are blamed on the parent by running extra passes of inspection." +#, priority:100 msgid "Detect moved or copied lines within a file. When a commit moves or copies a block of lines (e.g. the original file has A and then B, and the commit changes it to B and then A), the traditional 'blame' algorithm notices only half of the movement and typically blames the lines that were moved up (i.e. B) to the parent and assigns blame to the lines that were moved down (i.e. A) to the child commit. With this option, both groups of lines are blamed on the parent by running extra passes of inspection." msgstr "检测文件中移动或复制的行。当一次提交移动或复制一个行块时（例如，原始文件有 A，然后是 B，而提交将其改为 B，然后是 A），传统的 'blame' 算法只注意到一半的移动，通常将向上移动的行（即 B ）归咎于父代，而将向下移动的行（即 A ）归咎于子代提交。 有了这个选项，通过运行额外的检查，两组行都会被归咎于父代。" @@ -247,8 +241,7 @@ msgstr "-C[<数量>]" #. type: Plain text #: en/blame-options.txt:110 -#, fuzzy, priority:100 -#| msgid "In addition to `-M`, detect lines moved or copied from other files that were modified in the same commit. This is useful when you reorganize your program and move code around across files. When this option is given twice, the command additionally looks for copies from other files in the commit that creates the file. When this option is given three times, the command additionally looks for copies from other files in any commit." +#, priority:100 msgid "In addition to `-M`, detect lines moved or copied from other files that were modified in the same commit. This is useful when you reorganize your program and move code around across files. When this option is given twice, the command additionally looks for copies from other files in the commit that creates the file. When this option is given three times, the command additionally looks for copies from other files in any commit." msgstr "除了`-M`之外，还可以检测在同一提交中被修改的其他文件中移动或复制的行。 这在你重新组织程序并在不同文件间移动代码时很有用。 当这个选项被赋予两次时，命令会在创建文件的提交中额外寻找其他文件的拷贝。当这个选项出现三次时，命令会在任何一次提交中额外寻找其他文件的副本。" @@ -266,8 +259,7 @@ msgstr "--ignore-rev <修订>" #. type: Plain text #: en/blame-options.txt:129 -#, fuzzy, priority:100, placeholders:'blame.markIgnoredLines':'blame.markUnblamableLines' -#| msgid "Ignore changes made by the revision when assigning blame, as if the change never happened. Lines that were changed or added by an ignored commit will be blamed on the previous commit that changed that line or nearby lines. This option may be specified multiple times to ignore more than one revision. If the `blame.markIgnoredLines` config option is set, then lines that were changed by an ignored commit and attributed to another commit will be marked with a `?` in the blame output. If the `blame.markUnblamableLines` config option is set, then those lines touched by an ignored commit that we could not attribute to another revision are marked with a '*'." +#, placeholders:'blame.markIgnoredLines':'blame.markUnblamableLines', priority:100 msgid "Ignore changes made by the revision when assigning blame, as if the change never happened. Lines that were changed or added by an ignored commit will be blamed on the previous commit that changed that line or nearby lines. This option may be specified multiple times to ignore more than one revision. If the `blame.markIgnoredLines` config option is set, then lines that were changed by an ignored commit and attributed to another commit will be marked with a `?` in the blame output. If the `blame.markUnblamableLines` config option is set, then those lines touched by an ignored commit that we could not attribute to another revision are marked with a '*'." msgstr "在分配责任时忽略修订版所做的修改，就像该修改从未发生过一样。 被忽略的提交所改变或增加的行将被归咎于改变该行或附近行的前一个提交。 这个选项可以多次指定，以忽略一个以上的修订。 如果设置了 `blame.markIgnoredLines` 配置选项，那么被忽略的提交所改变的行将被归咎于另一个提交，在归咎输出中会标上`?` 如果设置了 `blame.markUnblamableLines` 配置选项，那么那些被忽略的提交所触及的、我们无法归因于另一个修订版的行将被标记为 '*'。" @@ -279,8 +271,7 @@ msgstr "--ignore-revs-file <文件>" #. type: Plain text #: en/blame-options.txt:136 -#, fuzzy, priority:100, placeholders:'fsck.skipList':'blame.ignoreRevsFile' -#| msgid "Ignore revisions listed in `file`, which must be in the same format as an `fsck.skipList`. This option may be repeated, and these files will be processed after any files specified with the `blame.ignoreRevsFile` config option. An empty file name, `\"\"`, will clear the list of revs from previously processed files." +#, placeholders:'fsck.skipList':'blame.ignoreRevsFile', priority:100 msgid "Ignore revisions listed in `file`, which must be in the same format as an `fsck.skipList`. This option may be repeated, and these files will be processed after any files specified with the `blame.ignoreRevsFile` config option. An empty file name, `\"\"`, will clear the list of revs from previously processed files." msgstr "忽略 `file` 中列出的修订，其格式必须与 `fsck.skipList` 相同。 这个选项可以重复使用，这些文件将在任何用 `blame.ignoreRevsFile` 配置选项指定的文件之后被处理。 一个空的文件名，`\"\"`，将清除以前处理的文件的 Revs 列表。" @@ -304,8 +295,7 @@ msgstr "--color-by-age" #. type: Plain text #: en/blame-options.txt:147 -#, fuzzy, priority:100, placeholders:'color.blame.highlightRecent' -#| msgid "Color line annotations depending on the age of the line in the default format. The `color.blame.highlightRecent` config option controls what color is used for each range of age." +#, placeholders:'color.blame.highlightRecent', priority:100 msgid "Color line annotations depending on the age of the line in the default format. The `color.blame.highlightRecent` config option controls what color is used for each range of age." msgstr "根据默认格式的行的阶段，给行的注释着色。 `color.blame.highlightRecent` 配置选项控制每个阶段范围使用什么颜色。" @@ -2532,8 +2522,7 @@ msgstr "Git 配置文件包含了一些影响 Git 命令行为的变量。每个 #. type: Plain text #: en/config.txt:21 -#, fuzzy, priority:100 -#| msgid "The configuration variables are used by both the Git plumbing and the porcelain commands. The variables are divided into sections, wherein the fully qualified variable name of the variable itself is the last dot-separated segment and the section name is everything before the last dot. The variable names are case-insensitive, allow only alphanumeric characters and `-`, and must start with an alphabetic character. Some variables may appear multiple times; we say then that the variable is multivalued." +#, priority:100 msgid "The configuration variables are used by both the Git plumbing and the porcelain commands. The variables are divided into sections, wherein the fully qualified variable name of the variable itself is the last dot-separated segment and the section name is everything before the last dot. The variable names are case-insensitive, allow only alphanumeric characters and `-`, and must start with an alphabetic character. Some variables may appear multiple times; we say then that the variable is multivalued." msgstr "配置变量同时被 Git 底层和上层命令使用。变量被分为几个部分，其中变量本身的完全合格的变量名是最后一个点分隔的部分，而部分名称是最后一个点之前的所有内容。变量名称不区分大小写，只允许使用字母数字字符和 `-`，并且必须以字母字符开头。 有些变量可能会出现多次；那么我们就说这个变量是多值的。" @@ -2545,22 +2534,19 @@ msgstr "语法" #. type: Plain text #: en/config.txt:28 -#, fuzzy, priority:100 -#| msgid "The syntax is fairly flexible and permissive; whitespaces are mostly ignored. The '#' and ';' characters begin comments to the end of line, blank lines are ignored." +#, priority:100 msgid "The syntax is fairly flexible and permissive; whitespaces are mostly ignored. The '#' and ';' characters begin comments to the end of line, blank lines are ignored." msgstr "语法是相当灵活和宽松的；空白处大多被忽略。 '#' 和 ';' 字符开始注释到行末，空行被忽略。" #. type: Plain text #: en/config.txt:35 -#, fuzzy, priority:100 -#| msgid "The file consists of sections and variables. A section begins with the name of the section in square brackets and continues until the next section begins. Section names are case-insensitive. Only alphanumeric characters, `-` and `.` are allowed in section names. Each variable must belong to some section, which means that there must be a section header before the first setting of a variable." +#, priority:100 msgid "The file consists of sections and variables. A section begins with the name of the section in square brackets and continues until the next section begins. Section names are case-insensitive. Only alphanumeric characters, `-` and `.` are allowed in section names. Each variable must belong to some section, which means that there must be a section header before the first setting of a variable." msgstr "该文件由章节和变量组成。 一个章节以方括号中的章节名称开始，一直到下一个章节开始。 节的名称是不区分大小写的。 在章节名称中只允许使用字母数字字符、`-` 和 `.`。 每个变量都必须属于某个部分，这意味着在第一次设置变量之前必须有一个部分标题。" #. type: Plain text #: en/config.txt:39 -#, fuzzy, priority:100 -#| msgid "Sections can be further divided into subsections. To begin a subsection put its name in double quotes, separated by space from the section name, in the section header, like in the example below:" +#, priority:100 msgid "Sections can be further divided into subsections. To begin a subsection put its name in double quotes, separated by space from the section name, in the section header, like in the example below:" msgstr "节可以进一步划分为子节。 要开始一个分节，请将其名称放在双引号中，与节的名称用空格隔开，放在节的标题中，如下面的例子：" @@ -2572,8 +2558,7 @@ msgstr "\t[section \"小节\"]\n" #. type: Plain text #: en/config.txt:53 -#, fuzzy, priority:100 -#| msgid "Subsection names are case sensitive and can contain any characters except newline and the null byte. Doublequote `\"` and backslash can be included by escaping them as `\\\"` and `\\\\`, respectively. Backslashes preceding other characters are dropped when reading; for example, `\\t` is read as `t` and `\\0` is read as `0`. Section headers cannot span multiple lines. Variables may belong directly to a section or to a given subsection. You can have `[section]` if you have `[section \"subsection\"]`, but you don't need to." +#, priority:100 msgid "Subsection names are case sensitive and can contain any characters except newline and the null byte. Doublequote `\"` and backslash can be included by escaping them as `\\\"` and `\\\\`, respectively. Backslashes preceding other characters are dropped when reading; for example, `\\t` is read as `t` and `\\0` is read as `0`. Section headers cannot span multiple lines. Variables may belong directly to a section or to a given subsection. You can have `[section]` if you have `[section \"subsection\"]`, but you don't need to." msgstr "分节名称是区分大小写的，可以包含任何字符，除了换行和空字节。双引号 `\"` 和反斜杠可以分别通过转义为 `\\\"`和 `\\\\` 来包含。读取时，其他字符前面的反斜杠将被删除；例如，`\\t` 被读作 `t`，`\\0` 被读作 `0`。章节标题不能跨越多行。 变量可以直接属于某一节或某一小节。如果你有 `[section \"subsection\"]`，你可以有 `[section]`，但你不需要这样。" @@ -2585,15 +2570,13 @@ msgstr "还有一种废弃的 `[section.subsection]` 语法。在这种语法中 #. type: Plain text #: en/config.txt:65 -#, fuzzy, priority:100 -#| msgid "All the other lines (and the remainder of the line after the section header) are recognized as setting variables, in the form 'name = value' (or just 'name', which is a short-hand to say that the variable is the boolean \"true\"). The variable names are case-insensitive, allow only alphanumeric characters and `-`, and must start with an alphabetic character." +#, priority:100 msgid "All the other lines (and the remainder of the line after the section header) are recognized as setting variables, in the form 'name = value' (or just 'name', which is a short-hand to say that the variable is the boolean \"true\"). The variable names are case-insensitive, allow only alphanumeric characters and `-`, and must start with an alphabetic character." msgstr "所有其他行（以及部分标题之后的剩余行）都被认为是设置变量，形式为 'name = value'（或者只是 'name'，这是一个简写，表示变量是布尔值 \"true\"）。 变量名称不区分大小写，只允许使用字母数字字符和 `-`，并且必须以字母字符开头。" #. type: Plain text #: en/config.txt:73 -#, fuzzy, priority:100 -#| msgid "A line that defines a value can be continued to the next line by ending it with a `\\`; the backslash and the end-of-line are stripped. Leading whitespaces after 'name =', the remainder of the line after the first comment character '#' or ';', and trailing whitespaces of the line are discarded unless they are enclosed in double quotes. Internal whitespaces within the value are retained verbatim." +#, priority:100 msgid "A line that defines a value can be continued to the next line by ending it with a `\\`; the backslash and the end-of-line are stripped. Leading whitespaces after 'name =', the remainder of the line after the first comment character '#' or ';', and trailing whitespaces of the line are discarded unless they are enclosed in double quotes. Internal whitespaces within the value are retained verbatim." msgstr "定义一个值的行可以通过以 `\\` 结束来延续到下一行；反斜杠和行尾被剥离。 在 'name =' 之后的前导空白，在第一个注释字符 '#' 或 ';' 之后的剩余行，以及该行的尾部空白都会被丢弃，除非它们被包含在双引号中。 值中的内部空白将被逐字保留。" @@ -2605,8 +2588,7 @@ msgstr "在双引号内，双引号 `\"` 和反斜杠 `\\` 字符必须被转义 #. type: Plain text #: en/config.txt:81 -#, fuzzy, priority:100 -#| msgid "The following escape sequences (beside `\\\"` and `\\\\`) are recognized: `\\n` for newline character (NL), `\\t` for horizontal tabulation (HT, TAB) and `\\b` for backspace (BS). Other char escape sequences (including octal escape sequences) are invalid." +#, priority:100 msgid "The following escape sequences (beside `\\\"` and `\\\\`) are recognized: `\\n` for newline character (NL), `\\t` for horizontal tabulation (HT, TAB) and `\\b` for backspace (BS). Other char escape sequences (including octal escape sequences) are invalid." msgstr "以下转义序列（除了 `\\\"` 和 `\\\\`）可以被识别：`\\n` 表示换行符（NL），`\\t` 表示水平制表（HT，TAB），`\\b` 表示退格（BS）。 其他字符转义序列（包括八进制转义序列）是无效的。" @@ -2630,8 +2612,7 @@ msgstr "你可以通过设置特殊的 `include.path`（或 `includeIf.*.path` #. type: Plain text #: en/config.txt:102 -#, fuzzy, priority:100 -#| msgid "The contents of the included file are inserted immediately, as if they had been found at the location of the include directive. If the value of the variable is a relative path, the path is considered to be relative to the configuration file in which the include directive was found. See below for examples." +#, priority:100 msgid "The contents of the included file are inserted immediately, as if they had been found at the location of the include directive. If the value of the variable is a relative path, the path is considered to be relative to the configuration file in which the include directive was found. See below for examples." msgstr "被包含的文件的内容会被立即插入，就像它们是在 include 指令的位置被发现的一样。如果该变量的值是一个相对路径，则该路径被认为是相对于发现 include 指令的配置文件。 请看下面的例子。" @@ -2721,8 +2702,7 @@ msgstr "`onbranch`" #. type: Plain text #: en/config.txt:155 -#, fuzzy, priority:100 -#| msgid "The data that follows the keyword `onbranch:` is taken to be a pattern with standard globbing wildcards and two additional ones, `**/` and `/**`, that can match multiple path components. If we are in a worktree where the name of the branch that is currently checked out matches the pattern, the include condition is met." +#, priority:100 msgid "The data that follows the keyword `onbranch:` is taken to be a pattern with standard globbing wildcards and two additional ones, `**/` and `/**`, that can match multiple path components. If we are in a worktree where the name of the branch that is currently checked out matches the pattern, the include condition is met." msgstr "关键词 `onbranch: ` 后面的数据被认为是一个带有标准通配符和两个额外的通配符的模式，`**/` 和 `/**`，可以匹配多个路径组件。 如果我们在一个工作树中，当前签出的分支的名称与该模式相匹配，则满足包含条件。" @@ -2984,8 +2964,7 @@ msgstr "真" #. type: Plain text #: en/config.txt:282 -#, fuzzy, priority:100 -#| msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= ` is taken as true." +#, priority:100 msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= ` is taken as true." msgstr "布尔真值是 `yes`、`on`、`true`和 `1`。 此外，一个没有 `= <值>` 的变量被认为是真。" @@ -3027,15 +3006,13 @@ msgstr "color" #. type: Plain text #: en/config.txt:299 -#, fuzzy, priority:100 -#| msgid "The value for a variable that takes a color is a list of colors (at most two, one for foreground and one for background) and attributes (as many as you want), separated by spaces." +#, priority:100 msgid "The value for a variable that takes a color is a list of colors (at most two, one for foreground and one for background) and attributes (as many as you want), separated by spaces." msgstr "接受颜色的变量的值是一个颜色（最多两个，一个用于前景，一个用于背景）和属性（你想要多少就有多少）的列表，用空格分隔。" #. type: Plain text #: en/config.txt:305 -#, fuzzy, priority:100 -#| msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan`, `white` and `default`. The first color given is the foreground; the second is the background. All the basic colors except `normal` and `default` have a bright variant that can be specified by prefixing the color with `bright`, like `brightred`." +#, priority:100 msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan`, `white` and `default`. The first color given is the foreground; the second is the background. All the basic colors except `normal` and `default` have a bright variant that can be specified by prefixing the color with `bright`, like `brightred`." msgstr "接受的基本颜色是 `normal`、`black`、`red`、`green`、`yellow`、`blue`、`magenta`、`cyan`、`white` 和 `default`。 给出的第一种颜色是前景；第二种是背景。 除了`normal'和`default'之外，所有的基本颜色都有一个明亮的变体，可以通过在颜色前面加上`bright'来指定，比如`brightred'。" @@ -3053,15 +3030,13 @@ msgstr "颜色`default` 明确地将颜色重置为终端的默认值，例如 #. type: Plain text #: en/config.txt:318 -#, fuzzy, priority:100 -#| msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`." +#, priority:100 msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`." msgstr "颜色也可以用 0 到 255 之间的数字来表示；这些颜色使用 ANSI 256 色模式（但注意不是所有的终端都支持这个）。 如果你的终端支持，你也可以指定 24 位 RGB 值为十六进制，如 `#ff0ab3`。" #. type: Plain text #: en/config.txt:325 -#, fuzzy, priority:100 -#| msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)." +#, priority:100 msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)." msgstr "可接受的属性是 `bold`、`dim`、`ul`、`blink`、`reverse`、`italic` 和 `strike`（用于划掉的字母或 “删除线”）。 任何属性相对于颜色的位置（在前，在后，或在中间）并不重要。特定的属性可以通过在它们前面加上 `no` 或 `no-` 来关闭（例如，`noreverse`，`no-ul`，等等）。" @@ -3079,8 +3054,7 @@ msgstr "一个空的颜色字符串根本不会产生任何颜色效果。这可 #. type: Plain text #: en/config.txt:342 -#, fuzzy, priority:100, placeholders:'color.decorate.branch':'--decorate' -#| msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there." +#, placeholders:'color.decorate.branch':'--decorate', priority:100 msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there." msgstr "对于 git 的预定义颜色槽，属性是为了在彩色输出的每一项开始时被重置。所以将 `color.decorate.branch` 设置为 `black` 会将该分支名称涂成普通的 `black`，即使同一输出行中的前一个东西（例如`log --decorate`输出中的分支名称列表前的括号）被设置为 `bold` 或其他属性。 然而，自定义的日志格式可能会做更复杂和分层的着色，而否定的形式在那里可能很有用。" @@ -3110,15 +3084,13 @@ msgstr "变量" #. type: Plain text #: en/config.txt:366 -#, fuzzy, priority:100 -#| msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page." +#, priority:100 msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page." msgstr "请注意，这个列表并不全面，也不一定完整。 对于特定命令的变量，你会在相应的手册页中找到更详细的描述。" #. type: Plain text #: en/config.txt:371 -#, fuzzy, priority:100 -#| msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation." +#, priority:100 msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation." msgstr "其他与 git 相关的工具可能也确实使用了他们自己的变量。 当发明新的变量用于自己的工具时，要确保它们的名字不与 Git 本身和其他流行的工具所使用的名字冲突，并在你的文档中描述它们。" @@ -3138,7 +3110,7 @@ msgstr "add.ignore-errors (deprecated 弃用)" #: en/config/add.txt:8 #, priority:300, placeholders:'--ignore-errors':'linkgit:git-add[1]':'add.ignore' msgid "Tells 'git add' to continue adding files when some files cannot be added due to indexing errors. Equivalent to the `--ignore-errors` option of linkgit:git-add[1]. `add.ignore-errors` is deprecated, as it does not follow the usual naming convention for configuration variables." -msgstr "" +msgstr "当某些文件因索引错误而无法添加时，告诉 'git add' 继续添加。等同于 linkgit:git-add[1] 的 `--ignore-errors` 选项。 `add.ignore-errors` 已被弃用，因为它不符合配置变量的常规命名规则。" #. type: Labeled list #: en/config/add.txt:9 @@ -3150,7 +3122,7 @@ msgstr "add.interactive.useBuiltin" #: en/config/add.txt:13 #, priority:300, placeholders:'linkgit:git-add[1]' msgid "Unused configuration variable. Used in Git versions v2.25.0 to v2.36.0 to enable the built-in version of linkgit:git-add[1]'s interactive mode, which then became the default in Git versions v2.37.0 to v2.39.0." -msgstr "" +msgstr "未使用的配置变量。在 Git v2.25.0 至 v2.36.0 版本中用于启用 linkgit:git-add[1] 的内置交互模式，在 Git v2.37.0 至 v2.39.0 版本中成为默认模式。" #. type: Labeled list #: en/config/clone.txt:1 @@ -3162,7 +3134,7 @@ msgstr "clone.defaultRemoteName" #: en/config/clone.txt:5 #, priority:300, placeholders:'--origin':'linkgit:git-clone[1]' msgid "The name of the remote to create when cloning a repository. Defaults to `origin`, and can be overridden by passing the `--origin` command-line option to linkgit:git-clone[1]." -msgstr "" +msgstr "克隆仓库时创建的远程仓库的名称。默认为 `--origin`，可以通过 linkgit:git-clone[1] 的 `--origin` 命令行选项覆盖。" #. type: Labeled list #: en/config/clone.txt:6 @@ -3174,7 +3146,7 @@ msgstr "clone.rejectShallow" #: en/config/clone.txt:9 #, priority:300, placeholders:'--reject-shallow':'linkgit:git-clone[1]' msgid "Reject cloning a repository if it is a shallow one; this can be overridden by passing the `--reject-shallow` option on the command line. See linkgit:git-clone[1]" -msgstr "" +msgstr "如果是浅层仓库，则拒绝克隆；可以通过在命令行中传递 `--reject-shallow` 选项来重写。参见 linkgit:git-clone[1]" #. type: Labeled list #: en/config/clone.txt:10 @@ -3186,7 +3158,7 @@ msgstr "clone.filterSubmodules" #: en/config/clone.txt:13 #, priority:300, placeholders:'--filter':'linkgit:git-rev-list[1]':'--recurse-submodules' msgid "If a partial clone filter is provided (see `--filter` in linkgit:git-rev-list[1]) and `--recurse-submodules` is used, also apply the filter to submodules." -msgstr "" +msgstr "如果提供了部分克隆过滤器（参见 linkgit:git-rev-list[1] 中的 `--filter` 选项），并且如果使用了 `--recurse-submodules` 选项，也会将过滤器应用于子模块。" #. type: Labeled list #: en/config/commit.txt:1 @@ -3198,7 +3170,7 @@ msgstr "commit.cleanup" #: en/config/commit.txt:9 #, priority:280, placeholders:'--cleanup':'linkgit:git-commit[1]':'commit.cleanup' msgid "This setting overrides the default of the `--cleanup` option in `git commit`. See linkgit:git-commit[1] for details. Changing the default can be useful when you always want to keep lines that begin with the comment character `#` in your log message, in which case you would do `git config commit.cleanup whitespace` (note that you will have to remove the help lines that begin with `#` in the commit log template yourself, if you do this)." -msgstr "" +msgstr "此设置会覆盖 `git commit` 中 `--cleanup` 选项的默认值。详见 linkgit:git-commit[1]。当您总是希望在日志信息中保留以注释字符 `#` 开头的行时，更改默认值会很有用，在这种情况下，您可以执行 `git config commit.cleanup whitespace` （注意，如果这样做，您必须自己删除提交日志模板中以 `#` 开头的帮助行）。" #. type: Labeled list #: en/config/commit.txt:10 @@ -3210,7 +3182,7 @@ msgstr "commit.gpgSign" #: en/config/commit.txt:17 #, priority:280 msgid "A boolean to specify whether all commits should be GPG signed. Use of this option when doing operations such as rebase can result in a large number of commits being signed. It may be convenient to use an agent to avoid typing your GPG passphrase several times." -msgstr "" +msgstr "布尔值，用于指定是否对所有提交进行 GPG 签名。在进行变基等操作时使用该选项可能会导致大量提交被签名。使用代理可以避免多次键入 GPG 密码。" #. type: Labeled list #: en/config/commit.txt:18 @@ -3220,10 +3192,9 @@ msgstr "commit.status" #. type: Plain text #: en/config/commit.txt:22 -#, fuzzy, priority:280 -#| msgid "Do not include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the default commit message." +#, priority:280 msgid "A boolean to enable/disable inclusion of status information in the commit message template when using an editor to prepare the commit message. Defaults to true." -msgstr "当使用编辑器准备默认的提交信息时，不要将 linkgit:git-status[1] 的输出包含在提交信息模板中。" +msgstr "布尔值，用于在使用编辑器准备提交信息时，启用/禁用在提交信息模板中包含状态信息。默认为 true。" #. type: Labeled list #: en/config/commit.txt:23 @@ -3235,7 +3206,7 @@ msgstr "commit.template" #: en/config/commit.txt:26 #, priority:280 msgid "Specify the pathname of a file to use as the template for new commit messages." -msgstr "" +msgstr "指定要用作新提交信息模板的文件路径名。" #. type: Labeled list #: en/config/commit.txt:27 @@ -3247,7 +3218,7 @@ msgstr "commit.verbose" #: en/config/commit.txt:29 #, priority:280, placeholders:'linkgit:git-commit[1]' msgid "A boolean or int to specify the level of verbosity with `git commit`. See linkgit:git-commit[1]." -msgstr "" +msgstr "布尔值或 int 值，用于指定 `git commit` 的繁琐程度。参见 linkgit:git-commit[1]。" #. type: Labeled list #: en/config/diff.txt:1 @@ -3259,7 +3230,7 @@ msgstr "diff.autoRefreshIndex" #: en/config/diff.txt:10 #, priority:280, placeholders:'git update-index':'--refresh':'git diff-files' msgid "When using 'git diff' to compare with work tree files, do not consider stat-only changes as changed. Instead, silently run `git update-index --refresh` to update the cached stat information for paths whose contents in the work tree match the contents in the index. This option defaults to true. Note that this affects only 'git diff' Porcelain, and not lower level 'diff' commands such as 'git diff-files'." -msgstr "" +msgstr "在使用 `git diff` 与工作树文件进行比较时，不要将仅统计信息的更改视为已更改。取而代之的是静默运行 `git update-index --refresh` 来更新工作树中内容与索引中内容匹配的路径的缓存统计信息。该选项默认为 true。请注意，这只会影响 'git diff' 命令，而不会影响更低级的 'diff' 命令，比如 \"git diff-files\"。" #. type: Labeled list #: en/config/diff.txt:11 @@ -3271,7 +3242,7 @@ msgstr "diff.dirstat" #: en/config/diff.txt:18 #, ignore-ellipsis, priority:280, placeholders:'--dirstat':'--dirstat':'linkgit:git-diff[1]':'--dirstat=':'diff.dirstat' msgid "A comma separated list of `--dirstat` parameters specifying the default behavior of the `--dirstat` option to linkgit:git-diff[1] and friends. The defaults can be overridden on the command line (using `--dirstat=`). The fallback defaults (when not changed by `diff.dirstat`) are `changes,noncumulative,3`. The following parameters are available:" -msgstr "" +msgstr "以逗号分隔的 `--dirstat` 参数列表，用于指定 linkgit:git-diff[1] 和友集的 `--dirstat` 选项的默认行为。默认值可以在命令行中覆盖（使用 `--dirstat=<参数1,参数2,...>`）。后备默认值（当 `diff.dirstat` 没有更改时）是 `changes,noncumulative,3` 。以下参数可用：" #. type: Labeled list #: en/config/diff.txt:20 en/diff-options.txt:263 @@ -3281,8 +3252,7 @@ msgstr "`changes`" #. type: Plain text #: en/config/diff.txt:26 en/diff-options.txt:269 -#, fuzzy, priority:280 -#| msgid "Compute the dirstat numbers by counting the lines that have been removed from the source, or added to the destination. This ignores the amount of pure code movements within a file. In other words, rearranging lines in a file is not counted as much as other changes. This is the default behavior when no parameter is given." +#, priority:280 msgid "Compute the dirstat numbers by counting the lines that have been removed from the source, or added to the destination. This ignores the amount of pure code movements within a file. In other words, rearranging lines in a file is not counted as much as other changes. This is the default behavior when no parameter is given." msgstr "通过计算从源文件中删除的行数或添加到目标文件中的行数来计算分布状态的数字。这忽略了文件内的代码移动行为。也就是说，在文件中重新排列的行不会像其他变化一样被计算在内。这是在没有给出参数时的默认行为。" @@ -3306,8 +3276,7 @@ msgstr "`files`" #. type: Plain text #: en/config/diff.txt:39 en/diff-options.txt:282 -#, fuzzy, priority:280, placeholders:'--dirstat' -#| msgid "Compute the dirstat numbers by counting the number of files changed. Each changed file counts equally in the dirstat analysis. This is the computationally cheapest `--dirstat` behavior, since it does not have to look at the file contents at all." +#, placeholders:'--dirstat', priority:280 msgid "Compute the dirstat numbers by counting the number of files changed. Each changed file counts equally in the dirstat analysis. This is the computationally cheapest `--dirstat` behavior, since it does not have to look at the file contents at all." msgstr "通过计算被改变的文件数量来计算分布状态的数字。在分布状态分析中，每一个被改变的文件都会被平等地计算。这是计算上开销最小的 `--dirstat` 行为，因为它无需查看文件内容。" @@ -3319,8 +3288,7 @@ msgstr "`cumulative`" #. type: Plain text #: en/config/diff.txt:44 en/diff-options.txt:287 -#, fuzzy, priority:280 -#| msgid "Count changes in a child directory for the parent directory as well. Note that when using `cumulative`, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the `noncumulative` parameter." +#, priority:280 msgid "Count changes in a child directory for the parent directory as well. Note that when using `cumulative`, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the `noncumulative` parameter." msgstr "子目录中的变化计算到父目录中。 注意，当使用 `cumulative` 选项时，报告的百分比之和可能超过 100%。默认的（非累积）行为可以用 `noncumulative` 参数指定。" @@ -3332,17 +3300,15 @@ msgstr "" #. type: Plain text #: en/config/diff.txt:48 en/diff-options.txt:291 -#, fuzzy, priority:280 -#| msgid "An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes are not shown in the output." +#, priority:280 msgid "An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes are not shown in the output." msgstr "一个整数参数，其指定一个截止百分比（默认为 3%）。贡献值小于这个百分比的目录不显示在输出中。" #. type: Plain text #: en/config/diff.txt:54 -#, fuzzy, priority:280 -#| msgid "Example: The following will count changed files, while ignoring directories with less than 10% of the total amount of changed files, and accumulating child directory counts in the parent directories: `--dirstat=files,10,cumulative`." +#, priority:280 msgid "Example: The following will count changed files, while ignoring directories with less than 10% of the total amount of changed files, and accumulating child directory counts in the parent directories: `files,10,cumulative`." -msgstr "例如：下面的参数会统计更改的文件，同时忽略占更改文件总数 10% 以下的目录，并累积父目录中的子目录计数：`--dirstat=files,10,cumulative`。" +msgstr "例如：下面的参数会统计更改的文件，同时忽略占更改文件总数 10% 以下的目录，并累积父目录中的子目录计数：`files,10,cumulative`。" #. type: Labeled list #: en/config/diff.txt:55 @@ -3354,7 +3320,7 @@ msgstr "diff.statNameWidth" #: en/config/diff.txt:58 #, priority:280, placeholders:'--stat':'--stat' msgid "Limit the width of the filename part in --stat output. If set, applies to all commands generating --stat output except format-patch." -msgstr "" +msgstr "限制 --stat 输出中文件名部分的宽度。如果设置，则适用于生成 --stat 输出的所有命令，format-patch 除外。" #. type: Labeled list #: en/config/diff.txt:59 @@ -3366,7 +3332,7 @@ msgstr "diff.statGraphWidth" #: en/config/diff.txt:62 #, priority:280, placeholders:'--stat':'--stat' msgid "Limit the width of the graph part in --stat output. If set, applies to all commands generating --stat output except format-patch." -msgstr "" +msgstr "限制 --stat 输出中图形部分的宽度。如果设置，则适用于生成 --stat 输出的所有命令，format-patch 除外。" # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 #. type: Labeled list @@ -3377,10 +3343,9 @@ msgstr "diff.context" #. type: Plain text #: en/config/diff.txt:66 -#, fuzzy, priority:280 -#| msgid "Generate diffs with lines of context instead of the usual three." +#, priority:280 msgid "Generate diffs with lines of context instead of the default of 3. This value is overridden by the -U option." -msgstr "生成带有 行上下文的差异，而不是通常的 3 行。暗含 `--patch` 选项。" +msgstr "生成 行上下文差异，而不是默认的 3 行。 该值由 -U 选项覆盖。" #. type: Labeled list #: en/config/diff.txt:67 @@ -3390,10 +3355,9 @@ msgstr "diff.interHunkContext" #. type: Plain text #: en/config/diff.txt:72 -#, fuzzy, priority:280, placeholders:'--inter-hunk-context' -#| msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other. Defaults to `diff.interHunkContext` or 0 if the config option is unset." +#, placeholders:'--inter-hunk-context', priority:280 msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing the hunks that are close to each other. This value serves as the default for the `--inter-hunk-context` command line option." -msgstr "显示块差异之间的上下文，最多显示指定的行数，从而合并彼此接近的块。 默认认为 `diff.interHunkContext`，如果配置选项未设置，则默认为0。" +msgstr "显示 diff hunk 之间的上下文，行数不超过指定行数，从而合并彼此相近的 hunk。此值是 `--inter-hunk-context` 命令行选项的默认值。" #. type: Labeled list #: en/config/diff.txt:73 @@ -3405,7 +3369,7 @@ msgstr "diff.external" #: en/config/diff.txt:81 #, priority:280, placeholders:'GIT_EXTERNAL_DIFF':'linkgit:git[1]':'linkgit:gitattributes[5]' msgid "If this config variable is set, diff generation is not performed using the internal diff machinery, but using the given command. Can be overridden with the `GIT_EXTERNAL_DIFF' environment variable. The command is called with parameters as described under \"git Diffs\" in linkgit:git[1]. Note: if you want to use an external diff program only on a subset of your files, you might want to use linkgit:gitattributes[5] instead." -msgstr "" +msgstr "如果设置了该配置变量，则不会使用内部 diff 机制生成 diff，而是使用给定的命令。可以用 `GIT_EXTERNAL_DIFF` 环境变量来覆盖。该命令的参数调用方式与 linkgit:git[1] 中 \"git Diffs\" 一节所述相同。注意：如果只想在部分文件上使用外部差异程序，可以用 linkgit:gitattributes[5] 代替。" #. type: Labeled list #: en/config/diff.txt:82 @@ -3417,7 +3381,7 @@ msgstr "diff.ignoreSubmodules" #: en/config/diff.txt:94 #, priority:280, placeholders:'--ignore-submodules':'git diff-files':'status.submoduleSummary':'--ignore-submodules' msgid "Sets the default value of --ignore-submodules. Note that this affects only 'git diff' Porcelain, and not lower level 'diff' commands such as 'git diff-files'. 'git checkout' and 'git switch' also honor this setting when reporting uncommitted changes. Setting it to 'all' disables the submodule summary normally shown by 'git commit' and 'git status' when `status.submoduleSummary` is set unless it is overridden by using the --ignore-submodules command-line option. The 'git submodule' commands are not affected by this setting. By default this is set to untracked so that any untracked submodules are ignored." -msgstr "" +msgstr "设置 --ignore-submodules 的默认值。请注意，这只会影响上层命令 'git diff'，而不会影响更底层的 'diff' 命令，如 'git diff-files'。'git checkout' 和 'git switch' 在报告未提交的改动时也会尊重这一设置。如果将其设置为 'all'，则 'git commit' 和 'git status' 在设置 `status.submoduleSummary` 时通常会显示子模块摘要，除非使用 --ignore-submodules 命令行选项将其覆盖。`git submodule` 命令不受此设置影响。默认设置为 untracked，因此任何未跟踪的子模块都会被忽略。" #. type: Labeled list #: en/config/diff.txt:95 @@ -3429,73 +3393,67 @@ msgstr "diff.mnemonicPrefix" #: en/config/diff.txt:100 #, priority:280 msgid "If set, 'git diff' uses a prefix pair that is different from the standard \"a/\" and \"b/\" depending on what is being compared. When this configuration is in effect, reverse diff output also swaps the order of the prefixes:" -msgstr "" +msgstr "如果设置了该选项，'git diff' 就会根据比较的内容使用不同于标准 \"a/\" 和 \"b/\" 的前缀对。当此配置生效时，反向 diff 输出也会交换前缀的顺序：" #. type: Labeled list #: en/config/diff.txt:100 -#, fuzzy, no-wrap, priority:280 -#| msgid "`gvimdiff`" +#, no-wrap, priority:280 msgid "`git diff`" -msgstr "`gvimdiff`" +msgstr "`git diff`" #. type: Plain text #: en/config/diff.txt:102 -#, fuzzy, priority:280 -#| msgid "compares the index and the files on the filesystem." +#, priority:280 msgid "compares the (i)ndex and the (w)ork tree;" -msgstr "比较索引和文件系统上的文件。" +msgstr "比较索引（i）和工作目录树（w）；" #. type: Labeled list #: en/config/diff.txt:102 -#, fuzzy, no-wrap, priority:280, placeholders:'HEAD' -#| msgid "`git push origin HEAD`" +#, no-wrap, placeholders:'HEAD', priority:280 msgid "`git diff HEAD`" -msgstr "`git push origin HEAD`" +msgstr "`git diff HEAD`" #. type: Plain text #: en/config/diff.txt:104 #, priority:280 msgid "compares a (c)ommit and the (w)ork tree;" -msgstr "" +msgstr "比较（c）提交（w）工作树；" #. type: Labeled list #: en/config/diff.txt:104 -#, fuzzy, no-wrap, priority:280, placeholders:'--cached' -#| msgid "\tgit diff-index --cached HEAD\n" +#, no-wrap, placeholders:'--cached', priority:280 msgid "`git diff --cached`" -msgstr "\tgit diff-index --cached HEAD\n" +msgstr "`git diff --cached`" #. type: Plain text #: en/config/diff.txt:106 -#, fuzzy, priority:280 -#| msgid "compares the and the index." +#, priority:280 msgid "compares a (c)ommit and the (i)ndex;" -msgstr "比较 <目录树对象> 和索引。" +msgstr "比较一个提交（c）和索引（i）；" #. type: Labeled list #: en/config/diff.txt:106 #, no-wrap, priority:280, placeholders:'HEAD' msgid "`git diff HEAD:file1 file2`" -msgstr "" +msgstr "`git diff HEAD:file1 file2`" #. type: Plain text #: en/config/diff.txt:108 #, priority:280 msgid "compares an (o)bject and a (w)ork tree entity;" -msgstr "" +msgstr "比较一个（o）对象和一个（w）工作树实体；" #. type: Labeled list #: en/config/diff.txt:108 -#, fuzzy, no-wrap, priority:280, placeholders:'--no-index' -#| msgid "git-diff-index(1)" +#, no-wrap, placeholders:'--no-index', priority:280 msgid "`git diff --no-index a b`" -msgstr "git-diff-index(1)" +msgstr "`git diff --no-index a b`" #. type: Plain text #: en/config/diff.txt:110 #, priority:280 msgid "compares two non-git things (1) and (2)." -msgstr "" +msgstr "比较了两个非 git 项目（1）和（2）。" #. type: Labeled list #: en/config/diff.txt:111 @@ -3505,10 +3463,9 @@ msgstr "diff.noprefix" #. type: Plain text #: en/config/diff.txt:113 -#, fuzzy, priority:280 -#| msgid "Do not show any source or destination prefix." +#, priority:280 msgid "If set, 'git diff' does not show any source or destination prefix." -msgstr "不显示任何源或目的前缀。" +msgstr "如果设置了，'git diff' 不会显示任何源前缀或目标前缀。" #. type: Labeled list #: en/config/diff.txt:114 @@ -3518,10 +3475,9 @@ msgstr "diff.relative" #. type: Plain text #: en/config/diff.txt:117 -#, fuzzy, priority:280 -#| msgid "Show `$GIT_DIR` if defined. Otherwise show the path to the .git directory. The path shown, when relative, is relative to the current working directory." +#, priority:280 msgid "If set to 'true', 'git diff' does not show changes outside of the directory and show pathnames relative to the current directory." -msgstr "如果已定义，则显示 `$GIT_DIR`。否则显示 .git 目录的路径。如果是相对路径，则显示当前工作目录的相对路径。" +msgstr "如果设置为 'true'，'git diff' 不会显示目录外的更改，而是显示相对于当前目录的路径名。" #. type: Labeled list #: en/config/diff.txt:118 @@ -3533,7 +3489,7 @@ msgstr "diff.orderFile" #: en/config/diff.txt:123 #, priority:280, placeholders:'linkgit:git-diff[1]':'diff.orderFile' msgid "File indicating how to order files within a diff. See the '-O' option to linkgit:git-diff[1] for details. If `diff.orderFile` is a relative pathname, it is treated as relative to the top of the working tree." -msgstr "" +msgstr "指示如何在差异中排列文件顺序的文件。详见 linkgit:git-diff[1] 的 `-O` 选项。如果 `diff.orderFile` 是一个相对路径名，它将被视为相对于工作树的顶层。" #. type: Labeled list #: en/config/diff.txt:124 @@ -3543,10 +3499,9 @@ msgstr "diff.renameLimit" #. type: Plain text #: en/config/diff.txt:129 -#, fuzzy, priority:280 -#| msgid "The number of files to consider in the exhaustive portion of rename detection during a merge. If not specified, defaults to the value of diff.renameLimit. If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000. This setting has no effect if rename detection is turned off." +#, priority:280 msgid "The number of files to consider in the exhaustive portion of copy/rename detection; equivalent to the 'git diff' option `-l`. If not set, the default value is currently 1000. This setting has no effect if rename detection is turned off." -msgstr "合并过程中重命名检测穷举部分要考虑的文件数量。 如果未指定，默认值为 diff.renameLimit 的值。 如果既未指定 merge.renameLimit 也未指定 diff.renameLimit，则默认值为 7000。 如果重命名检测已关闭，则此设置无效。" +msgstr "在复制/重命名检测的穷举部分要考虑的文件数量；相当于 'git diff' 选项 `-l`。如果未设置，默认值为 1000。如果重命名检测已关闭，则此设置不会有任何影响。" #. type: Labeled list #: en/config/diff.txt:130 @@ -3558,7 +3513,7 @@ msgstr "diff.renames" #: en/config/diff.txt:138 #, priority:280, placeholders:'linkgit:git-diff[1]':'linkgit:git-log[1]':'linkgit:git-diff-files[1]' msgid "Whether and how Git detects renames. If set to \"false\", rename detection is disabled. If set to \"true\", basic rename detection is enabled. If set to \"copies\" or \"copy\", Git will detect copies, as well. Defaults to true. Note that this affects only 'git diff' Porcelain like linkgit:git-diff[1] and linkgit:git-log[1], and not lower level commands such as linkgit:git-diff-files[1]." -msgstr "" +msgstr "Git 是否以及如何检测重命名。如果设置为 \"false\"，重命名检测将被禁用。如果设置为 \"true\"，则启用基本的重命名检测。如果设置为 \"copies\" 或 \"copy\"，Git 也会检测副本。默认为 true。需要注意的是，这只会影响 linkgit:git-diff[1] 和 linkgit:git-log[1] 等上层 'git diff' 命令，而不会影响 linkgit:git-diff-files[1] 等底层命令。" #. type: Labeled list #: en/config/diff.txt:139 @@ -3570,7 +3525,7 @@ msgstr "diff.suppressBlankEmpty" #: en/config/diff.txt:142 #, priority:280 msgid "A boolean to inhibit the standard behavior of printing a space before each empty output line. Defaults to false." -msgstr "" +msgstr "一个布尔值，用于抑制在每个空输出行前打印空格的标准行为。默认为 false。" #. type: Labeled list #: en/config/diff.txt:143 @@ -3580,10 +3535,9 @@ msgstr "diff.submodule" #. type: Plain text #: en/config/diff.txt:150 -#, fuzzy, priority:280, placeholders:'linkgit:git-submodule[1]' -#| msgid "Specify how differences in submodules are shown. When specifying `--submodule=short` the 'short' format is used. This format just shows the names of the commits at the beginning and end of the range. When `--submodule` or `--submodule=log` is specified, the 'log' format is used. This format lists the commits in the range like linkgit:git-submodule[1] `summary` does. When `--submodule=diff` is specified, the 'diff' format is used. This format shows an inline diff of the changes in the submodule contents between the commit range. Defaults to `diff.submodule` or the 'short' format if the config option is unset." +#, placeholders:'linkgit:git-submodule[1]', priority:280 msgid "Specify the format in which differences in submodules are shown. The \"short\" format just shows the names of the commits at the beginning and end of the range. The \"log\" format lists the commits in the range like linkgit:git-submodule[1] `summary` does. The \"diff\" format shows an inline diff of the changed contents of the submodule. Defaults to \"short\"." -msgstr "指定子模块中的差异如何显示。当指定 `--submodule=short` 选项时，会使用 'short' 格式。这种格式只显示范围的开头和结尾处的提交名称。当指定了 `--submodule=short` 或 `--submodule=log` 时，会使用 'log' 格式。这种格式会像 linkgit:git-submodule[1] `summary` 那样，列出该范围内的提交。当指定了 `--submodule=diff` 时，会使用 'diff' 格式。这个格式显示的是子模块内在提交范围之间的变化差异。默认为 `diff.submodule`，如果配置选项未设置， 则为 `short` 格式。" +msgstr "指定子模块差异的显示格式。\"short\" 格式只显示范围首尾的提交名称。\"log\" 格式会列出范围内的提交，就像 linkgit:git-submodule[1] `summary` 所做的那样。\"diff\" 格式显示子模块内容的内联差异。默认为 \"short\"。" #. type: Labeled list #: en/config/diff.txt:151 @@ -3595,85 +3549,79 @@ msgstr "diff.wordRegex" #: en/config/diff.txt:156 #, priority:280 msgid "A POSIX Extended Regular Expression used to determine what is a \"word\" when performing word-by-word difference calculations. Character sequences that match the regular expression are \"words\", all other characters are *ignorable* whitespace." -msgstr "" +msgstr "POSIX 扩展正则表达式，用于在进行逐字差异计算时确定什么是 \"字\"。符合正则表达式的字符序列为 \"字\"，所有其他字符均为 *不可忽略的* 空白。" #. type: Labeled list #: en/config/diff.txt:157 #, no-wrap, priority:280 msgid "diff..command" -msgstr "" +msgstr "diff.<驱动程序>.command" #. type: Plain text #: en/config/diff.txt:160 -#, fuzzy, priority:280, placeholders:'linkgit:gitattributes[5]' -#| msgid "Defines a human-readable name for a custom low-level merge driver. See linkgit:gitattributes[5] for details." +#, placeholders:'linkgit:gitattributes[5]', priority:280 msgid "The custom diff driver command. See linkgit:gitattributes[5] for details." -msgstr "为自定义的低级合并驱动定义了一个具有可读性的名字。 详情见 linkgit:gitattributes[5]。" +msgstr "自定义的 diff 驱动命令。详见 linkgit:gitattributes[5]。" #. type: Labeled list #: en/config/diff.txt:161 -#, fuzzy, no-wrap, priority:280 -#| msgid "merge..name" +#, no-wrap, priority:280 msgid "diff..xfuncname" -msgstr "合并..name" +msgstr "diff.<驱动程序>.xfuncname" #. type: Plain text #: en/config/diff.txt:165 #, priority:280, placeholders:'linkgit:gitattributes[5]' msgid "The regular expression that the diff driver should use to recognize the hunk header. A built-in pattern may also be used. See linkgit:gitattributes[5] for details." -msgstr "" +msgstr "正则表达式，diff 驱动程序应使用该正则表达式识别块状头。也可以使用内置模式。详见 linkgit:gitattributes[5]。" #. type: Labeled list #: en/config/diff.txt:166 -#, fuzzy, no-wrap, priority:280 -#| msgid "merge..name" +#, no-wrap, priority:280 msgid "diff..binary" -msgstr "合并..name" +msgstr "diff.<驱动程序>.binary" #. type: Plain text #: en/config/diff.txt:169 -#, fuzzy, priority:280, placeholders:'linkgit:gitattributes[5]' -#| msgid "Files and directories with the attribute export-ignore won't be added to archive files. See linkgit:gitattributes[5] for details." +#, placeholders:'linkgit:gitattributes[5]', priority:280 msgid "Set this option to true to make the diff driver treat files as binary. See linkgit:gitattributes[5] for details." -msgstr "带有 export-ignore 属性的文件和目录不会被添加到存档文件中。 详情见 linkgit:gitattributes[5]。" +msgstr "将此选项设为 true，可使 diff 驱动程序将文件视为二进制文件。详情参见 linkgit:gitattributes[5]。" #. type: Labeled list #: en/config/diff.txt:170 #, no-wrap, priority:280 msgid "diff..textconv" -msgstr "" +msgstr "diff.<驱动程序>.textconv" #. type: Plain text #: en/config/diff.txt:175 #, priority:280, placeholders:'linkgit:gitattributes[5]' msgid "The command that the diff driver should call to generate the text-converted version of a file. The result of the conversion is used to generate a human-readable diff. See linkgit:gitattributes[5] for details." -msgstr "" +msgstr "diff 驱动程序为生成文件的文本转换版本而调用的命令。转换结果用于生成易读形式的 diff 结果。详见 linkgit:gitattributes[5]。" #. type: Labeled list #: en/config/diff.txt:176 #, no-wrap, priority:280 msgid "diff..wordRegex" -msgstr "" +msgstr "diff.<驱动程序>.wordRegex" #. type: Plain text #: en/config/diff.txt:180 -#, fuzzy, priority:280, placeholders:'linkgit:gitattributes[5]' -#| msgid "If the attribute export-subst is set for a file then Git will expand several placeholders when adding this file to an archive. See linkgit:gitattributes[5] for details." +#, placeholders:'linkgit:gitattributes[5]', priority:280 msgid "The regular expression that the diff driver should use to split words in a line. See linkgit:gitattributes[5] for details." -msgstr "如果为一个文件设置了 export-subst 属性，那么当把这个文件添加到存档时，Git 会展开几个占位符。 详情见 linkgit:gitattributes[5]。" +msgstr "正则表达式，diff 驱动程序应使用它来分割一行中的单词。详见 linkgit:gitattributes[5]。" #. type: Labeled list #: en/config/diff.txt:181 #, no-wrap, priority:280 msgid "diff..cachetextconv" -msgstr "" +msgstr "diff.<驱动程序>.cachetextconv" #. type: Plain text #: en/config/diff.txt:184 -#, fuzzy, priority:280, placeholders:'linkgit:gitattributes[5]' -#| msgid "Files and directories with the attribute export-ignore won't be added to archive files. See linkgit:gitattributes[5] for details." +#, placeholders:'linkgit:gitattributes[5]', priority:280 msgid "Set this option to true to make the diff driver cache the text conversion outputs. See linkgit:gitattributes[5] for details." -msgstr "带有 export-ignore 属性的文件和目录不会被添加到存档文件中。 详情见 linkgit:gitattributes[5]。" +msgstr "将此选项设为 true 可使 diff 驱动程序缓存文本转换输出。详见 linkgit:gitattributes[5]。" #. type: Labeled list #: en/config/diff.txt:187 @@ -3683,10 +3631,9 @@ msgstr "diff.indentHeuristic" #. type: Plain text #: en/config/diff.txt:190 -#, fuzzy, priority:280 -#| msgid "Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default." +#, priority:280 msgid "Set this option to `false` to disable the default heuristics that shift diff hunk boundaries to make patches easier to read." -msgstr "启用启发式的缩进区块的方法，使得补丁更易读。这是默认选项。" +msgstr "将此选项设为 `false`，可禁用默认的启发式方法，该方法会移动差异块边界，使补丁更容易读取。" #. type: Labeled list #: en/config/diff.txt:191 @@ -3756,10 +3703,9 @@ msgstr "diff.wsErrorHighlight" #. type: Plain text #: en/config/diff.txt:216 -#, fuzzy, priority:280, placeholders:'color.diff.whitespace':'--ws-error-highlight=' -#| msgid "Highlight whitespace errors in the `context`, `old` or `new` lines of the diff. Multiple values are separated by comma, `none` resets previous values, `default` reset the list to `new` and `all` is a shorthand for `old,new,context`. When this option is not given, and the configuration variable `diff.wsErrorHighlight` is not set, only whitespace errors in `new` lines are highlighted. The whitespace errors are colored with `color.diff.whitespace`." +#, placeholders:'color.diff.whitespace':'--ws-error-highlight=', priority:280 msgid "Highlight whitespace errors in the `context`, `old` or `new` lines of the diff. Multiple values are separated by comma, `none` resets previous values, `default` reset the list to `new` and `all` is a shorthand for `old,new,context`. The whitespace errors are colored with `color.diff.whitespace`. The command line option `--ws-error-highlight=` overrides this setting." -msgstr "突出显示差异中 `context`（上下文）、`old`（旧）或 `new`（新）行中的空格错误。多个值用逗号隔开，`none` 选项会重置以前的值，`default` 重置列表为 `new`，`all` 是 `old,new,context` 的简写。当没有给定这个选项，并且配置变量 `diff.wsErrorHighlight` 没有设置时，只有 `new` 行中的空格错误会被高亮显示。空格错误会用 `color.diff.whitespace` 配置进行着色。" +msgstr "高亮显示 diff 的 `context`、`old` 或 `new` 行中的空白错误。多个值用逗号分隔，`none` 重置以前的值，`default` 重置为 `new`，`all` 是 `old,new,context` 的缩写。空白错误用 `color.diff.whitespace`着色。命令行选项 `--ws-error-highlight=`可覆盖此设置。" #. type: Labeled list #: en/config/diff.txt:217 @@ -3771,7 +3717,7 @@ msgstr "diff.colorMoved" #: en/config/diff.txt:223 #, priority:280, placeholders:'--color-moved':'linkgit:git-diff[1]' msgid "If set to either a valid `` or a true value, moved lines in a diff are colored differently, for details of valid modes see '--color-moved' in linkgit:git-diff[1]. If simply set to true the default color mode will be used. When set to false, moved lines are not colored." -msgstr "" +msgstr "如果设置为有效的 `<模式>` 或 true 值，diff 中移动的行会以不同的方式着色，有关有效模式的详情，请参阅 linkgit:git-diff[1] 中的 '--color-moved' 选项。如果设置为 true，则使用默认颜色模式。设为 false 时，移动的行不会着色。" #. type: Labeled list #: en/config/diff.txt:224 @@ -3783,7 +3729,7 @@ msgstr "diff.colorMovedWS" #: en/config/diff.txt:227 #, priority:280, placeholders:'diff.colorMoved':'--color-moved-ws':'linkgit:git-diff[1]' msgid "When moved lines are colored using e.g. the `diff.colorMoved` setting, this option controls the `` how spaces are treated for details of valid modes see '--color-moved-ws' in linkgit:git-diff[1]." -msgstr "" +msgstr "当使用 `diff.colorMoved` 等设置为移动的行着色时，此选项控制 `<模式>` 如何处理空格，有关有效模式的详情，请参阅 linkgit:git-diff[1] 中的 '--color-moved-ws' 选项。" #. type: Labeled list #: en/config/init.txt:1 @@ -3807,7 +3753,7 @@ msgstr "init.defaultBranch" #: en/config/init.txt:7 #, priority:300 msgid "Allows overriding the default branch name e.g. when initializing a new repository." -msgstr "" +msgstr "允许覆盖默认分支名称，例如在初始化新仓库时。" #. type: Labeled list #: en/config/merge.txt:1 @@ -3817,8 +3763,7 @@ msgstr "merge.conflictStyle" #. type: Plain text #: en/config/merge.txt:15 -#, fuzzy, priority:240 -#| msgid "Specify the style in which conflicted hunks are written out to working tree files upon merge. The default is \"merge\", which shows a `<<<<<<<` conflict marker, changes made by one side, a `=======` marker, changes made by the other side, and then a `>>>>>>>` marker. An alternate style, \"diff3\", adds a `|||||||` marker and the original text before the `=======` marker. The \"merge\" style tends to produce smaller conflict regions than diff3, both because of the exclusion of the original text, and because when a subset of lines match on the two sides, they are just pulled out of the conflict region. Another alternate style, \"zdiff3\", is similar to diff3 but removes matching lines on the two sides from the conflict region when those matching lines appear near either the beginning or end of a conflict region." +#, priority:240 msgid "Specify the style in which conflicted hunks are written out to working tree files upon merge. The default is \"merge\", which shows a `<<<<<<<` conflict marker, changes made by one side, a `=======` marker, changes made by the other side, and then a `>>>>>>>` marker. An alternate style, \"diff3\", adds a `|||||||` marker and the original text before the `=======` marker. The \"merge\" style tends to produce smaller conflict regions than diff3, both because of the exclusion of the original text, and because when a subset of lines match on the two sides, they are just pulled out of the conflict region. Another alternate style, \"zdiff3\", is similar to diff3 but removes matching lines on the two sides from the conflict region when those matching lines appear near either the beginning or end of a conflict region." msgstr "指定合并时将冲突块写入工作目录树文件的样式。 默认样式是 \"merge\"（合并），它会显示一个 `<<<<<<<` 冲突标记、一方所做的更改、一个 `=======` 标记、另一方所做的更改，然后是一个 `>>>>>>>` 标记。 另一种样式 \"diff3\" 会在 \"=======\" 标记前添加 \"|||||||\" 标记和原文。 “合并” 样式产生的冲突区域往往比 diff3 小，一是因为不包含原始文本，二是因为当双方有子集行匹配时，这些行会被从冲突区域中拉出。 另一种样式是 \"zdiff3\"，它与 diff3 类似，但会在冲突区域的开头或结尾附近出现匹配行时，将这些匹配行从冲突区域中移除。" @@ -3830,8 +3775,7 @@ msgstr "merge.defaultToUpstream" #. type: Plain text #: en/config/merge.txt:25 -#, fuzzy, priority:240 -#| msgid "If merge is called without any commit argument, merge the upstream branches configured for the current branch by using their last observed values stored in their remote-tracking branches. The values of the `branch..merge` that name the branches at the remote named by `branch..remote` are consulted, and then they are mapped via `remote..fetch` to their corresponding remote-tracking branches, and the tips of these tracking branches are merged. Defaults to true." +#, priority:240 msgid "If merge is called without any commit argument, merge the upstream branches configured for the current branch by using their last observed values stored in their remote-tracking branches. The values of the `branch..merge` that name the branches at the remote named by `branch..remote` are consulted, and then they are mapped via `remote..fetch` to their corresponding remote-tracking branches, and the tips of these tracking branches are merged. Defaults to true." msgstr "如果调用 merge 时没有任何提交参数，则通过使用存储在其远程跟踪分支中的最后观察值来合并为当前分支配置的上游分支。 `branch.<当前分支>.merge` 的值会被查阅，这些值命名了由 `branch.<当前分支>.remote` 命名的远程分支，然后通过 `remote.<远程仓库>.fetch` 将它们映射到相应的远程跟踪分支，并合并这些跟踪分支的提示。默认为 true。" @@ -3867,8 +3811,7 @@ msgstr "merge.renameLimit" #. type: Plain text #: en/config/merge.txt:49 -#, fuzzy, priority:240, placeholders:'diff.renameLimit':'merge.renameLimit':'diff.renameLimit' -#| msgid "The number of files to consider in the exhaustive portion of rename detection during a merge. If not specified, defaults to the value of diff.renameLimit. If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000. This setting has no effect if rename detection is turned off." +#, placeholders:'diff.renameLimit':'merge.renameLimit':'diff.renameLimit', priority:240 msgid "The number of files to consider in the exhaustive portion of rename detection during a merge. If not specified, defaults to the value of diff.renameLimit. If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000. This setting has no effect if rename detection is turned off." msgstr "合并过程中重命名检测穷举部分要考虑的文件数量。 如果未指定，默认值为 diff.renameLimit 的值。 如果既未指定 merge.renameLimit 也未指定 diff.renameLimit，则默认值为 7000。 如果重命名检测已关闭，则此设置无效。" @@ -3880,8 +3823,7 @@ msgstr "merge.renames" #. type: Plain text #: en/config/merge.txt:54 -#, fuzzy, priority:240, placeholders:'diff.renames' -#| msgid "Whether Git detects renames. If set to \"false\", rename detection is disabled. If set to \"true\", basic rename detection is enabled. Defaults to the value of diff.renames." +#, placeholders:'diff.renames', priority:240 msgid "Whether Git detects renames. If set to \"false\", rename detection is disabled. If set to \"true\", basic rename detection is enabled. Defaults to the value of diff.renames." msgstr "Git是否会检测重名。 如果设置为 \"false\"，重名检测被禁用。如果设置为 \"true\"，则启用基本重名检测。 默认为 diff.renames 的值。" @@ -3893,8 +3835,7 @@ msgstr "merge.directoryRenames" #. type: Plain text #: en/config/merge.txt:67 -#, fuzzy, priority:240, placeholders:'merge.directoryRenames':'merge.renames':'merge.directoryRenames' -#| msgid "Whether Git detects directory renames, affecting what happens at merge time to new files added to a directory on one side of history when that directory was renamed on the other side of history. If merge.directoryRenames is set to \"false\", directory rename detection is disabled, meaning that such new files will be left behind in the old directory. If set to \"true\", directory rename detection is enabled, meaning that such new files will be moved into the new directory. If set to \"conflict\", a conflict will be reported for such paths. If merge.renames is false, merge.directoryRenames is ignored and treated as false. Defaults to \"conflict\"." +#, placeholders:'merge.directoryRenames':'merge.renames':'merge.directoryRenames', priority:240 msgid "Whether Git detects directory renames, affecting what happens at merge time to new files added to a directory on one side of history when that directory was renamed on the other side of history. If merge.directoryRenames is set to \"false\", directory rename detection is disabled, meaning that such new files will be left behind in the old directory. If set to \"true\", directory rename detection is enabled, meaning that such new files will be moved into the new directory. If set to \"conflict\", a conflict will be reported for such paths. If merge.renames is false, merge.directoryRenames is ignored and treated as false. Defaults to \"conflict\"." msgstr "Git是否检测目录重名，影响在合并时对历史一侧的目录被重命名时加入的新文件的处理。 如果merge.directoryRenames设置为 \"false\"，目录重名检测将被禁用，这意味着这些新文件将被遗留在旧目录中。 如果设置为 \"true\"，目录重名检测被启用，意味着这样的新文件将被移到新目录中。 如果设置为 \"冲突\"，将报告此类路径的冲突。 如果merge.renames为false，merge.directoryRenames将被忽略并被视为false。 默认为 \"冲突\"。" @@ -3906,8 +3847,7 @@ msgstr "merge.renormalize" #. type: Plain text #: en/config/merge.txt:77 -#, fuzzy, priority:240, placeholders:'linkgit:gitattributes[5]' -#| msgid "Tell Git that canonical representation of files in the repository has changed over time (e.g. earlier commits record text files with CRLF line endings, but recent ones use LF line endings). In such a repository, Git can convert the data recorded in commits to a canonical form before performing a merge to reduce unnecessary conflicts. For more information, see section \"Merging branches with differing checkin/checkout attributes\" in linkgit:gitattributes[5]." +#, placeholders:'linkgit:gitattributes[5]', priority:240 msgid "Tell Git that canonical representation of files in the repository has changed over time (e.g. earlier commits record text files with CRLF line endings, but recent ones use LF line endings). In such a repository, Git can convert the data recorded in commits to a canonical form before performing a merge to reduce unnecessary conflicts. For more information, see section \"Merging branches with differing checkin/checkout attributes\" in linkgit:gitattributes[5]." msgstr "告诉 Git 仓库中文件的正则表示法随着时间的推移而改变（例如，早期的提交记录文本文件使用 CRLF 行结尾，但最近的提交使用 LF 行结尾）。 在这样的仓库中，Git 可以在执行合并之前将提交的数据转换为规范的形式，以减少不必要的冲突。 更多信息，请参阅 linkgit:gitattributes[5] 中的 \"合并具有不同签入/签出属性的分支 \"一节。" @@ -3919,8 +3859,7 @@ msgstr "merge.stat" #. type: Plain text #: en/config/merge.txt:81 -#, fuzzy, priority:240, placeholders:'ORIG_HEAD' -#| msgid "Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge. True by default." +#, placeholders:'ORIG_HEAD', priority:240 msgid "Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge. True by default." msgstr "是否在合并结束后打印ORIG_HEAD和合并结果之间的差异统计表。 默认为 \"真\"。" @@ -3932,8 +3871,7 @@ msgstr "merge.autoStash" #. type: Plain text #: en/config/merge.txt:91 -#, fuzzy, priority:240, placeholders:'--no-autostash':'--autostash':'linkgit:git-merge[1]' -#| msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run merge on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts. This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1]. Defaults to false." +#, placeholders:'--no-autostash':'--autostash':'linkgit:git-merge[1]', priority:240 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run merge on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts. This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1]. Defaults to false." msgstr "当设置为 \"true \"时，在操作开始前自动创建一个临时的储藏库条目，并在操作结束后应用它。 这意味着你可以在一个肮脏的工作树上运行merge。 然而，要小心使用：在成功的合并之后，最后的储藏库应用可能会导致非实质性的冲突。 这个选项可以被 linkgit:git-merge[1] 的 `--no-autostash` 和 `--autostash` 选项覆盖。 默认为false。" @@ -3945,8 +3883,7 @@ msgstr "merge.tool" #. type: Plain text #: en/config/merge.txt:97 -#, fuzzy, priority:240, placeholders:'linkgit:git-mergetool[1]' -#| msgid "Controls which merge tool is used by linkgit:git-mergetool[1]. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool..cmd variable is defined." +#, placeholders:'linkgit:git-mergetool[1]', priority:240 msgid "Controls which merge tool is used by linkgit:git-mergetool[1]. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool..cmd variable is defined." msgstr "控制linkgit:git-mergetool[1]使用哪个合并工具。 下面的列表显示了有效的内置值。 任何其他值都被视为自定义的合并工具，需要定义一个相应的mergetool..cmd变量。" @@ -3958,8 +3895,7 @@ msgstr "merge.guitool" #. type: Plain text #: en/config/merge.txt:103 -#, fuzzy, priority:240, placeholders:'linkgit:git-mergetool[1]':'--gui' -#| msgid "Controls which merge tool is used by linkgit:git-mergetool[1] when the -g/--gui flag is specified. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool..cmd variable is defined." +#, placeholders:'linkgit:git-mergetool[1]':'--gui', priority:240 msgid "Controls which merge tool is used by linkgit:git-mergetool[1] when the -g/--gui flag is specified. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool..cmd variable is defined." msgstr "控制linkgit:git-mergetool[1]在指定-g/--gui标志时使用的合并工具。下面的列表显示了有效的内置值。 任何其他值都被视为自定义的合并工具，需要定义一个相应的mergetool..cmd变量。" @@ -3971,8 +3907,7 @@ msgstr "merge.verbosity" #. type: Plain text #: en/config/merge.txt:113 -#, fuzzy, priority:240, placeholders:'GIT_MERGE_VERBOSITY' -#| msgid "Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. Can be overridden by the `GIT_MERGE_VERBOSITY` environment variable." +#, placeholders:'GIT_MERGE_VERBOSITY', priority:240 msgid "Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. Can be overridden by the `GIT_MERGE_VERBOSITY` environment variable." msgstr "控制递归合并策略所显示的输出量。 0级除了在检测到冲突时有一个最终的错误信息外，什么都不输出。1级只输出冲突，2级输出冲突和文件变化。 5级及以上输出调试信息。 默认是第2级。 可以通过`GIT_MERGE_VERBOSITY`环境变量覆盖。" @@ -3984,8 +3919,7 @@ msgstr "合并..name" #. type: Plain text #: en/config/merge.txt:117 -#, fuzzy, priority:240, placeholders:'linkgit:gitattributes[5]' -#| msgid "Defines a human-readable name for a custom low-level merge driver. See linkgit:gitattributes[5] for details." +#, placeholders:'linkgit:gitattributes[5]', priority:240 msgid "Defines a human-readable name for a custom low-level merge driver. See linkgit:gitattributes[5] for details." msgstr "为自定义的低级合并驱动定义了一个具有可读性的名字。 详情见 linkgit:gitattributes[5]。" @@ -3997,8 +3931,7 @@ msgstr "merge..driver" #. type: Plain text #: en/config/merge.txt:121 -#, fuzzy, priority:240, placeholders:'linkgit:gitattributes[5]' -#| msgid "Defines the command that implements a custom low-level merge driver. See linkgit:gitattributes[5] for details." +#, placeholders:'linkgit:gitattributes[5]', priority:240 msgid "Defines the command that implements a custom low-level merge driver. See linkgit:gitattributes[5] for details." msgstr "定义实现自定义低级合并驱动程序的命令。详见链接 linkgit:gitattributes[5]。" @@ -4010,8 +3943,7 @@ msgstr "merge.<驱动程序>.recursive" #. type: Plain text #: en/config/merge.txt:125 -#, fuzzy, priority:240, placeholders:'linkgit:gitattributes[5]' -#| msgid "Names a low-level merge driver to be used when performing an internal merge between common ancestors. See linkgit:gitattributes[5] for details." +#, placeholders:'linkgit:gitattributes[5]', priority:240 msgid "Names a low-level merge driver to be used when performing an internal merge between common ancestors. See linkgit:gitattributes[5] for details." msgstr "在执行共同祖先之间的内部合并时，命名一个低级别的合并驱动。 详情见 linkgit:gitattributes[5]。" @@ -4023,8 +3955,7 @@ msgstr "merge.branchdesc" #. type: Plain text #: en/config/fmt-merge-msg.txt:5 -#, fuzzy, priority:240 -#| msgid "In addition to branch names, populate the log message with the branch description text associated with them. Defaults to false." +#, priority:240 msgid "In addition to branch names, populate the log message with the branch description text associated with them. Defaults to false." msgstr "除了分支名称之外，还使用与其关联的分支描述文本填充日志消息。默认为 false。" @@ -4036,8 +3967,7 @@ msgstr "merge.log" #. type: Plain text #: en/config/fmt-merge-msg.txt:11 -#, fuzzy, priority:240 -#| msgid "In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged. Defaults to false, and true is a synonym for 20." +#, priority:240 msgid "In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged. Defaults to false, and true is a synonym for 20." msgstr "除了分支名称外，在日志信息中最多加入指定数量的被合并的实际提交的单行描述。 默认为 false，true 是2 0 的同义词。" @@ -4055,8 +3985,7 @@ msgstr "通过向这个多值配置变量添加一个匹配集成分支名称的 #. type: Plain text #: en/config/fmt-merge-msg.txt:22 -#, fuzzy, priority:240, placeholders:'merge.suppressDest' -#| msgid "An element with an empty value can be used to clear the list of globs accumulated from previous configuration entries. When there is no `merge.suppressDest` variable defined, the default value of `master` is used for backward compatibility." +#, placeholders:'merge.suppressDest', priority:240 msgid "An element with an empty value can be used to clear the list of globs accumulated from previous configuration entries. When there is no `merge.suppressDest` variable defined, the default value of `master` is used for backward compatibility." msgstr "一个空值的元素可以用来清除以前配置项积累的globs列表。 当没有定义`merge.suppressDest`变量时，为了向后兼容，会使用默认值`master`。" @@ -4080,8 +4009,7 @@ msgstr "Git 内部格式" #. type: Plain text #: en/date-formats.txt:12 -#, fuzzy, priority:280 -#| msgid "It is ` `, where `` is the number of seconds since the UNIX epoch. `` is a positive or negative offset from UTC. For example CET (which is 1 hour ahead of UTC) is `+0100`." +#, priority:280 msgid "It is ` `, where `` is the number of seconds since the UNIX epoch. `` is a positive or negative offset from UTC. For example CET (which is 1 hour ahead of UTC) is `+0100`." msgstr "` <时区偏移量>`，其中 `` 是自 UNIX epoch 以来的秒数。 `<时区偏移量>` 是相对于 UTC 的正或负偏移量。例如，CET（比 UTC 提前1小时）为 `+0100`。" @@ -4351,8 +4279,7 @@ msgstr "X：\"unknown\"（未知）更改类型（可能为错误，请报告） #. type: Plain text #: en/diff-format.txt:71 -#, fuzzy, priority:280 -#| msgid "Status letters C and R are always followed by a score (denoting the percentage of similarity between the source and target of the move or copy). Status letter M may be followed by a score (denoting the percentage of dissimilarity) for file rewrites." +#, priority:280 msgid "Status letters C and R are always followed by a score (denoting the percentage of similarity between the source and target of the move or copy). Status letter M may be followed by a score (denoting the percentage of dissimilarity) for file rewrites." msgstr "状态字母 C 和 R 后面总是一个分数（表示移动或复制的源与目标之间的相似性百分比）。状态字母 M 后面可能有文件重写的分数（表示相异百分比）。" @@ -4376,8 +4303,7 @@ msgstr ":100644 100644 5be4a4a 0000000 M 文件.c\n" #. type: Plain text #: en/diff-format.txt:85 en/git-ls-files.txt:257 en/git-ls-tree.txt:134 -#, fuzzy, priority:280, placeholders:'core.quotePath':'linkgit:git-config[1]' -#| msgid "Without the `-z` option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). Using `-z` the filename is output verbatim and the line is terminated by a NUL byte." +#, placeholders:'core.quotePath':'linkgit:git-config[1]', priority:280 msgid "Without the `-z` option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). Using `-z` the filename is output verbatim and the line is terminated by a NUL byte." msgstr "如果没有 `-z` 选项，带 “不常见” 字符的路径名会被加上引号，正如配置变量 `core.quotePath` 所解释的那样（参见 linkgit:git-config[1]）。 使用 `-z` 选项，文件名将被逐字输出，并以 NUL 字节结束。" @@ -4389,8 +4315,7 @@ msgstr "合并的差异格式" #. type: Plain text #: en/diff-format.txt:93 -#, fuzzy, priority:280, placeholders:'git-diff-tree':'git-diff-files':'git-diff':'--raw':'--cc' -#| msgid "\"git-diff-tree\", \"git-diff-files\" and \"git-diff --raw\" can take `-c` or `--cc` option to generate diff output also for merge commits. The output differs from the format described above in the following way:" +#, placeholders:'git-diff-tree':'git-diff-files':'git-diff':'--raw':'--cc', priority:280 msgid "\"git-diff-tree\", \"git-diff-files\" and \"git-diff --raw\" can take `-c` or `--cc` option to generate diff output also for merge commits. The output differs from the format described above in the following way:" msgstr "\"git-diff-tree\"、\"git-diff-files\" 和 \"git-diff --raw\" 可以使用 `-c` 或 `--cc` 选项来生成差异输出，也可以用于合并提交。其输出与上面描述的格式有以下不同：" @@ -4426,8 +4351,7 @@ msgstr "以制表符分隔的文件路径名" #. type: Plain text #: en/diff-format.txt:104 -#, fuzzy, priority:280, placeholders:'--cc':'--combined-all-paths' -#| msgid "For `-c` and `--cc`, only the destination or final path is shown even if the file was renamed on any side of history. With `--combined-all-paths`, the name of the path in each parent is shown followed by the name of the path in the merge commit." +#, placeholders:'--cc':'--combined-all-paths', priority:280 msgid "For `-c` and `--cc`, only the destination or final path is shown even if the file was renamed on any side of history. With `--combined-all-paths`, the name of the path in each parent is shown followed by the name of the path in the merge commit." msgstr "对于 `-c` 和 `--cc` 选项，即使文件在历史中的任何一边被重命名，也只显示目标路径或最终路径。使用 `--combined-all-paths` 选项，则每个父提交中的路径名称会在合并提交中的路径名称后面显示。" @@ -4481,15 +4405,13 @@ msgstr "其他差异格式" #. type: Plain text #: en/diff-format.txt:134 -#, fuzzy, priority:280, placeholders:'--summary':'--stat' -#| msgid "The `--summary` option describes newly added, deleted, renamed and copied files. The `--stat` option adds diffstat(1) graph to the output. These options can be combined with other options, such as `-p`, and are meant for human consumption." +#, placeholders:'--summary':'--stat', priority:280 msgid "The `--summary` option describes newly added, deleted, renamed and copied files. The `--stat` option adds diffstat(1) graph to the output. These options can be combined with other options, such as `-p`, and are meant for human consumption." msgstr "`--summary` 选项描述新添加、删除、重命名和复制的文件。`--stat` 选项将 diffstat(1) 图添加到输出中。这些选项可以与其他选项组合在一起，如 `-p` 选项可以提高可读性。" #. type: Plain text #: en/diff-format.txt:139 -#, fuzzy, priority:280, placeholders:'--stat' -#| msgid "When showing a change that involves a rename or a copy, `--stat` output formats the pathnames compactly by combining common prefix and suffix of the pathnames. For example, a change that moves `arch/i386/Makefile` to `arch/x86/Makefile` while modifying 4 lines will be shown like this:" +#, placeholders:'--stat', priority:280 msgid "When showing a change that involves a rename or a copy, `--stat` output formats the pathnames compactly by combining common prefix and suffix of the pathnames. For example, a change that moves `arch/i386/Makefile` to `arch/x86/Makefile` while modifying 4 lines will be shown like this:" msgstr "当显示一个涉及到重命名或复制的更改时，`--stat` 输出会将路径名的前缀和后缀结合在一起，会以较紧凑的方式显示。例如，将 `arch/i386/Makefile` 移动到 `arch/x86/Makefile`，同时修改了 4 行，就会显示出这样的变化：" @@ -4501,8 +4423,7 @@ msgstr "arch/{i386 => x86}/Makefile | 4 +--\n" #. type: Plain text #: en/diff-format.txt:147 -#, fuzzy, priority:280, placeholders:'--numstat':'--numstat' -#| msgid "The `--numstat` option gives the diffstat(1) information but is designed for easier machine consumption. An entry in `--numstat` output looks like this:" +#, placeholders:'--numstat':'--numstat', priority:280 msgid "The `--numstat` option gives the diffstat(1) information but is designed for easier machine consumption. An entry in `--numstat` output looks like this:" msgstr "`--numstat` 选项提供了 diffstat(1) 的信息，但其是为了方便程序使用而设计的。`--numstat` 输出中的一个条目如下：" @@ -4600,8 +4521,7 @@ msgstr "一个 NUL 字符。" #. type: Plain text #: en/diff-format.txt:185 -#, fuzzy, priority:280 -#| msgid "The extra `NUL` before the preimage path in renamed case is to allow scripts that read the output to tell if the current record being read is a single-path record or a rename/copy record without reading ahead. After reading added and deleted lines, reading up to `NUL` would yield the pathname, but if that is `NUL`, the record will show two paths." +#, priority:280 msgid "The extra `NUL` before the preimage path in renamed case is to allow scripts that read the output to tell if the current record being read is a single-path record or a rename/copy record without reading ahead. After reading added and deleted lines, reading up to `NUL` would yield the pathname, but if that is `NUL`, the record will show two paths." msgstr "在重命名的情况下，完整路径前多出的 `NUL` 为了让读取输出的脚本能够判断，当前被读取的记录是单路径记录还是重命名/复制记录，而不需要提前读取。在读完增删行数后，读至 `NUL` 会得到路径名，但如果先读到 `NUL`，记录将显示两个路径。" @@ -4613,8 +4533,7 @@ msgstr "使用选项 `-p` 生成补丁文本" #. type: Plain text #: en/diff-generate-patch.txt:16 -#, fuzzy, priority:280, placeholders:'linkgit:git-diff[1]':'linkgit:git-log[1]':'linkgit:git-show[1]':'linkgit:git-diff-index[1]':'linkgit:git-diff-tree[1]':'linkgit:git-diff-files[1]':'GIT_EXTERNAL_DIFF':'GIT_DIFF_OPTS':'linkgit:git[1]':'linkgit:gitattributes[5]' -#| msgid "Running linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], or linkgit:git-diff-files[1] with the `-p` option produces patch text. You can customize the creation of patch text via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables (see linkgit:git[1]), and the `diff` attribute (see linkgit:gitattributes[5])." +#, placeholders:'linkgit:git-diff[1]':'linkgit:git-log[1]':'linkgit:git-show[1]':'linkgit:git-diff-index[1]':'linkgit:git-diff-tree[1]':'linkgit:git-diff-files[1]':'GIT_EXTERNAL_DIFF':'GIT_DIFF_OPTS':'linkgit:git[1]':'linkgit:gitattributes[5]', priority:280 msgid "Running linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], or linkgit:git-diff-files[1] with the `-p` option produces patch text. You can customize the creation of patch text via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables (see linkgit:git[1]), and the `diff` attribute (see linkgit:gitattributes[5])." msgstr "使用 `-p` 选项运行 linkgit:git-diff[1]、linkgit:git-log[1]、linkgit:git-show[1]、linkgit:git-diff-index[1]、linkgit:git-diff-tree[1] 或 linkgit:git-diff-files[1] 会生成补丁文本。 你可以通过 `GIT_EXTERNAL_DIFF` 和 `GIT_DIFF_OPTS` 环境变量（参见 linkgit:git[1]），以及 `diff` 属性（参见 linkgit:gitattributes[5]）自定义补丁文本的创建。" @@ -4638,8 +4557,7 @@ msgstr "diff --git a/file1 b/file2\n" #. type: Plain text #: en/diff-generate-patch.txt:27 -#, fuzzy, priority:280 -#| msgid "The `a/` and `b/` filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, `/dev/null` is _not_ used in place of the `a/` or `b/` filenames." +#, priority:280 msgid "The `a/` and `b/` filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, `/dev/null` is _not_ used in place of the `a/` or `b/` filenames." msgstr "`a/` 和 `b/` 的文件名相同，除非涉及到重命名/复制。特别地，即使是创建或删除，也 _不_ 使用 `/dev/null` 来代替 `a/` 或 `b/` 文件名。" @@ -4697,15 +4615,13 @@ msgstr "扩展头信息中的路径名称不包括 `a/` 和 `b/` 前缀。" #. type: Plain text #: en/diff-generate-patch.txt:57 -#, fuzzy, priority:280 -#| msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one." +#, priority:280 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one." msgstr "相似性指数是未改变的行占比，而不相似性指数是改变的行占比。它是四舍五入的整数，后有百分号。因此，100%的相似度指数指为两个文件相等，而 100% 的不相似度意味着入新文件中没有旧文件中的行。" #. type: Plain text #: en/diff-generate-patch.txt:61 -#, fuzzy, priority:280 -#| msgid "The index line includes the blob object names before and after the change. The is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode." +#, priority:280 msgid "The index line includes the blob object names before and after the change. The is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode." msgstr "索引行包括改变前和改变后的 blob 对象名称。如果文件模式没有变化，则包含 <模式>；否则，分别显示新旧模式。" @@ -4717,8 +4633,7 @@ msgstr "含有 \"不常见\" 字符的路径名会被引用，这一点在配置 #. type: Plain text #: en/diff-generate-patch.txt:70 -#, fuzzy, priority:280 -#| msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:" +#, priority:280 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:" msgstr "输出中所有的 `file1` 文件都是指提交前的文件，而所有的 `file2` 文件都是指提交后的文件。按顺序对每个文件进行修改是不正确的。例如，这个补丁将交换文件 a 和 b：" @@ -4742,8 +4657,7 @@ msgstr "" #. type: Plain text #: en/diff-generate-patch.txt:82 -#, fuzzy, priority:280, placeholders:'linkgit:gitattributes[5]' -#| msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages." +#, placeholders:'linkgit:gitattributes[5]', priority:280 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages." msgstr "块头提到了块头所适用的函数的名称。 参见 linkgit:gitattributes[5] 中的 “定义自定义 hunk-header”，以了解如何针对特定语言进行定制。" @@ -4940,29 +4854,25 @@ msgstr "块中有（父提交数量+1）`@` 字符，用于合并的差异格式 #. type: Plain text #: en/diff-generate-patch.txt:190 -#, fuzzy, ignore-ellipsis, priority:280 -#| msgid "Unlike the traditional 'unified' diff format, which shows two files A and B with a single column that has `-` (minus -- appears in A but removed in B), `+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) prefix, this format compares two or more files file1, file2,... with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it." +#, ignore-ellipsis, priority:280 msgid "Unlike the traditional 'unified' diff format, which shows two files A and B with a single column that has `-` (minus -- appears in A but removed in B), `+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) prefix, this format compares two or more files file1, file2,... with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it." msgstr "与传统的 \"统一\" 差异格式不同，这种格式显示两个文件 A 和 B 的列，其中有 `-`（减号 -- 在 A 中出现，但在 B 中删除），`+`（加号 -- 在 A 中缺少，但在 B 中增加），或 `\" \"`（空格 -- 不变）前缀，这种格式比较两个或多个文件与一个文件 X，并显示 X 与其中每个文件的差异。文件中的每一个都有一列被前置在输出行中，以指出 X 的行与它的不同之处。" #. type: Plain text #: en/diff-generate-patch.txt:196 -#, fuzzy, priority:280 -#| msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)." +#, priority:280 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)." msgstr "第 N 列中的 `-` 字符意味着该行出现在文件 N 中，但它没有出现在结果文件中。第 N 列中的 `+` 字符意味着该行出现在结果文件中，而文件 N 中没有该行（换句话说，从该父提交的角度来看，该行是被添加的）。" #. type: Plain text #: en/diff-generate-patch.txt:202 -#, fuzzy, priority:280 -#| msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)." +#, priority:280 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)." msgstr "在上面的输出示例中，两个文件中的函数签名都被改变了（因此从文件 1 和文件 2 中都有表示删除的 `-`，而 `++` 表示被添加的一行没有出现在文件 1 或文件 2 中）。另外还有 8 行与文件 1 中的相同，但没有出现在文件 2 中（因此前缀为 `+`）。" #. type: Plain text #: en/diff-generate-patch.txt:208 -#, fuzzy, priority:280, placeholders:'git diff-tree':'git diff-files' -#| msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")." +#, placeholders:'git diff-tree':'git diff-files', priority:280 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")." msgstr "当用 `git diff-tree -c` 显示时，它将合并提交的父提交文件与合并结果进行比较（即文件 1 ... 文件 N 是父提交文件）。当用 `git diff-files -c` 显示时，它将两个未解决的合并父提交文件与工作树文件进行比较（即文件 1 是阶段 2 ，又称 \"我们的版本\"，文件 2 是阶段 3，又称 \"他们的版本\"）。" @@ -5017,8 +4927,7 @@ msgstr "--no-patch" # ERROR: --stat not found in translation #. type: Plain text #: en/diff-options.txt:36 -#, fuzzy, priority:280, placeholders:'--patch':'--stat' -#| msgid "Suppress all output from the diff machinery. Useful for commands like `git show` that show the patch by default to squelch their output, or to cancel the effect of options like `--patch`, `--stat` earlier on the command line in an alias." +#, placeholders:'--patch':'--stat', priority:280 msgid "Suppress all output from the diff machinery. Useful for commands like `git show` that show the patch by default to squelch their output, or to cancel the effect of options like `--patch`, `--stat` earlier on the command line in an alias." msgstr "抑制差异（diff）工具的所有输出。 对于默认显示补丁的 `git show` 等命令，可以压制其输出，或在别名中取消命令行中的 `--patch`、`--stat` 等选项的效果。" @@ -5042,8 +4951,7 @@ msgstr "-c" #. type: Plain text #: en/diff-options.txt:48 -#, fuzzy, priority:280, placeholders:'--diff-merges=combined' -#| msgid "Produce combined diff output for merge commits. Shortcut for '--diff-merges=combined -p'." +#, placeholders:'--diff-merges=combined', priority:280 msgid "Produce combined diff output for merge commits. Shortcut for '--diff-merges=combined -p'." msgstr "生成合并提交的合并差异输出。 '--diff-merges=combined -p' 的快捷方式。" @@ -5055,8 +4963,7 @@ msgstr "--cc" #. type: Plain text #: en/diff-options.txt:52 -#, fuzzy, priority:280, placeholders:'--diff-merges=dense-combined' -#| msgid "Produce dense combined diff output for merge commits. Shortcut for '--diff-merges=dense-combined -p'." +#, placeholders:'--diff-merges=dense-combined', priority:280 msgid "Produce dense combined diff output for merge commits. Shortcut for '--diff-merges=dense-combined -p'." msgstr "生成合并提交的密集合并差异输出。 '--diff-merges=dense-combined -p' 的快捷方式。" @@ -5068,8 +4975,7 @@ msgstr "--dd" #. type: Plain text #: en/diff-options.txt:57 -#, fuzzy, priority:280, placeholders:'--diff-merges=first-parent' -#| msgid "Produce diff with respect to first parent for both merge and regular commits. Shortcut for '--diff-merges=first-parent -p'." +#, placeholders:'--diff-merges=first-parent', priority:280 msgid "Produce diff with respect to first parent for both merge and regular commits. Shortcut for '--diff-merges=first-parent -p'." msgstr "为合并提交和常规提交生成与第一父提交的差异。 '--diff-merges=first-parent -p' 的快捷方式。" @@ -5081,8 +4987,7 @@ msgstr "--remerge-diff" #. type: Plain text #: en/diff-options.txt:61 -#, fuzzy, priority:280, placeholders:'--diff-merges=remerge' -#| msgid "Produce remerge-diff output for merge commits. Shortcut for '--diff-merges=remerge -p'." +#, placeholders:'--diff-merges=remerge', priority:280 msgid "Produce remerge-diff output for merge commits. Shortcut for '--diff-merges=remerge -p'." msgstr "生成合并提交的 remerge-diff 输出。 '--diff-merges=remerge -p' 的快捷方式。" @@ -5160,8 +5065,7 @@ msgstr "separate" #. type: Plain text #: en/diff-options.txt:90 -#, fuzzy, priority:280 -#| msgid "Show full diff with respect to each of parents. Separate log entry and diff is generated for each parent." +#, priority:280 msgid "Show full diff with respect to each of parents. Separate log entry and diff is generated for each parent." msgstr "显示每个父代的完整差异。 每个父代都会生成单独的日志条目和差异。" @@ -5197,8 +5101,7 @@ msgstr "remerge, r" #. type: Plain text #: en/diff-options.txt:108 -#, fuzzy, priority:280 -#| msgid "Remerge two-parent merge commits to create a temporary tree object--potentially containing files with conflict markers and such. A diff is then shown between that temporary tree and the actual merge commit." +#, priority:280 msgid "Remerge two-parent merge commits to create a temporary tree object--potentially containing files with conflict markers and such. A diff is then shown between that temporary tree and the actual merge commit." msgstr "重合双亲合并提交以创建临时目录树对象——可能包含冲突标记等文件。 然后会显示临时目录树与实际合并提交之间的差异。" @@ -5216,8 +5119,7 @@ msgstr "--combined-all-paths" #. type: Plain text #: en/diff-options.txt:120 -#, fuzzy, priority:280, placeholders:'--diff-merges=[dense-]combined' -#| msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when `--diff-merges=[dense-]combined` is in use, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)." +#, placeholders:'--diff-merges=[dense-]combined', priority:280 msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when `--diff-merges=[dense-]combined` is in use, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)." msgstr "这个标志会使合并后的差异文件（用于合并提交）列出所有父提交的名称。，因此它只在使用 `--diff-merges=[dense-]combined` 时有效。其可能在检测到文件名变化时有用（例如，当要求检测重命名或复制时）。" @@ -5428,8 +5330,7 @@ msgstr "--stat[=<宽度>[,<名称宽度>[,<数值>]]]" # ERROR: diff.statNameWidth not found in translation #. type: Plain text #: en/diff-options.txt:229 -#, fuzzy, ignore-ellipsis, priority:280, placeholders:'diff.statNameWidth':'--stat-graph-width=':'diff.statGraphWidth':'--stat':'--stat-graph-width':'diff.statNameWidth':'diff.statGraphWidth':'git format-patch' -#| 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." +#, 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 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 "生成差异统计（diffstat）。默认情况下，文件名部分将使用尽可能多的空间，其余空间用于图表部分。最大宽度默认为终端宽度，如果未连接终端，则为 80 列，可以用 `<最大宽度>`覆盖。文件名部分的宽度可以通过在逗号后另加宽度 `<文件名宽度>`或设置 `diff.statNameWidth=<文件名宽度>`来限制。图形部分的宽度可以通过使用 `--stat-graph-width=<图形宽度>`或设置 `diff.statGraphWidth=<图像宽度>` 来限制。使用 `--stat` 或 `--stat-graph-width` 选项会影响所有生成统计图的命令，而设置 `diff.statNameWidth` 或 `diff.statGraphWidth` 则不会影响 `git format-patch`。 通过给出第三个参数 `<行数>`，可以将输出限制在前 `<行数>`行，如果行数更多，则在后面加上 `...`。" @@ -5459,8 +5360,7 @@ msgstr "--numstat" #. type: Plain text #: en/diff-options.txt:247 -#, fuzzy, priority:280, placeholders:'--stat' -#| msgid "Similar to `--stat`, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly. For binary files, outputs two `-` instead of saying `0 0`." +#, placeholders:'--stat', priority:280 msgid "Similar to `--stat`, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly. For binary files, outputs two `-` instead of saying `0 0`." msgstr "类似于 `--stat`，但是使用小数点和不含缩写的路径名显示添加和删除的行数，使其对程序更友好。对于二进制文件，输出两个 `-`，而不是 `0 0`。" @@ -5490,8 +5390,7 @@ msgstr "--dirstat[=<参数1,参数2,...>]" #. type: Plain text #: en/diff-options.txt:261 -#, fuzzy, priority:280, placeholders:'--dirstat':'diff.dirstat':'linkgit:git-config[1]' -#| msgid "Output the distribution of relative amount of changes for each sub-directory. The behavior of `--dirstat` can be customized by passing it a comma separated list of parameters. The defaults are controlled by the `diff.dirstat` configuration variable (see linkgit:git-config[1]). The following parameters are available:" +#, placeholders:'--dirstat':'diff.dirstat':'linkgit:git-config[1]', priority:280 msgid "Output the distribution of relative amount of changes for each sub-directory. The behavior of `--dirstat` can be customized by passing it a comma separated list of parameters. The defaults are controlled by the `diff.dirstat` configuration variable (see linkgit:git-config[1]). The following parameters are available:" msgstr "输出每个子目录的相对变化量的分布。`--dirstat` 的行为可以通过传递一个以逗号分隔的参数列表来自定义。默认值由`diff.dirstat` 配置变量控制 (参见 linkgit:git-config[1])。以下是可用的参数：" @@ -5522,10 +5421,9 @@ msgstr "--dirstat-by-file[=<参数1,参数2>...]" #. type: Plain text #: en/diff-options.txt:303 -#, fuzzy, ignore-ellipsis, priority:280, placeholders:'--dirstat=files' -#| msgid "Synonym for --dirstat=files,param1,param2..." +#, ignore-ellipsis, placeholders:'--dirstat=files', priority:280 msgid "Synonym for --dirstat=files,,..." -msgstr "--dirstat=files,param1,param2... 的同义词。" +msgstr "与 --dirstat=files,<参数 1>,<参数 2> 同义" #. type: Labeled list #: en/diff-options.txt:304 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:168 @@ -5595,8 +5493,7 @@ msgstr "--name-only" #. type: Plain text #: en/diff-options.txt:335 -#, fuzzy, priority:280, placeholders:'linkgit:git-log[1]' -#| msgid "Show only names of changed files. The file names are often encoded in UTF-8. For more information see the discussion about encoding in the linkgit:git-log[1] manual page." +#, placeholders:'linkgit:git-log[1]', priority:280 msgid "Show only names of changed files. The file names are often encoded in UTF-8. For more information see the discussion about encoding in the linkgit:git-log[1] manual page." msgstr "只显示更改过的文件的名称。文件名通常以 UTF-8 编码。 更多信息见 linkgit:git-log[1] 手册页中关于编码的讨论。" @@ -5609,8 +5506,7 @@ msgstr "--name-status" # ERROR: --name-only not found in translation #. type: Plain text #: en/diff-options.txt:340 -#, fuzzy, priority:280, placeholders:'--diff-filter':'--name-only' -#| msgid "Show only names and status of changed files. See the description of the `--diff-filter` option on what the status letters mean. Just like `--name-only` the file names are often encoded in UTF-8." +#, placeholders:'--diff-filter':'--name-only', priority:280 msgid "Show only names and status of changed files. See the description of the `--diff-filter` option on what the status letters mean. Just like `--name-only` the file names are often encoded in UTF-8." msgstr "仅显示已更改文件的名称和状态。有关状态字母的含义，请参阅 `--diff-filter` 选项的说明。 与 `--name-only` 一样，文件名通常使用 UTF-8 编码。" @@ -5622,8 +5518,7 @@ msgstr "--submodule[=<格式>]" #. type: Plain text #: en/diff-options.txt:352 -#, fuzzy, priority:280, placeholders:'--submodule=short':'--submodule':'--submodule=log':'linkgit:git-submodule[1]':'--submodule=diff':'diff.submodule' -#| msgid "Specify how differences in submodules are shown. When specifying `--submodule=short` the 'short' format is used. This format just shows the names of the commits at the beginning and end of the range. When `--submodule` or `--submodule=log` is specified, the 'log' format is used. This format lists the commits in the range like linkgit:git-submodule[1] `summary` does. When `--submodule=diff` is specified, the 'diff' format is used. This format shows an inline diff of the changes in the submodule contents between the commit range. Defaults to `diff.submodule` or the 'short' format if the config option is unset." +#, placeholders:'--submodule=short':'--submodule':'--submodule=log':'linkgit:git-submodule[1]':'--submodule=diff':'diff.submodule', priority:280 msgid "Specify how differences in submodules are shown. When specifying `--submodule=short` the 'short' format is used. This format just shows the names of the commits at the beginning and end of the range. When `--submodule` or `--submodule=log` is specified, the 'log' format is used. This format lists the commits in the range like linkgit:git-submodule[1] `summary` does. When `--submodule=diff` is specified, the 'diff' format is used. This format shows an inline diff of the changes in the submodule contents between the commit range. Defaults to `diff.submodule` or the 'short' format if the config option is unset." msgstr "指定子模块中的差异如何显示。当指定 `--submodule=short` 选项时，会使用 'short' 格式。这种格式只显示范围的开头和结尾处的提交名称。当指定了 `--submodule=short` 或 `--submodule=log` 时，会使用 'log' 格式。这种格式会像 linkgit:git-submodule[1] `summary` 那样，列出该范围内的提交。当指定了 `--submodule=diff` 时，会使用 'diff' 格式。这个格式显示的是子模块内在提交范围之间的变化差异。默认为 `diff.submodule`，如果配置选项未设置， 则为 `short` 格式。" @@ -5635,8 +5530,7 @@ msgstr "--color[=]" #. type: Plain text #: en/diff-options.txt:357 -#, fuzzy, priority:280, placeholders:'--color':'--color=always' -#| msgid "Show colored diff. `--color` (i.e. without '=') is the same as `--color=always`. '' can be one of `always`, `never`, or `auto`." +#, placeholders:'--color':'--color=always', priority:280 msgid "Show colored diff. `--color` (i.e. without '=') is the same as `--color=always`. '' can be one of `always`, `never`, or `auto`." msgstr "显示有颜色的差异。`--color`（即不含 '=<何时>'）与 `--color=always` 相同。'<何时>' 可以是 `always`、`never` 或 `auto`。" @@ -5736,8 +5630,7 @@ msgstr "plain" #. type: Plain text #: en/diff-options.txt:391 -#, fuzzy, priority:280, placeholders:'color.diff.newMoved':'color.diff.oldMoved' -#| msgid "Any line that is added in one location and was removed in another location will be colored with 'color.diff.newMoved'. Similarly 'color.diff.oldMoved' will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation." +#, placeholders:'color.diff.newMoved':'color.diff.oldMoved', priority:280 msgid "Any line that is added in one location and was removed in another location will be colored with 'color.diff.newMoved'. Similarly 'color.diff.oldMoved' will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation." msgstr "任何在某个位置被添加，且在另一个位置被删除的行，都会被用 'color.diff.newMoved' 着色。同样的，在差异中在某处删除且在其它地方添加的行会使用 'color.diff.oldMoved' 着色。这种模式可以读取任何被移动的行，但在代码审查中，它不能确定一个代码块是否未经排列而进行了移动。" @@ -5749,8 +5642,7 @@ msgstr "blocks" #. type: Plain text #: en/diff-options.txt:396 -#, fuzzy, priority:280, placeholders:'color.diff' -#| msgid "Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are painted using either the 'color.diff.{old,new}Moved' color. Adjacent blocks cannot be told apart." +#, placeholders:'color.diff', priority:280 msgid "Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are painted using either the 'color.diff.{old,new}Moved' color. Adjacent blocks cannot be told apart." msgstr "使用贪心方法检测含至少 20 个字母数字字符的移动文本块。检测到的区块使用 'color.diff.{old,new}Moved' 的颜色。相邻的区块不能被区分开。" @@ -5774,8 +5666,7 @@ msgstr "dimmed-zebra" #. type: Plain text #: en/diff-options.txt:406 -#, fuzzy, priority:280, placeholders:'dimmed_zebra' -#| msgid "Similar to 'zebra', but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting. `dimmed_zebra` is a deprecated synonym." +#, placeholders:'dimmed_zebra', priority:280 msgid "Similar to 'zebra', but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting. `dimmed_zebra` is a deprecated synonym." msgstr "类似于 'zebra' 模式，但对使移动的代码中不关注的部分变暗。相邻两个区块的边界线被认为是重要，其余的部分是无关紧要的。`dimmed_zebra` 是一个被废弃的同义词。" @@ -5841,8 +5732,7 @@ msgstr "ignore-space-change" #. type: Plain text #: en/diff-options.txt:429 en/diff-options.txt:785 -#, fuzzy, priority:280 -#| msgid "Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent." +#, priority:280 msgid "Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent." msgstr "忽略空格数量的变化。这会忽略行尾的空格，并认为包含一个或多个空格字符的其他序列都是等同的。" @@ -5890,22 +5780,19 @@ msgstr "--word-diff[=<模式>]" #. type: Plain text #: en/diff-options.txt:449 -#, fuzzy, priority:280, placeholders:'--word-diff-regex' -#| msgid "Show a word diff, using the to delimit changed words. By default, words are delimited by whitespace; see `--word-diff-regex` below. The defaults to 'plain', and must be one of:" +#, placeholders:'--word-diff-regex', priority:280 msgid "Show a word diff, using the to delimit changed words. By default, words are delimited by whitespace; see `--word-diff-regex` below. The defaults to 'plain', and must be one of:" msgstr "显示词的差异，用 <模式> 来分隔已更改的词。默认情况下，单词是以空格分隔；请参考 `--word-diff-regex`。<模式> 默认为 `plain`，并且必须是以下其中之一：" #. type: Plain text #: en/diff-options.txt:453 -#, fuzzy, priority:280, placeholders:'--color' -#| msgid "Highlight changed words using only colors. Implies `--color`." +#, placeholders:'--color', priority:280 msgid "Highlight changed words using only colors. Implies `--color`." msgstr "只用颜色突出显示已更改的单词。暗含 `--color` 选项。" #. type: Plain text #: en/diff-options.txt:457 -#, fuzzy, priority:280 -#| msgid "Show words as `[-removed-]` and `{+added+}`. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous." +#, priority:280 msgid "Show words as `[-removed-]` and `{+added+}`. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous." msgstr "显示更改的词为 `[-removed-]` 和 `{+added+}`。如果在输入中出现定界符，则不尝试转义，所以输出可能是多义的。" @@ -5917,8 +5804,7 @@ msgstr "porcelain" #. type: Plain text #: en/diff-options.txt:464 -#, fuzzy, priority:280 -#| msgid "Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the usual unified diff format, starting with a `+`/`-`/` ` character at the beginning of the line and extending to the end of the line. Newlines in the input are represented by a tilde `~` on a line of its own." +#, priority:280 msgid "Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the usual unified diff format, starting with a `+`/`-`/` ` character at the beginning of the line and extending to the end of the line. Newlines in the input are represented by a tilde `~` on a line of its own." msgstr "使用一种特殊的、基于行的格式，供脚本使用。添加/删除/未更改的运行数据以通常的统一的差异格式输出，行的开头以 `+` / `-` / ` ` 字符开始，一直到行的结尾。输入中的新行用单行上的 `~`表示。" @@ -5948,15 +5834,13 @@ msgstr "--word-diff-regex=<正则表达式>" #. type: Plain text #: en/diff-options.txt:475 -#, fuzzy, priority:280, placeholders:'--word-diff' -#| msgid "Use to decide what a word is, instead of considering runs of non-whitespace to be a word. Also implies `--word-diff` unless it was already enabled." +#, placeholders:'--word-diff', priority:280 msgid "Use to decide what a word is, instead of considering runs of non-whitespace to be a word. Also implies `--word-diff` unless it was already enabled." msgstr "使用 <正则表达式> 来确定单词的格式，而不是将一串非空白行视为单词。除非已启用，否则还暗含 `--word-diff` 选项。" #. type: Plain text #: en/diff-options.txt:483 -#, fuzzy, priority:280 -#| msgid "Every non-overlapping match of the is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append `|[^[:space:]]` to your regular expression to make sure that it matches all non-whitespace characters. A match that contains a newline is silently truncated(!) at the newline." +#, priority:280 msgid "Every non-overlapping match of the is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append `|[^[:space:]]` to your regular expression to make sure that it matches all non-whitespace characters. A match that contains a newline is silently truncated(!) at the newline." msgstr "<正则表达式> 匹配的的每一个非重叠的匹配都被视为一个单词。在这些匹配项之间的任何内容都被认为是空白，并且在查找差异时被忽略(!)。您可能需要在您的正则表达式中附加 `|[^[:space:]]`，以确保它匹配所有非空格字符。包含换行的匹配会在换行处被截断(!)。" @@ -5968,8 +5852,7 @@ msgstr "例如，`--word-diff-regex=.` 将把每个字符当作一个单词， #. type: Plain text #: en/diff-options.txt:491 -#, fuzzy, priority:280, placeholders:'linkgit:gitattributes[5]':'linkgit:git-config[1]' -#| msgid "The regex can also be set via a diff driver or configuration option, see linkgit:gitattributes[5] or linkgit:git-config[1]. Giving it explicitly overrides any diff driver or configuration setting. Diff drivers override configuration settings." +#, placeholders:'linkgit:gitattributes[5]':'linkgit:git-config[1]', priority:280 msgid "The regex can also be set via a diff driver or configuration option, see linkgit:gitattributes[5] or linkgit:git-config[1]. Giving it explicitly overrides any diff driver or configuration setting. Diff drivers override configuration settings." msgstr "正则表达式也可以通过差异程序或配置选项来设置，参见 linkgit:gitattributes[5] 或 linkgit:git-config[1]。显式指明会覆盖任何程序或配置。差异程序会覆盖配置。" @@ -6017,8 +5900,7 @@ msgstr "--check" #. type: Plain text #: en/diff-options.txt:514 -#, fuzzy, priority:280, placeholders:'core.whitespace':'--exit-code' -#| msgid "Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by `core.whitespace` configuration. By default, trailing whitespaces (including lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible with --exit-code." +#, placeholders:'core.whitespace':'--exit-code', priority:280 msgid "Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by `core.whitespace` configuration. By default, trailing whitespaces (including lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible with --exit-code." msgstr "如果更改引入冲突标记或空格错误，则发出警告。哪些被认为是空格错误是由 `core.whitespace` 配置控制的。默认情况下，行尾部的空格字符（包括仅由空格字符组成的行）和紧跟在行初缩进内 tab 字符后的空格字符，都被认为是空格字符错误。如果发现问题，则以非零状态退出。与 --exit-code 选项不兼容。" @@ -6030,8 +5912,7 @@ msgstr "--ws-error-highlight=<种类>" #. type: Plain text #: en/diff-options.txt:524 -#, fuzzy, priority:280, placeholders:'diff.wsErrorHighlight':'color.diff.whitespace' -#| msgid "Highlight whitespace errors in the `context`, `old` or `new` lines of the diff. Multiple values are separated by comma, `none` resets previous values, `default` reset the list to `new` and `all` is a shorthand for `old,new,context`. When this option is not given, and the configuration variable `diff.wsErrorHighlight` is not set, only whitespace errors in `new` lines are highlighted. The whitespace errors are colored with `color.diff.whitespace`." +#, placeholders:'diff.wsErrorHighlight':'color.diff.whitespace', priority:280 msgid "Highlight whitespace errors in the `context`, `old` or `new` lines of the diff. Multiple values are separated by comma, `none` resets previous values, `default` reset the list to `new` and `all` is a shorthand for `old,new,context`. When this option is not given, and the configuration variable `diff.wsErrorHighlight` is not set, only whitespace errors in `new` lines are highlighted. The whitespace errors are colored with `color.diff.whitespace`." msgstr "突出显示差异中 `context`（上下文）、`old`（旧）或 `new`（新）行中的空格错误。多个值用逗号隔开，`none` 选项会重置以前的值，`default` 重置列表为 `new`，`all` 是 `old,new,context` 的简写。当没有给定这个选项，并且配置变量 `diff.wsErrorHighlight` 没有设置时，只有 `new` 行中的空格错误会被高亮显示。空格错误会用 `color.diff.whitespace` 配置进行着色。" @@ -6067,8 +5948,7 @@ msgstr "--abbrev[=]" #. type: Plain text #: en/diff-options.txt:548 -#, fuzzy, priority:280, placeholders:'--full-index':'--full-index':'--abbrev':'--abbrev=' -#| msgid "Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header lines, show the shortest prefix that is at least '' hexdigits long that uniquely refers the object. In diff-patch output format, `--full-index` takes higher precedence, i.e. if `--full-index` is specified, full blob names will be shown regardless of `--abbrev`. Non default number of digits can be specified with `--abbrev=`." +#, placeholders:'--full-index':'--full-index':'--abbrev':'--abbrev=', priority:280 msgid "Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header lines, show the shortest prefix that is at least '' hexdigits long that uniquely refers the object. In diff-patch output format, `--full-index` takes higher precedence, i.e. if `--full-index` is specified, full blob names will be shown regardless of `--abbrev`. Non default number of digits can be specified with `--abbrev=`." msgstr "在 diff-raw 格式输出和 diff-tree 头文件行中，不显示完整的 40 字节十六进制对象名称，而是显示唯一指向对象的最短前缀，长度至少为 '' 位十六进制数字。 在 diff-patch 输出格式中，`--full-index` 优先，也就是说，如果指定了 `--full-index`，则无论 `--abbrev` 如何，都会显示完整的 blob 名称。 可以使用 `--abbrev=` 指定非默认位数。" @@ -6166,8 +6046,7 @@ msgstr "--find-copies[=]" #. type: Plain text #: en/diff-options.txt:596 -#, fuzzy, priority:280, placeholders:'--find-copies-harder' -#| msgid "Detect copies as well as renames. See also `--find-copies-harder`. If `n` is specified, it has the same meaning as for `-M`." +#, placeholders:'--find-copies-harder', priority:280 msgid "Detect copies as well as renames. See also `--find-copies-harder`. If `n` is specified, it has the same meaning as for `-M`." msgstr "检测复制与重命名。参见 `--find-copies-harder`。如果指定了 `n`，则其与 `-M` 含义相同。" @@ -6179,8 +6058,7 @@ msgstr "--find-copies-harder" #. type: Plain text #: en/diff-options.txt:605 -#, fuzzy, priority:280 -#| msgid "For performance reasons, by default, `-C` option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command inspect unmodified files as candidates for the source of copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one `-C` option has the same effect." +#, priority:280 msgid "For performance reasons, by default, `-C` option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command inspect unmodified files as candidates for the source of copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one `-C` option has the same effect." msgstr "出于性能考虑，默认情况下，`-C` 选项只在复制的原始文件在相同的变更集中被修改时才会查找复制。这个标志使命令检查未修改的文件作为复制源的候选文件。 对于大型项目来说，这是一个非常耗时的操作，所以要谨慎使用。 给出一个以上的 `-C` 选项有同样的效果。" @@ -6216,8 +6094,7 @@ msgstr "-l<数量>" #. type: Plain text #: en/diff-options.txt:631 -#, fuzzy, priority:280, placeholders:'diff.renameLimit' -#| msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources. (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.) For N sources and destinations, this exhaustive check is O(N^2). This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number. Defaults to diff.renameLimit. Note that a value of 0 is treated as unlimited." +#, placeholders:'diff.renameLimit', priority:280 msgid "The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining unpaired destinations to all relevant sources. (For renames, only remaining unpaired sources are relevant; for copies, all original sources are relevant.) For N sources and destinations, this exhaustive check is O(N^2). This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved exceeds the specified number. Defaults to diff.renameLimit. Note that a value of 0 is treated as unlimited." msgstr "`-M` 和 `-C` 选项涉及一些初步步骤，可以廉价地检测重命名/副本的子集，然后是详尽的后备部分，将所有剩余的未配对目的地与所有相关源进行比较。 （对于重命名，只有剩余的未配对源是相关的；对于副本，所有原始源都是相关的。）对于 N 个源和目的地，这个详尽的检查是 O(N^2)。如果涉及的源/目标文件数量超过指定数量，则此选项可防止重命名/复制检测的详尽部分运行。默认为 diff.renameLimit。请注意，值 0 被视为无限制。" @@ -6229,15 +6106,13 @@ msgstr "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]" #. type: Plain text #: en/diff-options.txt:644 -#, fuzzy, ignore-ellipsis, priority:280 -#| msgid "Select only files that are Added (`A`), Copied (`C`), Deleted (`D`), Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, submodule, ...) changed (`T`), are Unmerged (`U`), are Unknown (`X`), or have had their pairing Broken (`B`). Any combination of the filter characters (including none) can be used. When `*` (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected." +#, ignore-ellipsis, priority:280 msgid "Select only files that are Added (`A`), Copied (`C`), Deleted (`D`), Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, submodule, ...) changed (`T`), are Unmerged (`U`), are Unknown (`X`), or have had their pairing Broken (`B`). Any combination of the filter characters (including none) can be used. When `*` (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected." msgstr "只选择添加（`A`）、复制（`C`）、删除（`D`）、修改（`M`）、重命名（`R`）、类型（即常规文件、符号链接、子模块......）改变（`T`）、未合并（`U`）、未知（`X`）或配对被破坏（`B`）的文件。可以使用过滤字符的任何组合（包括空）。当组合中加入 `*`（全部或空）时，如果在比较中有任何文件与其他条件匹配，则选择所有路径；如果没有符合其他条件的文件，则不会选择任何内容。" #. type: Plain text #: en/diff-options.txt:647 -#, fuzzy, priority:280, placeholders:'--diff-filter=ad' -#| msgid "Also, these upper-case letters can be downcased to exclude. E.g. `--diff-filter=ad` excludes added and deleted paths." +#, placeholders:'--diff-filter=ad', priority:280 msgid "Also, these upper-case letters can be downcased to exclude. E.g. `--diff-filter=ad` excludes added and deleted paths." msgstr "另外，这些大写字母也可以通过使用小写排除。例如：`--diff-filter=ad` 排除添加和删除的路径。" @@ -6255,8 +6130,7 @@ msgstr "-S" #. type: Plain text #: en/diff-options.txt:655 -#, fuzzy, priority:280 -#| msgid "Look for differences that change the number of occurrences of the specified string (i.e. addition/deletion) in a file. Intended for the scripter's use." +#, priority:280 msgid "Look for differences that change the number of occurrences of the specified string (i.e. addition/deletion) in a file. Intended for the scripter's use." msgstr "寻找改变文件中指定字符串出现次数的差异（即增加/删除）。供脚本编写者使用。" @@ -6370,15 +6244,13 @@ msgstr "-O<顺序控制文件>" #. type: Plain text #: en/diff-options.txt:713 -#, fuzzy, priority:280, placeholders:'diff.orderFile':'linkgit:git-config[1]':'diff.orderFile' -#| msgid "Control the order in which files appear in the output. This overrides the `diff.orderFile` configuration variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`." +#, placeholders:'diff.orderFile':'linkgit:git-config[1]':'diff.orderFile', priority:280 msgid "Control the order in which files appear in the output. This overrides the `diff.orderFile` configuration variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`." msgstr "控制文件在输出中出现的顺序。这将覆盖 `diff.orderFile` 配置变量（参见 linkgit:git-config[1]）。要取消 `diff.orderFile`，请使用 `-O/dev/null`。" #. type: Plain text #: en/diff-options.txt:725 -#, fuzzy, priority:280 -#| msgid "The output order is determined by the order of glob patterns in . All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on. All files with pathnames that do not match any pattern are output last, as if there was an implicit match-all pattern at the end of the file. If multiple pathnames have the same rank (they match the same pattern but no earlier patterns), their output order relative to each other is the normal order." +#, priority:280 msgid "The output order is determined by the order of glob patterns in . All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on. All files with pathnames that do not match any pattern are output last, as if there was an implicit match-all pattern at the end of the file. If multiple pathnames have the same rank (they match the same pattern but no earlier patterns), their output order relative to each other is the normal order." msgstr "输出顺序由 <顺序控制文件> 中的 glob 模式的顺序决定。所有路径名与第一个模式匹配的文件首先输出，路径名与第二个模式匹配（但不与第一个模式匹配）的文件其次输出，以此类推。所有路径名与任何模式匹配的文件会最后输出，就像在文件末尾有一个隐含的全部匹配模式。如果多个路径名具有相同的等级（它们匹配相同的模式，但没有匹配先前的模式），它们相对于彼此的输出顺序是正常的。" @@ -6396,8 +6268,7 @@ msgstr "空白行会被忽略，因此可以用它们作为分隔符，以保证 #. type: Plain text #: en/diff-options.txt:735 -#, fuzzy, priority:280 -#| msgid "Lines starting with a hash (\"`#`\") are ignored, so they can be used for comments. Add a backslash (\"`\\`\") to the beginning of the pattern if it starts with a hash." +#, priority:280 msgid "Lines starting with a hash (\"`#`\") are ignored, so they can be used for comments. Add a backslash (\"`\\`\") to the beginning of the pattern if it starts with a hash." msgstr "以井号（\"`#`\"）开头的行会被忽略，所以它们可以用来做注释。如果模式以井号开头，则需要在模式的开头加上反斜杠（\"`\\`\"）。" @@ -6409,8 +6280,7 @@ msgstr "每一行都包含一个模式。" #. type: Plain text #: en/diff-options.txt:744 -#, fuzzy, priority:280, placeholders:'FNM_PATHNAME' -#| msgid "Patterns have the same syntax and semantics as patterns used for fnmatch(3) without the FNM_PATHNAME flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern. For example, the pattern \"`foo*bar`\" matches \"`fooasdfbar`\" and \"`foo/bar/baz/asdf`\" but not \"`foobarx`\"." +#, placeholders:'FNM_PATHNAME', priority:280 msgid "Patterns have the same syntax and semantics as patterns used for fnmatch(3) without the FNM_PATHNAME flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern. For example, the pattern \"`foo*bar`\" matches \"`fooasdfbar`\" and \"`foo/bar/baz/asdf`\" but not \"`foobarx`\"." msgstr "模式的语法和语义与 fnmatch(3) 中使用的相同，不包括 FNM_PATHNAME 标志，但在删除路径名中结尾任意几个成分后匹配的情况下例外。例如，模式 \"`foo*bar`\" 匹配 \"`fooasdfbar`\" 和 \"`foo/bar/baz/asdf`\"，但不匹配 \"`foobarx`\"。" @@ -6429,8 +6299,7 @@ msgstr "--rotate-to=<文件>" #. type: Plain text #: en/diff-options.txt:752 -#, fuzzy, priority:280 -#| msgid "Discard the files before the named from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to'). These options were invented primarily for the use of the `git difftool` command, and may not be very useful otherwise." +#, priority:280 msgid "Discard the files before the named from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to'). These options were invented primarily for the use of the `git difftool` command, and may not be very useful otherwise." msgstr "从输出中丢弃命名 <文件> 之前的文件（即 'skip to'），或将它们移到输出的末尾（即 'rotate to'）。 这些选项主要是为使用 `git difftool` 命令而发明的，在其他情况下可能用处不大。" @@ -6460,8 +6329,7 @@ msgstr "--no-relative" #. type: Plain text #: en/diff-options.txt:769 -#, fuzzy, priority:280, placeholders:'--no-relative':'diff.relative':'--relative' -#| msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option. When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a as an argument. `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`." +#, placeholders:'--no-relative':'diff.relative':'--relative', priority:280 msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option. When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a as an argument. `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`." msgstr "当从项目的子目录中运行时，可以排除目录外的变化，并通过这个选项显示相对于它的路径名。当你不在子目录中时（例如在纯仓库中），你可以通过 <路径> 参数来指明要使输出相对于哪个子目录。`--no-relative` 可以用来取消 `diff.relative`配置选项和之前的 `--relative` 选项。" @@ -6546,8 +6414,7 @@ msgstr "--ignore-matching-lines=<正则表达式>" #. type: Plain text #: en/diff-options.txt:799 -#, fuzzy, priority:280 -#| msgid "Ignore changes whose all lines match . This option may be specified more than once." +#, priority:280 msgid "Ignore changes whose all lines match . This option may be specified more than once." msgstr "忽略所有行均匹配 <正则表达式> 的更改。 此选项可指定多次。" @@ -6559,8 +6426,7 @@ msgstr "--inter-hunk-context=<行数>" #. type: Plain text #: en/diff-options.txt:805 -#, fuzzy, priority:280, placeholders:'diff.interHunkContext' -#| msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other. Defaults to `diff.interHunkContext` or 0 if the config option is unset." +#, placeholders:'diff.interHunkContext', priority:280 msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other. Defaults to `diff.interHunkContext` or 0 if the config option is unset." msgstr "显示块差异之间的上下文，最多显示指定的行数，从而合并彼此接近的块。 默认认为 `diff.interHunkContext`，如果配置选项未设置，则默认为0。" @@ -6578,8 +6444,7 @@ msgstr "--function-context" #. type: Plain text #: en/diff-options.txt:812 -#, fuzzy, priority:280, placeholders:'linkgit:gitattributes[5]' -#| msgid "Show whole function as context lines for each change. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." +#, placeholders:'linkgit:gitattributes[5]', priority:280 msgid "Show whole function as context lines for each change. The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])." msgstr "在每个修改中的上下文行显示整个函数。函数名称的确定方式与 `git diff` 计算补丁头的方式相同（参见 linkgit:gitattributes[5] 中的 '自定义区块头' ）。" @@ -6591,8 +6456,7 @@ msgstr "--exit-code" #. type: Plain text #: en/diff-options.txt:819 -#, fuzzy, priority:280 -#| msgid "Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and 0 means no differences." +#, priority:280 msgid "Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and 0 means no differences." msgstr "让程序以类似 diff(1) 的代码退出。也就是说，如果有差异则返回1，否则返回0。" @@ -6658,8 +6522,7 @@ msgstr "--ignore-submodules[=]" #. type: Plain text #: en/diff-options.txt:856 -#, fuzzy, priority:280, placeholders:'HEAD':'linkgit:git-config[1]':'linkgit:gitmodules[5]' -#| 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." +#, placeholders:'HEAD':'linkgit:git-config[1]':'linkgit:gitmodules[5]', priority:280 msgid "Ignore changes to submodules in the diff generation. can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default. Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules." msgstr "在生成差异时忽略子模块的修改。 可以是 \"none\"、\"untracked\"、\"dirty \" 或 \"all\"，\"all\" 是默认选项。使用 \"none\" 会在子模块包含未跟踪或修改的文件，或者它的HEAD 与上级项目中记录的提交不同时，认为它被修改了，并且可以用来覆盖 linkgit:git-config[1] 或 linkgit:gitmodules[5] 中 '忽略' 选项的设置。当使用 \"untracked\" 时，当子模块只包含未跟踪的内容时，它们不会被认为是有改动的（但它们仍然会被扫描是否有被修改的内容）。使用 \"dirty\" 会忽略所有对子模块工作树的修改，只有存储在上级项目中的提交的修改才会被显示出来（这是在1.7.0之前的行为）。使用 \"all\" 会隐藏所有对子模块的修改。" @@ -6707,8 +6570,7 @@ msgstr "--default-prefix" #. type: Plain text #: en/diff-options.txt:870 -#, fuzzy, priority:280, placeholders:'diff.noprefix' -#| msgid "Use the default source and destination prefixes (\"a/\" and \"b/\"). This is usually the default already, but may be used to override config such as `diff.noprefix`." +#, placeholders:'diff.noprefix', priority:280 msgid "Use the default source and destination prefixes (\"a/\" and \"b/\"). This is usually the default already, but may be used to override config such as `diff.noprefix`." msgstr "使用默认的源和目标前缀（\"a/\"和 \"b/\"）。 这通常已经是默认的，但可以用来覆盖配置，如 `diff.noprefix`。" @@ -6732,8 +6594,7 @@ msgstr "--ita-invisible-in-index" #. type: Plain text #: en/diff-options.txt:881 -#, fuzzy, priority:280, placeholders:'--cached':'--cached':'--ita-visible-in-index' -#| msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\". This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future." +#, placeholders:'--cached':'--cached':'--ita-visible-in-index', priority:280 msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\". This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future." msgstr "默认情况下，通过 \"git add -N\" 添加的条目在 \"git diff\" 中显示为现有的空文件，在 \"git diff --cached\" 中显示为新文件。这个选项使得条目在 \"git diff\" 中显示为一个新文件，而在 \"git diff --cached\" 中显示为不存在的文件。这个选项可以用 `--ita-visible-in-index` 来还原。这两个选项都是试验性的，将来可能会被删除。" @@ -6751,10 +6612,9 @@ msgstr "--[no-]all" #. type: Plain text #: en/fetch-options.txt:4 -#, fuzzy, priority:220, placeholders:'fetch.all' -#| msgid "Disables the `renormalize` option. This overrides the `merge.renormalize` configuration variable." +#, placeholders:'fetch.all', priority:220 msgid "Fetch all remotes. This overrides the configuration variable `fetch.all`." -msgstr "禁用 `renormalize` 选项。 这覆盖了 `merge.renormalize` 配置变量。" +msgstr "获取所有远程控制。这将覆盖配置变量 `fetch.all`。" #. type: Labeled list #: en/fetch-options.txt:6 @@ -6764,8 +6624,7 @@ msgstr "--append" #. type: Plain text #: en/fetch-options.txt:10 -#, fuzzy, priority:220, placeholders:'FETCH_HEAD':'FETCH_HEAD' -#| 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." +#, placeholders:'FETCH_HEAD':'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 "在 `.git/FETCH_HEAD` 的现有内容中添加获取的引用名称和对象名称。 如果没有这个选项，`.git/FETCH_HEAD` 中的旧数据将被覆盖。" @@ -6825,8 +6684,7 @@ msgstr "--shallow-exclude=<修订版本>" #. type: Plain text #: en/fetch-options.txt:35 en/git-fetch-pack.txt:98 -#, fuzzy, priority:220 -#| msgid "Deepen or shorten the history of a shallow repository to exclude commits reachable from a specified remote branch or tag. This option can be specified multiple times." +#, priority:220 msgid "Deepen or shorten the history of a shallow repository to exclude commits reachable from a specified remote branch or tag. This option can be specified multiple times." msgstr "深化或缩短浅层版本库的历史，以排除从指定的远程分支或标记中可以到达的提交。 这个选项可以指定多次。" @@ -6868,8 +6726,7 @@ msgstr "--negotiation-tip=<提交|通配符>" #. type: Plain text #: en/fetch-options.txt:58 -#, fuzzy, priority:220 -#| msgid "By default, Git will report, to the server, commits reachable from all local refs to find common commits in an attempt to reduce the size of the to-be-received packfile. If specified, Git will only report commits reachable from the given tips. This is useful to speed up fetches when the user knows which local ref is likely to have commits in common with the upstream ref being fetched." +#, priority:220 msgid "By default, Git will report, to the server, commits reachable from all local refs to find common commits in an attempt to reduce the size of the to-be-received packfile. If specified, Git will only report commits reachable from the given tips. This is useful to speed up fetches when the user knows which local ref is likely to have commits in common with the upstream ref being fetched." msgstr "默认情况下，Git 会向服务器报告从所有本地引用中可触及的提交，以寻找共同的提交，试图减少待接收的打包文件的大小。如果指定的话，Git将只报告从给定提示中的可达提交。 当用户知道哪个本地引用可能与被获取的上游引用有共同的提交时，这会加快抓取文件的速度。" @@ -6905,8 +6762,7 @@ msgstr "不从服务器获取任何东西，而是打印所提供的 `--negotiat #. type: Plain text #: en/fetch-options.txt:78 -#, fuzzy, priority:220, placeholders:'--recurse-submodules=[yes|on-demand]':'push.negotiate':'linkgit:git-config[1]' -#| msgid "This is incompatible with `--recurse-submodules=[yes|on-demand]`. Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]." +#, placeholders:'--recurse-submodules=[yes|on-demand]':'push.negotiate':'linkgit:git-config[1]', priority:220 msgid "This is incompatible with `--recurse-submodules=[yes|on-demand]`. Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]." msgstr "这与 `--recurse-submodules=[yes|on-demand]` 不兼容。 在内部，这被用来实现 `push.negotiate` 选项，见linkgit:git-config[1]。" @@ -6942,8 +6798,7 @@ msgstr "--[no-]write-fetch-head" #. type: Plain text #: en/fetch-options.txt:96 -#, fuzzy, priority:220, placeholders:'FETCH_HEAD':'$GIT_DIR':'--no-write-fetch-head':'--dry-run' -#| 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." +#, 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 "直接在`$GIT_DIR`下的`FETCH_HEAD`文件中写入获取的远程引用列表。 这是默认的。 从命令行传递`--no-write-fetch-head`，告诉Git不要写入该文件。 在`--dry-run`选项下，该文件永远不会被写入。" @@ -7031,8 +6886,7 @@ msgstr "--[no-]auto-gc" #. type: Plain text #: en/fetch-options.txt:125 -#, fuzzy, priority:220, placeholders:'--auto':'--[no-]auto-gc' -#| msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.) This is enabled by default." +#, placeholders:'--auto':'--[no-]auto-gc', priority:220 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.) This is enabled by default." msgstr "在最后运行 `git maintenance run --auto`，以在需要时执行自动仓库维护。（与 \"--[no-]auto-gc\" 选项效果一样。）这个功能默认启用。" @@ -7068,8 +6922,7 @@ msgstr "--prune" #. type: Plain text #: en/fetch-options.txt:147 -#, fuzzy, priority:220, placeholders:'--tags':'--mirror':'--prune-tags' -#| msgid "Before fetching, remove any remote-tracking references that no longer exist on the remote. Tags are not subject to pruning if they are fetched only because of the default tag auto-following or due to a --tags option. However, if tags are fetched due to an explicit refspec (either on the command line or in the remote configuration, for example if the remote was cloned with the --mirror option), then they are also subject to pruning. Supplying `--prune-tags` is a shorthand for providing the tag refspec." +#, placeholders:'--tags':'--mirror':'--prune-tags', priority:220 msgid "Before fetching, remove any remote-tracking references that no longer exist on the remote. Tags are not subject to pruning if they are fetched only because of the default tag auto-following or due to a --tags option. However, if tags are fetched due to an explicit refspec (either on the command line or in the remote configuration, for example if the remote was cloned with the --mirror option), then they are also subject to pruning. Supplying `--prune-tags` is a shorthand for providing the tag refspec." msgstr "在获取之前，删除任何不再存在于远程的远程跟踪引用。 如果只是因为默认的标签自动跟踪或者因为 --tags 选项而获取标签，则不需要剪枝。 然而，如果标签是由于明确的引用规范（无论是在命令行还是在远程配置中，例如，如果远程是用 --mirror 选项克隆的）而被获取的，那么它们也会被剪除。提供 `--prune-tags` 是提供标签引用规范的速记方法。" @@ -7111,8 +6964,7 @@ msgstr "--no-tags" #. type: Plain text #: en/fetch-options.txt:173 -#, fuzzy, priority:220, placeholders:'linkgit:git-config[1]' -#| msgid "By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following. The default behavior for a remote may be specified with the remote..tagOpt setting. See linkgit:git-config[1]." +#, placeholders:'linkgit:git-config[1]', priority:220 msgid "By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following. The default behavior for a remote may be specified with the remote..tagOpt setting. See linkgit:git-config[1]." msgstr "默认情况下，指向从远程仓库下载的对象的标签会被获取并存储到本地。 这个选项禁用了这种自动标记跟踪。远程的默认行为可以通过 remote.<远程名称>.tagOpt 设置来指定。参见 linkgit:git-config[1]。" @@ -7136,8 +6988,7 @@ msgstr "--refmap=<引用规范>" #. type: Plain text #: en/fetch-options.txt:194 -#, fuzzy, priority:220, placeholders:'--refmap' -#| msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details." +#, placeholders:'--refmap', priority:220 msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details." msgstr "当获取命令行上列出的引用时，使用指定的引用规范（可以是多个）来映射引用到远程跟踪分支，而不是远程仓库的 `remote.*.fetch` 配置变量的值。 为 `--refmap` 选项提供一个空的 `<引用规范>` 会导致Git忽略配置的引用规范，而完全依赖作为命令行参数提供的引用规范。详见 \"配置的远程跟踪分支\" 一节。" @@ -7149,8 +7000,7 @@ msgstr "--tags" #. type: Plain text #: en/fetch-options.txt:203 -#, fuzzy, priority:220, placeholders:'--prune':'--prune' -#| msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)." +#, placeholders:'--prune':'--prune', priority:220 msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)." msgstr "从远程获取所有标签（即，将远程标签 `refs/tags/*` 获取为同名的本地标签），除此之外，还可以获取其他东西。 单独使用这个选项，即使使用了 --prune，也不会对标签进行修剪（尽管标签是一个明确了无论如何也要删除的引用规范目标，见 `--prune` 选项）。" @@ -7162,8 +7012,7 @@ msgstr "--recurse-submodules[=yes|on-demand|no]" #. type: Plain text #: en/fetch-options.txt:215 -#, fuzzy, priority:220, placeholders:'$GIT_DIR':'linkgit:gitsubmodules[7]' -#| 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`." +#, placeholders:'$GIT_DIR':'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 "这个选项控制是否以及在什么条件下，子模块的新提交也应该被获取。当遍历子模块时，`git fetch` 总是试图获取 \"改变的\" 子模块，也就是说，一个子模块的提交被新获取的父项目提交所引用，但在本地的子模块克隆中却没有。一个改变了的子模块可以被获取，只要它在本地存在，例如在`$GIT_DIR/modules/`（见linkgit:gitsubmodules[7]）；如果上游添加了一个新的子模块，该子模块不能被获取，直到它被克隆，例如通过`git submodule update`。" @@ -7175,8 +7024,7 @@ msgstr "当设置为 'on-demand' 时，只取回已改变的子模块。当设 #. type: Plain text #: en/fetch-options.txt:224 -#, fuzzy, priority:220, placeholders:'fetch.recurseSubmodules':'linkgit:git-config[1]' -#| msgid "When unspecified, this uses the value of `fetch.recurseSubmodules` if it is set (see linkgit:git-config[1]), defaulting to 'on-demand' if unset. When this option is used without any value, it defaults to 'yes'." +#, placeholders:'fetch.recurseSubmodules':'linkgit:git-config[1]', priority:220 msgid "When unspecified, this uses the value of `fetch.recurseSubmodules` if it is set (see linkgit:git-config[1]), defaulting to 'on-demand' if unset. When this option is used without any value, it defaults to 'yes'." msgstr "当未指定时，如果设置了 `fetch.recurseSubmodules`，则使用该值（见linkgit:git-config[1]），如果未设置则默认为 'on-demand'。 当这个选项被使用而没有任何值时，它默认为 'yes'。" @@ -7242,8 +7090,7 @@ msgstr "--submodule-prefix=<路径>" #. type: Plain text #: en/fetch-options.txt:256 -#, fuzzy, priority:220 -#| msgid "Prepend to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules." +#, priority:220 msgid "Prepend to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules." msgstr "将 <路径> 添加到信息性消息中打印的路径，例如“获取子模块 foo”。递归子模块时在内部使用此选项。" @@ -7255,8 +7102,7 @@ msgstr "--recurse-submodules-default=[yes|on-demand]" #. type: Plain text #: en/fetch-options.txt:264 -#, fuzzy, priority:220, placeholders:'--recurse-submodules':'linkgit:gitmodules[5]':'linkgit:git-config[1]':'--[no-]recurse-submodules' -#| msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly." +#, placeholders:'--recurse-submodules':'linkgit:gitmodules[5]':'linkgit:git-config[1]':'--[no-]recurse-submodules', priority:220 msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly." msgstr "这个选项在内部被用来为 --recurse-submodules 选项暂时提供一个非负的默认值。 所有其他配置获取子模块递归的方法（比如 linkgit:gitmodules[5] 和 linkgit:git-config[1] 中的设置）都覆盖这个选项，直接指定 --[no-]recurse-submodules 也是如此。" @@ -7268,8 +7114,7 @@ msgstr "--update-head-ok" #. type: Plain text #: en/fetch-options.txt:273 -#, fuzzy, priority:220 -#| msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it." +#, priority:220 msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it." msgstr "默认情况下，\"git fetch\" 拒绝更新与当前分支相对应的头部。 这个标志禁用了这种检查。 这纯粹是为了让 'git pull' 与 'git fetch' 沟通的内部使用，除非你正在实现你自己的上层命令，否则你不应该使用它。" @@ -7353,8 +7198,7 @@ msgstr "--show-forced-updates" #. type: Plain text #: en/fetch-options.txt:313 -#, fuzzy, priority:220, placeholders:'fetch.showForcedUpdates':'--show-forced-updates':'linkgit:git-config[1]' -#| msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]." +#, placeholders:'fetch.showForcedUpdates':'--show-forced-updates':'linkgit:git-config[1]', priority:220 msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]." msgstr "默认情况下，git 在获取过程中会检查一个分支是否被强制更新了。这可以通过 fetch.showForcedUpdates 禁用，但 --show-forced-updates 选项保证了这种检查的发生。 参见 linkgit:git-config[1]。" @@ -7444,15 +7288,13 @@ msgstr "描述" #. type: Plain text #: en/gitignore.txt:19 -#, fuzzy, priority:100 -#| msgid "A `gitignore` file specifies intentionally untracked files that Git should ignore. Files already tracked by Git are not affected; see the NOTES below for details." +#, priority:100 msgid "A `gitignore` file specifies intentionally untracked files that Git should ignore. Files already tracked by Git are not affected; see the NOTES below for details." msgstr "`gitignore` 文件指定了 Git 追踪时应忽略的文件。 已被 Git 追踪的文件不受影响，详见下面的注释。" #. type: Plain text #: en/gitignore.txt:25 -#, fuzzy, priority:100 -#| msgid "Each line in a `gitignore` file specifies a pattern. When deciding whether to ignore a path, Git normally checks `gitignore` patterns from multiple sources, with the following order of precedence, from highest to lowest (within one level of precedence, the last matching pattern decides the outcome):" +#, priority:100 msgid "Each line in a `gitignore` file specifies a pattern. When deciding whether to ignore a path, Git normally checks `gitignore` patterns from multiple sources, with the following order of precedence, from highest to lowest (within one level of precedence, the last matching pattern decides the outcome):" msgstr "`gitignore` 文件中的每一行都指定了一个模式。 在决定是否忽略路径时，Git 通常会检查多个来源的 `gitignore` 模式，优先级从高到低（在一个优先级内，由最后匹配的模式决定结果）：" @@ -7464,8 +7306,7 @@ msgstr "从支持这些模式的命令行中读取的模式。" #. type: Plain text #: en/gitignore.txt:36 -#, fuzzy, 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." +#, 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 "模式从与路径相同目录下的 `.gitignore` 文件或任何父目录（直到工作树的顶层）中读取，上层文件中的模式会被下层文件中的模式覆盖，直到包含该文件的目录。这些模式相对于 `.gitignore` 文件的位置进行匹配。 项目通常会在其资源库中包含此类 `.gitignore` 文件，其中包含项目构建过程中生成的文件的模式。" @@ -7507,8 +7348,7 @@ msgstr "用户希望 Git 在任何情况下都忽略的模式（例如，由用 #. type: Plain text #: en/gitignore.txt:68 -#, fuzzy, priority:100, placeholders:'git ls-files':'git read-tree' -#| msgid "The underlying Git plumbing tools, such as 'git ls-files' and 'git read-tree', read `gitignore` patterns specified by command-line options, or from files specified by command-line options. Higher-level Git tools, such as 'git status' and 'git add', use patterns from the sources specified above." +#, placeholders:'git ls-files':'git read-tree', priority:100 msgid "The underlying Git plumbing tools, such as 'git ls-files' and 'git read-tree', read `gitignore` patterns specified by command-line options, or from files specified by command-line options. Higher-level Git tools, such as 'git status' and 'git add', use patterns from the sources specified above." msgstr "底层的 Git 工具，如 'git ls-files' 和 'git read-tree'，会读取命令行选项指定的 'gitignore' 模式，或从命 令行选项指定的文件中读取。 更高层次的 Git 工具，如 'git status' 和 'git add'，会使用上述指定来源的模式。" @@ -7526,8 +7366,7 @@ msgstr "空行不匹配任何文件，因此可以作为分隔符，以提高可 #. type: Plain text #: en/gitignore.txt:78 -#, fuzzy, priority:100 -#| msgid "A line starting with # serves as a comment. Put a backslash (\"`\\`\") in front of the first hash for patterns that begin with a hash." +#, priority:100 msgid "A line starting with # serves as a comment. Put a backslash (\"`\\`\") in front of the first hash for patterns that begin with a hash." msgstr "以 # 开头的一行为注释。 对于以散列开头的模式，在第一个散列前面加上反斜杠（ \"`\\`\" ）。" @@ -7539,8 +7378,7 @@ msgstr "除非使用反斜线（\"`\\`\"）引号，否则尾部空格将被忽 #. type: Plain text #: en/gitignore.txt:90 -#, fuzzy, priority:100 -#| msgid "An optional prefix \"`!`\" which negates the pattern; any matching file excluded by a previous pattern will become included again. It is not possible to re-include a file if a parent directory of that file is excluded. Git doesn't list excluded directories for performance reasons, so any patterns on contained files have no effect, no matter where they are defined. Put a backslash (\"`\\`\") in front of the first \"`!`\" for patterns that begin with a literal \"`!`\", for example, \"`\\!important!.txt`\"." +#, priority:100 msgid "An optional prefix \"`!`\" which negates the pattern; any matching file excluded by a previous pattern will become included again. It is not possible to re-include a file if a parent directory of that file is excluded. Git doesn't list excluded directories for performance reasons, so any patterns on contained files have no effect, no matter where they are defined. Put a backslash (\"`\\`\") in front of the first \"`!`\" for patterns that begin with a literal \"`!`\", for example, \"`\\!important!.txt`\"." msgstr "一个可选的前缀 \"`!``\"，用于否定模式；任何被先前模式排除的匹配文件都将被重新包含。如果文件的父目录已被排除，则无法重新包含该文件。出于性能考虑，Git 不会列出排除的目录，因此无论在哪里定义，任何包含文件的模式都不会产生影响。 对于以 \"`!`\" 开头的模式，在第一个 \"`!`\" 前面加反斜杠（\"`\\`\"），例如 \"`\\!important!.txt`\"。" @@ -7570,8 +7408,7 @@ msgstr "例如，模式 `doc/frotz/` 匹配 `doc/frotz` 目录，但不匹配 `a #. type: Plain text #: en/gitignore.txt:113 -#, fuzzy, priority:100, placeholders:'FNM_PATHNAME' -#| msgid "An asterisk \"`*`\" matches anything except a slash. The character \"`?`\" matches any one character except \"`/`\". The range notation, e.g. `[a-zA-Z]`, can be used to match one of the characters in a range. See fnmatch(3) and the FNM_PATHNAME flag for a more detailed description." +#, placeholders:'FNM_PATHNAME', priority:100 msgid "An asterisk \"`*`\" matches anything except a slash. The character \"`?`\" matches any one character except \"`/`\". The range notation, e.g. `[a-zA-Z]`, can be used to match one of the characters in a range. See fnmatch(3) and the FNM_PATHNAME flag for a more detailed description." msgstr "星号 \"`*`\" 匹配斜线以外的任何字符。 字符 \"`?`\" 匹配除 \"`/`\" 以外的任何一个字符。 范围符号，如 \"`[a-zA-Z]`\"，可用于匹配范围中的一个字符。更详细的说明请参见 fnmatch(3) 和 FNM_PATHNAME 标志。" @@ -7613,8 +7450,7 @@ msgstr "配置" #. type: Plain text #: en/gitignore.txt:141 -#, fuzzy, priority:100, placeholders:'core.excludesFile':'$GIT_DIR':'$GIT_DIR' -#| 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`." +#, placeholders:'core.excludesFile':'$GIT_DIR':'$GIT_DIR', 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 "可选的配置变量 `core.excludesFile` 表示包含要排除的文件名模式的文件路径，类似于 `$GIT_DIR/info/exclude`。 除 `$GIT_DIR/info/exclude` 中的模式外，还将使用排除文件中的模式。" @@ -8593,8 +8429,7 @@ msgstr "(|)..." #. type: Plain text #: en/git-am.txt:37 -#, fuzzy, priority:100 -#| msgid "The list of mailbox files to read patches from. If you do not supply this argument, the command reads from the standard input. If you supply directories, they will be treated as Maildirs." +#, priority:100 msgid "The list of mailbox files to read patches from. If you do not supply this argument, the command reads from the standard input. If you supply directories, they will be treated as Maildirs." msgstr "要读取补丁的邮箱文件的列表。如果你不提供这个参数，命令将从标准输入中读取。 如果你提供目录，它们将被视为邮箱目录。" @@ -8606,8 +8441,7 @@ msgstr "--signoff" #. type: Plain text #: en/git-am.txt:43 en/git-format-patch.txt:143 -#, fuzzy, priority:100, placeholders:'linkgit:git-commit[1]' -#| msgid "Add a `Signed-off-by` trailer to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information." +#, placeholders:'linkgit:git-commit[1]', priority:100 msgid "Add a `Signed-off-by` trailer to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information." msgstr "在提交信息中加入 `Signed-off-by` 的尾注，使用自己的提交者身份。 更多信息见 linkgit:git-commit[1] 中的 signoff 选项。" @@ -8637,8 +8471,7 @@ msgstr "--[no-]keep-cr" #. type: Plain text #: en/git-am.txt:56 -#, fuzzy, priority:100, placeholders:'--keep-cr':'linkgit:git-mailsplit[1]':'am.keepcr':'--no-keep-cr':'am.keepcr' -#| msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) with the same option, to prevent it from stripping CR at the end of lines. `am.keepcr` configuration variable can be used to specify the default behaviour. `--no-keep-cr` is useful to override `am.keepcr`." +#, placeholders:'--keep-cr':'linkgit:git-mailsplit[1]':'am.keepcr':'--no-keep-cr':'am.keepcr', priority:100 msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) with the same option, to prevent it from stripping CR at the end of lines. `am.keepcr` configuration variable can be used to specify the default behaviour. `--no-keep-cr` is useful to override `am.keepcr`." msgstr "使用 `--keep-cr`，调用 'git mailsplit'（见linkgit:git-mailsplit[1]），并使用相同的选项，以防止它在行末剥离 CR。`am.keepcr` 配置变量可以用来指定默认行为。 `--no-keep-cr` 可以用来覆盖 `am.keepcr`。" @@ -8682,14 +8515,13 @@ msgstr "这个标志将被传递给 'git mailinfo'（见 linkgit:git-mailinfo[1] # ERROR: --empty=(stop|drop|keep) not found in translation #. type: Labeled list #: en/git-am.txt:69 -#, priority:100, fuzzy, no-wrap, placeholders:'--empty=(stop|drop|keep)' +#, no-wrap, placeholders:'--empty=(stop|drop|keep)', priority:100 msgid "--empty=(stop|drop|keep)" -msgstr "--empty={drop,keep,ask}" +msgstr "--empty=(stop|drop|keep)" #. type: Plain text #: en/git-am.txt:76 -#, fuzzy, priority:100 -#| msgid "By default, or when the option is set to 'stop', the command errors out on an input e-mail message lacking a patch and stops in the middle of the current am session. When this option is set to 'drop', skip such an e-mail message instead. When this option is set to 'keep', create an empty commit, recording the contents of the e-mail message as its log." +#, priority:100 msgid "By default, or when the option is set to 'stop', the command errors out on an input e-mail message lacking a patch and stops in the middle of the current am session. When this option is set to 'drop', skip such an e-mail message instead. When this option is set to 'keep', create an empty commit, recording the contents of the e-mail message as its log." msgstr "默认情况下，或者当该选项被设置为 'stop' 时，该命令在输入缺乏补丁的电子邮件时出错，并停止到当前 am 会话的中间。当这个选项被设置为 'drop' 时，跳过这样的电子邮件信息。 当这个选项被设置为 'keep' 时，会创建一个空的提交，将电子邮件的内容记录为日志。" @@ -8701,8 +8533,7 @@ msgstr "--message-id" #. type: Plain text #: en/git-am.txt:83 -#, fuzzy, priority:100, placeholders:'linkgit:git-mailinfo[1]':'am.messageid' -#| msgid "Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]), so that the Message-ID header is added to the commit message. The `am.messageid` configuration variable can be used to specify the default behaviour." +#, placeholders:'linkgit:git-mailinfo[1]':'am.messageid', priority:100 msgid "Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]), so that the Message-ID header is added to the commit message. The `am.messageid` configuration variable can be used to specify the default behaviour." msgstr "传递 `-m` 标志给 'git mailinfo'（见 linkgit:git-mailinfo[1]），这样 Message-ID 头会被添加到提交信息中。 `am.messageid` 配置变量可以用来指定默认行为。" @@ -8714,8 +8545,7 @@ msgstr "--no-message-id" #. type: Plain text #: en/git-am.txt:87 -#, fuzzy, priority:100, placeholders:'am.messageid' -#| msgid "Do not add the Message-ID header to the commit message. `no-message-id` is useful to override `am.messageid`." +#, placeholders:'am.messageid', priority:100 msgid "Do not add the Message-ID header to the commit message. `no-message-id` is useful to override `am.messageid`." msgstr "不要在提交信息中添加 Message-ID 头。 `no-message-id` 对于覆盖 `am.messageid` 很有用。" @@ -8733,21 +8563,15 @@ msgstr "--utf8" #. type: Plain text #: en/git-am.txt:99 -#, fuzzy, priority:100, placeholders:'linkgit:git-mailinfo[1]' -#| msgid "Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]). The proposed commit log message taken from the e-mail is re-coded into UTF-8 encoding (configuration variable `i18n.commitEncoding` can be used to specify the project's preferred encoding if it is not UTF-8)." +#, placeholders:'linkgit:git-mailinfo[1]', priority:100 msgid "Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]). The proposed commit log message taken from the e-mail is re-coded into UTF-8 encoding (configuration variable `i18n.commitEncoding` can be used to specify the project's preferred encoding if it is not UTF-8)." msgstr "传递 `-u` 标志给 'git mailinfo'（见linkgit:git-mailinfo[1]）。 建议从邮件中提取的提交日志信息被重新编码为 UTF-8 编码（配置变量 `i18n.commitEncoding` 可以用来指定项目的首选编码，如果它不是 UTF-8）。" #. type: Plain text #: en/git-am.txt:102 -#, fuzzy, priority:100, placeholders:'--no-utf8' -#| msgid "" -#| "This was optional in prior versions of git, but now it is the\n" -#| "default. You can use `--no-utf8` to override this.\n" +#, placeholders:'--no-utf8', priority:100 msgid "This was optional in prior versions of git, but now it is the default. You can use `--no-utf8` to override this." -msgstr "" -"这在以前的 git 版本中是可选的，但现在它是\n" -"默认的。 你可以使用 `--no-utf8` 来覆盖它。\n" +msgstr "这在以前的 git 版本中是可选的，但现在它是默认的。 你可以使用 `--no-utf8` 来覆盖它。" #. type: Labeled list #: en/git-am.txt:103 @@ -8835,8 +8659,7 @@ msgstr "--reject" #. type: Plain text #: en/git-am.txt:131 -#, fuzzy, priority:100, placeholders:'linkgit:git-apply[1]' -#| msgid "These flags are passed to the 'git apply' (see linkgit:git-apply[1]) program that applies the patch." +#, placeholders:'linkgit:git-apply[1]', priority:100 msgid "These flags are passed to the 'git apply' (see linkgit:git-apply[1]) program that applies the patch." msgstr "这些标志会传递给应用补丁的 \"git apply\"（见 linkgit:git-apply[1]）程序。" @@ -8866,8 +8689,7 @@ msgstr "--no-verify" #. type: Plain text #: en/git-am.txt:148 -#, fuzzy, priority:100, placeholders:'--no-verify':'linkgit:githooks[5]' -#| msgid "By default, the pre-applypatch and applypatch-msg hooks are run. When any of `--no-verify` or `-n` is given, these are bypassed. See also linkgit:githooks[5]." +#, placeholders:'--no-verify':'linkgit:githooks[5]', priority:100 msgid "By default, the pre-applypatch and applypatch-msg hooks are run. When any of `--no-verify` or `-n` is given, these are bypassed. See also linkgit:githooks[5]." msgstr "默认情况下，会运行 pre-commit 和 commit-msg 钩子。当给出任何 `--no-verify` 或 `-n` 时，这些都会被绕过。参见链接 linkgit:githooks[5]。" @@ -8903,8 +8725,7 @@ msgstr "--skip" #. type: Plain text #: en/git-am.txt:166 -#, fuzzy, priority:100 -#| msgid "Skip the current patch. This is only meaningful when restarting an aborted patch." +#, priority:100 msgid "Skip the current patch. This is only meaningful when restarting an aborted patch." msgstr "跳过当前的补丁。 这只有在重新启动一个中止的补丁时才有意义。" @@ -8952,8 +8773,7 @@ msgstr "--resolved" #. type: Plain text #: en/git-am.txt:185 -#, fuzzy, priority:100 -#| msgid "After a patch failure (e.g. attempting to apply conflicting patch), the user has applied it by hand and the index file stores the result of the application. Make a commit using the authorship and commit log extracted from the e-mail message and the current index file, and continue." +#, priority:100 msgid "After a patch failure (e.g. attempting to apply conflicting patch), the user has applied it by hand and the index file stores the result of the application. Make a commit using the authorship and commit log extracted from the e-mail message and the current index file, and continue." msgstr "补丁失败后（如试图应用冲突的补丁），用户已经手工应用，索引文件存储了应用的结果。 使用从电子邮件中提取的作者和提交日志以及当前的索引文件进行提交，然后继续运行。" @@ -8965,8 +8785,7 @@ msgstr "--resolvemsg=<消息>" #. type: Plain text #: en/git-am.txt:192 -#, fuzzy, priority:100, placeholders:'--continue':'--skip' -#| msgid "When a patch failure occurs, will be printed to the screen before exiting. This overrides the standard message informing you to use `--continue` or `--skip` to handle the failure. This is solely for internal use between 'git rebase' and 'git am'." +#, placeholders:'--continue':'--skip', priority:100 msgid "When a patch failure occurs, will be printed to the screen before exiting. This overrides the standard message informing you to use `--continue` or `--skip` to handle the failure. This is solely for internal use between 'git rebase' and 'git am'." msgstr "当发生补丁失败时，<信息> 将在退出前被打印到屏幕上。 这将覆盖标准信息，通知你使用 `--continue` 或 `--skip` 来处理失败。 这只是为了在 'git rebase' 和 'git am' 之间的内部使用。" @@ -8978,8 +8797,7 @@ msgstr "--abort" #. type: Plain text #: en/git-am.txt:197 -#, fuzzy, priority:100 -#| msgid "Restore the original branch and abort the patching operation. Revert the contents of files involved in the am operation to their pre-am state." +#, priority:100 msgid "Restore the original branch and abort the patching operation. Revert the contents of files involved in the am operation to their pre-am state." msgstr "恢复原来的分支，放弃打补丁的操作。 将 am 操作中涉及的文件内容恢复到 am 前的状态。" @@ -9003,8 +8821,7 @@ msgstr "--show-current-patch[=(diff|raw)]" #. type: Plain text #: en/git-am.txt:207 -#, fuzzy, priority:100 -#| msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`." +#, priority:100 msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`." msgstr "显示`git am` 因冲突而停止的消息。 如果指定了 `raw`，显示电子邮件的原始内容；如果是 `diff`，只显示差异部分。 默认为 `raw`。" @@ -9028,8 +8845,7 @@ msgstr "讨论" #. type: Plain text #: en/git-am.txt:222 -#, fuzzy, priority:100 -#| msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH ]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text." +#, priority:100 msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH ]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text." msgstr "提交者的名字取自信息的 \"From:\" 行，而提交者的日期则取自信息的 \"Date:\" 行。 \"Subject:\" 行是提交的标题，在去掉普通前缀 \"[PATCH <任何东西>]\" 之后。 \"Sbuject: \" 是为了用一行文字简洁地描述提交的内容。" @@ -9041,15 +8857,13 @@ msgstr "\"From: \"、\"Date: \" 和 \"Subject: \" 行开始的正文覆盖了从 #. type: Plain text #: en/git-am.txt:230 -#, fuzzy, priority:100 -#| msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped." +#, priority:100 msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped." msgstr "提交信息由 \"Subject: \" 中的标题、一个空行和直到补丁开始的信息正文组成。 每行末尾多余的空格会被自动删除。" #. type: Plain text #: en/git-am.txt:233 -#, fuzzy, priority:100 -#| msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:" +#, priority:100 msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:" msgstr "补丁应该是内联的，直接跟在信息后面。 任何形式的行：" @@ -9079,8 +8893,7 @@ msgstr "被认为是一个补丁的开始，提交日志信息在第一次出现 #. type: Plain text #: en/git-am.txt:244 -#, fuzzy, priority:100 -#| msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:" +#, priority:100 msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:" msgstr "当最初调用 `git am` 时，你给了它要处理的邮箱的名字。 当看到第一个不适用的补丁时，它就会在中间中止。 你可以通过以下两种方式之一恢复：" @@ -9092,8 +8905,7 @@ msgstr "通过重新运行带有 `--skip` 选项的命令，跳过当前补丁 #. type: Plain text #: en/git-am.txt:251 -#, fuzzy, priority:100, placeholders:'--continue' -#| msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option." +#, placeholders:'--continue', priority:100 msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option." msgstr "手解决工作目录中的冲突，并更新索引文件，使其进入补丁应该产生的状态。 然后用 `--continue` 选项运行该命令。" @@ -9105,8 +8917,7 @@ msgstr "在当前操作完成之前，该命令拒绝处理新的邮箱，所以 #. type: Plain text #: en/git-am.txt:262 -#, fuzzy, priority:100, placeholders:'ORIG_HEAD' -#| msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)." +#, placeholders:'ORIG_HEAD', priority:100 msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)." msgstr "在应用任何补丁之前，ORIG_HEAD 被设置为当前分支的顶端。 如果你在多个提交中遇到问题，比如在错误的分支上运行 'git am'，或者提交中的错误更容易通过改变邮箱来解决（比如 \"From: \" 行中的错误），这就很有用了。" @@ -9118,8 +8929,7 @@ msgstr "钩子" #. type: Plain text #: en/git-am.txt:268 -#, fuzzy, priority:100, placeholders:'linkgit:githooks[5]' -#| msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information." +#, placeholders:'linkgit:githooks[5]', priority:100 msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information." msgstr "这个命令可以运行 `applypatch-msg`, `pre-applypatch`, 和 `post-applypatch` 钩子。 更多信息见 linkgit:githooks[5]。" @@ -9196,15 +9006,13 @@ msgstr "" #. type: Plain text #: en/git-apply.txt:30 -#, fuzzy, priority:100, placeholders:'--index':'--cached' -#| msgid "Reads the supplied diff output (i.e. \"a patch\") and applies it to files. When running from a subdirectory in a repository, patched paths outside the directory are ignored. With the `--index` option, the patch is also applied to the index, and with the `--cached` option, the patch is only applied to the index. Without these options, the command applies the patch only to files, and does not require them to be in a Git repository." +#, placeholders:'--index':'--cached', priority:100 msgid "Reads the supplied diff output (i.e. \"a patch\") and applies it to files. When running from a subdirectory in a repository, patched paths outside the directory are ignored. With the `--index` option, the patch is also applied to the index, and with the `--cached` option, the patch is only applied to the index. Without these options, the command applies the patch only to files, and does not require them to be in a Git repository." msgstr "读取提供的差异输出（即 \"一个补丁\" ）并将其应用于文件。 当从版本库中的子目录运行时，目录外的补丁路径会被忽略。 使用 `--index `选项，补丁也会应用到索引中，使用 `--cached` 选项，补丁只应用到索引中。 如果没有这些选项，该命令只对文件打补丁，而不要求它们在 Git 仓库中。" #. type: Plain text #: en/git-apply.txt:34 -#, fuzzy, priority:100, placeholders:'linkgit:git-am[1]':'linkgit:git-format-patch[1]' -#| msgid "This command applies the patch but does not create a commit. Use linkgit:git-am[1] to create commits from patches generated by linkgit:git-format-patch[1] and/or received by email." +#, placeholders:'linkgit:git-am[1]':'linkgit:git-format-patch[1]', priority:100 msgid "This command applies the patch but does not create a commit. Use linkgit:git-am[1] to create commits from patches generated by linkgit:git-format-patch[1] and/or received by email." msgstr "该命令会应用补丁，但不会创建提交。 使用 linkgit:git-am[1] 从 linkgit:git-format-patch[1] 生成的和/或通过电子邮件收到的补丁创建提交。" @@ -9216,8 +9024,7 @@ msgstr "<补丁>..." #. type: Plain text #: en/git-apply.txt:40 -#, fuzzy, priority:100 -#| msgid "The files to read the patch from. '-' can be used to read from the standard input." +#, priority:100 msgid "The files to read the patch from. '-' can be used to read from the standard input." msgstr "要读取补丁的文件。 '-' 可以用来从标准输入中读取。" @@ -9229,29 +9036,25 @@ msgstr "--stat" #. type: Plain text #: en/git-apply.txt:44 -#, fuzzy, priority:100 -#| msgid "Instead of applying the patch, output diffstat for the input. Turns off \"apply\"." +#, priority:100 msgid "Instead of applying the patch, output diffstat for the input. Turns off \"apply\"." msgstr "不应用补丁，而是输出输入的差异状态。 关掉 \"apply\"。" #. type: Plain text #: en/git-apply.txt:51 -#, fuzzy, priority:100, placeholders:'--stat' -#| msgid "Similar to `--stat`, but shows the number of added and deleted lines in decimal notation and the pathname without abbreviation, to make it more machine friendly. For binary files, outputs two `-` instead of saying `0 0`. Turns off \"apply\"." +#, placeholders:'--stat', priority:100 msgid "Similar to `--stat`, but shows the number of added and deleted lines in decimal notation and the pathname without abbreviation, to make it more machine friendly. For binary files, outputs two `-` instead of saying `0 0`. Turns off \"apply\"." msgstr "类似于 `--stat`，但是用十进制符号显示增加和删除的行数，路径名不加缩写，使其对机器更友好。 对于二进制文件，输出两个`-` 而不是 `0 0`。 关闭 \"apply\"。" #. type: Plain text #: en/git-apply.txt:57 -#, fuzzy, priority:100 -#| msgid "Instead of applying the patch, output a condensed summary of information obtained from git diff extended headers, such as creations, renames, and mode changes. Turns off \"apply\"." +#, priority:100 msgid "Instead of applying the patch, output a condensed summary of information obtained from git diff extended headers, such as creations, renames, and mode changes. Turns off \"apply\"." msgstr "不应用补丁，而是输出从 git dif f扩展头文件中获得的信息的浓缩摘要，如创建、重命名和模式变化。 关闭 \"apply\"。" #. type: Plain text #: en/git-apply.txt:62 -#, fuzzy, priority:100 -#| msgid "Instead of applying the patch, see if the patch is applicable to the current working tree and/or the index file and detects errors. Turns off \"apply\"." +#, priority:100 msgid "Instead of applying the patch, see if the patch is applicable to the current working tree and/or the index file and detects errors. Turns off \"apply\"." msgstr "看看该补丁是否适用于当前工作树和/或索引文件，并检测到错误，而不是应用该补丁。 关闭 \"apply\"。" @@ -9281,15 +9084,13 @@ msgstr "将补丁只应用于索引，而不触及工作目录。如果 `--check #. type: Plain text #: en/git-apply.txt:84 -#, fuzzy, priority:100, placeholders:'--intent-to-add':'linkgit:git-add[1]':'--index':'--index':'--cached':'--3way' -#| msgid "When applying the patch only to the working tree, mark new files to be added to the index later (see `--intent-to-add` option in linkgit:git-add[1]). This option is ignored unless running in a Git repository and `--index` is not specified. Note that `--index` could be implied by other options such as `--cached` or `--3way`." +#, placeholders:'--intent-to-add':'linkgit:git-add[1]':'--index':'--index':'--cached':'--3way', priority:100 msgid "When applying the patch only to the working tree, mark new files to be added to the index later (see `--intent-to-add` option in linkgit:git-add[1]). This option is ignored unless running in a Git repository and `--index` is not specified. Note that `--index` could be implied by other options such as `--cached` or `--3way`." msgstr "当只在工作树上应用补丁时，标记新的文件，以便以后添加到索引中（见 linkgit:git-add[1] 中的 `--intent-to-add` 选项）。除非在 Git 仓库中运行且没有指定 `--index`，否则该选项将被忽略。 请注意，`--index` 可能是由其他选项暗示的，如 `--cached` 或 `--3way`。" #. type: Plain text #: en/git-apply.txt:94 -#, fuzzy, priority:100, placeholders:'--index':'--cached':'--reject':'--cached' -#| msgid "Attempt 3-way merge if the patch records the identity of blobs it is supposed to apply to and we have those blobs available locally, possibly leaving the conflict markers in the files in the working tree for the user to resolve. This option implies the `--index` option unless the `--cached` option is used, and is incompatible with the `--reject` option. When used with the `--cached` option, any conflicts are left at higher stages in the cache." +#, placeholders:'--index':'--cached':'--reject':'--cached', priority:100 msgid "Attempt 3-way merge if the patch records the identity of blobs it is supposed to apply to and we have those blobs available locally, possibly leaving the conflict markers in the files in the working tree for the user to resolve. This option implies the `--index` option unless the `--cached` option is used, and is incompatible with the `--reject` option. When used with the `--cached` option, any conflicts are left at higher stages in the cache." msgstr "如果补丁记录了它应该应用到的二进制文件的身份，并且我们有这些二进制文件在本地可用，则尝试三方合并，可能会在工作树中的文件中留下冲突标记，由用户解决。 这个选项意味着 `--index` 选项，除非使用 `--cached` 选项，并且与 `--reject` 选项不兼容。 当与 `--cached` 选项一起使用时，任何冲突都被留在缓存的较高阶段。" @@ -9301,8 +9102,7 @@ msgstr "--build-fake-ancestor=<文件>" #. type: Plain text #: en/git-apply.txt:101 -#, fuzzy, priority:100 -#| msgid "Newer 'git diff' output has embedded 'index information' for each blob to help identify the original version that the patch applies to. When this flag is given, and if the original versions of the blobs are available locally, builds a temporary index containing those blobs." +#, priority:100 msgid "Newer 'git diff' output has embedded 'index information' for each blob to help identify the original version that the patch applies to. When this flag is given, and if the original versions of the blobs are available locally, builds a temporary index containing those blobs." msgstr "较新的 \"git diff\" 输出为每个 blob 嵌入了 \"索引信息\"，以帮助识别补丁所适用的原始版本。 当给出这个标志时，如果 blob 的原始版本在本地可用，则建立一个包含这些 blob 的临时索引。" @@ -9326,8 +9126,7 @@ msgstr "反过来应用补丁。" #. type: Plain text #: en/git-apply.txt:115 -#, fuzzy, priority:100 -#| msgid "For atomicity, 'git apply' by default fails the whole patch and does not touch the working tree when some of the hunks do not apply. This option makes it apply the parts of the patch that are applicable, and leave the rejected hunks in corresponding *.rej files." +#, priority:100 msgid "For atomicity, 'git apply' by default fails the whole patch and does not touch the working tree when some of the hunks do not apply. This option makes it apply the parts of the patch that are applicable, and leave the rejected hunks in corresponding *.rej files." msgstr "为了保证原子性，'git apply' 默认情况下会使整个补丁失效，并且在某些目标不适用的情况下不会接触工作区。 这个选项让它应用补丁中适用的部分，并将被拒绝的目标留在相应的 *.rej 文件中。" @@ -9345,8 +9144,7 @@ msgstr "移除传统差异路径中的 前导路径成分（用斜线分隔 #. type: Plain text #: en/git-apply.txt:135 -#, fuzzy, priority:100 -#| msgid "Ensure at least lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored." +#, priority:100 msgid "Ensure at least lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored." msgstr "确保每次更改前后至少有 行的周围环境相匹配。 当周围环境的行数较少时，它们必须全部匹配。 在默认情况下，没有任何上下文被忽略。" @@ -9358,8 +9156,7 @@ msgstr "--unidiff-zero" #. type: Plain text #: en/git-apply.txt:142 -#, fuzzy, priority:100, placeholders:'--unified=0':'--unidiff-zero' -#| msgid "By default, 'git apply' expects that the patch being applied is a unified diff with at least one line of context. This provides good safety measures, but breaks down when applying a diff generated with `--unified=0`. To bypass these checks use `--unidiff-zero`." +#, placeholders:'--unified=0':'--unidiff-zero', priority:100 msgid "By default, 'git apply' expects that the patch being applied is a unified diff with at least one line of context. This provides good safety measures, but breaks down when applying a diff generated with `--unified=0`. To bypass these checks use `--unidiff-zero`." msgstr "默认情况下，'git apply' 希望被应用的补丁是一个至少有一行上下文的统一差异。 这提供了很好的安全措施，但在应用以 `--unified=0` 生成的差异时，会出现问题。要绕过这些检查，请使用 `--unidiff-zero`。" @@ -9377,8 +9174,7 @@ msgstr "--apply" #. type: Plain text #: en/git-apply.txt:152 -#, fuzzy, priority:100 -#| msgid "If you use any of the options marked \"Turns off 'apply'\" above, 'git apply' reads and outputs the requested information without actually applying the patch. Give this flag after those flags to also apply the patch." +#, priority:100 msgid "If you use any of the options marked \"Turns off 'apply'\" above, 'git apply' reads and outputs the requested information without actually applying the patch. Give this flag after those flags to also apply the patch." msgstr "如果您使用了上面标有 \"关闭 'apply' \" 的任何选项，'git apply' 会读取并输出所需的信息，而不会实际应用补丁。 在这些标志之后给出这个标志，也可以应用该补丁。" @@ -9390,8 +9186,7 @@ msgstr "--no-add" #. type: Plain text #: en/git-apply.txt:159 -#, fuzzy, priority:100 -#| msgid "When applying a patch, ignore additions made by the patch. This can be used to extract the common part between two files by first running 'diff' on them and applying the result with this option, which would apply the deletion part but not the addition part." +#, priority:100 msgid "When applying a patch, ignore additions made by the patch. This can be used to extract the common part between two files by first running 'diff' on them and applying the result with this option, which would apply the deletion part but not the addition part." msgstr "当应用一个补丁时，忽略该补丁所做的添加内容。 这可以用来提取两个文件之间的共同部分，首先对它们运行 'diff'，然后用这个选项应用结果，这将应用删除的部分，但不应用增加的部分。" @@ -9403,8 +9198,7 @@ msgstr "--allow-binary-replacement" #. type: Plain text #: en/git-apply.txt:166 -#, fuzzy, priority:100 -#| msgid "Historically we did not allow binary patch application without an explicit permission from the user, and this flag was the way to do so. Currently, we always allow binary patch application, so this is a no-op." +#, priority:100 msgid "Historically we did not allow binary patch application without an explicit permission from the user, and this flag was the way to do so. Currently, we always allow binary patch application, so this is a no-op." msgstr "过去，我们不允许在没有用户明确许可的情况下使用二进制补丁程序，这个标志就是这样做的。 目前，我们始终允许二进制补丁的应用，所以这个标记是无效的。" @@ -9434,29 +9228,25 @@ msgstr "将修改应用于与给定路径模式相匹配的文件。这在导入 #. type: Plain text #: en/git-apply.txt:182 -#, fuzzy, priority:100, placeholders:'--exclude':'--include' -#| msgid "When `--exclude` and `--include` patterns are used, they are examined in the order they appear on the command line, and the first match determines if a patch to each path is used. A patch to a path that does not match any include/exclude pattern is used by default if there is no include pattern on the command line, and ignored if there is any include pattern." +#, placeholders:'--exclude':'--include', priority:100 msgid "When `--exclude` and `--include` patterns are used, they are examined in the order they appear on the command line, and the first match determines if a patch to each path is used. A patch to a path that does not match any include/exclude pattern is used by default if there is no include pattern on the command line, and ignored if there is any include pattern." msgstr "当使用 `--exclude` 和 `--include` 模式时，会按照它们在命令行中出现的顺序进行检查，第一个匹配项决定是否使用每个路径的补丁。 如果命令行上没有include模式，则默认使用不匹配任何 include/exclude 模式的路径的补丁，如果有任何 include 模式，则忽略。" #. type: Plain text #: en/git-apply.txt:190 -#, fuzzy, priority:100, placeholders:'--whitespace' -#| msgid "When applying a patch, ignore changes in whitespace in context lines if necessary. Context lines will preserve their whitespace, and they will not undergo whitespace fixing regardless of the value of the `--whitespace` option. New lines will still be fixed, though." +#, placeholders:'--whitespace', priority:100 msgid "When applying a patch, ignore changes in whitespace in context lines if necessary. Context lines will preserve their whitespace, and they will not undergo whitespace fixing regardless of the value of the `--whitespace` option. New lines will still be fixed, though." msgstr "当应用一个补丁时，如果有必要，请忽略上下文行中的空白变化。 上下文行将保留其空白，无论 `--whitespace` 选项的值是多少，它们都不会进行空白修正。不过，新的行仍然会被修复。" #. type: Plain text #: en/git-apply.txt:199 -#, fuzzy, priority:100, placeholders:'core.whitespace' -#| msgid "When applying a patch, detect a new or modified line that has whitespace errors. What are considered whitespace errors is controlled by `core.whitespace` configuration. By default, trailing whitespaces (including lines that solely consist of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors." +#, placeholders:'core.whitespace', priority:100 msgid "When applying a patch, detect a new or modified line that has whitespace errors. What are considered whitespace errors is controlled by `core.whitespace` configuration. By default, trailing whitespaces (including lines that solely consist of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors." msgstr "当应用一个补丁时，检测一个新的或修改过的行有空格错误。 什么是空格错误是由 `core.whitespace` 配置控制的。 默认情况下，尾部的空白（包括仅由空白组成的行）和紧跟在行的初始缩进内的 Tab 字符的空白字符被认为是空白错误。" #. type: Plain text #: en/git-apply.txt:203 -#, fuzzy, priority:100, placeholders:'git-apply' -#| 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`." +#, 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 "默认情况下，该命令输出警告信息，但会应用补丁。 当 `git-apply` 被用于统计而不应用补丁时，它默认为 `nowarn`。" @@ -9540,8 +9330,7 @@ msgstr "--directory=" #. type: Plain text #: en/git-apply.txt:244 -#, fuzzy, priority:100 -#| msgid "Prepend to all filenames. If a \"-p\" argument was also passed, it is applied before prepending the new root." +#, priority:100 msgid "Prepend to all filenames. If a \"-p\" argument was also passed, it is applied before prepending the new root." msgstr "将 <根目录> 预置到所有文件名中。 如果还传递了 \"-p \" 参数，则在预置新根目录之前应用。" @@ -9565,8 +9354,7 @@ msgstr "默认情况下，影响到工作区域之外（无论是 Git 控制的 #. type: Plain text #: en/git-apply.txt:258 -#, fuzzy, priority:100, placeholders:'--unsafe-paths':'--index':'--cached' -#| msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the `--unsafe-paths` option to override this safety check. This option has no effect when `--index` or `--cached` is in use." +#, placeholders:'--unsafe-paths':'--index':'--cached', priority:100 msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the `--unsafe-paths` option to override this safety check. This option has no effect when `--index` or `--cached` is in use." msgstr "当 `git apply` 被用作 \"更好的 GNU 补丁\" 时，用户可以通过 `--unsafe-paths` 选项来覆盖这个安全检查。 当使用 `--index` 或 `--cached` 时，该选项没有作用。" @@ -9590,8 +9378,7 @@ msgstr "如果该补丁包含对子模块的任何修改，那么 'git apply' #. type: Plain text #: en/git-apply.txt:280 -#, fuzzy, priority:100, placeholders:'--index' -#| msgid "If `--index` is specified (explicitly or implicitly), then the submodule commits must match the index exactly for the patch to apply. If any of the submodules are checked-out, then these check-outs are completely ignored, i.e., they are not required to be up to date or clean and they are not updated." +#, placeholders:'--index', priority:100 msgid "If `--index` is specified (explicitly or implicitly), then the submodule commits must match the index exactly for the patch to apply. If any of the submodules are checked-out, then these check-outs are completely ignored, i.e., they are not required to be up to date or clean and they are not updated." msgstr "如果 `--index` 被指定（显式或隐式），那么子模块的提交必须与索引完全匹配，补丁才能应用。 如果任何一个子模块被检出，那么这些检出的模块将被完全忽略，也就是说，它们不需要是最新的或干净的，它们也不会被更新。" @@ -9631,8 +9418,7 @@ msgstr "" #. type: Plain text #: en/git-archimport.txt:23 -#, fuzzy, priority:100 -#| msgid "Imports a project from one or more GNU Arch repositories. It will follow branches and repositories within the namespaces defined by the / parameters supplied. If it cannot find the remote branch a merge comes from it will just import it as a regular commit. If it can find it, it will mark it as a merge whenever possible (see discussion below)." +#, priority:100 msgid "Imports a project from one or more GNU Arch repositories. It will follow branches and repositories within the namespaces defined by the / parameters supplied. If it cannot find the remote branch a merge comes from it will just import it as a regular commit. If it can find it, it will mark it as a merge whenever possible (see discussion below)." msgstr "从一个或多个 GNU Arch 仓库导入一个项目。 它将在所提供的 <归档>/<分支> 参数所定义的命名空间内跟踪分支和仓库。如果它找不到合并后的远程分支，就会把它作为一个普通的提交导入。如果它能找到它，它会尽可能地将其标记为合并（见下面的讨论）。" @@ -9663,15 +9449,13 @@ msgstr "对于初始导入，'git archimport' 希望能在一个空目录中找 #. type: Plain text #: en/git-archimport.txt:49 -#, fuzzy, priority:100 -#| msgid "While 'git archimport' will try to create sensible branch names for the archives that it imports, it is also possible to specify Git branch names manually. To do so, write a Git branch name after each / parameter, separated by a colon. This way, you can shorten the Arch branch names and convert Arch jargon to Git jargon, for example mapping a \"PROJECT{litdd}devo{litdd}VERSION\" branch to \"master\"." +#, priority:100 msgid "While 'git archimport' will try to create sensible branch names for the archives that it imports, it is also possible to specify Git branch names manually. To do so, write a Git branch name after each / parameter, separated by a colon. This way, you can shorten the Arch branch names and convert Arch jargon to Git jargon, for example mapping a \"PROJECT{litdd}devo{litdd}VERSION\" branch to \"master\"." msgstr "虽然 'git archimport' 会尝试为它导入的档案创建合理的分支名，但也可以手动指定 Git 分支名。 要做到这一点，在每个 <归档>/<分支> 参数后面写一个 Git 分支名，用冒号隔开。 这样，你可以缩短 Arch 分支的名称，并将 Arch 的行话转换成 Git 的行话，例如将 \"PROJECT{litdd}devo{litdd}VERSION\" 分支映射为 \"master\"。" #. type: Plain text #: en/git-archimport.txt:54 -#, fuzzy, priority:100 -#| msgid "Associating multiple Arch branches to one Git branch is possible; the result will make the most sense only if no commits are made to the first branch, after the second branch is created. Still, this is useful to convert Arch repositories that had been rotated periodically." +#, priority:100 msgid "Associating multiple Arch branches to one Git branch is possible; the result will make the most sense only if no commits are made to the first branch, after the second branch is created. Still, this is useful to convert Arch repositories that had been rotated periodically." msgstr "将多个 Arch 分支关联到一个 Git 分支是可能的；只有在创建第二个分支后没有向第一个分支提交的情况下，其结果才是最合理的。 不过，这对于转换定期轮换的 Arch 仓库还是很有用的。" @@ -9719,8 +9503,7 @@ msgstr "多标签。将为每个提交创建一个标签，反映 Arch 库中的 #. type: Plain text #: en/git-archimport.txt:85 -#, fuzzy, priority:100 -#| msgid "Use the fast patchset import strategy. This can be significantly faster for large trees, but cannot handle directory renames or permissions changes. The default strategy is slow and safe." +#, priority:100 msgid "Use the fast patchset import strategy. This can be significantly faster for large trees, but cannot handle directory renames or permissions changes. The default strategy is slow and safe." msgstr "使用快速补丁集导入策略。 这对大目录树来说可以明显加快，但不能处理目录重名或权限变化。 默认策略是缓慢而安全的。" @@ -9732,8 +9515,7 @@ msgstr "-o" #. type: Plain text #: en/git-archimport.txt:93 -#, fuzzy, priority:100 -#| msgid "Use this for compatibility with old-style branch names used by earlier versions of 'git archimport'. Old-style branch names were category{litdd}branch, whereas new-style branch names are archive,category{litdd}branch{litdd}version. In both cases, names given on the command-line will override the automatically-generated ones." +#, priority:100 msgid "Use this for compatibility with old-style branch names used by earlier versions of 'git archimport'. Old-style branch names were category{litdd}branch, whereas new-style branch names are archive,category{litdd}branch{litdd}version. In both cases, names given on the command-line will override the automatically-generated ones." msgstr "为了与早期版本的 'git archimport' 所使用的旧式分支名兼容，使用这个名字。 旧式的分支名是 category{litdd}branch，而新式的分支名是 archive,category{litdd}branch{litdd}version。 在这两种情况下，在命令行中给出的名字将覆盖自动生成的名字。" @@ -9745,8 +9527,7 @@ msgstr "-D <深度>" #. type: Plain text #: en/git-archimport.txt:98 -#, fuzzy, priority:100 -#| msgid "Follow merge ancestry and attempt to import trees that have been merged from. Specify a depth greater than 1 if patch logs have been pruned." +#, priority:100 msgid "Follow merge ancestry and attempt to import trees that have been merged from. Specify a depth greater than 1 if patch logs have been pruned." msgstr "遵循合并的祖先，并尝试导入已经合并的目录树。 如果补丁日志已经被修剪，则指定一个大于 1 的深度。" @@ -9808,15 +9589,13 @@ msgstr "" #. type: Plain text #: en/git-archive.txt:23 -#, fuzzy, priority:100 -#| msgid "Creates an archive of the specified format containing the tree structure for the named tree, and writes it out to the standard output. If is specified it is prepended to the filenames in the archive." +#, priority:100 msgid "Creates an archive of the specified format containing the tree structure for the named tree, and writes it out to the standard output. If is specified it is prepended to the filenames in the archive." msgstr "创建一个指定格式的档案，包含命名的目录树的结构，并将其写入标准输出。 如果 <前缀> 被指定，它将被预置在归档文件的文件名上。" #. type: Plain text #: en/git-archive.txt:32 -#, fuzzy, priority:100, placeholders:'git get-tar-commit-id' -#| msgid "'git archive' behaves differently when given a tree ID as opposed to a commit ID or tag ID. When a tree ID is provided, the current time is used as the modification time of each file in the archive. On the other hand, when a commit ID or tag ID is provided, the commit time as recorded in the referenced commit object is used instead. Additionally the commit ID is stored in a global extended pax header if the tar format is used; it can be extracted using 'git get-tar-commit-id'. In ZIP files it is stored as a file comment." +#, placeholders:'git get-tar-commit-id', priority:100 msgid "'git archive' behaves differently when given a tree ID as opposed to a commit ID or tag ID. When a tree ID is provided, the current time is used as the modification time of each file in the archive. On the other hand, when a commit ID or tag ID is provided, the commit time as recorded in the referenced commit object is used instead. Additionally the commit ID is stored in a global extended pax header if the tar format is used; it can be extracted using 'git get-tar-commit-id'. In ZIP files it is stored as a file comment." msgstr "与提交 ID 或标签 ID 相比，'git archive' 在提供目录树 ID 时的行为有所不同。提供树 ID 时，当前时间会被用作存档中每个文件的修改时间。另一方面，如果提供了提交 ID 或标记 ID，则会使用引用的提交对象中记录的提交时间。 此外，如果使用 tar 格式，提交 ID 会存储在全局扩展 pax 标头中；可以使用 'git get-tar-commit-id' 提取。在 ZIP 文件中，它被存储为文件注释。" @@ -9858,8 +9637,7 @@ msgstr "--prefix=<前缀>/" #. type: Plain text #: en/git-archive.txt:57 -#, fuzzy, priority:100, placeholders:'--add-file':'--add-virtual-file' -#| msgid "Prepend / to paths in the archive. Can be repeated; its rightmost value is used for all tracked files. See below which value gets used by `--add-file` and `--add-virtual-file`." +#, placeholders:'--add-file':'--add-virtual-file', priority:100 msgid "Prepend / to paths in the archive. Can be repeated; its rightmost value is used for all tracked files. See below which value gets used by `--add-file` and `--add-virtual-file`." msgstr "将 <前缀>/ 预置到存档中的路径。 可以重复使用；其最右边的值用于所有跟踪的文件。 请看下面的 `--add-file` 和 `--add-virtual-file` 所使用的值。" @@ -9883,8 +9661,7 @@ msgstr "--add-file=<文件>" #. type: Plain text #: en/git-archive.txt:67 -#, fuzzy, priority:100, placeholders:'--prefix':'--add-file' -#| msgid "Add a non-tracked file to the archive. Can be repeated to add multiple files. The path of the file in the archive is built by concatenating the value of the last `--prefix` option (if any) before this `--add-file` and the basename of ." +#, placeholders:'--prefix':'--add-file', priority:100 msgid "Add a non-tracked file to the archive. Can be repeated to add multiple files. The path of the file in the archive is built by concatenating the value of the last `--prefix` option (if any) before this `--add-file` and the basename of ." msgstr "添加一个非跟踪的文件到存档。 可以重复添加多个文件。 归档文件的路径是由这个 `--add-file` 之前的最后一个 `--prefix` 选项（如果有的话）的值和 <文件> 的基本名称连接而成的。" @@ -9896,8 +9673,7 @@ msgstr "--add-virtual-file=<路径>:<内容>" #. type: Plain text #: en/git-archive.txt:73 -#, fuzzy, priority:100, placeholders:'--prefix':'--add-virtual-file' -#| msgid "Add the specified contents to the archive. Can be repeated to add multiple files. The path of the file in the archive is built by concatenating the value of the last `--prefix` option (if any) before this `--add-virtual-file` and ``." +#, placeholders:'--prefix':'--add-virtual-file', priority:100 msgid "Add the specified contents to the archive. Can be repeated to add multiple files. The path of the file in the archive is built by concatenating the value of the last `--prefix` option (if any) before this `--add-virtual-file` and ``." msgstr "将指定的内容添加到档案中。 可以重复添加多个文件。 归档文件的路径是由这个 `--add-virtual-file` 之前的最后一个 `--prefix` 选项（如果有的话）和 `<路径>` 相连而成的。" @@ -9934,8 +9710,7 @@ msgstr "--mtime=<时间>" #. type: Plain text #: en/git-archive.txt:93 -#, fuzzy, priority:100 -#| msgid "Set modification time of archive entries. Without this option the committer time is used if `` is a commit or tag, and the current time if it is a tree." +#, priority:100 msgid "Set modification time of archive entries. Without this option the committer time is used if `` is a commit or tag, and the current time if it is a tree." msgstr "设置存档条目的修改时间。 如果没有这个选项，如果 `<树状对象>` 是一个提交或标签，则使用提交者的时间，如果是一个树，则使用当前时间。" @@ -9947,8 +9722,7 @@ msgstr "" #. type: Plain text #: en/git-archive.txt:97 -#, fuzzy, priority:100 -#| msgid "This can be any options that the archiver backend understands. See next section." +#, priority:100 msgid "This can be any options that the archiver backend understands. See next section." msgstr "这可以是存档器后端能理解的任何选项。 见下一节。" @@ -9996,8 +9770,7 @@ msgstr "<路径>" #. type: Plain text #: en/git-archive.txt:116 -#, fuzzy, priority:100 -#| msgid "Without an optional path parameter, all files and subdirectories of the current working directory are included in the archive. If one or more paths are specified, only these are included." +#, priority:100 msgid "Without an optional path parameter, all files and subdirectories of the current working directory are included in the archive. If one or more paths are specified, only these are included." msgstr "如果没有可选的路径参数，当前工作目录下的所有文件和子目录都会包括在存档中。 如果指定了一个或多个路径，则只包括这些路径。" @@ -10021,8 +9794,7 @@ msgstr "-<数字 0-9>" #. type: Plain text #: en/git-archive.txt:127 -#, fuzzy, priority:100 -#| msgid "Specify compression level. Larger values allow the command to spend more time to compress to smaller size. Supported values are from `-0` (store-only) to `-9` (best ratio). Default is `-6` if not given." +#, priority:100 msgid "Specify compression level. Larger values allow the command to spend more time to compress to smaller size. Supported values are from `-0` (store-only) to `-9` (best ratio). Default is `-6` if not given." msgstr "指定压缩级别。 较大的值允许命令花费更多的时间来压缩到较小的尺寸。 支持的值从 `-0`（只存储）到 `-9`（最佳比例）。 如果没有给出，默认为 `-6'。" @@ -10052,8 +9824,7 @@ msgstr "tar.umask" #. type: Plain text #: en/git-archive.txt:146 -#, fuzzy, priority:100, placeholders:'--remote' -#| msgid "This variable can be used to restrict the permission bits of tar archive entries. The default is 0002, which turns off the world write bit. The special value \"user\" indicates that the archiving user's umask will be used instead. See umask(2) for details. If `--remote` is used then only the configuration of the remote repository takes effect." +#, placeholders:'--remote', priority:100 msgid "This variable can be used to restrict the permission bits of tar archive entries. The default is 0002, which turns off the world write bit. The special value \"user\" indicates that the archiving user's umask will be used instead. See umask(2) for details. If `--remote` is used then only the configuration of the remote repository takes effect." msgstr "这个变量可以用来限制 tar 存档条目的权限位。 默认值是 0002，它关闭了世界写入位。 特殊值 \"user\" 表示将使用归档用户的 umask 来代替。 详情见 umask(2)。 如果使用 `--remote`，那么只有远程仓库的配置才会生效。" @@ -10101,8 +9872,7 @@ msgstr "export-ignore" #. type: Plain text #: en/git-archive.txt:172 -#, fuzzy, priority:100, placeholders:'linkgit:gitattributes[5]' -#| msgid "Files and directories with the attribute export-ignore won't be added to archive files. See linkgit:gitattributes[5] for details." +#, placeholders:'linkgit:gitattributes[5]', priority:100 msgid "Files and directories with the attribute export-ignore won't be added to archive files. See linkgit:gitattributes[5] for details." msgstr "带有 export-ignore 属性的文件和目录不会被添加到存档文件中。 详情见 linkgit:gitattributes[5]。" @@ -10114,15 +9884,13 @@ msgstr "export-subst" #. type: Plain text #: en/git-archive.txt:177 -#, fuzzy, priority:100, placeholders:'linkgit:gitattributes[5]' -#| msgid "If the attribute export-subst is set for a file then Git will expand several placeholders when adding this file to an archive. See linkgit:gitattributes[5] for details." +#, placeholders:'linkgit:gitattributes[5]', priority:100 msgid "If the attribute export-subst is set for a file then Git will expand several placeholders when adding this file to an archive. See linkgit:gitattributes[5] for details." msgstr "如果为一个文件设置了 export-subst 属性，那么当把这个文件添加到存档时，Git 会展开几个占位符。 详情见 linkgit:gitattributes[5]。" #. type: Plain text #: en/git-archive.txt:185 -#, fuzzy, priority:100, placeholders:'--worktree-attributes':'$GIT_DIR' -#| 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." +#, placeholders:'--worktree-attributes':'$GIT_DIR', 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 "注意，默认情况下，属性来自被归档的树中的 `.gitattributes` 文件。 如果你想在事后调整输出的方式（例如，你提交时没有在其 `.gitattributes` 中添加适当的 export-ignore ），请根据需要调整检查出来的 `.gitattributes` 文件并使用 `--worktree-attributes` 选项。 另外，你也可以在你的 `$GIT_DIR/info/attributes` 文件中保留归档任何树时应该适用的必要属性。" @@ -10230,8 +9998,7 @@ msgstr "`git config tar.tar.xz.command \"xz -c\"`" #. type: Plain text #: en/git-archive.txt:233 -#, fuzzy, priority:100, placeholders:'tar.xz':'--format=tar':'foo.tar.xz' -#| msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." +#, placeholders:'tar.xz':'--format=tar':'foo.tar.xz', priority:100 msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." msgstr "配置一个 \"tar.xz\" 格式来制作 LZMA 压缩的 tarf 文件。 你可以指定 `--format=tar.xz` 来使用它，或者通过创建一个像 `-o foo.tar.xz` 这样的输出文件。" @@ -10418,8 +10185,7 @@ msgstr "$ git bisect reset\n" #. type: Plain text #: en/git-bisect.txt:110 -#, fuzzy, priority:100 -#| msgid "By default, this will return your tree to the commit that was checked out before `git bisect start`. (A new `git bisect start` will also do that, as it cleans up the old bisection state.)" +#, priority:100 msgid "By default, this will return your tree to the commit that was checked out before `git bisect start`. (A new `git bisect start` will also do that, as it cleans up the old bisection state.)" msgstr "默认情况下，这将使你的树返回到 `git bisect start` 之前检查出来的提交。 (新的 `git bisect start` 也会这样做，因为它清理了旧的分界状态）" @@ -10575,15 +10341,13 @@ msgstr "$ git bisect visualize\n" #. type: Plain text #: en/git-bisect.txt:212 -#, fuzzy, priority:100 -#| msgid "Git detects a graphical environment through various environment variables: `DISPLAY`, which is set in X Window System environments on Unix systems. `SESSIONNAME`, which is set under Cygwin in interactive desktop sessions. `MSYSTEM`, which is set under Msys2 and Git for Windows. `SECURITYSESSIONID`, which may be set on macOS in interactive desktop sessions." +#, priority:100 msgid "Git detects a graphical environment through various environment variables: `DISPLAY`, which is set in X Window System environments on Unix systems. `SESSIONNAME`, which is set under Cygwin in interactive desktop sessions. `MSYSTEM`, which is set under Msys2 and Git for Windows. `SECURITYSESSIONID`, which may be set on macOS in interactive desktop sessions." msgstr "Git 通过各种环境变量检测图形环境：`DISPLAY`，在 Unix 系统的 X 窗口系统环境中设置。 `SESSIONNAME` （会话名），在 Cygwin 下的交互式桌面会话中设置。 `MSYSTEM`，在 Msys2 和 Git for Windows 下设置。 `SECURITYSESSIONID`，可在 macOS 上的交互式桌面会话中设置。" #. type: Plain text #: en/git-bisect.txt:215 -#, fuzzy, priority:100, placeholders:'--stat' -#| msgid "If none of these environment variables is set, 'git log' is used instead. You can also give command-line options such as `-p` and `--stat`." +#, placeholders:'--stat', priority:100 msgid "If none of these environment variables is set, 'git log' is used instead. You can also give command-line options such as `-p` and `--stat`." msgstr "如果没有设置这些环境变量，则会使用 'git log'。 您也可以提供命令行选项，如 `-p` 和 `--stat`。" @@ -10735,8 +10499,7 @@ msgstr "通过提供更多的参数来削减二分查找的起点" #. type: Plain text #: en/git-bisect.txt:303 -#, fuzzy, priority:100 -#| msgid "You can further cut down the number of trials, if you know what part of the tree is involved in the problem you are tracking down, by specifying path parameters when issuing the `bisect start` command:" +#, priority:100 msgid "You can further cut down the number of trials, if you know what part of the tree is involved in the problem you are tracking down, by specifying pathspec parameters when issuing the `bisect start` command:" msgstr "如果你知道你要追踪的问题涉及到树的哪一部分，你可以通过在发出 `bisect start` 命令时指定路径参数来进一步减少试验的数量：" @@ -10808,8 +10571,7 @@ msgstr "你可能经常发现，在一个二分查找会话中，你想让临时 #. type: Plain text #: en/git-bisect.txt:359 -#, fuzzy, priority:100 -#| msgid "To cope with such a situation, after the inner 'git bisect' finds the next revision to test, the script can apply the patch before compiling, run the real test, and afterwards decide if the revision (possibly with the needed patch) passed the test and then rewind the tree to the pristine state. Finally the script should exit with the status of the real test to let the `git bisect run` command loop determine the eventual outcome of the bisect session." +#, priority:100 msgid "To cope with such a situation, after the inner 'git bisect' finds the next revision to test, the script can apply the patch before compiling, run the real test, and afterwards decide if the revision (possibly with the needed patch) passed the test and then rewind the tree to the pristine state. Finally the script should exit with the status of the real test to let the `git bisect run` command loop determine the eventual outcome of the bisect session." msgstr "为了应对这种情况，在内部的 'git bisect' 找到要测试的下一个修订版后，脚本可以在编译前应用补丁，运行真正的测试，之后决定该修订版（可能有需要的补丁）是否通过测试，然后将树倒回原始状态。 最后，脚本应该以真实测试的状态退出，让 `git bisect run` 命令循环决定二分查找会话的最终结果。" @@ -10821,10 +10583,9 @@ msgstr "--no-checkout" #. type: Plain text #: en/git-bisect.txt:367 -#, fuzzy, priority:100, placeholders:'BISECT_HEAD' -#| msgid "Do not checkout the new working tree at each iteration of the bisection process. Instead just update a special reference named `BISECT_HEAD` to make it point to the commit that should be tested." +#, placeholders:'BISECT_HEAD', priority:100 msgid "Do not checkout the new working tree at each iteration of the bisection process. Instead just update the reference named `BISECT_HEAD` to make it point to the commit that should be tested." -msgstr "在二分查找过程的每个迭代中，不要检出新的工作区。相反，只需更新一个名为 `BISECT_HEAD` 的特殊引用，使其指向应被测试的提交。" +msgstr "在二分查找过程的每个迭代中，不要检出新的工作区。相反，只需更新一个名为 `BISECT_HEAD` 的引用，使其指向应被测试的提交。" #. type: Plain text #: en/git-bisect.txt:370 @@ -10920,8 +10681,7 @@ msgstr "" #. type: Plain text #: en/git-bisect.txt:419 -#, fuzzy, priority:100, placeholders:'test.sh':'check_test_case' -#| msgid "Here we use a `test.sh` custom script. In this script, if `make` fails, we skip the current commit. `check_test_case.sh` should `exit 0` if the test case passes, and `exit 1` otherwise." +#, placeholders:'test.sh':'check_test_case', priority:100 msgid "Here we use a `test.sh` custom script. In this script, if `make` fails, we skip the current commit. `check_test_case.sh` should `exit 0` if the test case passes, and `exit 1` otherwise." msgstr "这里我们使用一个 `test.sh `自定义脚本。在这个脚本中，如果 `make` 失败，我们就跳过当前的提交。 `check_test_case.sh` 如果测试用例通过，应该 `exit 0`，否则 `exit 1`。" @@ -11200,8 +10960,7 @@ msgstr "--score-debug" #. type: Plain text #: en/git-blame.txt:64 -#, fuzzy, priority:100 -#| msgid "Include debugging information related to the movement of lines between files (see `-C`) and lines moved within a file (see `-M`). The first number listed is the score. This is the number of alphanumeric characters detected as having been moved between or within files. This must be above a certain threshold for 'git blame' to consider those lines of code to have been moved." +#, priority:100 msgid "Include debugging information related to the movement of lines between files (see `-C`) and lines moved within a file (see `-M`). The first number listed is the score. This is the number of alphanumeric characters detected as having been moved between or within files. This must be above a certain threshold for 'git blame' to consider those lines of code to have been moved." msgstr "包括与文件之间行的移动（见 `-C`）和文件内行的移动（见 `-M`）有关的调试信息。 列出的第一个数字是分数。 这是检测到的在文件间或文件内移动的字母数字字符的数量。 这个数字必须超过一定的阈值，'git blame' 才会认为这些代码行被移动了。" @@ -11213,8 +10972,7 @@ msgstr "--show-name" #. type: Plain text #: en/git-blame.txt:70 -#, fuzzy, priority:100 -#| msgid "Show the filename in the original commit. By default the filename is shown if there is any line that came from a file with a different name, due to rename detection." +#, priority:100 msgid "Show the filename in the original commit. By default the filename is shown if there is any line that came from a file with a different name, due to rename detection." msgstr "显示原始提交中的文件名。 默认情况下，如果有任何一行来自不同名字的文件，由于重名检测，文件名会显示出来。" @@ -11244,8 +11002,7 @@ msgstr "--show-email" #. type: Plain text #: en/git-blame.txt:83 -#, fuzzy, priority:100, placeholders:'blame.showEmail' -#| msgid "Show the author email instead of the author name (Default: off). This can also be controlled via the `blame.showEmail` config option." +#, placeholders:'blame.showEmail', priority:100 msgid "Show the author email instead of the author name (Default: off). This can also be controlled via the `blame.showEmail` config option." msgstr "显示作者的电子邮件而不是作者的名字（默认：off）。 这也可以通过 `blame.showEmail` 配置选项来控制。" @@ -11263,8 +11020,7 @@ msgstr "--abbrev=" #. type: Plain text #: en/git-blame.txt:94 -#, fuzzy, priority:100 -#| msgid "Instead of using the default 7+1 hexadecimal digits as the abbreviated object name, use +1 digits, where is at least but ensures the commit object names are unique. Note that 1 column is used for a caret to mark the boundary commit." +#, priority:100 msgid "Instead of using the default 7+1 hexadecimal digits as the abbreviated object name, use +1 digits, where is at least but ensures the commit object names are unique. Note that 1 column is used for a caret to mark the boundary commit." msgstr "不要使用默认的7+1个十六进制数字作为对象的缩写，而是使用 +1 个数字，其中 至少是 ，但确保提交对象的名称是唯一的。 请注意，有1列是用来标记边界提交的关健词。" @@ -11336,8 +11092,7 @@ msgstr "最后文件中该行的行号；" #. type: Plain text #: en/git-blame.txt:121 -#, fuzzy, priority:100 -#| msgid "on a line that starts a group of lines from a different commit than the previous one, the number of lines in this group. On subsequent lines this field is absent." +#, priority:100 msgid "on a line that starts a group of lines from a different commit than the previous one, the number of lines in this group. On subsequent lines this field is absent." msgstr "在开始一组与前一次不同的提交的行上，该组的行数。 在随后的行中，这个字段是不存在的。" @@ -11375,8 +11130,7 @@ msgstr "实际行的内容会在上述标题之后输出，前缀为 TAB。这 # ERROR: --line-porcelain not found in translation #. type: Plain text #: en/git-blame.txt:142 -#, fuzzy, priority:100, placeholders:'--line-porcelain' -#| msgid "The porcelain format generally suppresses commit information that has already been seen. For example, two lines that are blamed to the same commit will both be shown, but the details for that commit will be shown only once. This is more efficient, but may require more state be kept by the reader. The `--line-porcelain` option can be used to output full commit information for each line, allowing simpler (but less efficient) usage like:" +#, placeholders:'--line-porcelain', priority:100 msgid "The porcelain format generally suppresses commit information that has already been seen. For example, two lines that are blamed to the same commit will both be shown, but the details for that commit will be shown only once. This is more efficient, but may require more state be kept by the reader. The `--line-porcelain` option can be used to output full commit information for each line, allowing simpler (but less efficient) usage like:" msgstr "上层命令的格式通常会抑制已被查看过的提交信息。例如，归咎于同一提交的两行内容都会显示，但该提交的详细信息只显示一次。这样效率更高，但可能需要读者保留更多状态。可以使用 `--line-porcelain`选项来输出每一行的完整提交信息，这样的用法更简单（但效率较低），例如：" @@ -11464,8 +11218,7 @@ msgstr "当修订范围指定符被用来限制注释时，自范围边界（在 #. type: Plain text #: en/git-blame.txt:189 -#, fuzzy, priority:100 -#| msgid "A particularly useful way is to see if an added file has lines created by copy-and-paste from existing files. Sometimes this indicates that the developer was being sloppy and did not refactor the code properly. You can first find the commit that introduced the file with:" +#, priority:100 msgid "A particularly useful way is to see if an added file has lines created by copy-and-paste from existing files. Sometimes this indicates that the developer was being sloppy and did not refactor the code properly. You can first find the commit that introduced the file with:" msgstr "一个特别有用的方法是看一个新增的文件是否有从现有文件中复制和粘贴的行。 有时，这表明开发人员很马虎，没有正确地重构代码。 你可以首先找到引入该文件的提交：" @@ -11495,8 +11248,7 @@ msgstr "增量输出" #. type: Plain text #: en/git-blame.txt:206 -#, fuzzy, priority:100, placeholders:'--incremental' -#| msgid "When called with `--incremental` option, the command outputs the result as it is built. The output generally will talk about lines touched by more recent commits first (i.e. the lines will be annotated out of order) and is meant to be used by interactive viewers." +#, placeholders:'--incremental', priority:100 msgid "When called with `--incremental` option, the command outputs the result as it is built. The output generally will talk about lines touched by more recent commits first (i.e. the lines will be annotated out of order) and is meant to be used by interactive viewers." msgstr "当调用 `--incremental` 选项时，该命令在构建过程中输出结果。 一般来说，输出结果会先谈及最近提交的行（也就是说，这些行会被不按顺序的注释），并且是为了给交互式浏览者使用。" @@ -11514,10 +11266,9 @@ msgstr "每个历史追溯条目总是以一行字开始：" #. type: Plain text #: en/git-blame.txt:214 -#, fuzzy, no-wrap, priority:100 -#| msgid "<40-byte hex sha1> \n" +#, no-wrap, priority:100 msgid "<40-byte-hex-sha1> \n" -msgstr "<40-byte hex sha1> <源行> <结果行> <数量行>\n" +msgstr "<40-byte-hex sha1> <源行> <结果行> <数量行>\n" #. type: Plain text #: en/git-blame.txt:216 @@ -11551,8 +11302,7 @@ msgstr "因此，对于一些面向行和字的解析器来说，它确实很容 #. type: Plain text #: en/git-blame.txt:237 -#, fuzzy, priority:100 -#| msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care." +#, priority:100 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care." msgstr "对于做解析的人来说：为了使它更健壮，只要忽略第一和最后一个（\"\" 和 \"filename\" 行）之间的任何行，在 \"扩展信息\" 行的开头，你不认识标签词（或关心那个特定的）。这样一来，如果有一天增加了信息（比如提交编码或扩展的提交注释），历史追溯查看者就不会在意。" @@ -11620,8 +11370,7 @@ msgstr "" #. type: Plain text #: en/git-branch.txt:37 -#, fuzzy, priority:260, placeholders:'--list' -#| msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches." +#, placeholders:'--list', priority:260 msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches." msgstr "如果给了`--list`，或者没有非选项参数，现有的分支将被列出；当前的分支将以绿色突出显示，并标有星号。 在链接的工作树中检查出来的任何分支将以青色突出显示，并标有加号。选项`-r`导致远程跟踪的分支被列出，选项`-a`显示本地和远程分支。" @@ -11639,8 +11388,7 @@ msgstr "注意，当提供\"\"时，必须使用\"--list\"；否则命 #. type: Plain text #: en/git-branch.txt:55 -#, fuzzy, priority:260, placeholders:'--contains':'--no-contains':'--merged':'--no-merged':'HEAD' -#| 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)." +#, 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)." msgstr "使用 `--contains` 时，只显示包含指定提交的分支（换句话说，尖端提交是指定提交的后裔的分支），`--no-contains` 会反过来。如果使用 `--merged`，则只列出被合并到指定提交的分支（即其顶端提交可以从指定提交处到达的分支）。 如果使用\"--no-merged\"，则只列出未被合并到指定提交的分支。 如果缺少参数，则默认为`HEAD`（即当前分支的顶端）。" @@ -11664,8 +11412,7 @@ msgstr "当一个本地分支从远程跟踪的分支开始时，Git 会设置 #. type: Plain text #: en/git-branch.txt:80 -#, fuzzy, priority:260 -#| msgid "With a `-m` or `-M` option, will be renamed to . If had a corresponding reflog, it is renamed to match , and a reflog entry is created to remember the branch renaming. If exists, -M must be used to force the rename to happen." +#, priority:260 msgid "With a `-m` or `-M` option, will be renamed to . If had a corresponding reflog, it is renamed to match , and a reflog entry is created to remember the branch renaming. If exists, -M must be used to force the rename to happen." msgstr "使用`-m`或`-M`选项，将被重命名为。 如果 有相应的 reflog，它将被重命名以匹配 ，并创建一个 reflog 条目以记住分支重命名。如果 存在，必须使用 -M 来强制重命名。" @@ -11677,8 +11424,7 @@ msgstr "`-c`和`-C`选项的语义与`-m`和`-M`完全相同，只不过不是 #. type: Plain text #: en/git-branch.txt:88 -#, fuzzy, priority:260 -#| msgid "With a `-d` or `-D` option, `` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted." +#, priority:260 msgid "With a `-d` or `-D` option, `` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted." msgstr "使用`-d`或`-D`选项，``将被删除。 你可以指定一个以上的分支进行删除。 如果该分支目前有一个reflog，那么reflog也将被删除。" @@ -11720,15 +11466,13 @@ msgstr "--create-reflog" #. type: Plain text #: en/git-branch.txt:116 -#, fuzzy, priority:260, placeholders:'core.logAllRefUpdates':'--no-create-reflog':'--create-reflog':'core.logAllRefUpdates' -#| msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`." +#, placeholders:'core.logAllRefUpdates':'--no-create-reflog':'--create-reflog':'core.logAllRefUpdates', priority:260 msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`." msgstr "创建该分支的 reflog。 这将激活对该分支参考文献所做的所有修改的记录，使其能够使用基于日期的sha1表达式，如\"@{yesterday}\"。 请注意，在非空白仓库中， reflogs通常由`core.logAllRefUpdates`配置选项默认启用。 否定的形式`--no-create-reflog`只覆盖先前的`--create-reflog`，但目前并不否定`core.logAllRefUpdates`的设置。" #. type: Plain text #: en/git-branch.txt:126 -#, fuzzy, priority:260, placeholders:'--delete':'--move':'--copy' -#| msgid "Reset to , even if exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status, or whether it even points to a valid commit. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)." +#, placeholders:'--delete':'--move':'--copy', priority:260 msgid "Reset to , even if exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status, or whether it even points to a valid commit. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)." msgstr "将 <分支名> 重置为 <起始点>，即使 <分支名> 已经存在。如果没有 `-f`，'git branch' 会拒绝更改现有分支。 与 `-d`（或 `--delete`）结合使用时，允许删除分支，而不管其合并状态如何，也不管它是否指向一个有效的提交。结合 `-m`（或 `--move`），允许重命名分支，即使新的分支名称已经存在，这同样适用于 `-c`（或 `--copy`）。" @@ -11788,15 +11532,13 @@ msgstr "`--copy --force`的快捷方式。" #. type: Plain text #: en/git-branch.txt:149 -#, fuzzy, priority:260 -#| msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto." +#, priority:260 msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto." msgstr "给分支着色，以突出当前、本地和远程跟踪的分支。 该值必须是始终（默认）、从不或自动。" #. type: Plain text #: en/git-branch.txt:154 -#, fuzzy, priority:260, placeholders:'--color=never' -#| msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`." +#, placeholders:'--color=never', priority:260 msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`." msgstr "关闭分支的颜色，即使在配置文件中默认为彩色输出。 与`--color=never`相同。" @@ -11856,22 +11598,19 @@ msgstr "--remotes" #. type: Plain text #: en/git-branch.txt:175 -#, fuzzy, priority:260, placeholders:'--list' -#| msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)." +#, placeholders:'--list', priority:260 msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)." msgstr "列出或删除（如果与-d一起使用）远程跟踪的分支。 与`--list`结合使用，以匹配可选的模式（s）。" #. type: Plain text #: en/git-branch.txt:180 -#, fuzzy, priority:260, placeholders:'--list' -#| msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)." +#, placeholders:'--list', priority:260 msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)." msgstr "列出远程跟踪的分支和本地分支。 与`--list`组合，以匹配可选的模式。" #. type: Plain text #: en/git-branch.txt:186 -#, fuzzy, ignore-ellipsis, priority:260, placeholders:'--list' -#| msgid "List branches. With optional `...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)." +#, ignore-ellipsis, placeholders:'--list', priority:260 msgid "List branches. With optional `...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)." msgstr "列出分支。 使用可选的\"...\"，例如 \"git branch --list 'maint-*'\"，只列出符合该模式的分支。" @@ -11895,8 +11634,7 @@ msgstr "-vv" #. type: Plain text #: en/git-branch.txt:201 -#, fuzzy, priority:260, placeholders:'HEAD' -#| 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)." +#, placeholders:'HEAD', 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 "当在列表模式下，显示每个头的sha1和提交主题行，以及与上游分支的关系（如果有的话）。如果给了两次，也会打印链接的工作树的路径（如果有的话）和上游分支的名称（也见 `git remote show `）。 请注意，当前工作树的HEAD不会打印其路径（它总是你的当前目录）。" @@ -11908,8 +11646,7 @@ msgstr "在创建或删除一个分支时更加安静，抑制非错误信息。 #. type: Plain text #: en/git-branch.txt:213 -#, fuzzy, priority:260, placeholders:'core.abbrev' -#| msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option." +#, placeholders:'core.abbrev', priority:260 msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option." msgstr "在显示提交对象名称的冗长列表中，显示至少有''个六位数的最短前缀，以唯一地指代该对象。 默认值是7，可以通过`core.abbrev`配置选项覆盖。" @@ -11928,9 +11665,9 @@ msgstr "在输出列表中显示完整的sha1，而不是缩写它们。" # ERROR: --track[=(direct|inherit)] not found in translation #. type: Labeled list #: en/git-branch.txt:218 en/git-checkout.txt:165 -#, fuzzy, priority:260, no-wrap, placeholders:'--track[=(direct|inherit)]' +#, no-wrap, placeholders:'--track[=(direct|inherit)]', priority:260 msgid "--track[=(direct|inherit)]" -msgstr "--track [inherit|direct]" +msgstr "--track[=(direct|inherit)]" #. type: Plain text #: en/git-branch.txt:226 @@ -11952,8 +11689,7 @@ msgstr "branch.autoSetupMerge配置变量指定了当既不指定`--track`也不 #. type: Plain text #: en/git-branch.txt:243 -#, fuzzy, priority:260, placeholders:'--track=direct':'--no-track':'--track=direct':'--track=inherit':'--track=direct' -#| msgid "The default option, `true`, behaves as though `--track=direct` were given whenever the start-point is a remote-tracking branch. `false` behaves as if `--no-track` were given. `always` behaves as though `--track=direct` were given. `inherit` behaves as though `--track=inherit` were given. `simple` behaves as though `--track=direct` were given only when the start-point is a remote-tracking branch and the new branch has the same name as the remote branch." +#, placeholders:'--track=direct':'--no-track':'--track=direct':'--track=inherit':'--track=direct', priority:260 msgid "The default option, `true`, behaves as though `--track=direct` were given whenever the start-point is a remote-tracking branch. `false` behaves as if `--no-track` were given. `always` behaves as though `--track=direct` were given. `inherit` behaves as though `--track=inherit` were given. `simple` behaves as though `--track=direct` were given only when the start-point is a remote-tracking branch and the new branch has the same name as the remote branch." msgstr "默认选项 \"true\"，在起点是远程跟踪分支的情况下，就像给了 \"track=direct\"。 `false`的行为就像给了`--no-track`一样。`always`的行为就像给了`--track=direct`一样。继承(inherit)的行为就像给了`--track=inherit'一样。`simple`的行为就像给了`--track=direct`一样，只有当起点是远程跟踪的分支，并且新的分支与远程分支有相同的名字时，才会有这种行为。" @@ -11995,8 +11731,7 @@ msgstr "当在分支创建中使用时，一个新的分支将在父 #. type: Plain text #: en/git-branch.txt:270 -#, fuzzy, priority:260, placeholders:'--track':'--set-upstream-to' -#| msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead." +#, placeholders:'--track':'--set-upstream-to', priority:260 msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead." msgstr "由于这个选项的语法混乱，不再支持。 请使用`--track`或`--set-upstream-to`代替。" @@ -12098,8 +11833,7 @@ msgstr "" #. type: Plain text #: en/git-branch.txt:308 -#, fuzzy, priority:260, placeholders:'linkgit:git-check-ref-format[1]' -#| msgid "The name of the branch to create or delete. The new branch name must pass all checks defined by linkgit:git-check-ref-format[1]. Some of these checks may restrict the characters allowed in a branch name." +#, placeholders:'linkgit:git-check-ref-format[1]', priority:260 msgid "The name of the branch to create or delete. The new branch name must pass all checks defined by linkgit:git-check-ref-format[1]. Some of these checks may restrict the characters allowed in a branch name." msgstr "要创建或删除的分支的名称。 新的分支名必须通过 linkgit:git-check-ref-format[1] 定义的所有检查。 其中一些检查可能会限制分支名称中允许的字符。" @@ -12111,8 +11845,7 @@ msgstr "" #. type: Plain text #: en/git-branch.txt:313 -#, fuzzy, priority:260, placeholders:'HEAD' -#| 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." +#, placeholders:'HEAD', 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." msgstr "新的分支头将指向这个提交。 它可以是一个分支名，一个提交号，或者一个标签。 如果省略此选项，将使用当前的HEAD来代替。" @@ -12124,8 +11857,7 @@ msgstr "<旧分支>" #. type: Plain text #: en/git-branch.txt:317 -#, 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." +#, priority:260 msgid "The name of an existing branch. If this option is omitted, the name of the current branch will be used instead." msgstr "新的分支头将指向这个提交。 它可以是一个分支名，一个提交号，或者一个标签。 如果省略此选项，将使用当前的HEAD来代替。" @@ -12173,15 +11905,13 @@ msgstr "--format <格式>" #. type: Plain text #: en/git-branch.txt:341 -#, fuzzy, priority:260, placeholders:'linkgit:git-for-each-ref[1]' -#| msgid "A string that interpolates `%(fieldname)` from a branch ref being shown and the object it points at. The format is the same as that of linkgit:git-for-each-ref[1]." +#, placeholders:'linkgit:git-for-each-ref[1]', priority:260 msgid "A string that interpolates `%(fieldname)` from a branch ref being shown and the object it points at. The format is the same as that of linkgit:git-for-each-ref[1]." msgstr "一个字符串，从正在显示的分支参考文献和它所指向的对象中插值`%(fieldname)'。 其格式与linkgit:git-for-each-ref[1]的格式相同。" #. type: Plain text #: en/git-branch.txt:347 -#, fuzzy, priority:260, placeholders:'pager.branch':'--list':'linkgit:git-config[1]' -#| msgid "`pager.branch` is only respected when listing branches, i.e., when `--list` is used or implied. The default is to use a pager. See linkgit:git-config[1]." +#, placeholders:'pager.branch':'--list':'linkgit:git-config[1]', priority:260 msgid "`pager.branch` is only respected when listing branches, i.e., when `--list` is used or implied. The default is to use a pager. See linkgit:git-config[1]." msgstr "`pager.branch`只在列出分支时被尊重，即使用或暗示使用`--list`时。默认情况是使用 pager。 参见 linkgit:git-config[1]。" @@ -12233,8 +11963,7 @@ msgstr "" #. type: Plain text #: en/git-branch.txt:379 -#, fuzzy, priority:260, placeholders:'linkgit:git-fetch[1]' -#| msgid "Delete the remote-tracking branches \"todo\", \"html\" and \"man\". The next 'fetch' or 'pull' will create them again unless you configure them not to. See linkgit:git-fetch[1]." +#, placeholders:'linkgit:git-fetch[1]', priority:260 msgid "Delete the remote-tracking branches \"todo\", \"html\" and \"man\". The next 'fetch' or 'pull' will create them again unless you configure them not to. See linkgit:git-fetch[1]." msgstr "删除远程跟踪的分支 \"todo\"、\"html \"和 \"man\"。下一次的 \"fetch \"或 \"pull \"会再次创建它们，除非你配置它们不这样做。 参见 linkgit:git-fetch[1]。" @@ -12456,8 +12185,7 @@ msgstr "--suffix <格式>" #. type: Plain text #: en/git-bugreport.txt:57 -#, fuzzy, priority:100, placeholders:'git-bugreport-' -#| 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." +#, placeholders:'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." msgstr "为 bugreport 名称指定一个备用后缀，以创建一个名为 \"git-bugreport-<格式化后缀>\"的文件。这应该采取 strftime(3) 格式字符串的形式；将使用当前的本地时间。" @@ -12476,8 +12204,7 @@ msgstr "--diagnose[=<模式>]" #. type: Plain text #: en/git-bugreport.txt:64 -#, fuzzy, priority:100, placeholders:'git-diagnostics-' -#| msgid "Create a zip archive of supplemental information about the user's machine, Git client, and repository state. The archive is written to the same output directory as the bug report and is named 'git-diagnostics-'." +#, placeholders:'git-diagnostics-', priority:100 msgid "Create a zip archive of supplemental information about the user's machine, Git client, and repository state. The archive is written to the same output directory as the bug report and is named 'git-diagnostics-'." msgstr "创建一个包含用户机器、Git 客户端和仓库状态等补充信息的 zip 档案。该归档文件与错误报告写入同一输出目录，并命名为 'git-diagnostics-<格式化后缀>'。" @@ -12553,8 +12280,7 @@ msgstr "捆绑包是 `.pack` 文件（见 linkgit:git-pack-objects[1]），有 #. type: Plain text #: en/git-bundle.txt:48 -#, fuzzy, priority:100 -#| msgid "Like the packed archive format itself bundles can either be self-contained, or be created using exclusions. See the \"OBJECT PREREQUISITES\" section below." +#, priority:100 msgid "Like the packed archive format itself bundles can either be self-contained, or be created using exclusions. See the \"OBJECT PREREQUISITES\" section below." msgstr "就像打包的归档格式本身一样，捆绑包既可以是独立的，也可以使用排除法创建。 参见下面的 \"目标前提\" 部分。" @@ -12584,8 +12310,7 @@ msgstr "create [options] <文件> " #. type: Plain text #: en/git-bundle.txt:70 -#, fuzzy, priority:100 -#| msgid "Used to create a bundle named 'file'. This requires the '' arguments to define the bundle contents. 'options' contains the options specific to the 'git bundle create' subcommand. If 'file' is `-`, the bundle is written to stdout." +#, priority:100 msgid "Used to create a bundle named 'file'. This requires the '' arguments to define the bundle contents. 'options' contains the options specific to the 'git bundle create' subcommand. If 'file' is `-`, the bundle is written to stdout." msgstr "用来创建一个名为 '<文件>' 的捆绑包。 这需要 '' 参数来定义包的内容。 '选项' 包含 'git bundle create' 子命令的特定选项。如果 'file' 是 '-'，捆绑内容将被写入标准输出流。" @@ -12597,8 +12322,7 @@ msgstr "verify <文件>" #. type: Plain text #: en/git-bundle.txt:82 -#, fuzzy, priority:100, placeholders:'linkgit:gitformat-bundle[5]' -#| msgid "Used to check that a bundle file is valid and will apply cleanly to the current repository. This includes checks on the bundle format itself as well as checking that the prerequisite commits exist and are fully linked in the current repository. Then, 'git bundle' prints a list of missing commits, if any. Finally, information about additional capabilities, such as \"object filter\", is printed. See \"Capabilities\" in linkgit:gitformat-bundle[5] for more information. The exit code is zero for success, but will be nonzero if the bundle file is invalid. If 'file' is `-`, the bundle is read from stdin." +#, placeholders:'linkgit:gitformat-bundle[5]', priority:100 msgid "Used to check that a bundle file is valid and will apply cleanly to the current repository. This includes checks on the bundle format itself as well as checking that the prerequisite commits exist and are fully linked in the current repository. Then, 'git bundle' prints a list of missing commits, if any. Finally, information about additional capabilities, such as \"object filter\", is printed. See \"Capabilities\" in linkgit:gitformat-bundle[5] for more information. The exit code is zero for success, but will be nonzero if the bundle file is invalid. If 'file' is `-`, the bundle is read from stdin." msgstr "用于检查捆绑包文件是否有效，是否能干净地应用到当前仓库。 这包括对捆绑包格式本身的检查，以及检查前提提交是否存在，并在当前版本库中被完全链接。 然后，'git bundle' 会打印出一个缺失提交的列表，如果有的话。 最后，打印出关于额外能力的信息，比如 “对象过滤器”。更多信息见 linkgit:gitformat-bundle[5] 中的 “能力”。成功时退出代码为零，但如果捆绑包文件无效，退出代码将为非零。如果 'file' 是 `-`，则从标准输入流读取捆绑包文件。" @@ -12610,8 +12334,7 @@ msgstr "list-heads <文件>" #. type: Plain text #: en/git-bundle.txt:87 -#, fuzzy, priority:100 -#| msgid "Lists the references defined in the bundle. If followed by a list of references, only references matching those given are printed out. If 'file' is `-`, the bundle is read from stdin." +#, priority:100 msgid "Lists the references defined in the bundle. If followed by a list of references, only references matching those given are printed out. If 'file' is `-`, the bundle is read from stdin." msgstr "列出捆绑中定义的引用。 如果后面是引用列表，则只打印出与之匹配的引用。如果 'file' 是 `-`，则从标准输入流中读取捆绑包文件。" @@ -12623,8 +12346,7 @@ msgstr "unbundle <文件>" #. type: Plain text #: en/git-bundle.txt:95 -#, fuzzy, priority:100, placeholders:'git index-pack' -#| msgid "Passes the objects in the bundle to 'git index-pack' for storage in the repository, then prints the names of all defined references. If a list of references is given, only references matching those in the list are printed. This command is really plumbing, intended to be called only by 'git fetch'. If 'file' is `-`, the bundle is read from stdin." +#, placeholders:'git index-pack', priority:100 msgid "Passes the objects in the bundle to 'git index-pack' for storage in the repository, then prints the names of all defined references. If a list of references is given, only references matching those in the list are printed. This command is really plumbing, intended to be called only by 'git fetch'. If 'file' is `-`, the bundle is read from stdin." msgstr "将捆绑包中的对象传递给 'git index-pack' 以存储在仓库中，然后打印出所有定义的引用的名称。如果给了一个引用列表，则只打印列表中匹配的引用。这个命令是真正的管道，只打算由 'git fetch' 调用。 如果 'file' 是 `-`，则从标准输入流读取捆绑包文件。" @@ -12636,8 +12358,7 @@ msgstr "" #. type: Plain text #: en/git-bundle.txt:105 -#, fuzzy, priority:100, placeholders:'git rev-parse':'git rev-list' -#| msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list' (and containing a named ref, see SPECIFYING REFERENCES below), that specifies the specific objects and references to transport. For example, `master~10..master` causes the current master reference to be packaged along with all objects added since its 10th ancestor commit. There is no explicit limit to the number of references and objects that may be packaged." +#, placeholders:'git rev-parse':'git rev-list', priority:100 msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list' (and containing a named ref, see SPECIFYING REFERENCES below), that specifies the specific objects and references to transport. For example, `master~10..master` causes the current master reference to be packaged along with all objects added since its 10th ancestor commit. There is no explicit limit to the number of references and objects that may be packaged." msgstr "一个参数列表，可以被 'git rev-parse' 和 'git rev-list' 接受（并包含一个命名的引用，见下面的 指定引用），它指定了要传送的特定对象和引用。 例如，`master~10...master` 会导致当前的主引用与自其第 10 次祖先提交后添加的所有对象一起被打包。 对于可以打包的引用和对象的数量没有明确的限制。" @@ -12661,8 +12382,7 @@ msgstr "--version=<版本>" #. type: Plain text #: en/git-bundle.txt:125 -#, fuzzy, priority:100 -#| msgid "Specify the bundle version. Version 2 is the older format and can only be used with SHA-1 repositories; the newer version 3 contains capabilities that permit extensions. The default is the oldest supported format, based on the hash algorithm in use." +#, priority:100 msgid "Specify the bundle version. Version 2 is the older format and can only be used with SHA-1 repositories; the newer version 3 contains capabilities that permit extensions. The default is the oldest supported format, based on the hash algorithm in use." msgstr "指定捆绑包的版本。 版本 2 是较老的格式，只能用于 SHA-1 仓库；较新的版本 3 包含允许扩展的功能。默认是最古老的支持格式，基于使用中的哈希算法。" @@ -12686,8 +12406,7 @@ msgstr "修订必须附有引用名称，才能打包成捆绑包。" #. type: Plain text #: en/git-bundle.txt:140 -#, fuzzy, priority:100 -#| msgid "More than one reference may be packaged, and more than one set of prerequisite objects can be specified. The objects packaged are those not contained in the union of the prerequisites." +#, priority:100 msgid "More than one reference may be packaged, and more than one set of prerequisite objects can be specified. The objects packaged are those not contained in the union of the prerequisites." msgstr "可以打包一个以上的引用，也可以指定一组以上的先决条件对象。 被打包的对象是那些不包含在先决条件组合中的对象。" @@ -12779,8 +12498,7 @@ msgstr "$ git bundle create mybundle -10 master\n" #. type: Plain text #: en/git-bundle.txt:193 -#, fuzzy, priority:100 -#| msgid "A revision range such as `old..new` will produce a bundle file that will require the revision `old` (and any objects reachable from it) to exist for the bundle to be \"unbundle\"-able:" +#, priority:100 msgid "A revision range such as `old..new` will produce a bundle file that will require the revision `old` (and any objects reachable from it) to exist for the bundle to be \"unbundle\"-able:" msgstr "向`git bundle create` 输入诸如 `new` 这样的修订版将创建一个捆绑包文件，其中包含所有从 `new` 修订版可以到达的对象。捆绑包文件可以在任何仓库中解绑，以获得通往 `new` 版本的完整历史：" @@ -12804,8 +12522,7 @@ msgstr "谨慎行事是可以的，使捆绑文件包含已经在目的地的对 #. type: Plain text #: en/git-bundle.txt:211 -#, fuzzy, priority:100, placeholders:'--mirror':'--all':'--branches':'--tags' -#| msgid "If you want to match `git clone --mirror`, which would include your refs such as `refs/remotes/*`, use `--all`. If you want to provide the same set of refs that a clone directly from the source repository would get, use `--branches --tags` for the ``." +#, placeholders:'--mirror':'--all':'--branches':'--tags', priority:100 msgid "If you want to match `git clone --mirror`, which would include your refs such as `refs/remotes/*`, use `--all`. If you want to provide the same set of refs that a clone directly from the source repository would get, use `--branches --tags` for the ``." msgstr "如果你想匹配 `git clone --mirror`，这将包括你的 refs 如 `refs/remotes/*`，使用 `--all`。 如果你想提供与直接从源码库克隆得到的相同的引用，使用 `--branches --tags` 作为 ``。" @@ -12817,8 +12534,7 @@ msgstr "'git bundle verify' 命令可以用来检查你的接收库是否有一 #. type: Plain text #: en/git-bundle.txt:224 -#, fuzzy, priority:100 -#| msgid "Assume you want to transfer the history from a repository R1 on machine A to another repository R2 on machine B. For whatever reason, direct connection between A and B is not allowed, but we can move data from A to B via some mechanism (CD, email, etc.). We want to update R2 with development made on the branch master in R1." +#, priority:100 msgid "Assume you want to transfer the history from a repository R1 on machine A to another repository R2 on machine B. For whatever reason, direct connection between A and B is not allowed, but we can move data from A to B via some mechanism (CD, email, etc.). We want to update R2 with development made on the branch master in R1." msgstr "假设你想把 A 机器上的版本库 R1 的历史记录转移到 B 机器上的另一个版本库 R2。由于某种原因，A 和 B 之间不允许直接连接，但我们可以通过某种机制（CD、电子邮件等）把数据从 A 转移到 B。 我们想用 R1 中的分支 master 上的开发来更新 R2。" @@ -13832,8 +13548,7 @@ msgstr "-a, --all" #. type: Plain text #: en/git-check-attr.txt:26 -#, fuzzy, priority:100 -#| msgid "List all attributes that are associated with the specified paths. If this option is used, then 'unspecified' attributes will not be included in the output." +#, priority:100 msgid "List all attributes that are associated with the specified paths. If this option is used, then 'unspecified' attributes will not be included in the output." msgstr "列出与指定路径相关的所有属性。 如果使用这个选项，那么 “未指定的” 属性将不包括在输出中。" @@ -13857,8 +13572,7 @@ msgstr "从标准输入中读取路径名，每行一个，而不是从命令行 #. type: Plain text #: en/git-check-attr.txt:38 -#, fuzzy, priority:100, placeholders:'--stdin' -#| msgid "The output format is modified to be machine-parsable. If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character." +#, placeholders:'--stdin', priority:100 msgid "The output format is modified to be machine-parsable. If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character." msgstr "输出格式被修改为机器可解析的。 如果同时给出 `--stdin`，输入路径将用 NUL 字符而不是换行符来分隔。" @@ -13954,8 +13668,7 @@ msgstr "当一个值被分配给该属性时。" #. type: Plain text #: en/git-check-attr.txt:74 en/git-check-ignore.txt:105 -#, fuzzy, priority:100, placeholders:'GIT_FLUSH':'linkgit:git[1]' -#| msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer." +#, placeholders:'GIT_FLUSH':'linkgit:git[1]', priority:100 msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer." msgstr "缓冲发生在 linkgit:git[1] 中的 `GIT_FLUSH` 选项下的记录。 调用者负责避免因过度填充输入缓冲区或从空的输出缓冲区读取而造成的死锁。" @@ -14300,8 +14013,7 @@ msgstr "在用完命令行上提供的联系人后，从标准输入中读取联 #. type: Plain text #: en/git-check-mailmap.txt:37 -#, fuzzy, priority:100 -#| msgid "For each contact, a single line is output, terminated by a newline. If the name is provided or known to the 'mailmap', ``Name $$$$'' is printed; otherwise only ``$$$$'' is printed." +#, priority:100 msgid "For each contact, a single line is output, terminated by a newline. If the name is provided or known to the 'mailmap', ``Name $$$$'' is printed; otherwise only ``$$$$'' is printed." msgstr "对于每个联系人，都会输出一行，以换行结束。 如果名字被提供或被 'mailmap' 知道，``Name $$$$'' 被打印；否则只有 ``$$$$'' 被打印。" @@ -14657,8 +14369,7 @@ msgstr "" #. type: Plain text #: en/git-checkout.txt:27 -#, fuzzy, priority:240, placeholders:'HEAD' -#| 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." +#, 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." msgstr "更新工作区中的文件，使其与索引或指定的树中的版本一致。 如果没有给出pathspec，'git checkout'也将更新`HEAD`，将指定的分支设为当前分支。" @@ -14700,8 +14411,7 @@ msgstr "'git checkout' -b|-B <新分支> [<起始点>]" #. type: Plain text #: en/git-checkout.txt:56 -#, fuzzy, priority:240, placeholders:'--track':'--no-track':'--track':'--track' -#| msgid "Specifying `-b` causes a new branch to be created as if linkgit:git-branch[1] were called and then checked out. In this case you can use the `--track` or `--no-track` options, which will be passed to 'git branch'. As a convenience, `--track` without `-b` implies branch creation; see the description of `--track` below." +#, placeholders:'--track':'--no-track':'--track':'--track', priority:240 msgid "Specifying `-b` causes a new branch to be created as if linkgit:git-branch[1] were called and then checked out. In this case you can use the `--track` or `--no-track` options, which will be passed to 'git branch'. As a convenience, `--track` without `-b` implies branch creation; see the description of `--track` below." msgstr "指定 `-b` 会导致一个新的分支被创建，就像调用 linkgit:git-branch[1] 然后签出一样。 在这种情况下，你可以使用 `--track` 或 `--no-track` 选项，它们将被传递给 'git branch'。 为方便起见，`--track`不加`-b`意味着创建分支；见下文对`--track`的描述。" @@ -14725,7 +14435,7 @@ msgstr "" #: en/git-checkout.txt:69 #, priority:240 msgid "that is to say, the branch is not reset/created unless \"git checkout\" is successful (e.g., when the branch is in use in another worktree, not just the current branch stays the same, but the branch is not reset to the start-point, either)." -msgstr "" +msgstr "也就是说，除非 \"git checkout\" 成功，否则不会重置/创建分支（例如，当分支在另一个工作树中使用时，不仅当前分支保持不变，分支也不会重置为起点）。" #. type: Labeled list #: en/git-checkout.txt:70 @@ -14741,8 +14451,7 @@ msgstr "'git checkout' [--detach] <提交>" #. type: Plain text #: en/git-checkout.txt:79 -#, fuzzy, priority:240, placeholders:'HEAD':'HEAD' -#| 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." +#, placeholders:'HEAD':'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." msgstr "准备在 `<提交>` 上工作，通过分离 `HEAD` 来实现（参见 \"DETACHED HEAD\" 部分），并更新工作区中的索引和文件。 对工作区中的文件的本地修改会被保留，所以最终的工作区将是提交时记录的状态加上本地的修改。" @@ -14772,15 +14481,13 @@ msgstr "'git checkout' [-f|--ours|--theirs|-m|--conflict=<样式>] [<树状对 #. type: Plain text #: en/git-checkout.txt:94 -#, fuzzy, priority:240 -#| msgid "Overwrite the contents of the files that match the pathspec. When the `` (most often a commit) is not given, overwrite working tree with the contents in the index. When the `` is given, overwrite both the index and the working tree with the contents at the ``." +#, priority:240 msgid "Overwrite the contents of the files that match the pathspec. When the `` (most often a commit) is not given, overwrite working tree with the contents in the index. When the `` is given, overwrite both the index and the working tree with the contents at the ``." msgstr "覆盖符合路径对范文件的内容。 当没有给出`<树状对象>`（最常见的是提交），用索引中的内容覆盖工作区。 当`<树状对象>`被给出时，用`<树状对象>`处的内容覆盖索引和工作区。" #. type: Plain text #: en/git-checkout.txt:102 -#, fuzzy, priority:240, placeholders:'--ours':'--theirs' -#| msgid "The index may contain unmerged entries because of a previous failed merge. By default, if you try to check out such an entry from the index, the checkout operation will fail and nothing will be checked out. Using `-f` will ignore these unmerged entries. The contents from a specific side of the merge can be checked out of the index by using `--ours` or `--theirs`. With `-m`, changes made to the working tree file can be discarded to re-create the original conflicted merge result." +#, placeholders:'--ours':'--theirs', priority:240 msgid "The index may contain unmerged entries because of a previous failed merge. By default, if you try to check out such an entry from the index, the checkout operation will fail and nothing will be checked out. Using `-f` will ignore these unmerged entries. The contents from a specific side of the merge can be checked out of the index by using `--ours` or `--theirs`. With `-m`, changes made to the working tree file can be discarded to re-create the original conflicted merge result." msgstr "索引可能包含因之前合并失败导致的未合并条目。 默认情况下，如果你试图从索引中签出这样的条目，签出操作将失败，没有任何东西被签出。 使用`-f`将忽略这些未合并的条目。 通过使用`--ours\"或`--theirs\"选项，可以从索引中检出合并的特定一方的内容。 使用`-m`，对工作区文件的修改可以被丢弃，以重新创建原冲突合并的结果。" @@ -14792,8 +14499,7 @@ msgstr "'git checkout' (-p|--patch) [<树状对象>] [--] [<路径规范>...]" #. type: Plain text #: en/git-checkout.txt:108 -#, fuzzy, priority:240, placeholders:'--patch' -#| msgid "This is similar to the previous mode, but lets you use the interactive interface to show the \"diff\" output and choose which hunks to use in the result. See below for the description of `--patch` option." +#, placeholders:'--patch', priority:240 msgid "This is similar to the previous mode, but lets you use the interactive interface to show the \"diff\" output and choose which hunks to use in the result. See below for the description of `--patch` option." msgstr "这与前面的模式类似，但让你使用交互式界面来显示 \"diff \"输出，并选择在结果中使用哪些代码块。 关于`--patch`选项的描述，见下文。" @@ -14817,8 +14523,7 @@ msgstr "当它附加到终端时，除非指定 `--quiet`，否则默认情况 #. type: Plain text #: en/git-checkout.txt:128 -#, fuzzy, priority:240, placeholders:'HEAD' -#| 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." +#, 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 "当切换分支时，即使索引或工作区与`HEAD`不同，即使有未追踪的文件挡住去路，也要继续。 这是用来丢弃本地修改和任何碍事的未追踪文件或目录的。" @@ -14854,8 +14559,7 @@ msgstr "注意在 \"git rebase \"和 \"git pull --rebase \"过程中，\"ours\" #. type: Plain text #: en/git-checkout.txt:151 -#, fuzzy, priority:240 -#| msgid "This is because `rebase` is used in a workflow that treats the history at the remote as the shared canonical one, and treats the work done on the branch you are rebasing as the third-party work to be integrated, and you are temporarily assuming the role of the keeper of the canonical history during the rebase. As the keeper of the canonical history, you need to view the history from the remote as `ours` (i.e. \"our shared canonical history\"), while what you did on your side branch as `theirs` (i.e. \"one contributor's work on top of it\")." +#, priority:240 msgid "This is because `rebase` is used in a workflow that treats the history at the remote as the shared canonical one, and treats the work done on the branch you are rebasing as the third-party work to be integrated, and you are temporarily assuming the role of the keeper of the canonical history during the rebase. As the keeper of the canonical history, you need to view the history from the remote as `ours` (i.e. \"our shared canonical history\"), while what you did on your side branch as `theirs` (i.e. \"one contributor's work on top of it\")." msgstr "这是因为 \"rebase\"在工作流程中使用，它将远程的历史视为共享的规范历史，并将在你重命名的分支上所做的工作视为需要整合的第三方工作，而你在重命名过程中暂时承担了规范历史守护者的角色。 作为规范历史的守护者，你需要将远程的历史视为 \"ours\"（即 \"我们共享的规范历史\"），而将你在侧边分支上的工作视为 \"their\"（即 \"一个贡献者在上面所作的工作\"）。" @@ -14879,8 +14583,7 @@ msgstr "-B <新分支>" #. type: Plain text #: en/git-checkout.txt:163 -#, fuzzy, priority:240 -#| msgid "Creates the branch ``, start it at ``; if it already exists, then reset it to ``. And then check the resulting branch out. This is equivalent to running \"git branch\" with \"-f\" followed by \"git checkout\" of that branch; see linkgit:git-branch[1] for details." +#, priority:240 msgid "Creates the branch ``, start it at ``; if it already exists, then reset it to ``. And then check the resulting branch out. This is equivalent to running \"git branch\" with \"-f\" followed by \"git checkout\" of that branch; see linkgit:git-branch[1] for details." msgstr "从`<起点>`开始，创建分支`<新分支>`；如果分支已经存在，则重置为`<起点>`。然后检出生成的分支。这相当于用 \"-f\"选项 运行 \"git branch\" ，然后用 \"git checkout\" 检出该分支；详见 linkgit:git-branch[1]。" @@ -14892,8 +14595,7 @@ msgstr "创建新分支时，要设置 \"上游\"配置。详情见 linkgit:git- #. type: Plain text #: en/git-checkout.txt:178 -#, fuzzy, priority:240 -#| msgid "If no `-b` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of the refspec configured for the corresponding remote, and then stripping the initial part up to the \"*\". This would tell us to use `hack` as the local branch when branching off of `origin/hack` (or `remotes/origin/hack`, or even `refs/remotes/origin/hack`). If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted. You can explicitly give a name with `-b` in such a case." +#, priority:240 msgid "If no `-b` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of the refspec configured for the corresponding remote, and then stripping the initial part up to the \"*\". This would tell us to use `hack` as the local branch when branching off of `origin/hack` (or `remotes/origin/hack`, or even `refs/remotes/origin/hack`). If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted. You can explicitly give a name with `-b` in such a case." msgstr "如果没有给出`-b`选项，新分支的名称将从远程跟踪分支中推导出来，方法是查看为相应的远程配置引用规范的本地部分，然后剥离初始部分，直至 \"*\"。由上述可得出，在从`origin/hack`（或`remotes/origin/hack`，甚至`refs/remotes/origin/hack`）分支时，将使用`hack`作为本地分支。如果给定的名字没有斜线，或者上述推测的结果是一个空名，则会终止推测。在这种情况下，你可以用`-b`明确地给出一个名字。" @@ -14953,8 +14655,7 @@ msgstr "--detach" #. type: Plain text #: en/git-checkout.txt:218 -#, fuzzy, priority:240, placeholders:'HEAD' -#| 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." +#, placeholders:'HEAD', 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 "与其签出一个分支来工作，不如签出一个提交来进行检查和可放弃的实验。当`<提交>`不是一个分支名时， 这是`git checkout <提交>`的默认行为，。 详见下面的 \"游离状态（DETACHED HEAD）\"部分。" @@ -14966,17 +14667,15 @@ msgstr "--orphan <新分支>" #. type: Plain text #: en/git-checkout.txt:225 -#, fuzzy, priority:240 -#| msgid "Create a new 'orphan' branch, named ``, started from `` and switch to it. The first commit made on this new branch will have no parents and it will be the root of a new history totally disconnected from all the other branches and commits." +#, priority:240 msgid "Create a new unborn branch, named ``, started from `` and switch to it. The first commit made on this new branch will have no parents and it will be the root of a new history totally disconnected from all the other branches and commits." -msgstr "从\"<起点>\"开始，创建一个新的 \"孤儿\"分支，命名为\"<新分支>\"，并切换到该分支。 在这个新分支上的第一次提交将没有父分支，它将是一个新的历史起点，与所有其他的分支和提交完全断开。" +msgstr "从`<起点>` 开始，创建一个新的 “未出生” 分支，命名为 `<新分支>`，并切换到该分支。 在这个新分支上的第一次提交将没有父分支，它将是一个新的历史起点，与所有其他的分支和提交完全断开。" #. type: Plain text #: en/git-checkout.txt:230 -#, fuzzy, priority:240 -#| msgid "The index and the working tree are adjusted as if you had previously run `git checkout `. This allows you to start a new history that records a set of paths similar to `` by easily running `git commit -a` to make the root commit." +#, priority:240 msgid "The index and the working tree are adjusted as if you had previously run `git checkout `. This allows you to start a new history that records a set of paths similar to `` by easily running `git commit -a` to make the root commit." -msgstr "索引和工作区的调整就像你之前运行`git checkout <起点>`一样。 这允许你轻松地通过运行`git commit -a`来启动一个新的历史，记录一组类似于`<新起点>`的路径，进行根提交。" +msgstr "索引和工作区的调整就像你之前运行 `git checkout <起点>` 一样。 这允许你轻松地通过运行 `git commit -a` 来启动一个新的历史，记录一组类似于 `<新起点>` 的路径，进行根提交。" #. type: Plain text #: en/git-checkout.txt:236 @@ -14986,8 +14685,7 @@ msgstr "当你想发布一个提交树而不暴露其完整的历史时，这就 #. type: Plain text #: en/git-checkout.txt:243 -#, fuzzy, priority:240 -#| msgid "If you want to start a disconnected history that records a set of paths that is totally different from the one of ``, then you should clear the index and the working tree right after creating the orphan branch by running `git rm -rf .` from the top level of the working tree. Afterwards you will be ready to prepare your new files, repopulating the working tree, by copying them from elsewhere, extracting a tarball, etc." +#, priority:240 msgid "If you want to start a disconnected history that records a set of paths that is totally different from the one of ``, then you should clear the index and the working tree right after creating the orphan branch by running `git rm -rf .` from the top level of the working tree. Afterwards you will be ready to prepare your new files, repopulating the working tree, by copying them from elsewhere, extracting a tarball, etc." msgstr "如果你想启动一个断开的历史，记录一组完全不同于`<起点>`的路径，那么你应该在创建孤儿分支后立即清除索引和工作区，从工作区的顶层运行`git rm -rf .`。 之后你就可以准备你的新文件了，重新填充工作区，办法是从其他地方复制它们，提取一个包，等等。" @@ -15005,8 +14703,7 @@ msgstr "--merge" #. type: Plain text #: en/git-checkout.txt:260 -#, fuzzy, priority:240 -#| msgid "When switching branches, if you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context. However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch." +#, priority:240 msgid "When switching branches, if you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context. However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch." msgstr "在切换分支时，如果你对一个或多个文件的本地修改在当前分支和你要切换的分支之间是不同的，命令会拒绝切换分支，以保留你的修改内容。 然而，使用这个选项后，就会在当前分支、你的工作区内容和新的分支之间进行三方合并，之后，你会处于新分支。" @@ -15018,8 +14715,7 @@ msgstr "当合并冲突发生时，冲突路径的索引条目会被留下，你 #. type: Plain text #: en/git-checkout.txt:269 -#, fuzzy, priority:240 -#| msgid "When checking out paths from the index, this option lets you recreate the conflicted merge in the specified paths. This option cannot be used when checking out paths from a tree-ish." +#, priority:240 msgid "When checking out paths from the index, this option lets you recreate the conflicted merge in the specified paths. This option cannot be used when checking out paths from a tree-ish." msgstr "从索引中检出路径时，该选项可让你在指定路径中重新创建冲突的合并。 该选项不能用于从目录树对象路径中检出路径。" @@ -15037,17 +14733,15 @@ msgstr "--conflict=<样式>" #. type: Plain text #: en/git-checkout.txt:277 en/git-restore.txt:100 en/git-switch.txt:146 -#, fuzzy, priority:280, placeholders:'--merge':'merge.conflictStyle' -#| msgid "The same as `--merge` option above, but changes the way the conflicting hunks are presented, overriding the `merge.conflictStyle` configuration variable. Possible values are \"merge\" (default), \"diff3\", and \"zdiff3\"." +#, placeholders:'--merge':'merge.conflictStyle', priority:280 msgid "The same as `--merge` option above, but changes the way the conflicting hunks are presented, overriding the `merge.conflictStyle` configuration variable. Possible values are \"merge\" (default), \"diff3\", and \"zdiff3\"." msgstr "与上面的 `--merge` 选项相同，但改变了冲突块的显示方式，覆盖 `merge.conflictStyle` 配置变量。可能的值是 \"merge\"（默认）和 \"diff3\"（除了 \"merge\" 样式显示的内容外，还显示原始内容）。" #. type: Plain text #: en/git-checkout.txt:284 -#, fuzzy, priority:240 -#| msgid "Interactively select hunks in the difference between the `` (or the index, if unspecified) and the working tree. The chosen hunks are then applied in reverse to the working tree (and if a `` was specified, the index)." +#, priority:240 msgid "Interactively select hunks in the difference between the `` (or the index, if unspecified) and the working tree. The chosen hunks are then applied in reverse to the working tree (and if a `` was specified, the index)." -msgstr "在`<树状对象>`（或索引，如果没有指定）和工作区之间的差异中，交互式地选择目标。 选择的目标会被反向应用到工作区上（如果指定了`<树状对象>`，则是索引）。" +msgstr "在 `<树状对象>`（或索引，如果没有指定）和工作区之间的差异中，交互式地选择目标。 选择的目标会被反向应用到工作区上（如果指定了 `<树状对象>`，则是索引）。" #. type: Plain text #: en/git-checkout.txt:288 @@ -15093,8 +14787,7 @@ msgstr "在切换分支时静默地覆盖被忽略的文件。这是默认行为 #. type: Plain text #: en/git-checkout.txt:313 -#, fuzzy, priority:240, placeholders:'--recurse-submodules':'--no-recurse-submodules':'linkgit:git-submodule[1]':'HEAD' -#| 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." +#, placeholders:'--recurse-submodules':'--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 "使用`--recurse-submodules`将根据父项目的提交记录更新所有活动的子模块的内容。如果子模块中的本地修改会被覆盖，除非使用`-f`，则会签出将失败。如果什么都不使用（或`--no-recurse-submodules`），子模块的工作区将不会被更新。 就像linkgit:git-submodule[1]，这将分离子模块的`HEAD`。" @@ -15112,8 +14805,7 @@ msgstr "--no-overlay" #. type: Plain text #: en/git-checkout.txt:321 -#, fuzzy, priority:240, placeholders:'--no-overlay' -#| msgid "In the default overlay mode, `git checkout` never removes files from the index or the working tree. When specifying `--no-overlay`, files that appear in the index and working tree, but not in `` are removed, to make them match `` exactly." +#, placeholders:'--no-overlay', priority:240 msgid "In the default overlay mode, `git checkout` never removes files from the index or the working tree. When specifying `--no-overlay`, files that appear in the index and working tree, but not in `` are removed, to make them match `` exactly." msgstr "在默认的覆盖模式下，`git checkout`不会从索引或工作区中删除文件。 当指定`--no-overlay`时，出现在索引和工作区中，但不在`<树状对象>`中的文件会被删除，以使它们与`<树状对象>`完全匹配。" @@ -15285,8 +14977,7 @@ msgstr "" #. type: Plain text #: en/git-checkout.txt:433 -#, fuzzy, priority:240, placeholders:'HEAD':'HEAD':'HEAD' -#| 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:" +#, 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 "请注意，无论我们使用哪条结账命令，`HEAD`现在都直接指向提交`b`。这就是所谓的分离的`HEAD'状态。 这意味着，`HEAD`指向一个特定的提交，而不是指向一个命名的分支。让我们看看创建提交时发生了什么：" @@ -15436,8 +15127,7 @@ msgstr "参数消歧义" #. type: Plain text #: en/git-checkout.txt:520 -#, fuzzy, priority:240 -#| msgid "When there is only one argument given and it is not `--` (e.g. `git checkout abc`), and when the argument is both a valid `` (e.g. a branch `abc` exists) and a valid `` (e.g. a file or a directory whose name is \"abc\" exists), Git would usually ask you to disambiguate. Because checking out a branch is so common an operation, however, `git checkout abc` takes \"abc\" as a `` in such a situation. Use `git checkout -- ` if you want to checkout these paths out of the index." +#, priority:240 msgid "When there is only one argument given and it is not `--` (e.g. `git checkout abc`), and when the argument is both a valid `` (e.g. a branch `abc` exists) and a valid `` (e.g. a file or a directory whose name is \"abc\" exists), Git would usually ask you to disambiguate. Because checking out a branch is so common an operation, however, `git checkout abc` takes \"abc\" as a `` in such a situation. Use `git checkout -- ` if you want to checkout these paths out of the index." msgstr "当只有一个参数且不是`--`时（例如`git checkout abc`），当参数既是有效的`<树状对象>`（例如分支`abc`存在）又是有效的`<路径规范>`（例如文件或目录的名称为 \"abc \"存在），Git通常会要求你进行区分。 因为签出分支是很常见的操作，`git checkout abc`在这种情况下把 \"abc \"作为`<树状对象>`。 如果你想从索引中签出这些路径，请使用`git checkout --<路径规范>`。" @@ -15499,15 +15189,13 @@ msgstr "$ git checkout -- '*.c'\n" #. type: Plain text #: en/git-checkout.txt:551 -#, fuzzy, priority:240 -#| msgid "Note the quotes around `*.c`. The file `hello.c` will also be checked out, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)." +#, priority:240 msgid "Note the quotes around `*.c`. The file `hello.c` will also be checked out, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)." msgstr "注意 `*.c `周围的引号。 文件`hello.c`也将被检出，尽管它已经不在工作树中了，因为文件通配符被用来匹配索引中的条目（不是工作区中的shell）。" #. type: Plain text #: en/git-checkout.txt:555 -#, fuzzy, priority:240 -#| msgid "If you have an unfortunate branch that is named `hello.c`, this step would be confused as an instruction to switch to that branch. You should instead write:" +#, priority:240 msgid "If you have an unfortunate branch that is named `hello.c`, this step would be confused as an instruction to switch to that branch. You should instead write:" msgstr "如果不幸你有一个分支被命名为 \"hello.c\"，这一步会误认为切换到该分支的指令。 你应该这样写：" @@ -15601,8 +15289,7 @@ msgstr "" #. type: Plain text #: en/git-checkout.txt:606 -#, fuzzy, priority:240 -#| msgid "At this point, `git diff` shows the changes cleanly merged as in the previous example, as well as the changes in the conflicted files. Edit and resolve the conflict and mark it resolved with `git add` as usual:" +#, priority:240 msgid "At this point, `git diff` shows the changes cleanly merged as in the previous example, as well as the changes in the conflicted files. Edit and resolve the conflict and mark it resolved with `git add` as usual:" msgstr "在这一点上，`git diff`显示了与前面的例子一样干净地合并的修改，以及冲突文件中的修改。 编辑并解决冲突，让后像往常一样用`git add`标记已解决：" @@ -15656,8 +15343,7 @@ msgstr "检查给定的 ‘引用名’ 是否可接受，如果不可接受， #. type: Plain text #: en/git-check-ref-format.txt:27 -#, fuzzy, priority:100, placeholders:'$GIT_DIR':'$GIT_DIR':'$GIT_DIR' -#| 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`)." +#, placeholders:'$GIT_DIR':'$GIT_DIR':'$GIT_DIR', 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 "在 Git 中，引用被用来指定分支和标签。 分支头存储在 `refs/heads` 层次结构中，而标签存储在引用命名空间的 `refs/tags` 层次结构中（通常在 `$GIT_DIR/refs/heads` 和 `$GIT_DIR/refs/tags` 目录中，或者，如果引用是由 `git gc` 打包的，则作为文件 `$GIT_DIR/packed-refs` 的条目）。" @@ -15669,8 +15355,7 @@ msgstr "Git 对引用的命名方式有以下规则：" #. type: Plain text #: en/git-check-ref-format.txt:33 -#, fuzzy, priority:100 -#| msgid "They can include slash `/` for hierarchical (directory) grouping, but no slash-separated component can begin with a dot `.` or end with the sequence `.lock`." +#, priority:100 msgid "They can include slash `/` for hierarchical (directory) grouping, but no slash-separated component can begin with a dot `.` or end with the sequence `.lock`." msgstr "它们可以包括斜线`/`，用于分层（目录）分组，但任何斜线分隔的组件都不能以点`.`开头或以序列`.lock`结尾。" @@ -15697,8 +15382,7 @@ msgstr "它们不能有 ASCII 控制字符（即数值低于 \\040，或 177 `DE #. type: Plain text #: en/git-check-ref-format.txt:48 -#, fuzzy, priority:100, placeholders:'--refspec-pattern' -#| msgid "They cannot have question-mark `?`, asterisk `*`, or open bracket `[` anywhere. See the `--refspec-pattern` option below for an exception to this rule." +#, placeholders:'--refspec-pattern', priority:100 msgid "They cannot have question-mark `?`, asterisk `*`, or open bracket `[` anywhere. See the `--refspec-pattern` option below for an exception to this rule." msgstr "它们不能有问号 `?`，星号 `*`，或大括号 `[`的地方。 参见下面的 `--refspec-pattern` 选项，以了解这一规则的例外情况。" @@ -15752,8 +15436,7 @@ msgstr "省略号 `~` 和 `^` 符号用于介绍后缀 ‘第 n 个父亲’ 和 #. type: Plain text #: en/git-check-ref-format.txt:77 -#, fuzzy, priority:100, placeholders:'git cat-file':'git cat-file' -#| msgid "A colon `:` is used as in `srcref:dstref` to mean \"use srcref\\'s value and store it in dstref\" in fetch and push operations. It may also be used to select a specific object such as with 'git cat-file': \"git cat-file blob v1.3.3:refs.c\"." +#, placeholders:'git cat-file':'git cat-file', priority:100 msgid "A colon `:` is used as in `srcref:dstref` to mean \"use srcref\\'s value and store it in dstref\" in fetch and push operations. It may also be used to select a specific object such as with 'git cat-file': \"git cat-file blob v1.3.3:refs.c\"." msgstr "冒号 `:` 在获取和推送操作中被用于 `srcref:dstref`，表示 `使用 srcref（源引用）的值并将其存储在 dstref（目标引用）中。 它也可以用来选择一个特定的对象，如 'git cat-file': \"git cat-file blob v1.3.3:refs.c\"。" @@ -15765,8 +15448,7 @@ msgstr "`@{` 被用来作为访问一个引用日志条目的符号。" #. type: Plain text #: en/git-check-ref-format.txt:98 -#, fuzzy, priority:100, placeholders:'--branch':'HEAD':'git check-ref-format':'--branch':'git check-ref-format':'--branch' -#| 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." +#, placeholders:'--branch':'HEAD':'git check-ref-format':'--branch':'git check-ref-format':'--branch', 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 "使用 `--branch` 选项，该命令接收一个名字，并检查它是否可以作为一个有效的分支名称（例如在创建新的分支时）。但在使用之前的检查语法时要谨慎，因为它可能指的是一个分离的 HEAD 状态。 `git check-ref-format --branch $name` 实现的规则可能比` git check-ref-format refs/heads/$name` 说的更严格（例如，破折号可以出现在引用组件的开头，但在分支名的开头是明确禁止的）。 当在仓库中使用 `--branch` 选项运行时，输入的内容首先被扩展为 ``以前的检出语法\" `@{-n}`。 例如，`@{-1}` 是指使用 \"git switch\" 或 \"git checkout\" 操作签出的最后一件东西。 这个选项应该被上层命令用来在任何需要分支名的地方接受这个语法，这样他们就可以像你输入分支名一样行事。作为一个例外，请注意，当最后签出的第 N 个东西不是一个分支时，\"以前的签出操作\" 可能会导致一个提交对象的名字。" @@ -15778,8 +15460,7 @@ msgstr "--[no-]allow-onelevel" #. type: Plain text #: en/git-check-ref-format.txt:105 -#, fuzzy, priority:100, placeholders:'--no-allow-onelevel' -#| msgid "Controls whether one-level refnames are accepted (i.e., refnames that do not contain multiple `/`-separated components). The default is `--no-allow-onelevel`." +#, placeholders:'--no-allow-onelevel', priority:100 msgid "Controls whether one-level refnames are accepted (i.e., refnames that do not contain multiple `/`-separated components). The default is `--no-allow-onelevel`." msgstr "控制是否接受单级参考名称（即不包含多个 `/` 分隔的参考名称）。 默认值是 `--no-allow-onelevel`。" @@ -15791,8 +15472,7 @@ msgstr "--refspec-pattern" #. type: Plain text #: en/git-check-ref-format.txt:112 -#, fuzzy, priority:100 -#| msgid "Interpret as a reference name pattern for a refspec (as used with remote repositories). If this option is enabled, is allowed to contain a single `*` in the refspec (e.g., `foo/bar*/baz` or `foo/bar*baz/` but not `foo/bar*/baz*`)." +#, priority:100 msgid "Interpret as a reference name pattern for a refspec (as used with remote repositories). If this option is enabled, is allowed to contain a single `*` in the refspec (e.g., `foo/bar*/baz` or `foo/bar*baz/` but not `foo/bar*/baz*`)." msgstr "将 <引用名> 解释为引用规范的参考名称模式（如用于远程仓库）。 如果这个选项被启用，<引用名> 允许在引用规范中包含一个 `*`（例如， `foo/bar*/baz` 或 `foo/bar*baz/`，但不允许 `foo/bar*/baz*`）。" @@ -15804,8 +15484,7 @@ msgstr "--normalize" #. type: Plain text #: en/git-check-ref-format.txt:120 -#, fuzzy, priority:100, placeholders:'--print':'--normalize' -#| msgid "Normalize 'refname' by removing any leading slash (`/`) characters and collapsing runs of adjacent slashes between name components into a single slash. If the normalized refname is valid then print it to standard output and exit with a status of 0, otherwise exit with a non-zero status. (`--print` is a deprecated way to spell `--normalize`.)" +#, placeholders:'--print':'--normalize', priority:100 msgid "Normalize 'refname' by removing any leading slash (`/`) characters and collapsing runs of adjacent slashes between name components into a single slash. If the normalized refname is valid then print it to standard output and exit with a status of 0, otherwise exit with a non-zero status. (`--print` is a deprecated way to spell `--normalize`.)" msgstr "将 ‘引用名’ 规范化，去掉任何前导斜线（`/`）字符，并将名称成分之间的相邻斜线折叠成一个斜线。 如果规范化后的引用名有效，则将其打印到标准输出，并以 0 的状态退出，否则以非零状态退出。 (`--print` 是 `--normalize` 的一种废弃的拼写方式。)" @@ -15863,8 +15542,7 @@ msgstr "" #. type: Plain text #: en/git-cherry-pick.txt:21 -#, fuzzy, priority:100, placeholders:'HEAD' -#| 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)." +#, placeholders:'HEAD', 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 "给出一个或多个现有的提交，应用每个提交所带来的变化，为每个提交记录一个新的提交。 这需要您的工作区是干净的（没有对 HEAD 提交的修改）。" @@ -15894,8 +15572,7 @@ msgstr "在索引文件和你的工作区中，更改应用得很干净的路径 #. type: Plain text #: en/git-cherry-pick.txt:36 -#, fuzzy, priority:100, placeholders:'linkgit:git-merge[1]' -#| msgid "For conflicting paths, the index file records up to three versions, as described in the \"TRUE MERGE\" section of linkgit:git-merge[1]. The working tree files will include a description of the conflict bracketed by the usual conflict markers `<<<<<<<` and `>>>>>>>`." +#, placeholders:'linkgit:git-merge[1]', priority:100 msgid "For conflicting paths, the index file records up to three versions, as described in the \"TRUE MERGE\" section of linkgit:git-merge[1]. The working tree files will include a description of the conflict bracketed by the usual conflict markers `<<<<<<<` and `>>>>>>>`." msgstr "对于冲突的路径，索引文件最多记录三个版本，如 linkgit:git-merge[1] 的 “正确的合并” 部分所述。 工作区文件将包括对冲突的描述，括号里是通常的冲突标记 `<<<<<<<` 和 `>>>>>>>`。" @@ -15919,8 +15596,7 @@ msgstr "<提交>..." #. type: Plain text #: en/git-cherry-pick.txt:52 -#, fuzzy, ignore-ellipsis, priority:100, placeholders:'linkgit:gitrevisions[7]':'--no-walk':'linkgit:git-rev-list[1]' -#| msgid "Commits to cherry-pick. For a more complete list of ways to spell commits, see linkgit:gitrevisions[7]. Sets of commits can be passed but no traversal is done by default, as if the `--no-walk` option was specified, see linkgit:git-rev-list[1]. Note that specifying a range will feed all ... arguments to a single revision walk (see a later example that uses 'maint master..next')." +#, ignore-ellipsis, placeholders:'linkgit:gitrevisions[7]':'--no-walk':'linkgit:git-rev-list[1]', priority:100 msgid "Commits to cherry-pick. For a more complete list of ways to spell commits, see linkgit:gitrevisions[7]. Sets of commits can be passed but no traversal is done by default, as if the `--no-walk` option was specified, see linkgit:git-rev-list[1]. Note that specifying a range will feed all ... arguments to a single revision walk (see a later example that uses 'maint master..next')." msgstr "拣选（cherry-pick）的提交。 更完整的拼写提交的方法列表，见 linkgit:gitrevisions[7]。 可以传递提交集，但默认不做遍历，就像指定了 `--no-walk` 选项一样，见 linkgit:git-rev-list[1]。注意，指定一个范围会把所有 <提交>... 参数送入一个单一的修订版（见后面的例子，使用 'maint master...next'）。" @@ -15950,15 +15626,13 @@ msgstr "-x" #. type: Plain text #: en/git-cherry-pick.txt:78 -#, fuzzy, ignore-ellipsis, priority:100 -#| msgid "When recording the commit, append a line that says \"(cherry picked from commit ...)\" to the original commit message in order to indicate which commit this change was cherry-picked from. This is done only for cherry picks without conflicts. Do not use this option if you are cherry-picking from your private branch because the information is useless to the recipient. If on the other hand you are cherry-picking between two publicly visible branches (e.g. backporting a fix to a maintenance branch for an older release from a development branch), adding this information can be useful." +#, ignore-ellipsis, priority:100 msgid "When recording the commit, append a line that says \"(cherry picked from commit ...)\" to the original commit message in order to indicate which commit this change was cherry-picked from. This is done only for cherry picks without conflicts. Do not use this option if you are cherry-picking from your private branch because the information is useless to the recipient. If on the other hand you are cherry-picking between two publicly visible branches (e.g. backporting a fix to a maintenance branch for an older release from a development branch), adding this information can be useful." msgstr "在记录提交时，在原始提交信息中添加一行 \"(cherry picked from commit ...)\"，以表明这个改动是从哪个提交中拣选的。 这只适用于没有冲突的拣选。 如果你是从自己的私有分支中偷梁换柱，请不要使用这个选项，因为这个信息对接收者来说是无用的。 另一方面，如果您是在两个公开可见的分支之间进行拣选（例如，从开发分支向维护分支回传一个旧版本的修正），添加这一信息会很有用。" #. type: Plain text #: en/git-cherry-pick.txt:83 -#, fuzzy, priority:100 -#| msgid "It used to be that the command defaulted to do `-x` described above, and `-r` was to disable it. Now the default is not to do `-x` so this option is a no-op." +#, priority:100 msgid "It used to be that the command defaulted to do `-x` described above, and `-r` was to disable it. Now the default is not to do `-x` so this option is a no-op." msgstr "过去，该命令默认为做上述的 `-x`，`-r` 是禁用它。 现在默认是不做 `-x` ，所以这个选项是一个无用的选项。" @@ -15976,8 +15650,7 @@ msgstr "--mainline <父提交数量>" #. type: Plain text #: en/git-cherry-pick.txt:91 -#, fuzzy, priority:100 -#| msgid "Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. This option specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change relative to the specified parent." +#, priority:100 msgid "Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. This option specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change relative to the specified parent." msgstr "通常你不能对一个合并进行拣选，因为你不知道合并的哪一边应该被视为主线。 这个选项指定了主线的父号（从 1 开始），允许拣选相对于指定的父号重放修改。" @@ -15989,8 +15662,7 @@ msgstr "--no-commit" #. type: Plain text #: en/git-cherry-pick.txt:101 -#, fuzzy, priority:100, placeholders:'HEAD' -#| 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." +#, placeholders:'HEAD', 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 "通常该命令会自动创建一连串的提交。 这个标志会对您的工作树和索引进行必要的修改，以摘取每个命名的提交，而不做任何提交。 此外，使用这个选项时，您的索引不需要与 HEAD 提交相匹配。 挑拣是针对你的索引的起始状态进行的。" @@ -16002,8 +15674,7 @@ msgstr "这在连续摘取多个提交的效果给你的索引时很有用。" #. type: Plain text #: en/git-cherry-pick.txt:109 en/git-revert.txt:104 -#, fuzzy, priority:100, placeholders:'linkgit:git-commit[1]' -#| msgid "Add a `Signed-off-by` trailer at the end of the commit message. See the signoff option in linkgit:git-commit[1] for more information." +#, placeholders:'linkgit:git-commit[1]', priority:100 msgid "Add a `Signed-off-by` trailer at the end of the commit message. See the signoff option in linkgit:git-commit[1] for more information." msgstr "在提交信息的末尾添加一个 `Signed-off-by` 的尾注。 更多信息见 linkgit:git-commit[1] 中的 signoff 选项。" @@ -16021,8 +15692,7 @@ msgstr "如果当前的 HEAD 与拣选的提交的父本相同，那么将执行 #. type: Plain text #: en/git-cherry-pick.txt:136 -#, fuzzy, priority:100, placeholders:'--allow-empty':'--ff':'--keep-redundant-commits' -#| msgid "By default, cherry-picking an empty commit will fail, indicating that an explicit invocation of `git commit --allow-empty` is required. This option overrides that behavior, allowing empty commits to be preserved automatically in a cherry-pick. Note that when \"--ff\" is in effect, empty commits that meet the \"fast-forward\" requirement will be kept even without this option. Note also, that use of this option only keeps commits that were initially empty (i.e. the commit recorded the same tree as its parent). Commits which are made empty due to a previous commit are dropped. To force the inclusion of those commits use `--keep-redundant-commits`." +#, placeholders:'--allow-empty':'--ff':'--keep-redundant-commits', priority:100 msgid "By default, cherry-picking an empty commit will fail, indicating that an explicit invocation of `git commit --allow-empty` is required. This option overrides that behavior, allowing empty commits to be preserved automatically in a cherry-pick. Note that when \"--ff\" is in effect, empty commits that meet the \"fast-forward\" requirement will be kept even without this option. Note also, that use of this option only keeps commits that were initially empty (i.e. the commit recorded the same tree as its parent). Commits which are made empty due to a previous commit are dropped. To force the inclusion of those commits use `--keep-redundant-commits`." msgstr "默认情况下，对空提交的偷取会失败，表明需要明确调用 `git commit --allow-empty`。这个选项覆盖了这一行为，允许在偷取时自动保留空的提交。注意，当 \"--ff\" 生效时，即使没有这个选项，符合 “快速合并” 要求的空提交也会被保留。 还要注意的是，使用这个选项只保留最初为空的提交（即提交与它的父级记录在同一目录苏上）。 由于之前的提交而导致的空的提交会被放弃。 如果要强制包含这些提交，请使用 `--keep-redundant-commits`。" @@ -16034,8 +15704,7 @@ msgstr "--allow-empty-message" #. type: Plain text #: en/git-cherry-pick.txt:141 -#, fuzzy, priority:100 -#| msgid "By default, cherry-picking a commit with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be cherry picked." +#, priority:100 msgid "By default, cherry-picking a commit with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be cherry picked." msgstr "默认情况下，对空信息的提交进行拣选会失败。 这个选项覆盖了这一行为，允许对空信息的提交进行拣选。" @@ -16047,8 +15716,7 @@ msgstr "--keep-redundant-commits" #. type: Plain text #: en/git-cherry-pick.txt:148 -#, fuzzy, priority:100, placeholders:'--allow-empty' -#| msgid "If a commit being cherry picked duplicates a commit already in the current history, it will become empty. By default these redundant commits cause `cherry-pick` to stop so the user can examine the commit. This option overrides that behavior and creates an empty commit object. Implies `--allow-empty`." +#, placeholders:'--allow-empty', priority:100 msgid "If a commit being cherry picked duplicates a commit already in the current history, it will become empty. By default these redundant commits cause `cherry-pick` to stop so the user can examine the commit. This option overrides that behavior and creates an empty commit object. Implies `--allow-empty`." msgstr "如果被摘取的提交与当前历史中已有的提交重复，它将变成空的。 默认情况下，这些多余的提交会导致 `cherry-pick` 停止，以便用户能够检查提交。这个选项覆盖了这一行为，并创建一个空的提交对象。暗含 `--allow-empty`。" @@ -16060,8 +15728,7 @@ msgstr "--strategy=<策略>" #. type: Plain text #: en/git-cherry-pick.txt:153 en/git-revert.txt:109 -#, fuzzy, priority:100, placeholders:'linkgit:git-merge[1]' -#| msgid "Use the given merge strategy. Should only be used once. See the MERGE STRATEGIES section in linkgit:git-merge[1] for details." +#, placeholders:'linkgit:git-merge[1]', priority:100 msgid "Use the given merge strategy. Should only be used once. See the MERGE STRATEGIES section in linkgit:git-merge[1] for details." msgstr "使用给定的合并策略。 应该只使用一次。 详见 linkgit:git-merge[1] 中的合并策略部分。" @@ -16079,8 +15746,7 @@ msgstr "--strategy-option=<选项>" #. type: Plain text #: en/git-cherry-pick.txt:158 en/git-revert.txt:114 -#, fuzzy, priority:100, placeholders:'linkgit:git-merge[1]' -#| msgid "Pass the merge strategy-specific option through to the merge strategy. See linkgit:git-merge[1] for details." +#, placeholders:'linkgit:git-merge[1]', priority:100 msgid "Pass the merge strategy-specific option through to the merge strategy. See linkgit:git-merge[1] for details." msgstr "将合并策略特有的选项传递给合并策略。 详见 linkgit:git-merge[1]。" @@ -16134,8 +15800,7 @@ msgstr "`git cherry-pick maint master..next`" #. type: Plain text #: en/git-cherry-pick.txt:186 -#, fuzzy, priority:100 -#| msgid "Apply the changes introduced by all commits that are ancestors of maint or next, but not master or any of its ancestors. Note that the latter does not mean `maint` and everything between `master` and `next`; specifically, `maint` will not be used if it is included in `master`." +#, priority:100 msgid "Apply the changes introduced by all commits that are ancestors of maint or next, but not master or any of its ancestors. Note that the latter does not mean `maint` and everything between `master` and `next`; specifically, `maint` will not be used if it is included in `master`." msgstr "应用所有属于 maint 或 next 的祖先的提交所带来的变化，但不包括 master 或其任何祖先。 注意，后者不是指 `maint` 和 `master` 与 `next` 之间的一切；具体来说，如果 `maint` 包含在 `master` 中，则不会被使用。" @@ -16171,8 +15836,7 @@ msgstr "`git cherry-pick --ff ..next`" #. type: Plain text #: en/git-cherry-pick.txt:207 -#, fuzzy, priority:100, placeholders:'HEAD':'HEAD':'HEAD' -#| 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." +#, placeholders:'HEAD':'HEAD':'HEAD', 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 "如果历史是线性的，并且 HEAD 是 next 的祖先，则更新工作区并将 HEAD 指针向前推进以匹配 next。 否则，将那些在 next 但不在 HEAD 中的提交所带来的变化应用到当前分支，为每个新变化创建一个新的提交。" @@ -16211,8 +15875,7 @@ msgstr "" #. type: Plain text #: en/git-cherry-pick.txt:229 -#, fuzzy, priority:100 -#| msgid "apply the change that would be shown by `git show topic^`. In this example, the patch does not apply cleanly, so information about the conflict is written to the index and working tree and no new commit results." +#, priority:100 msgid "apply the change that would be shown by `git show topic^`. In this example, the patch does not apply cleanly, so information about the conflict is written to the index and working tree and no new commit results." msgstr "应用将由 `git show topic^` 显示的变化。 在这个例子中，补丁没有干净地应用，所以冲突的信息被写入索引和工作树，没有新的提交结果。" @@ -16224,8 +15887,7 @@ msgstr "总结需要调节的变化" #. type: Plain text #: en/git-cherry-pick.txt:233 -#, fuzzy, priority:100 -#| msgid "cancel the cherry-pick. In other words, return to the pre-cherry-pick state, preserving any local modifications you had in the working tree." +#, priority:100 msgid "cancel the cherry-pick. In other words, return to the pre-cherry-pick state, preserving any local modifications you had in the working tree." msgstr "取消 cherry-pick。 换句话说，返回到 cherry-pick 前的状态，保留你在工作区上的任何本地修改。" @@ -16261,8 +15923,7 @@ msgstr "确定 `...` 中是否有与 `...` 范围 #. type: Plain text #: en/git-cherry.txt:22 -#, fuzzy, priority:100, placeholders:'git-cherry':'linkgit:git-cherry-pick[1]':'linkgit:git-am[1]':'linkgit:git-rebase[1]' -#| msgid "The equivalence test is based on the diff, after removing whitespace and line numbers. git-cherry therefore detects when commits have been \"copied\" by means of linkgit:git-cherry-pick[1], linkgit:git-am[1] or linkgit:git-rebase[1]." +#, placeholders:'git-cherry':'linkgit:git-cherry-pick[1]':'linkgit:git-am[1]':'linkgit:git-rebase[1]', priority:100 msgid "The equivalence test is based on the diff, after removing whitespace and line numbers. git-cherry therefore detects when commits have been \"copied\" by means of linkgit:git-cherry-pick[1], linkgit:git-am[1] or linkgit:git-rebase[1]." msgstr "因此，git-cherry 通过 linkgit:git-cherry-pick[1]、linkgit:git-am[1] 或 linkgit:git-rebase[1] 来检测提交是否被 “复制” 了。" @@ -16317,8 +15978,7 @@ msgstr "补丁工作流程" #. type: Plain text #: en/git-cherry.txt:52 -#, fuzzy, priority:100, placeholders:'git-cherry':'linkgit:gitworkflows[7]' -#| msgid "git-cherry is frequently used in patch-based workflows (see linkgit:gitworkflows[7]) to determine if a series of patches has been applied by the upstream maintainer. In such a workflow you might create and send a topic branch like this:" +#, placeholders:'git-cherry':'linkgit:gitworkflows[7]', priority:100 msgid "git-cherry is frequently used in patch-based workflows (see linkgit:gitworkflows[7]) to determine if a series of patches has been applied by the upstream maintainer. In such a workflow you might create and send a topic branch like this:" msgstr "git-cherry 常用于基于补丁的工作流程（见 linkgit:gitworkflows[7]），以确定一系列补丁是否已被上游维护者应用。 在这样的工作流程中，你可能会创建并发送一个类似这样的主题分支：" @@ -16426,8 +16086,7 @@ msgstr "使用一个限制" #. type: Plain text #: en/git-cherry.txt:110 -#, fuzzy, priority:100 -#| msgid "The optional is useful in cases where your topic is based on other work that is not in upstream. Expanding on the previous example, this might look like:" +#, priority:100 msgid "The optional is useful in cases where your topic is based on other work that is not in upstream. Expanding on the previous example, this might look like:" msgstr "可选的 <限制> 在你的主题是基于其他不在上游的工作的情况下很有用。 在前面的例子基础上扩展，这可能看起来像：" @@ -16505,15 +16164,13 @@ msgstr "'git citool'\n" #. type: Plain text #: en/git-citool.txt:19 -#, fuzzy, priority:100 -#| msgid "A Tcl/Tk based graphical interface to review modified files, stage them into the index, enter a commit message and record the new commit onto the current branch. This interface is an alternative to the less interactive 'git commit' program." +#, priority:100 msgid "A Tcl/Tk based graphical interface to review modified files, stage them into the index, enter a commit message and record the new commit onto the current branch. This interface is an alternative to the less interactive 'git commit' program." msgstr "一个基于 Tcl/Tk 的图形界面，用于查看修改过的文件，将其放入索引，输入提交信息，并将新的提交记录到当前分支。 这个界面是对互动性较差的 'git commit' 程序的一种替代。" #. type: Plain text #: en/git-citool.txt:22 -#, fuzzy, priority:100, placeholders:'linkgit:git-gui[1]' -#| msgid "'git citool' is actually a standard alias for `git gui citool`. See linkgit:git-gui[1] for more details." +#, placeholders:'linkgit:git-gui[1]', priority:100 msgid "'git citool' is actually a standard alias for `git gui citool`. See linkgit:git-gui[1] for more details." msgstr "'git citool' 实际上是 'git gui citool' 的标准别名。 详见 linkgit:git-gui[1]。" @@ -16555,15 +16212,13 @@ msgstr "如果给出任何可选的`<路径规范>...`参数，只有那些与 #. type: Plain text #: en/git-clean.txt:35 -#, fuzzy, priority:100, placeholders:'--force' -#| msgid "Normally, when no is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If a is specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed." +#, placeholders:'--force', priority:100 msgid "Normally, when no is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If a is specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed." msgstr "通常，当没有指定 <路径规范> 时，git clean 不会递归到未追踪的目录，以避免删除太多。 指定 -d 可以让它也递归到这些目录。 如果指定了<路径规范>，-d 就不重要了；所有符合指定路径的未追踪文件（`--force` 下提到的嵌套的 git 目录除外）将被删除。" #. type: Plain text #: en/git-clean.txt:43 -#, fuzzy, priority:100, placeholders:'clean.requireForce' -#| msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i. Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given." +#, placeholders:'clean.requireForce', priority:100 msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i. Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given." msgstr "如果 Git 配置变量 clean.requireForce 没有设置为 false，'git clean' 将拒绝删除文件或目录，除非给出 -f 或 -i。 除非给出第二个 -f，否则 Git 将拒绝修改未跟踪的嵌套 git 仓库（有.git子目录的目录）。" @@ -16605,8 +16260,7 @@ msgstr "在标准的忽略规则之外，使用给定的排除模式（见 linkg #. type: Plain text #: en/git-clean.txt:70 -#, fuzzy, priority:100, placeholders:'linkgit:gitignore[5]' -#| msgid "Don't use the standard ignore rules (see linkgit:gitignore[5]), but still use the ignore rules given with `-e` options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git restore' or 'git reset') to create a pristine working directory to test a clean build." +#, placeholders:'linkgit:gitignore[5]', priority:100 msgid "Don't use the standard ignore rules (see linkgit:gitignore[5]), but still use the ignore rules given with `-e` options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git restore' or 'git reset') to create a pristine working directory to test a clean build." msgstr "不要使用标准的忽略规则（见linkgit:gitignore[5]），但仍然使用命令行中用 `-e` 选项给出的忽略规则。 这允许删除所有未跟踪的文件，包括构建产品。 这可以用来（可能与 'git restore' 或 'git reset' 一起使用）创建一个原始的工作目录来测试一个干净的构建。" @@ -16618,8 +16272,7 @@ msgstr "-X" #. type: Plain text #: en/git-clean.txt:74 -#, fuzzy, priority:100 -#| msgid "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files." +#, priority:100 msgid "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files." msgstr "只删除被 Git 忽略的文件。 这对于从头开始重建一切，但保留手动创建的文件可能很有用。" @@ -16681,8 +16334,7 @@ msgstr "按模式过滤" #. type: Plain text #: en/git-clean.txt:109 -#, fuzzy, priority:100 -#| msgid "This shows the files and directories to be deleted and issues an \"Input ignore patterns>>\" prompt. You can input space-separated patterns to exclude files and directories from deletion. E.g. \"*.c *.h\" will exclude files ending with \".c\" and \".h\" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu." +#, priority:100 msgid "This shows the files and directories to be deleted and issues an \"Input ignore patterns>>\" prompt. You can input space-separated patterns to exclude files and directories from deletion. E.g. \"*.c *.h\" will exclude files ending with \".c\" and \".h\" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu." msgstr "这将显示要删除的文件和目录，并发出 \"Input ignore patterns>>（输入忽略模式）\" 提示。你可以输入以空格分隔的模式来排除文件和目录的删除。 例如，\"*.c *.h \" 将排除以 \".c \" 和 \".h\" 结尾的文件不被删除。当你对过滤后的结果满意时，按回车（空）键回到主菜单。" @@ -16694,8 +16346,7 @@ msgstr "按数字选择" #. type: Plain text #: en/git-clean.txt:121 -#, fuzzy, priority:100 -#| msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu." +#, priority:100 msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu." msgstr "这显示了要删除的文件和目录，并发出 \"Select items to delete>>（选择要删除的项目）\"提示。当提示像这样以双 '>>' 结束时，你可以做一个以上的选择，用空格或逗号连接起来。 你也可以说范围。 例如，\"2-5 7,9\" 可以从列表中选择 2,3,4,5,7,9。 如果一个范围内的第二个数字被省略了，所有剩下的项目都会被选中。 例如：\"7-\" 从列表中选择 7、8、9。 你可以输入 '*' 来选择所有项目。 另外，当你对过滤后的结果满意时，按回车（空）键回到主菜单。" @@ -17769,8 +17420,7 @@ msgstr "--reuse-message=<提交>" #. type: Plain text #: en/git-commit.txt:84 -#, fuzzy, priority:280 -#| msgid "Take an existing commit object, and reuse the log message and the authorship information (including the timestamp) when creating the commit." +#, priority:280 msgid "Take an existing commit object, and reuse the log message and the authorship information (including the timestamp) when creating the commit." msgstr "取一个现有的提交对象，并在创建提交时重新使用日志信息和作者信息（包括时间戳）。" @@ -17800,8 +17450,7 @@ msgstr "--fixup=[(amend|reword):]<提交>" #. type: Plain text #: en/git-commit.txt:100 -#, fuzzy, priority:280, placeholders:'--autosquash':'--fixup=':'--fixup=amend':'--fixup=reword' -#| msgid "Create a new commit which \"fixes up\" `` when applied with `git rebase --autosquash`. Plain `--fixup=` creates a \"fixup!\" commit which changes the content of `` but leaves its log message untouched. `--fixup=amend:` is similar but creates an \"amend!\" commit which also replaces the log message of `` with the log message of the \"amend!\" commit. `--fixup=reword:` creates an \"amend!\" commit which replaces the log message of `` with its own log message but makes no changes to the content of ``." +#, placeholders:'--autosquash':'--fixup=':'--fixup=amend':'--fixup=reword', priority:280 msgid "Create a new commit which \"fixes up\" `` when applied with `git rebase --autosquash`. Plain `--fixup=` creates a \"fixup!\" commit which changes the content of `` but leaves its log message untouched. `--fixup=amend:` is similar but creates an \"amend!\" commit which also replaces the log message of `` with the log message of the \"amend!\" commit. `--fixup=reword:` creates an \"amend!\" commit which replaces the log message of `` with its own log message but makes no changes to the content of ``." msgstr "创建一个新的提交，在使用 `git rebase --autosquash` 时，\"修复\"``。普通的`--fixup=`会创建一个 \"fixup!\"的提交，改变``的内容，但不改变其日志信息。`--fixup=amend:`类似，但会创建一个 \"修正！\"的提交，同时用 \"修正！\"的提交的日志信息替换``的日志信息。 `--fixup=reword:`创建一个 \"修正！\"提交，用自己的日志信息替换``的日志信息，但不对``的内容做任何修改。" @@ -17825,8 +17474,7 @@ msgstr "`--fixup=reword:`是`--fixup=amend:--only`的简写。 #. type: Plain text #: en/git-commit.txt:128 -#, fuzzy, priority:280, placeholders:'--autosquash':'linkgit:git-rebase[1]' -#| msgid "Neither \"fixup!\" nor \"amend!\" commits change authorship of `` when applied by `git rebase --autosquash`. See linkgit:git-rebase[1] for details." +#, placeholders:'--autosquash':'linkgit:git-rebase[1]', priority:280 msgid "Neither \"fixup!\" nor \"amend!\" commits change authorship of `` when applied by `git rebase --autosquash`. See linkgit:git-rebase[1] for details." msgstr "当被 `git rebase --autosquash` 应用时，\"fixup!\"和 \"amend!\"提交都不会改变 `` 的作者身份。 详情见 linkgit:git-rebase[1]。" @@ -17838,8 +17486,7 @@ msgstr "--squash=<提交>" #. type: Plain text #: en/git-commit.txt:135 -#, fuzzy, priority:280, placeholders:'--autosquash':'linkgit:git-rebase[1]' -#| msgid "Construct a commit message for use with `rebase --autosquash`. The commit message subject line is taken from the specified commit with a prefix of \"squash! \". Can be used with additional commit message options (`-m`/`-c`/`-C`/`-F`). See linkgit:git-rebase[1] for details." +#, placeholders:'--autosquash':'linkgit:git-rebase[1]', priority:280 msgid "Construct a commit message for use with `rebase --autosquash`. The commit message subject line is taken from the specified commit with a prefix of \"squash! \". Can be used with additional commit message options (`-m`/`-c`/`-C`/`-F`). See linkgit:git-rebase[1] for details." msgstr "构建一条提交信息，供`rebase --autosquash`使用。 提交信息的主题行取自指定的提交，前缀为 \"squash!\". 可以和其他提交信息选项（`-m`/`-c`/`-C`/`-F`）一起使用。详情见 linkgit:git-rebase[1]。" @@ -17893,8 +17540,7 @@ msgstr "--long" #. type: Plain text #: en/git-commit.txt:157 -#, fuzzy, priority:280, placeholders:'--dry-run' -#| msgid "When doing a dry-run, give the output in the long-format. Implies `--dry-run`." +#, placeholders:'--dry-run', priority:280 msgid "When doing a dry-run, give the output in the long-format. Implies `--dry-run`." msgstr "当做干运行时，以长格式给出输出。 意味着\"--dry-run\"。" @@ -17906,8 +17552,7 @@ msgstr "--null" #. type: Plain text #: en/git-commit.txt:166 -#, fuzzy, priority:280, placeholders:'--porcelain':'core.quotePath':'linkgit:git-config[1]' -#| msgid "When showing `short` or `porcelain` status output, print the filename verbatim and terminate the entries with NUL, instead of LF. If no format is given, implies the `--porcelain` output format. Without the `-z` option, filenames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])." +#, placeholders:'--porcelain':'core.quotePath':'linkgit:git-config[1]', priority:280 msgid "When showing `short` or `porcelain` status output, print the filename verbatim and terminate the entries with NUL, instead of LF. If no format is given, implies the `--porcelain` output format. Without the `-z` option, filenames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])." msgstr "当显示 \"short \"或 \"porcelain \"状态输出时，逐字打印文件名，用NUL而不是LF来结束条目。 如果没有给出格式，就意味着是`--porcelain`输出格式。 如果没有`-z`选项，带有 \"不寻常 \"字符的文件名将被引用，正如对配置变量`core.quotePath`的解释（见linkgit:git-config[1]）。" @@ -17919,8 +17564,7 @@ msgstr "--file=<文件>" #. type: Plain text #: en/git-commit.txt:171 -#, fuzzy, priority:280 -#| msgid "Take the commit message from the given file. Use '-' to read the message from the standard input." +#, priority:280 msgid "Take the commit message from the given file. Use '-' to read the message from the standard input." msgstr "从给定文件中获取提交信息。 使用'-'可以从标准输入中读取信息。" @@ -17962,8 +17606,7 @@ msgstr "--message=" #. type: Plain text #: en/git-commit.txt:187 -#, fuzzy, priority:280 -#| msgid "Use the given as the commit message. If multiple `-m` options are given, their values are concatenated as separate paragraphs." +#, priority:280 msgid "Use the given as the commit message. If multiple `-m` options are given, their values are concatenated as separate paragraphs." msgstr "使用给定的作为提交信息。 如果给定了多个`-m`选项，它们的值会作为单独的段落串联起来。" @@ -17987,8 +17630,7 @@ msgstr "--template=<文件>" #. type: Plain text #: en/git-commit.txt:200 -#, fuzzy, priority:280, placeholders:'commit.template' -#| msgid "When editing the commit message, start the editor with the contents in the given file. The `commit.template` configuration variable is often used to give this option implicitly to the command. This mechanism can be used by projects that want to guide participants with some hints on what to write in the message in what order. If the user exits the editor without editing the message, the commit is aborted. This has no effect when a message is given by other means, e.g. with the `-m` or `-F` options." +#, placeholders:'commit.template', priority:280 msgid "When editing the commit message, start the editor with the contents in the given file. The `commit.template` configuration variable is often used to give this option implicitly to the command. This mechanism can be used by projects that want to guide participants with some hints on what to write in the message in what order. If the user exits the editor without editing the message, the commit is aborted. This has no effect when a message is given by other means, e.g. with the `-m` or `-F` options." msgstr "编辑提交信息时，以给定文件中的内容启动编辑器。 `commit.template`配置变量经常被用来给命令隐含这个选项。 这个机制可以被那些希望通过一些提示来指导参与者在消息中以何种顺序书写的项目所使用。 如果用户在没有编辑消息的情况下退出编辑器，提交将被中止。 当用其他方式给出消息时，例如用`-m`或`-F`选项时，这没有影响。" @@ -18000,8 +17642,7 @@ msgstr "--trailer <令牌>[(=|:)<值>]" #. type: Plain text #: en/git-commit.txt:213 -#, fuzzy, priority:280, placeholders:'--trailer':'--trailer':'linkgit:git-interpret-trailers[1]' -#| msgid "Specify a (, ) pair that should be applied as a trailer. (e.g. `git commit --trailer \"Signed-off-by:C O Mitter \\ \" --trailer \"Helped-by:C O Mitter \\ \"` will add the \"Signed-off-by\" trailer and the \"Helped-by\" trailer to the commit message.) The `trailer.*` configuration variables (linkgit:git-interpret-trailers[1]) can be used to define if a duplicated trailer is omitted, where in the run of trailers each trailer would appear, and other details." +#, placeholders:'--trailer':'--trailer':'linkgit:git-interpret-trailers[1]', priority:280 msgid "Specify a (, ) pair that should be applied as a trailer. (e.g. `git commit --trailer \"Signed-off-by:C O Mitter \\ \" --trailer \"Helped-by:C O Mitter \\ \"` will add the \"Signed-off-by\" trailer and the \"Helped-by\" trailer to the commit message.) The `trailer.*` configuration variables (linkgit:git-interpret-trailers[1]) can be used to define if a duplicated trailer is omitted, where in the run of trailers each trailer would appear, and other details." msgstr "指定一个（, ）对，应该作为拖车应用。(例如，`git commit --trailer \"Signed-off-by:C O Mitter / \" --trailer \"Helped-by:C O Mitter / \"`将在提交信息中加入 \"Signed-off-by \"预告片和 \"Helped-by \"预告片。) `trailer.*`配置变量（linkgit:git-interpret-trailers[1]）可以用来定义是否省略重复的拖车，每个拖车会出现在拖车运行的哪个位置，以及其他细节。" @@ -18013,15 +17654,13 @@ msgstr "--[no-]verify" #. type: Plain text #: en/git-commit.txt:219 -#, fuzzy, priority:280, placeholders:'--no-verify':'linkgit:githooks[5]' -#| msgid "By default, the pre-commit and commit-msg hooks are run. When any of `--no-verify` or `-n` is given, these are bypassed. See also linkgit:githooks[5]." +#, placeholders:'--no-verify':'linkgit:githooks[5]', priority:280 msgid "By default, the pre-commit and commit-msg hooks are run. When any of `--no-verify` or `-n` is given, these are bypassed. See also linkgit:githooks[5]." msgstr "默认情况下，会运行 pre-commit 和 commit-msg 钩子。当给出任何 `--no-verify` 或 `-n` 时，这些都会被绕过。参见链接 linkgit:githooks[5]。" #. type: Plain text #: en/git-commit.txt:225 -#, fuzzy, priority:280 -#| msgid "Usually recording a commit that has the exact same tree as its sole parent commit is a mistake, and the command prevents you from making such a commit. This option bypasses the safety, and is primarily for use by foreign SCM interface scripts." +#, priority:280 msgid "Usually recording a commit that has the exact same tree as its sole parent commit is a mistake, and the command prevents you from making such a commit. This option bypasses the safety, and is primarily for use by foreign SCM interface scripts." msgstr "通常情况下，记录一个与唯一的父级提交的树完全相同的提交是一个错误，该命令会阻止你做出这样的提交。 这个选项绕过了安全问题，主要供国外SCM接口脚本使用。" @@ -18033,8 +17672,7 @@ msgstr "和 --allow-empty 一样，这条命令主要是给国外的 SCM 接口 #. type: Plain text #: en/git-commit.txt:236 -#, fuzzy, priority:280 -#| msgid "This option determines how the supplied commit message should be cleaned up before committing. The '' can be `strip`, `whitespace`, `verbatim`, `scissors` or `default`." +#, priority:280 msgid "This option determines how the supplied commit message should be cleaned up before committing. The '' can be `strip`, `whitespace`, `verbatim`, `scissors` or `default`." msgstr "这个选项决定了在提交前如何清理所提供的提交信息。 可以是`strip`、`whitespace`、`verbatim`、`scissors`或`default`。" @@ -18082,8 +17720,7 @@ msgstr "scissors" #. type: Plain text #: en/git-commit.txt:249 -#, fuzzy, priority:280, placeholders:'core.commentChar' -#| msgid "Same as `whitespace` except that everything from (and including) the line found below is truncated, if the message is to be edited. \"`#`\" can be customized with core.commentChar." +#, placeholders:'core.commentChar', priority:280 msgid "Same as `whitespace` except that everything from (and including) the line found below is truncated, if the message is to be edited. \"`#`\" can be customized with core.commentChar." msgstr "与 \"whitespace \"相同，但如果要编辑信息，从下面一行开始（包括）的所有内容都被截断。 \"`#`\"可以用core.commentChar自定义。" @@ -18095,8 +17732,7 @@ msgstr "# ------------------------ >8 ------------------------\n" #. type: Plain text #: en/git-commit.txt:255 -#, fuzzy, priority:280 -#| msgid "Same as `strip` if the message is to be edited. Otherwise `whitespace`." +#, priority:280 msgid "Same as `strip` if the message is to be edited. Otherwise `whitespace`." msgstr "如果要编辑信息，与`strip`相同。 否则就是`whitespace'。" @@ -18120,8 +17756,7 @@ msgstr "--no-edit" #. type: Plain text #: en/git-commit.txt:271 -#, fuzzy, priority:280, placeholders:'--amend':'--no-edit' -#| msgid "Use the selected commit message without launching an editor. For example, `git commit --amend --no-edit` amends a commit without changing its commit message." +#, placeholders:'--amend':'--no-edit', priority:280 msgid "Use the selected commit message without launching an editor. For example, `git commit --amend --no-edit` amends a commit without changing its commit message." msgstr "使用选定的提交信息而不启动编辑器。 例如，`git commit --amend --no-edit`修改一个提交，但不改变其提交信息。" @@ -18133,8 +17768,7 @@ msgstr "--amend" #. type: Plain text #: en/git-commit.txt:282 -#, fuzzy, priority:280, placeholders:'--reset-author' -#| msgid "Replace the tip of the current branch by creating a new commit. The recorded tree is prepared as usual (including the effect of the `-i` and `-o` options and explicit pathspec), and the message from the original commit is used as the starting point, instead of an empty message, when no other message is specified from the command line via options such as `-m`, `-F`, `-c`, etc. The new commit has the same parents and author as the current one (the `--reset-author` option can countermand this)." +#, placeholders:'--reset-author', priority:280 msgid "Replace the tip of the current branch by creating a new commit. The recorded tree is prepared as usual (including the effect of the `-i` and `-o` options and explicit pathspec), and the message from the original commit is used as the starting point, instead of an empty message, when no other message is specified from the command line via options such as `-m`, `-F`, `-c`, etc. The new commit has the same parents and author as the current one (the `--reset-author` option can countermand this)." msgstr "通过创建一个新的提交来替换当前分支的顶端。记录的树像往常一样准备（包括`-i`和`-o`选项和显式pathspec的效果），当命令行没有通过`-m`、`-F`、`-c`等选项指定其他信息时，原始提交的信息会被用作起点，而不是空信息。 新的提交与当前的提交具有相同的父辈和作者（`--reset-author`选项可以反驳）。" @@ -18164,8 +17798,7 @@ msgstr "但可以用来修改合并提交。" #. type: Plain text #: en/git-commit.txt:297 -#, fuzzy, priority:280, placeholders:'linkgit:git-rebase[1]' -#| msgid "You should understand the implications of rewriting history if you amend a commit that has already been published. (See the \"RECOVERING FROM UPSTREAM REBASE\" section in linkgit:git-rebase[1].)" +#, placeholders:'linkgit:git-rebase[1]', priority:280 msgid "You should understand the implications of rewriting history if you amend a commit that has already been published. (See the \"RECOVERING FROM UPSTREAM REBASE\" section in linkgit:git-rebase[1].)" msgstr "如果你修改了一个已经发布的提交，你应该明白重写历史的意义。 参见 linkgit:git-rebase[1]中的 “从上游仓库重建中恢复” 部分。）" @@ -18189,8 +17822,7 @@ msgstr "--include" #. type: Plain text #: en/git-commit.txt:307 -#, fuzzy, priority:280 -#| msgid "Before making a commit out of staged contents so far, stage the contents of paths given on the command line as well. This is usually not what you want unless you are concluding a conflicted merge." +#, priority:280 msgid "Before making a commit out of staged contents so far, stage the contents of paths given on the command line as well. This is usually not what you want unless you are concluding a conflicted merge." msgstr "在对迄今为止的暂存内容进行提交之前，对命令行上给出的路径内容也进行暂存。 这通常不是你想要的，除非你正在结束一个冲突的合并。" @@ -18202,8 +17834,7 @@ msgstr "--only" #. type: Plain text #: en/git-commit.txt:321 -#, fuzzy, priority:280, placeholders:'--amend':'--allow-empty' -#| msgid "Make a commit by taking the updated working tree contents of the paths specified on the command line, disregarding any contents that have been staged for other paths. This is the default mode of operation of 'git commit' if any paths are given on the command line, in which case this option can be omitted. If this option is specified together with `--amend`, then no paths need to be specified, which can be used to amend the last commit without committing changes that have already been staged. If used together with `--allow-empty` paths are also not required, and an empty commit will be created." +#, placeholders:'--amend':'--allow-empty', priority:280 msgid "Make a commit by taking the updated working tree contents of the paths specified on the command line, disregarding any contents that have been staged for other paths. This is the default mode of operation of 'git commit' if any paths are given on the command line, in which case this option can be omitted. If this option is specified together with `--amend`, then no paths need to be specified, which can be used to amend the last commit without committing changes that have already been staged. If used together with `--allow-empty` paths are also not required, and an empty commit will be created." msgstr "在提交时，只取命令行上指定的工作树的最新内容，而不考虑其他路径上的缓存内容。这是'git commit'的默认操作模式，如果在命令行中给出了任何路径，在这种情况下可以省略该选项。 如果该选项与`--amend`一起指定，则不需要指定路径，可以用来修改最后的提交，而不提交已经被暂存的修改。如果和`--allow-empty`一起使用，也不需要指定路径，将创建一个空的提交。" @@ -18239,24 +17870,21 @@ msgstr "可选项：" #. type: Plain text #: en/git-commit.txt:347 -#, fuzzy, priority:280 -#| msgid "'no' - Show no untracked files\n" +#, priority:280 msgid "'no' - Show no untracked files" -msgstr "'no' - 不显示未被追踪的文件\n" +msgstr "'no' - 显示未被追踪的文件" #. type: Plain text #: en/git-commit.txt:348 -#, fuzzy, priority:280 -#| msgid "'normal' - Shows untracked files and directories\n" +#, priority:280 msgid "'normal' - Shows untracked files and directories" -msgstr "'normal' - 显示未被追踪的文件和目录\n" +msgstr "'normal' - 显示未被追踪的文件和目录" #. type: Plain text #: en/git-commit.txt:349 en/git-status.txt:72 -#, fuzzy, priority:280 -#| msgid "'all' - Also shows individual files in untracked directories.\n" +#, priority:280 msgid "'all' - Also shows individual files in untracked directories." -msgstr "'all' - 也显示未被追踪的目录中的单个文件。\n" +msgstr "'all' - 也显示未被追踪的目录中的单个文件。" #. type: Plain text #: en/git-commit.txt:352 en/git-status.txt:85 @@ -18266,8 +17894,7 @@ msgstr "默认值可以用linkgit:git-config[1]中记载的 status.showUntracked #. type: Plain text #: en/git-commit.txt:364 -#, fuzzy, priority:280, placeholders:'HEAD':'commit.verbose':'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]." +#, placeholders:'HEAD':'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]." msgstr "在提交信息模板的底部显示HEAD提交和将要提交的内容之间的统一差异，通过提醒提交有哪些变化来帮助用户描述提交。 请注意，这个差异输出的行数不会以'#'为前缀。这个差异不会成为提交信息的一部分。参见 linkgit:git-config[1] 中的 `commit.verbose` 配置变量。" @@ -18297,8 +17924,7 @@ msgstr "--status" #. type: Plain text #: en/git-commit.txt:383 -#, fuzzy, priority:280, placeholders:'linkgit:git-status[1]':'commit.status' -#| msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status." +#, placeholders:'linkgit:git-status[1]':'commit.status', priority:280 msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status." msgstr "在使用编辑器准备提交信息时，在提交信息模板中包含linkgit:git-status[1]的输出。 默认为开，但可以用来覆盖配置变量commit.status。" @@ -18322,8 +17948,7 @@ msgstr "当命令行中给出pathspec时，提交符合pathspec的文件内容 #. type: Plain text #: en/git-commit.txt:422 -#, fuzzy, priority:280, placeholders:'--staged' -#| msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged `, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:" +#, placeholders:'--staged', priority:280 msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged `, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:" msgstr "在记录自己的工作时，工作树中修改过的文件的内容会通过 'git add' 暂时存储到一个叫做 \"index\" 的暂存区域。 一个文件可以用 `git restore --staged <问价>` 恢复到上次提交时的状态，只是在索引中，而不是在工作目录树中，这实际上是恢复了'git add'，并阻止这个文件的修改参与下一次提交。 在用这些命令建立了要增量提交的状态后，`git commit`（没有任何路径名参数）被用来记录到目前为止已经分阶段提交的内容。 这是该命令最基本的形式。例如：" @@ -18343,8 +17968,7 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:436 -#, fuzzy, priority:280 -#| msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:" +#, priority:280 msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you. That is, this example does the same as the earlier example if there is no other change in your working tree:" msgstr "你可以告诉`git commit`注意到工作树中内容被跟踪的文件的变化，并为你做相应的 `git add` 和 `git rm`，而不是在每个单独的变化后暂存文件。 也就是说，如果你的工作目录树中没有其他变化，这个例子的做法与前面的例子相同：" @@ -18368,8 +17992,7 @@ msgstr "命令`git commit -a`首先查看你的工作树，注意到你修改了 #. type: Plain text #: en/git-commit.txt:451 -#, fuzzy, priority:280 -#| msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:" +#, priority:280 msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:" msgstr "在对许多文件进行分期修改后，你可以通过给 `git commit` 提供路径名来改变修改的顺序。 给出路径名后，该命令就会进行提交，只记录对指定路径的修改：" @@ -18389,8 +18012,7 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:464 -#, fuzzy, priority:280 -#| msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:" +#, priority:280 msgid "This makes a commit that records the modification to `Makefile`. The changes staged for `hello.c` and `hello.h` are not included in the resulting commit. However, their changes are not lost -- they are still staged and merely held back. After the above sequence, if you do:" msgstr "这将产生一个提交，记录对 `Makefile` 的修改。 为 `hello.c` 和 `hello.h` 所做的修改不包括在这次提交中。 然而，它们的修改并没有丢失——它们仍然被暂存，只是被保留了下来。 在上述顺序之后，如果你：" @@ -18408,8 +18030,7 @@ msgstr "第二次提交会记录下对`hello.c`和`hello.h`的修改，正如预 #. type: Plain text #: en/git-commit.txt:479 -#, fuzzy, priority:280 -#| msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':" +#, priority:280 msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':" msgstr "在一次合并（由 'git merge' 或 'git pull' 发起）因冲突而停止后，干净的合并路径已经被分阶段提交给你了，而发生冲突的路径则被留在未合并状态。 你必须先用 'git status' 检查哪些路径有冲突，然后在工作目录树上手动修复它们，再像往常一样用 'git add' 将结果分阶段：" @@ -18429,15 +18050,13 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:490 -#, fuzzy, priority:280, placeholders:'git ls-files' -#| msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:" +#, placeholders:'git ls-files', priority:280 msgid "After resolving conflicts and staging the result, `git ls-files -u` would stop mentioning the conflicted path. When you are done, run `git commit` to finally record the merge:" msgstr "在解决冲突并将结果归档后，`git ls-files -u` 将不再提及冲突的路径。 完成后，运行 `git commit` 来最终记录合并的结果：" #. type: Plain text #: en/git-commit.txt:501 -#, fuzzy, priority:280 -#| msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)." +#, priority:280 msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)." msgstr "和记录自己的修改的情况一样，你可以使用`-a`选项来节省打字。 有一点不同的是，在解决合并的过程中，你不能使用`git commit`和路径名来改变修改的提交顺序，因为合并应该被记录为一次提交。 事实上，该命令在给定路径名时拒绝运行（但见`-i`选项）。" @@ -18503,8 +18122,7 @@ msgstr "典型的用法是只设置 \"user.name \"和 \"user.email \"变量； #. type: Plain text #: en/git-commit.txt:550 -#, fuzzy, priority:280, placeholders:'linkgit:git-format-patch[1]' -#| msgid "Though not required, it's a good idea to begin the commit message with a single short (no more than 50 characters) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body." +#, placeholders:'linkgit:git-format-patch[1]', priority:280 msgid "Though not required, it's a good idea to begin the commit message with a single short (no more than 50 characters) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body." msgstr "虽然不是必须的，但在提交信息的开头用一行简短（不多于 50 个字符）的文字来概括修改内容是个好主意，接下来是空白行，然后是更详尽的描述。 提交信息中第一个空行之前的文字被视为提交标题，并且该标题在整个 Git 中使用。 例如，linkgit:git-format-patch[1] 把提交变成了电子邮件，它在主题行使用标题，在正文中使用提交的其他内容。" @@ -18516,15 +18134,13 @@ msgstr "环境和配置变量" #. type: Plain text #: en/git-commit.txt:559 -#, fuzzy, priority:280, placeholders:'GIT_EDITOR':'core.editor':'linkgit:git-var[1]' -#| msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details." +#, placeholders:'GIT_EDITOR':'core.editor':'linkgit:git-var[1]', priority:280 msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details." msgstr "用于编辑提交日志信息的编辑器将从`GIT_EDITOR`环境变量、core.editor配置变量、`VISUAL`环境变量或`EDITOR`环境变量中选择（按顺序）。 详情见linkgit:git-var[1]。" #. type: Plain text #: en/git-commit.txt:569 -#, fuzzy, priority:280, placeholders:'linkgit:githooks[5]' -#| msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information." +#, placeholders:'linkgit:githooks[5]', priority:280 msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information." msgstr "这个命令可以运行`commit-msg`、`prepare-commit-msg`、`pre-commit`、`post-commit`和`post-rewrite`钩子。 更多信息见linkgit:githooks[5]。" @@ -18536,8 +18152,7 @@ msgstr "`$GIT_DIR/COMMIT_EDITMSG`" #. type: Plain text #: en/git-commit.txt:579 -#, fuzzy, priority:280 -#| msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`." +#, priority:280 msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`." msgstr "该文件包含正在进行的提交的提交信息。 如果`git commit`在创建提交前因错误而退出，任何由用户提供的提交信息（例如在编辑器会话中）都会在此文件中出现，但会被下次调用`git commit`时覆盖。" @@ -18603,15 +18218,13 @@ msgstr "你可以用这个命令查询/设置/替换/取消选项。名称(name) #. type: Plain text #: en/git-config.txt:43 -#, fuzzy, priority:100, placeholders:'--add':'--fixed-value':'<>':'--fixed-value' -#| msgid "Multiple lines can be added to an option by using the `--add` option. If you want to update or unset an option which can occur on multiple lines, a `value-pattern` (which is an extended regular expression, unless the `--fixed-value` option is given) needs to be given. Only the existing values that match the pattern are updated or unset. If you want to handle the lines that do *not* match the pattern, just prepend a single exclamation mark in front (see also <>), but note that this only works when the `--fixed-value` option is not in use." +#, placeholders:'--add':'--fixed-value':'<>':'--fixed-value', priority:100 msgid "Multiple lines can be added to an option by using the `--add` option. If you want to update or unset an option which can occur on multiple lines, a `value-pattern` (which is an extended regular expression, unless the `--fixed-value` option is given) needs to be given. Only the existing values that match the pattern are updated or unset. If you want to handle the lines that do *not* match the pattern, just prepend a single exclamation mark in front (see also <>), but note that this only works when the `--fixed-value` option is not in use." msgstr "通过使用`--add`选项，可以为一个选项添加多行。 如果你想更新或取消一个可以出现在多行的选项，需要给出一个`value-pattern`（这是一个扩展的正则表达式，除非给出`--fixed-value`选项）。 只有符合该模式的现有值被更新或取消设置。 如果你想处理不符合模式的行，只需在前面加上一个感叹号（参见<>），但注意这只在没有使用`--fixed-value`选项时有效。" #. type: Plain text #: en/git-config.txt:48 -#, fuzzy, priority:100, placeholders:'--type=':'--type=':'--type':'--no-type' -#| msgid "The `--type=` option instructs 'git config' to ensure that incoming and outgoing values are canonicalize-able under the given . If no `--type=` is given, no canonicalization will be performed. Callers may unset an existing `--type` specifier with `--no-type`." +#, placeholders:'--type=':'--type=':'--type':'--no-type', priority:100 msgid "The `--type=` option instructs 'git config' to ensure that incoming and outgoing values are canonicalize-able under the given . If no `--type=` is given, no canonicalization will be performed. Callers may unset an existing `--type` specifier with `--no-type`." msgstr "`--type=<类型>`选项指示'git config'确保传入和传出的值在给定的<类型>下是可以被规范化的。 如果没有给定`--type=<类型>`，将不执行规范化。调用者可以用`--no-type`取消现有的`--type`指定器。" @@ -18629,8 +18242,7 @@ msgstr "写入时，新值默认写入版本库的本地配置文件，选项`-- #. type: Plain text #: en/git-config.txt:63 -#, fuzzy, priority:100 -#| msgid "This command will fail with non-zero status upon error. Some exit codes are:" +#, priority:100 msgid "This command will fail with non-zero status upon error. Some exit codes are:" msgstr "该命令出错时将以非零状态失败。 以下是一些退出代码：" @@ -18708,8 +18320,7 @@ msgstr "--add" #. type: Plain text #: en/git-config.txt:89 -#, fuzzy, priority:100, placeholders:'--replace-all' -#| msgid "Adds a new line to the option without altering any existing values. This is the same as providing '^$' as the `value-pattern` in `--replace-all`." +#, placeholders:'--replace-all', priority:100 msgid "Adds a new line to the option without altering any existing values. This is the same as providing '^$' as the `value-pattern` in `--replace-all`." msgstr "不改变任何现有的值的情况下，在选项中增加一个新的行。 这与在`--replace-all`中提供'^$'作为`value-pattern` 是一样的。" @@ -18745,8 +18356,7 @@ msgstr "--get-regexp" #. type: Plain text #: en/git-config.txt:104 -#, fuzzy, priority:100, placeholders:'--get-all' -#| msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names. Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not." +#, placeholders:'--get-all', priority:100 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names. Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not." msgstr "像 --get-all 一样，但是用正则表达式作为，并写出键名。 正则表达式匹配目前是区分大小写的，并且是针对一个规范化的键的版本进行的，其中节(section)和变量名称是小写的，但子节名称不是小写的。" @@ -18758,8 +18368,7 @@ msgstr "--get-urlmatch <名称> " #. type: Plain text #: en/git-config.txt:112 -#, fuzzy, priority:100 -#| msgid "When given a two-part name section.key, the value for section..key whose part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback). When given just the section as name, do so for all the keys in the section and list them. Returns error code 1 if no value is found." +#, priority:100 msgid "When given a two-part as
., the value for
.. whose part matches the best to the given URL is returned (if no such key exists, the value for
. is used as a fallback). When given just the
as name, do so for all the keys in the section and list them. Returns error code 1 if no value is found." msgstr "当给定一个由两部分组成的名称section.key时，返回section..key的值，其部分是给定的最相匹配的URL（如果没有这样的键存在，section.key的值将作为备用值）。 当只给出section的名称时，对section中的所有key进行处理，并将其列出。 如果没有找到值，返回错误代码1（section: 节，key:键；在配置文件中是这样的[section] key=value）。" @@ -18807,8 +18416,7 @@ msgstr "对于读取选项：只从系统范围内的`$(prefix)/etc/gitconfig` #. type: Plain text #: en/git-config.txt:137 -#, fuzzy, priority:100 -#| msgid "For writing options: write to the repository `.git/config` file. This is the default behavior." +#, priority:100 msgid "For writing options: write to the repository `.git/config` file. This is the default behavior." msgstr "对于写选项：写到版本库的`.git/config`文件中。 这是默认行为。" @@ -18862,8 +18470,7 @@ msgstr "--blob <二进制对象>" #. type: Plain text #: en/git-config.txt:168 -#, fuzzy, priority:100, placeholders:'--file':'linkgit:gitrevisions[7]' -#| msgid "Similar to `--file` but use the given blob instead of a file. E.g. you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names." +#, placeholders:'--file':'linkgit:gitrevisions[7]', priority:100 msgid "Similar to `--file` but use the given blob instead of a file. E.g. you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names." msgstr "类似于`--file`，但使用指定的二进制对象而不是文件。例如，你可以使用'master:.gitmodules'来读取主分支中'.gitmodules'文件中的值。参见 linkgit:gitrevisions[7] 中的 \"指定的修正\"部分，以获得更完整的二进制对象名称拼写方式。" @@ -19031,8 +18638,7 @@ msgstr "--no-type" #. type: Plain text #: en/git-config.txt:228 -#, fuzzy, priority:100, placeholders:'--no-type':'--type=' -#| msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable. `--no-type` has no effect without `--type=` or `--`." +#, placeholders:'--no-type':'--type=', priority:100 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable. `--no-type` has no effect without `--type=` or `--`." msgstr "取消先前设置的类型指定器（如果先前有的话）。这个选项要求 'git config' 不对检索的变量进行规范化处理。 `--no-type` 在没有 `--type=<类型>` 或 `--<类型>` 的情况下没有作用。" @@ -19080,8 +18686,7 @@ msgstr "--get-colorbool <名称> []" #. type: Plain text #: en/git-config.txt:263 -#, fuzzy, priority:100, placeholders:'color.diff':'color.ui' -#| msgid "Find the color setting for `` (e.g. `color.diff`) and output \"true\" or \"false\". `` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback." +#, placeholders:'color.diff':'color.ui', priority:100 msgid "Find the color setting for `` (e.g. `color.diff`) and output \"true\" or \"false\". `` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback." msgstr "找到 `<名称>` 的颜色设置（例如 `color.diff`），并输出 \"true\" 或 \"false\"。 `` 应该是 \"true\" 或 \"false\"，当配置为 \"auto\" 时将被考虑。 如果 `` 缺失，则检查命令本身的标准输出，如果要使用颜色则以状态 0 退出，否则以状态 1 退出。 当 `name` 的颜色设置未被定义时，该命令使用 `color.ui` 作为回退。" @@ -19093,8 +18698,7 @@ msgstr "--get-color <名称> [<默认>]" #. type: Plain text #: en/git-config.txt:270 -#, fuzzy, priority:100, placeholders:'color.diff.new' -#| msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`." +#, placeholders:'color.diff.new', priority:100 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output. The optional `default` parameter is used instead, if there is no color configured for `name`." msgstr "找到为 `name` 配置的颜色（例如：`color.diff.new`），并将其作为 ANSI 颜色转义序列输出到标准输出。 如果没有为 `name` 配置的颜色，则使用可选的 `default` 参数来代替。" @@ -19136,8 +18740,7 @@ msgstr "当使用 `--get` 时，如果没有找到所要求的变量，则表现 #. type: Plain text #: en/git-config.txt:295 -#, fuzzy, priority:100, placeholders:'pager.config':'--list':'--get-' -#| msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager." +#, placeholders:'pager.config':'--list':'--get-', priority:100 msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager." msgstr "`pager.config` 只在列出配置时被尊重，即在使用 `--list` 或任何可能返回多个结果的 `--get-*` 时。 默认情况下是使用 pager。" @@ -19221,8 +18824,7 @@ msgstr "选项将从所有这些可用的文件中读取。如果全局或全系 #. type: Plain text #: en/git-config.txt:334 -#, fuzzy, priority:100 -#| msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used." +#, priority:100 msgid "The files are read in the order given above, with last value found taking precedence over values read earlier. When multiple values are taken then all values of a key from all files will be used." msgstr "文件是按照上述顺序读取的，最后发现的值优先于之前读取的值。 当有多个值时，将使用所有文件中某个键的所有值。" @@ -19234,8 +18836,7 @@ msgstr "默认情况下，选项只被写入版本库特定的配置文件中。 #. type: Plain text #: en/git-config.txt:343 -#, fuzzy, priority:100, placeholders:'--file':'--system':'--global':'--local':'--worktree':'<>' -#| msgid "You can limit which configuration sources are read from or written to by specifying the path of a file with the `--file` option, or by specifying a configuration scope with `--system`, `--global`, `--local`, or `--worktree`. For more, see <> above." +#, placeholders:'--file':'--system':'--global':'--local':'--worktree':'<>', priority:100 msgid "You can limit which configuration sources are read from or written to by specifying the path of a file with the `--file` option, or by specifying a configuration scope with `--system`, `--global`, `--local`, or `--worktree`. For more, see <> above." msgstr "你可以通过使用 `--file` 选项指定文件路径，或者使用 `--system`、`--global`、`--local` 或 `--worktree` 指定配置范围，来限制从哪些配置源读取或写入。 更多内容请参见上面的 <>。" @@ -19319,8 +18920,7 @@ msgstr "受保护的配置" #. type: Plain text #: en/git-config.txt:389 -#, fuzzy, priority:100 -#| msgid "Protected configuration refers to the 'system', 'global', and 'command' scopes. For security reasons, certain options are only respected when they are specified in protected configuration, and ignored otherwise." +#, priority:100 msgid "Protected configuration refers to the 'system', 'global', and 'command' scopes. For security reasons, certain options are only respected when they are specified in protected configuration, and ignored otherwise." msgstr "受保护的配置指的是 'system'、'global' 和 'command' 范围。 出于安全考虑，某些选项只有在受保护的配置中指定时才会被尊重，否则会被忽略。" @@ -20118,8 +19718,7 @@ msgstr "文件中不允许有其他类型的行（如空行或注释行），尽 #. type: Plain text #: en/git-credential-store.txt:107 -#, fuzzy, priority:100, placeholders:'linkgit:gitcredentials[7]' -#| msgid "When Git needs authentication for a particular URL context, credential-store will consider that context a pattern to match against each entry in the credentials file. If the protocol, hostname, and username (if we already have one) match, then the password is returned to Git. See the discussion of configuration in linkgit:gitcredentials[7] for more information." +#, placeholders:'linkgit:gitcredentials[7]', priority:100 msgid "When Git needs authentication for a particular URL context, credential-store will consider that context a pattern to match against each entry in the credentials file. If the protocol, hostname, and username (if we already have one) match, then the password is returned to Git. See the discussion of configuration in linkgit:gitcredentials[7] for more information." msgstr "当 Git 需要对某个特定的 URL 上下文进行认证时，credential-store 会将该上下文视为一种模式，与凭证文件中的每个条目进行匹配。 如果协议、主机名和用户名（如果我们已经有了）相匹配，那么密码就会返回给 Git。更多信息见 linkgit:gitcredentials[7] 中关于配置的讨论。" @@ -20265,8 +19864,7 @@ msgstr "输入/输出格式" #. type: Plain text #: en/git-credential.txt:108 -#, fuzzy, priority:100 -#| msgid "`git credential` reads and/or writes (depending on the action used) credential information in its standard input/output. This information can correspond either to keys for which `git credential` will obtain the login information (e.g. host, protocol, path), or to the actual credential data to be obtained (username/password)." +#, priority:100 msgid "`git credential` reads and/or writes (depending on the action used) credential information in its standard input/output. This information can correspond either to keys for which `git credential` will obtain the login information (e.g. host, protocol, path), or to the actual credential data to be obtained (username/password)." msgstr "`git credential` 在其标准输入/输出中读取和/或写入（取决于使用的操作）凭证信息。这些信息可以对应于 `git credential` 将获得登录信息的键（如主机、协议、路径），或者对应于要获得的实际凭证数据（用户名/密码）。" @@ -20284,8 +19882,7 @@ msgstr "键可以包含任何字节，除了 `=`、换行或 NUL。值可以包 #. type: Plain text #: en/git-credential.txt:121 -#, fuzzy, priority:100 -#| msgid "Attributes with keys that end with C-style array brackets `[]` can have multiple values. Each instance of a multi-valued attribute forms an ordered list of values - the order of the repeated attributes defines the order of the values. An empty multi-valued attribute (`key[]=\\n`) acts to clear any previous entries and reset the list." +#, priority:100 msgid "Attributes with keys that end with C-style array brackets `[]` can have multiple values. Each instance of a multi-valued attribute forms an ordered list of values - the order of the repeated attributes defines the order of the values. An empty multi-valued attribute (`key[]=\\n`) acts to clear any previous entries and reset the list." msgstr "键值以 C 型数组括号 `[]` 结尾的属性可以有多个值。一个多值属性的每个实例形成一个有序的值列表--重复属性的顺序决定了值的顺序。一个空的多值属性（`key[]=\\n`）的作用是清除之前的任何条目并重置列表。" @@ -20321,8 +19918,7 @@ msgstr "`host`" #. type: Plain text #: en/git-credential.txt:137 -#, fuzzy, priority:100 -#| msgid "The remote hostname for a network credential. This includes the port number if one was specified (e.g., \"example.com:8088\")." +#, priority:100 msgid "The remote hostname for a network credential. This includes the port number if one was specified (e.g., \"example.com:8088\")." msgstr "网络凭证的远程主机名。 如果指定了端口号，这包括端口号（例如，\"example.com:8088\"）。" @@ -20370,8 +19966,7 @@ msgstr "`password_expiry_utc`" #. type: Plain text #: en/git-credential.txt:158 -#, fuzzy, priority:100 -#| msgid "Generated passwords such as an OAuth access token may have an expiry date. When reading credentials from helpers, `git credential fill` ignores expired passwords. Represented as Unix time UTC, seconds since 1970." +#, priority:100 msgid "Generated passwords such as an OAuth access token may have an expiry date. When reading credentials from helpers, `git credential fill` ignores expired passwords. Represented as Unix time UTC, seconds since 1970." msgstr "生成的密码，如 OAuth 访问令牌，可能有一个过期日期。 当从助手那里读取凭证时，`git credential fill` 会忽略过期的密码。表示为 Unix 时间 UTC，自 1970 年以来的秒数。" @@ -21868,22 +21463,7 @@ msgstr "git-daemon - 一个非常简单的git存储库服务器" #. type: Plain text #: en/git-daemon.txt:25 -#, fuzzy, ignore-ellipsis, no-wrap, priority:100, placeholders:'--verbose]':'--syslog]':'--export-all]':'--timeout=':'--init-timeout=':'--max-connections=':'--strict-paths]':'--base-path=':'--base-path-relaxed]':'--user-path':'--user-path=':'--interpolated-path=':'--reuseaddr]':'--detach]':'--pid-file=':'--enable=':'--disable=':'--allow-override=':'--forbid-override=':'--access-hook=':'--[no-]informative-errors]':'--inetd':'--listen=':'--port=':'--user=':'--group=':'--log-destination=(stderr|syslog|none)]' -#| msgid "" -#| "'git daemon' [--verbose] [--syslog] [--export-all]\n" -#| "\t [--timeout=] [--init-timeout=] [--max-connections=]\n" -#| "\t [--strict-paths] [--base-path=] [--base-path-relaxed]\n" -#| "\t [--user-path | --user-path=]\n" -#| "\t [--interpolated-path=]\n" -#| "\t [--reuseaddr] [--detach] [--pid-file=]\n" -#| "\t [--enable=] [--disable=]\n" -#| "\t [--allow-override=] [--forbid-override=]\n" -#| "\t [--access-hook=] [--[no-]informative-errors]\n" -#| "\t [--inetd |\n" -#| "\t [--listen=] [--port=]\n" -#| "\t [--user= [--group=]]]\n" -#| "\t [--log-destination=(stderr|syslog|none)]\n" -#| "\t [...]\n" +#, ignore-ellipsis, no-wrap, placeholders:'--verbose]':'--syslog]':'--export-all]':'--timeout=':'--init-timeout=':'--max-connections=':'--strict-paths]':'--base-path=':'--base-path-relaxed]':'--user-path':'--user-path=':'--interpolated-path=':'--reuseaddr]':'--detach]':'--pid-file=':'--enable=':'--disable=':'--allow-override=':'--forbid-override=':'--access-hook=':'--[no-]informative-errors]':'--inetd':'--listen=':'--port=':'--user=':'--group=':'--log-destination=(stderr|syslog|none)]', priority:100 msgid "" "'git daemon' [--verbose] [--syslog] [--export-all]\n" "\t [--timeout=] [--init-timeout=] [--max-connections=]\n" @@ -21899,26 +21479,11 @@ msgid "" "\t [--user= [--group=]]]\n" "\t [--log-destination=(stderr|syslog|none)]\n" "\t [...]\n" -msgstr "" -"'git daemon' [--verbose] [--syslog] [--export-all]\n" -"\t [--timeout=] [--init-timeout=] [--max-connections=]\n" -"\t [--strict-paths] [--base-path=<路径>] [--base-path-relaxed]\n" -"\t [--user-path | --user-path=<路径>]\n" -"\t [--interpolated-path=<路径模板>]\n" -"\t [--reuseaddr] [--detach] [--pid-file=<文件>]\n" -"\t [--enable=<服务>] [--disable=<服务>]\n" -"\t [--allow-override=<服务>] [--forbid-override=<服务>]\n" -"\t [--access-hook=<路径>] [--[no-]informative-errors]\n" -"\t [--inetd |\n" -"\t [--listen=<主机或 ip 地址>] [--port=]\n" -"\t [--user=<用户> [--group=<组>]]]\n" -"\t [--log-destination=(stderr|syslog|none)]\n" -"\t [<目录>...]\n" +msgstr "'git daemon' [--verbose] [--syslog] [--export-all]\n\t [--timeout=] [--init-timeout=] [--max-connections=]\n\t [--strict-paths] [--base-path=<路径>] [--base-path-relaxed]\n\t [--user-path | --user-path=<路径>]\n\t [--interpolated-path=<路径模板>]\n\t [--reuseaddr] [--detach] [--pid-file=<文件>]\n\t [--enable=<服务>] [--disable=<服务>]\n\t [--allow-override=<服务>] [--forbid-override=<服务>]\n\t [--access-hook=<路径>] [--[no-]informative-errors]\n\t [--inetd |\n\t [--listen=<主机或 ip 地址>] [--port=]\n\t [--user=<用户> [--group=<组>]]]\n\t [--log-destination=(stderr|syslog|none)]\n\t [<目录>...]\n" #. type: Plain text #: en/git-daemon.txt:31 -#, fuzzy, priority:100, placeholders:'DEFAULT_GIT_PORT' -#| msgid "A really simple TCP Git daemon that normally listens on port \"DEFAULT_GIT_PORT\" aka 9418. It waits for a connection asking for a service, and will serve that service if it is enabled." +#, placeholders:'DEFAULT_GIT_PORT', priority:100 msgid "A really simple TCP Git daemon that normally listens on port \"DEFAULT_GIT_PORT\" aka 9418. It waits for a connection asking for a service, and will serve that service if it is enabled." msgstr "一个非常简单的 TCP Git 守护进程，通常在端口 \"DEFAULT_GIT_PORT\"（即 9418）上进行监听。 它等待一个要求提供服务的连接，如果该服务被启用，它将提供服务。" @@ -21948,8 +21513,7 @@ msgstr "还存在一个 `upload-archive`，为 'git archive' 服务。" #. type: Plain text #: en/git-daemon.txt:54 -#, fuzzy, priority:100 -#| msgid "Match paths exactly (i.e. don't allow \"/foo/repo\" when the real path is \"/foo/repo.git\" or \"/foo/repo/.git\") and don't do user-relative paths. 'git daemon' will refuse to start when this option is enabled and no directory arguments are provided." +#, priority:100 msgid "Match paths exactly (i.e. don't allow \"/foo/repo\" when the real path is \"/foo/repo.git\" or \"/foo/repo/.git\") and don't do user-relative paths. 'git daemon' will refuse to start when this option is enabled and no directory arguments are provided." msgstr "准确匹配路径（即不允许 \"/foo/repo\"，而真正的路径是 \"/foo/repo.git \" 或 \"/foo/repo/.git\"），不做与用户相关的路径。 当这个选项被启用并且没有提供目录参数时，\"git daemon\" 将拒绝启动。" @@ -21961,8 +21525,7 @@ msgstr "--base-path=<路径>" #. type: Plain text #: en/git-daemon.txt:61 -#, fuzzy, priority:100, placeholders:'--base-path=':'hello.git':'hello.git' -#| msgid "Remap all the path requests as relative to the given path. This is sort of \"Git root\" - if you run 'git daemon' with '--base-path=/srv/git' on example.com, then if you later try to pull 'git://example.com/hello.git', 'git daemon' will interpret the path as `/srv/git/hello.git`." +#, placeholders:'--base-path=':'hello.git':'hello.git', priority:100 msgid "Remap all the path requests as relative to the given path. This is sort of \"Git root\" - if you run 'git daemon' with '--base-path=/srv/git' on example.com, then if you later try to pull 'git://example.com/hello.git', 'git daemon' will interpret the path as `/srv/git/hello.git`." msgstr "将所有的路径请求重新映射为相对于给定路径的请求。 这有点像 \"Git root\"--如果你在 example.com 上用 '--base-path=/srv/git' 运行 'git daemon'，那么如果你以后试图拉 'git://example.com/hello.git'，'git daemon' 将把路径解释为 `/srv/git/hello.git`。" @@ -21974,8 +21537,7 @@ msgstr "--base-path-relaxed" #. type: Plain text #: en/git-daemon.txt:67 -#, fuzzy, priority:100, placeholders:'--base-path':'--base-path' -#| msgid "If --base-path is enabled and repo lookup fails, with this option 'git daemon' will attempt to lookup without prefixing the base path. This is useful for switching to --base-path usage, while still allowing the old paths." +#, placeholders:'--base-path':'--base-path', priority:100 msgid "If --base-path is enabled and repo lookup fails, with this option 'git daemon' will attempt to lookup without prefixing the base path. This is useful for switching to --base-path usage, while still allowing the old paths." msgstr "如果启用了 --base-path，并且 repo 查找失败，使用这个选项，'git daemon' 将尝试在不加前缀的基础路径下进行查找。 这对于切换到 --base-path 的使用很有用，同时仍然允许使用旧的路径。" @@ -21987,8 +21549,7 @@ msgstr "--interpolated-path=<路径模板>" #. type: Plain text #: en/git-daemon.txt:77 -#, fuzzy, priority:100 -#| msgid "To support virtual hosting, an interpolated path template can be used to dynamically construct alternate paths. The template supports %H for the target hostname as supplied by the client but converted to all lowercase, %CH for the canonical hostname, %IP for the server's IP address, %P for the port number, and %D for the absolute path of the named repository. After interpolation, the path is validated against the directory list." +#, priority:100 msgid "To support virtual hosting, an interpolated path template can be used to dynamically construct alternate paths. The template supports %H for the target hostname as supplied by the client but converted to all lowercase, %CH for the canonical hostname, %IP for the server's IP address, %P for the port number, and %D for the absolute path of the named repository. After interpolation, the path is validated against the directory list." msgstr "为了支持虚拟主机，可以使用插值路径模板来动态地构建备用路径。 该模板支持由客户提供的目标主机名的 %H，但转换为小写字母；支持规范主机名的 %CH；支持服务器 IP 地址的 %IP；支持端口号的 %P；支持命名仓库的绝对路径的 %D。 在插值之后，该路径将根据目录列表进行验证。" @@ -22006,22 +21567,19 @@ msgstr "--inetd" #. type: Plain text #: en/git-daemon.txt:88 -#, fuzzy, priority:100, placeholders:'--syslog':'--log-destination=':'--detach':'--port':'--listen':'--user':'--group' -#| msgid "Have the server run as an inetd service. Implies --syslog (may be overridden with `--log-destination=`). Incompatible with --detach, --port, --listen, --user and --group options." +#, placeholders:'--syslog':'--log-destination=':'--detach':'--port':'--listen':'--user':'--group', priority:100 msgid "Have the server run as an inetd service. Implies --syslog (may be overridden with `--log-destination=`). Incompatible with --detach, --port, --listen, --user and --group options." msgstr "让服务器作为一个 inetd 服务运行。暗示 --syslog（可以用 `--log-destination=` 重写）。 与 --detach、--port、--listen、--user 和 --group 选项不兼容。" #. type: Labeled list #: en/git-daemon.txt:89 -#, fuzzy, no-wrap, priority:100, placeholders:'--listen=' -#| msgid "--listen=" +#, no-wrap, placeholders:'--listen=', priority:100 msgid "--listen=" msgstr "--listen=<主机或 IP 地址>" #. type: Plain text #: en/git-daemon.txt:96 -#, fuzzy, priority:100, placeholders:'--listen=':'--listen':'--inetd' -#| msgid "Listen on a specific IP address or hostname. IP addresses can be either an IPv4 address or an IPv6 address if supported. If IPv6 is not supported, then --listen=hostname is also not supported and --listen must be given an IPv4 address. Can be given more than once. Incompatible with `--inetd` option." +#, placeholders:'--listen=':'--listen':'--inetd', priority:100 msgid "Listen on a specific IP address or hostname. IP addresses can be either an IPv4 address or an IPv6 address if supported. If IPv6 is not supported, then --listen= is also not supported and --listen must be given an IPv4 address. Can be given more than once. Incompatible with `--inetd` option." msgstr "在一个特定的 IP 地址或主机名上收听。 IP 地址可以是一个 IPv4 地址，也可以是一个 IPv6 地址（如果支持）。 如果不支持 IPv6，那么 --listen=hostname也不被支持，--listen 必须给出一个 IPv4 地址。 可以多次给出。 与 `--inetd` 选项不兼容。" @@ -22033,8 +21591,7 @@ msgstr "--port=" #. type: Plain text #: en/git-daemon.txt:99 -#, fuzzy, priority:100, placeholders:'--inetd' -#| msgid "Listen on an alternative port. Incompatible with `--inetd` option." +#, placeholders:'--inetd', priority:100 msgid "Listen on an alternative port. Incompatible with `--inetd` option." msgstr "在另一个端口上监听。 与 `--inetd` 选项不兼容。" @@ -22070,8 +21627,7 @@ msgstr "--max-connections=" #. type: Plain text #: en/git-daemon.txt:113 -#, fuzzy, priority:100 -#| msgid "Maximum number of concurrent clients, defaults to 32. Set it to zero for no limit." +#, priority:100 msgid "Maximum number of concurrent clients, defaults to 32. Set it to zero for no limit." msgstr "最大并发客户数，默认为 32。 设置为零表示没有限制。" @@ -22095,8 +21651,7 @@ msgstr "--log-destination=<目的>" #. type: Plain text #: en/git-daemon.txt:122 -#, fuzzy, priority:100, placeholders:'--verbose' -#| msgid "Send log messages to the specified destination. Note that this option does not imply --verbose, thus by default only error conditions will be logged. The must be one of:" +#, placeholders:'--verbose', priority:100 msgid "Send log messages to the specified destination. Note that this option does not imply --verbose, thus by default only error conditions will be logged. The must be one of:" msgstr "发送日志信息到指定的目的地。 注意，这个选项并不意味着 --verbose，因此默认情况下只有错误情况会被记录下来。 <目的> 必须是以下之一：" @@ -22108,8 +21663,7 @@ msgstr "标准错误" #. type: Plain text #: en/git-daemon.txt:129 -#, fuzzy, priority:100, placeholders:'--detach' -#| msgid "Write to standard error. Note that if `--detach` is specified, the process disconnects from the real standard error, making this destination effectively equivalent to `none`." +#, placeholders:'--detach', priority:100 msgid "Write to standard error. Note that if `--detach` is specified, the process disconnects from the real standard error, making this destination effectively equivalent to `none`." msgstr "写入标准错误。 注意，如果指定了 `--detach`，进程就会断开与真正的标准错误的连接，使得这个目的地实际上等同于 `none`。" @@ -22151,8 +21705,7 @@ msgstr "--user-path=<路径>" #. type: Plain text #: en/git-daemon.txt:147 -#, fuzzy, priority:100, placeholders:'--user-path=' -#| msgid "Allow {tilde}user notation to be used in requests. When specified with no parameter, a request to git://host/{tilde}alice/foo is taken as a request to access 'foo' repository in the home directory of user `alice`. If `--user-path=path` is specified, the same request is taken as a request to access `path/foo` repository in the home directory of user `alice`." +#, placeholders:'--user-path=', priority:100 msgid "Allow {tilde}user notation to be used in requests. When specified with no parameter, a request to git://host/{tilde}alice/foo is taken as a request to access 'foo' repository in the home directory of user `alice`. If `--user-path=` is specified, the same request is taken as a request to access `/foo` repository in the home directory of user `alice`." msgstr "允许在请求中使用 {tilde} 用户符号。 当没有指定参数时，对 git://host/{tilde}alice/foo 的请求会被视为访问用户 `alice` 的主目录下的 'foo' 仓库的请求。 如果指定了 `--user-path=path`，同样的请求将被视为访问用户 `alice` 的主目录下的 `path/foo` 仓库。" @@ -22170,8 +21723,7 @@ msgstr "--reuseaddr" #. type: Plain text #: en/git-daemon.txt:155 -#, fuzzy, priority:100, placeholders:'SO_REUSEADDR' -#| msgid "Use SO_REUSEADDR when binding the listening socket. This allows the server to restart without waiting for old connections to time out." +#, placeholders:'SO_REUSEADDR', priority:100 msgid "Use SO_REUSEADDR when binding the listening socket. This allows the server to restart without waiting for old connections to time out." msgstr "在绑定监听套接字时使用 SO_REUSEADDR。 这允许服务器重新启动，而不必等待旧的连接超时。" @@ -22189,8 +21741,7 @@ msgstr "--pid-file=<文件>" #. type: Plain text #: en/git-daemon.txt:162 -#, fuzzy, priority:100, placeholders:'--inetd' -#| msgid "Save the process id in 'file'. Ignored when the daemon is run under `--inetd`." +#, placeholders:'--inetd', priority:100 msgid "Save the process id in 'file'. Ignored when the daemon is run under `--inetd`." msgstr "在 'file' 中保存进程 ID。 当守护进程在 `--inetd` 下运行时被忽略。" @@ -22208,8 +21759,7 @@ msgstr "--group=<组>" #. type: Plain text #: en/git-daemon.txt:170 -#, fuzzy, priority:100, placeholders:'--user':'--group' -#| msgid "Change daemon's uid and gid before entering the service loop. When only `--user` is given without `--group`, the primary group ID for the user is used. The values of the option are given to `getpwnam(3)` and `getgrnam(3)` and numeric IDs are not supported." +#, placeholders:'--user':'--group', priority:100 msgid "Change daemon's uid and gid before entering the service loop. When only `--user` is given without `--group`, the primary group ID for the user is used. The values of the option are given to `getpwnam(3)` and `getgrnam(3)` and numeric IDs are not supported." msgstr "在进入服务循环之前，改变 daemon 的 uid 和 gid。 当只给出 `--user` 而没有 `--group` 时，将使用用户的主要组 ID。 该选项的值是给 `getpwnam(3)` 和 `getgrnam(3)` 的，不支持数字 ID。" @@ -22239,8 +21789,7 @@ msgstr "--disable=<服务>" #. type: Plain text #: en/git-daemon.txt:189 -#, fuzzy, priority:100 -#| msgid "Enable/disable the service site-wide per default. Note that a service disabled site-wide can still be enabled per repository if it is marked overridable and the repository enables the service with a configuration item." +#, priority:100 msgid "Enable/disable the service site-wide per default. Note that a service disabled site-wide can still be enabled per repository if it is marked overridable and the repository enables the service with a configuration item." msgstr "在全站范围内默认启用/禁用该服务。 请注意，如果一个全站禁用的服务被标记为可重写，并且版本库用配置项启用了该服务，那么它仍然可以在每个版本库中启用。" @@ -22258,8 +21807,7 @@ msgstr "--forbid-override=<服务>" #. type: Plain text #: en/git-daemon.txt:195 -#, fuzzy, priority:100 -#| msgid "Allow/forbid overriding the site-wide default with per repository configuration. By default, all the services may be overridden." +#, priority:100 msgid "Allow/forbid overriding the site-wide default with per repository configuration. By default, all the services may be overridden." msgstr "允许/禁止用每个版本库的配置来覆盖全站的默认值。 默认情况下，所有的服务都可以被覆盖。" @@ -22271,8 +21819,7 @@ msgstr "--[no-]informative-errors" #. type: Plain text #: en/git-daemon.txt:204 -#, fuzzy, priority:100, placeholders:'git-daemon':'--no-informative-errors' -#| msgid "When informative errors are turned on, git-daemon will report more verbose errors to the client, differentiating conditions like \"no such repository\" from \"repository not exported\". This is more convenient for clients, but may leak information about the existence of unexported repositories. When informative errors are not enabled, all errors report \"access denied\" to the client. The default is --no-informative-errors." +#, placeholders:'git-daemon':'--no-informative-errors', priority:100 msgid "When informative errors are turned on, git-daemon will report more verbose errors to the client, differentiating conditions like \"no such repository\" from \"repository not exported\". This is more convenient for clients, but may leak information about the existence of unexported repositories. When informative errors are not enabled, all errors report \"access denied\" to the client. The default is --no-informative-errors." msgstr "当信息性错误被打开时，git-daemon 会向客户端报告更多详细的错误，区分 \"没有这样的仓库\" 和 \"仓库没有被导出\" 这样的情况。这对客户端来说更方便，但可能会泄露未导出版本库的信息。 如果不启用信息性错误，所有错误都会向客户报告 \"拒绝访问\"。默认情况是 --no-informative-errors。" @@ -22284,8 +21831,7 @@ msgstr "--access-hook=<路径>" #. type: Plain text #: en/git-daemon.txt:215 -#, fuzzy, priority:100, placeholders:'$REMOTE_ADDR':'$REMOTE_PORT' -#| 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." +#, 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 "每次客户端连接时，首先运行 <路径> 指定的外部命令，以服务名称（如 \"upload-pack\"）、仓库的路径、主机名（%H）、规范主机名（%CH）、IP 地址（%IP）和 TCP 端口（%P）作为其命令行参数。外部命令可以通过以非零状态退出来决定拒绝该服务（或通过以零状态退出来允许它）。 在做出这个决定时，它还可以查看 $REMOTE_ADDR 和 `$REMOTE_PORT` 环境变量来了解请求者的情况。" @@ -22309,8 +21855,7 @@ msgstr "服务" #. type: Plain text #: en/git-daemon.txt:236 -#, fuzzy, priority:100 -#| msgid "These services can be globally enabled/disabled using the command-line options of this command. If finer-grained control is desired (e.g. to allow 'git archive' to be run against only in a few selected repositories the daemon serves), the per-repository configuration file can be used to enable or disable them." +#, priority:100 msgid "These services can be globally enabled/disabled using the command-line options of this command. If finer-grained control is desired (e.g. to allow 'git archive' to be run against only in a few selected repositories the daemon serves), the per-repository configuration file can be used to enable or disable them." msgstr "这些服务可以通过该命令的命令行选项全局启用/禁用。 如果需要更精细的控制（例如，允许 'git archive' 只在守护进程所服务的几个选定的仓库中运行），可以使用每个仓库的配置文件来启用或禁用它们。" @@ -22322,8 +21867,7 @@ msgstr "upload-pack" #. type: Plain text #: en/git-daemon.txt:242 -#, fuzzy, priority:100, placeholders:'git fetch-pack':'git ls-remote':'daemon.uploadpack' -#| msgid "This serves 'git fetch-pack' and 'git ls-remote' clients. It is enabled by default, but a repository can disable it by setting `daemon.uploadpack` configuration item to `false`." +#, placeholders:'git fetch-pack':'git ls-remote':'daemon.uploadpack', priority:100 msgid "This serves 'git fetch-pack' and 'git ls-remote' clients. It is enabled by default, but a repository can disable it by setting `daemon.uploadpack` configuration item to `false`." msgstr "它为 'git fetch-pack' 和 'git ls-remote' 客户端服务。 它默认是启用的，但仓库可以通过设置 `daemon.uploadpack` 配置项为 `false` 来禁用它。" @@ -22335,8 +21879,7 @@ msgstr "upload-archive" #. type: Plain text #: en/git-daemon.txt:247 -#, fuzzy, priority:100, placeholders:'--remote':'daemon.uploadarch' -#| msgid "This serves 'git archive --remote'. It is disabled by default, but a repository can enable it by setting `daemon.uploadarch` configuration item to `true`." +#, placeholders:'--remote':'daemon.uploadarch', priority:100 msgid "This serves 'git archive --remote'. It is disabled by default, but a repository can enable it by setting `daemon.uploadarch` configuration item to `true`." msgstr "这为 'git archive --remote' 服务。 它默认是禁用的，但版本库可以通过设置 `daemon.uploadarch` 配置项为 `true` 来启用它。" @@ -22348,8 +21891,7 @@ msgstr "receive-pack" #. type: Plain text #: en/git-daemon.txt:257 -#, fuzzy, priority:100, placeholders:'git send-pack':'daemon.receivepack' -#| msgid "This serves 'git send-pack' clients, allowing anonymous push. It is disabled by default, as there is _no_ authentication in the protocol (in other words, anybody can push anything into the repository, including removal of refs). This is solely meant for a closed LAN setting where everybody is friendly. This service can be enabled by setting `daemon.receivepack` configuration item to `true`." +#, placeholders:'git send-pack':'daemon.receivepack', priority:100 msgid "This serves 'git send-pack' clients, allowing anonymous push. It is disabled by default, as there is _no_ authentication in the protocol (in other words, anybody can push anything into the repository, including removal of refs). This is solely meant for a closed LAN setting where everybody is friendly. This service can be enabled by setting `daemon.receivepack` configuration item to `true`." msgstr "它为 'git send-pack' 客户端服务，允许匿名推送。 它默认是禁用的，因为协议中没有认证（换句话说，任何人都可以推送任何东西到仓库，包括删除引用）。 这只适用于封闭的局域网环境，大家都很友好。 这个服务可以通过设置 `daemon.receivepack` 配置项为 `true` 来启用。" @@ -22425,8 +21967,7 @@ msgstr "" #. type: Plain text #: en/git-daemon.txt:300 -#, fuzzy, priority:100 -#| msgid "In this example, the root-level directory `/pub` will contain a subdirectory for each virtual host name supported. Further, both hosts advertise repositories simply as `git://www.example.com/software/repo.git`. For pre-1.4.0 clients, a symlink from `/software` into the appropriate default repository could be made as well." +#, priority:100 msgid "In this example, the root-level directory `/pub` will contain a subdirectory for each virtual host name supported. Further, both hosts advertise repositories simply as `git://www.example.com/software/repo.git`. For pre-1.4.0 clients, a symlink from `/software` into the appropriate default repository could be made as well." msgstr "在这个例子中，根级目录 `/pub` 将包含一个子目录，用于支持每个虚拟主机名。 此外，两台主机都简单地以 `git://www.example.com/software/repo.git` 的方式宣传仓库。 对于 1.4.0 之前的客户端，也可以从 `/software` 建立一个符号链接到相应的默认仓库。" @@ -22458,8 +21999,7 @@ msgstr "" #. type: Plain text #: en/git-daemon.txt:318 -#, fuzzy, priority:100 -#| msgid "In this example, the root-level directory `/pub` will contain a subdirectory for each virtual host IP address supported. Repositories can still be accessed by hostname though, assuming they correspond to these IP addresses." +#, priority:100 msgid "In this example, the root-level directory `/pub` will contain a subdirectory for each virtual host IP address supported. Repositories can still be accessed by hostname though, assuming they correspond to these IP addresses." msgstr "在这个例子中，根级目录 `/pub` 将包含一个支持每个虚拟主机IP地址的子目录。 虽然仓库仍然可以通过主机名访问，但假设它们对应于这些 IP 地址。" @@ -22519,15 +22059,13 @@ msgstr "" #. type: Plain text #: en/git-describe.txt:24 -#, fuzzy, priority:260 -#| msgid "The command finds the most recent tag that is reachable from a commit. If the tag points to the commit, then only the tag is shown. Otherwise, it suffixes the tag name with the number of additional commits on top of the tagged object and the abbreviated object name of the most recent commit. The result is a \"human-readable\" object name which can also be used to identify the commit to other git commands." +#, priority:260 msgid "The command finds the most recent tag that is reachable from a commit. If the tag points to the commit, then only the tag is shown. Otherwise, it suffixes the tag name with the number of additional commits on top of the tagged object and the abbreviated object name of the most recent commit. The result is a \"human-readable\" object name which can also be used to identify the commit to other git commands." msgstr "该命令找到可从提交中获取的最新标签。 如果标签指向该提交，则只显示该标签。 否则，它会在标签名后面加上附加提交的数量，以及最新提交的缩写对象名。其结果是一个 \"人类可读 \"的对象名称，也可用于识别其他git命令中的提交。" #. type: Plain text #: en/git-describe.txt:28 -#, fuzzy, priority:260, placeholders:'--all':'--tags)':'linkgit:git-tag[1]' -#| msgid "By default (without --all or --tags) `git describe` only shows annotated tags. For more information about creating annotated tags see the -a and -s options to linkgit:git-tag[1]." +#, placeholders:'--all':'--tags)':'linkgit:git-tag[1]', priority:260 msgid "By default (without --all or --tags) `git describe` only shows annotated tags. For more information about creating annotated tags see the -a and -s options to linkgit:git-tag[1]." msgstr "默认情况下（没有 --all 或 --tags）`git describe`只显示有注释的标签。 关于创建注释标签的更多信息，请参见linkgit:git-tag[1]的-a和-s选项。" @@ -22545,8 +22083,7 @@ msgstr "<提交号>..." #. type: Plain text #: en/git-describe.txt:39 -#, fuzzy, priority:260, placeholders:'HEAD' -#| msgid "Commit-ish object names to describe. Defaults to HEAD if omitted." +#, placeholders:'HEAD', priority:260 msgid "Commit-ish object names to describe. Defaults to HEAD if omitted." msgstr "要描述的类似于承诺的对象名称。 如果省略，则默认为HEAD。" @@ -22564,22 +22101,19 @@ msgstr "--broken[=<标记>]" #. type: Plain text #: en/git-describe.txt:49 -#, fuzzy, priority:260, placeholders:'HEAD':'HEAD':'--broken' -#| 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." +#, placeholders:'HEAD':'HEAD':'--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 "描述工作树的状态。 当工作树与HEAD匹配时，其输出与 \"git describe HEAD \"相同。 如果工作树有本地修改，\"-dirty \"会被附加到它上面。 如果一个仓库被破坏了，而Git不能确定是否有本地修改，Git会出错，除非给了`--broken'，它将附加后缀\"-broken\"。" #. type: Plain text #: en/git-describe.txt:54 -#, fuzzy, priority:260 -#| msgid "Instead of using only the annotated tags, use any ref found in `refs/` namespace. This option enables matching any known branch, remote-tracking branch, or lightweight tag." +#, priority:260 msgid "Instead of using only the annotated tags, use any ref found in `refs/` namespace. This option enables matching any known branch, remote-tracking branch, or lightweight tag." msgstr "而不是只使用注释的标签，使用在`refs/`命名空间中发现的任何ref。 这个选项可以匹配任何已知的分支、远程跟踪分支或轻量级标签。" #. type: Plain text #: en/git-describe.txt:59 -#, fuzzy, priority:260 -#| msgid "Instead of using only the annotated tags, use any tag found in `refs/tags` namespace. This option enables matching a lightweight (non-annotated) tag." +#, priority:260 msgid "Instead of using only the annotated tags, use any tag found in `refs/tags` namespace. This option enables matching a lightweight (non-annotated) tag." msgstr "而不是只使用注释过的标签，使用在`refs/tags`命名空间中发现的任何标签。 这个选项可以匹配轻量级（非注释的）标签。" @@ -22592,8 +22126,7 @@ msgstr "--contains" # ERROR: --tags not found in translation #. type: Plain text #: en/git-describe.txt:64 -#, fuzzy, priority:260, placeholders:'--tags' -#| msgid "Instead of finding the tag that predates the commit, find the tag that comes after the commit, and thus contains it. Automatically implies --tags." +#, placeholders:'--tags', priority:260 msgid "Instead of finding the tag that predates the commit, find the tag that comes after the commit, and thus contains it. Automatically implies --tags." msgstr "与其寻找提交前的标签，不如寻找提交后的标签，从而包含该标签。 自动暗含 --tags。" @@ -22611,8 +22144,7 @@ msgstr "--candidates=" #. type: Plain text #: en/git-describe.txt:78 -#, fuzzy, priority:260 -#| msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to candidates. Increasing above 10 will take slightly longer but may produce a more accurate result. An of 0 will cause only exact matches to be output." +#, priority:260 msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to candidates. Increasing above 10 will take slightly longer but may produce a more accurate result. An of 0 will cause only exact matches to be output." msgstr "与其只考虑用最近的10个标签来描述输入的commit-ish，不如考虑最多个候选人。 将增加到10以上会花费更长的时间，但可能会产生一个更准确的结果。 为0将导致只输出完全匹配的结果。" @@ -22624,8 +22156,7 @@ msgstr "--exact-match" #. type: Plain text #: en/git-describe.txt:82 -#, fuzzy, priority:260, placeholders:'--candidates=0' -#| msgid "Only output exact matches (a tag directly references the supplied commit). This is a synonym for --candidates=0." +#, placeholders:'--candidates=0', priority:260 msgid "Only output exact matches (a tag directly references the supplied commit). This is a synonym for --candidates=0." msgstr "只输出完全匹配的内容（一个标签直接引用所提供的提交）。 这是 --candidates=0 的同义词。" @@ -22637,15 +22168,13 @@ msgstr "--debug" #. type: Plain text #: en/git-describe.txt:87 -#, fuzzy, priority:260 -#| msgid "Verbosely display information about the searching strategy being employed to standard error. The tag name will still be printed to standard out." +#, priority:260 msgid "Verbosely display information about the searching strategy being employed to standard error. The tag name will still be printed to standard out." msgstr "以粗略的方式向标准错误显示正在使用的搜索策略的信息。 标签名称仍将被打印到标准输出。" #. type: Plain text #: en/git-describe.txt:96 -#, fuzzy, ignore-ellipsis, priority:260 -#| msgid "Always output the long format (the tag, the number of commits and the abbreviated commit name) even when it matches a tag. This is useful when you want to see parts of the commit object name in \"describe\" output, even when the commit in question happens to be a tagged version. Instead of just emitting the tag name, it will describe such a commit as v1.2-0-gdeadbee (0th commit since tag v1.2 that points at object deadbee....)." +#, ignore-ellipsis, priority:260 msgid "Always output the long format (the tag, the number of commits and the abbreviated commit name) even when it matches a tag. This is useful when you want to see parts of the commit object name in \"describe\" output, even when the commit in question happens to be a tagged version. Instead of just emitting the tag name, it will describe such a commit as v1.2-0-gdeadbee (0th commit since tag v1.2 that points at object deadbee....)." msgstr "总是输出长格式（标签、提交数量和提交名称的缩写），即使它与一个标签相匹配。 当你想在 \"describe \"输出中看到提交对象的部分名称时，这很有用，即使相关的提交恰好是一个有标签的版本。 它不会只发出标签名称，而是将这样的提交描述为v1.2-0-gdeadbee（标签v1.2后的第0次提交，指向对象deadbee....）。" @@ -22657,8 +22186,7 @@ msgstr "--match <模式>" #. type: Plain text #: en/git-describe.txt:106 -#, fuzzy, priority:260, placeholders:'--all':'--no-match' -#| msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered. Use `--no-match` to clear and reset the list of patterns." +#, placeholders:'--all':'--no-match', priority:260 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered. Use `--no-match` to clear and reset the list of patterns." msgstr "只考虑与给定的 `glob(7)` 模式匹配的标签，不包括 \"refs/tags/\" 前缀。如果和`--all`一起使用，它也会考虑匹配该模式的本地分支和远程跟踪引用，分别排除 \"refs/heads/\"和 \"refs/remotes/\"前缀；其他类型的引用永远不会被考虑。如果给出多次，将积累一个模式列表，匹配任何模式的标签都会被考虑。 使用`--no-match`来清除和重置模式列表。" @@ -22688,8 +22216,7 @@ msgstr "显示唯一缩写的提交对象作为后备。" #. type: Plain text #: en/git-describe.txt:126 -#, fuzzy, priority:260 -#| msgid "Follow only the first parent commit upon seeing a merge commit. This is useful when you wish to not match tags on branches merged in the history of the target commit." +#, priority:260 msgid "Follow only the first parent commit upon seeing a merge commit. This is useful when you wish to not match tags on branches merged in the history of the target commit." msgstr "在看到合并提交时，只跟随第一个父提交。 当你希望不匹配目标提交历史中合并的分支上的标签时，这很有用。" @@ -22711,15 +22238,13 @@ msgstr "" #. type: Plain text #: en/git-describe.txt:140 -#, fuzzy, priority:260 -#| msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\") at the end." +#, priority:260 msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\") at the end." msgstr "也就是说，我的 \"父 \"分支的当前头部是基于v1.0.4的，但由于它在此基础上有一些提交，所以describe在最后添加了额外的提交数量（\"14\"）和提交本身的缩写对象名称（\"2414721\"）。" #. type: Plain text #: en/git-describe.txt:151 -#, fuzzy, priority:260 -#| msgid "The number of additional commits is the number of commits which would be displayed by \"git log v1.0.4..parent\". The hash suffix is \"-g\" + an unambiguous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7. The \"g\" prefix stands for \"git\" and is used to allow describing the version of a software depending on the SCM the software is managed with. This is useful in an environment where people may use different SCMs." +#, priority:260 msgid "The number of additional commits is the number of commits which would be displayed by \"git log v1.0.4..parent\". The hash suffix is \"-g\" + an unambiguous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7. The \"g\" prefix stands for \"git\" and is used to allow describing the version of a software depending on the SCM the software is managed with. This is useful in an environment where people may use different SCMs." msgstr "额外提交的次数是 \"git log v1.0.4.parent\" 显示的提交次数。 哈希后缀是\"-g\" + 父提交（即 `2414721b194453f058079d897d13c4e377f92dc6` ）顶端提交的明确缩写。缩写的长度会随着仓库的增长而缩减，使用的是仓库中对象的大致数量和生日悖论的数学计算方法，默认最小长度为 7。\"g\" 前缀代表 \"git\" ，用于根据管理软件的 SCM 来描述软件的版本。这在人们使用不同 SCM 的环境中非常有用。" @@ -22795,29 +22320,25 @@ msgstr "搜索策略" #. type: Plain text #: en/git-describe.txt:187 -#, fuzzy, priority:260 -#| msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit. Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates. If an exact match is found, its name will be output and searching will stop." +#, priority:260 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit. Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates. If an exact match is found, its name will be output and searching will stop." msgstr "对于提供的每个提交，'git describe'将首先寻找一个标签，该标签正是该提交的标签。 有注释的标签总是比轻量级的标签更受欢迎，日期较新的标签总是比日期较老的标签更受欢迎。 如果找到一个完全匹配的标签，它的名字就会被输出，搜索就会停止。" #. type: Plain text #: en/git-describe.txt:194 -#, fuzzy, priority:260, placeholders:'--first-parent' -#| msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged. The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit." +#, placeholders:'--first-parent', priority:260 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged. The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit." msgstr "如果没有找到完全匹配的，'git describe'会回溯提交历史，找到一个已经被标记的祖先提交。 该祖先的标签将与输入的提交的SHA-1的缩写一起被输出。如果指定了 `--first-parent`，那么回溯将只考虑每个提交的第一个父级。" #. type: Plain text #: en/git-describe.txt:200 -#, fuzzy, priority:260 -#| msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output. Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible." +#, priority:260 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output. Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible." msgstr "如果在行走过程中发现了多个标签，那么将选择与输入的commit-ish相差最少的标签并输出。 这里，最小的提交差异被定义为 \"git log tag...input \"所显示的提交数量将是最小的提交数量。" #. type: Plain text #: en/git-describe.txt:208 -#, fuzzy, priority:260 -#| msgid "Tree objects as well as tag objects not pointing at commits, cannot be described. When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as : despite the lightweight tag being favorable." +#, priority:260 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described. When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as : despite the lightweight tag being favorable." msgstr "树对象以及不指向提交的标签对象，不能被描述。 在描述 blob 时，指向 blob 的轻量级标签会被忽略，但尽管轻量级标签是有利的，blob 仍然被描述为 <提交号>:<路径>。" @@ -22841,8 +22362,7 @@ msgstr "'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<普通差异选项>] [<路 #. type: Plain text #: en/git-diff-files.txt:20 -#, fuzzy, priority:100, placeholders:'git diff-index':'git diff-tree' -#| msgid "Compares the files in the working tree and the index. When paths are specified, compares only those named paths. Otherwise all entries in the index are compared. The output format is the same as for 'git diff-index' and 'git diff-tree'." +#, placeholders:'git diff-index':'git diff-tree', priority:100 msgid "Compares the files in the working tree and the index. When paths are specified, compares only those named paths. Otherwise all entries in the index are compared. The output format is the same as for 'git diff-index' and 'git diff-tree'." msgstr "比较工作区和索引中的文件。 当指定路径时，只比较那些命名的路径。 否则就比较索引中的所有条目。 输出格式与 'git diff-index' 和 'git diff-tree' 的相同。" @@ -22872,15 +22392,13 @@ msgstr "-0" #. type: Plain text #: en/git-diff-files.txt:32 -#, fuzzy, priority:100 -#| msgid "Diff against the \"base\" version, \"our branch\", or \"their branch\" respectively. With these options, diffs for merged entries are not shown." +#, priority:100 msgid "Diff against the \"base\" version, \"our branch\", or \"their branch\" respectively. With these options, diffs for merged entries are not shown." msgstr "分别与 “基础” 版本、“我们的分支” 或 “他们的分支” 进行比较。 有了这些选项，合并后的条目的差异就不会显示。" #. type: Plain text #: en/git-diff-files.txt:36 -#, fuzzy, priority:100 -#| msgid "The default is to diff against our branch (-2) and the cleanly resolved paths. The option -0 can be given to omit diff output for unmerged entries and just show \"Unmerged\"." +#, priority:100 msgid "The default is to diff against our branch (-2) and the cleanly resolved paths. The option -0 can be given to omit diff output for unmerged entries and just show \"Unmerged\"." msgstr "默认是针对我们的分支 (-2) 和干净的解决路径进行差异比对。 可以给出选项 -0 来省略未合并的条目的差异输出，只显示 \"Unmerged\"。" @@ -23120,8 +22638,7 @@ msgstr "'git difftool' [<选项>] [<提交> [<提交>]] [--] [<路径>...]\n" #. type: Plain text #: en/git-difftool.txt:19 -#, fuzzy, priority:100, placeholders:'linkgit:git-diff[1]' -#| msgid "'git difftool' is a Git command that allows you to compare and edit files between revisions using common diff tools. 'git difftool' is a frontend to 'git diff' and accepts the same options and arguments. See linkgit:git-diff[1]." +#, placeholders:'linkgit:git-diff[1]', priority:100 msgid "'git difftool' is a Git command that allows you to compare and edit files between revisions using common diff tools. 'git difftool' is a frontend to 'git diff' and accepts the same options and arguments. See linkgit:git-diff[1]." msgstr "'git difftool' 是一条 Git 命令，它允许你使用常用的差异工具在不同版本之间比较和编辑文件。 'git difftool' 是 'git diff' 的前端，接受相同的选项和参数。参见 linkgit:git-diff[1]。" @@ -23163,8 +22680,7 @@ msgstr "--prompt" #. type: Plain text #: en/git-difftool.txt:36 -#, fuzzy, priority:100 -#| msgid "Prompt before each invocation of the diff tool. This is the default behaviour; the option is provided to override any configuration settings." +#, priority:100 msgid "Prompt before each invocation of the diff tool. This is the default behaviour; the option is provided to override any configuration settings." msgstr "在每次调用差异工具之前提示。 这是默认行为；提供该选项是为了覆盖任何配置设置。" @@ -23194,15 +22710,13 @@ msgstr "--tool=<工具>" #. type: Plain text #: en/git-difftool.txt:50 -#, fuzzy, priority:100, placeholders:'--tool-help' -#| msgid "Use the diff tool specified by . Valid values include emerge, kompare, meld, and vimdiff. Run `git difftool --tool-help` for the list of valid settings." +#, placeholders:'--tool-help', priority:100 msgid "Use the diff tool specified by . Valid values include emerge, kompare, meld, and vimdiff. Run `git difftool --tool-help` for the list of valid settings." msgstr "使用由 <工具> 指定的差异工具。 有效值包括 emerge, kompare, meld, 和 vimdiff。运行 `git difftool --tool-help` 以获得有效的 <工具> 设置列表。" #. type: Plain text #: en/git-difftool.txt:55 -#, fuzzy, priority:100, placeholders:'diff.tool':'diff.tool' -#| msgid "If a diff tool is not specified, 'git difftool' will use the configuration variable `diff.tool`. If the configuration variable `diff.tool` is not set, 'git difftool' will pick a suitable default." +#, placeholders:'diff.tool':'diff.tool', priority:100 msgid "If a diff tool is not specified, 'git difftool' will use the configuration variable `diff.tool`. If the configuration variable `diff.tool` is not set, 'git difftool' will pick a suitable default." msgstr "如果没有指定差异工具，'git difftool' 将使用配置变量 `diff.tool`。 如果配置变量 `diff.tool` 没有设置，'git difftool' 将选择一个合适的默认值。" @@ -23220,8 +22734,7 @@ msgstr "通过在配置变量 `difftool.<工具>.cmd` 中指定要调用的命 #. type: Plain text #: en/git-difftool.txt:76 -#, fuzzy, priority:100, placeholders:'--tool':'diff.tool':'$LOCAL':'$REMOTE':'$MERGED':'$BASE':'$MERGED' -#| 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`." +#, placeholders:'--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 "当 'git difftool' 与此工具一起调用时（通过 `-t` 或 `--tool` 选项或 `diff.tool` 配置变量），配置的命令行将被调用，以下变量可用： `$LOCAL` 被设置为包含差异比对前图像内容的临时文件名，`$REMOTE` 被设置为包含差异比对后图像内容的临时文件名。 `$MERGED` 是被比较的文件的名称。`$BASE` 是为了与自定义合并工具命令兼容而提供的，其值与 `$MERGED` 相同。" @@ -23251,8 +22764,7 @@ msgstr "在 `--dir-diff` 模式下运行时，'git difftool' 的默认行为是 #. type: Plain text #: en/git-difftool.txt:88 -#, fuzzy, priority:100, placeholders:'--no-symlinks':'--no-symlinks' -#| msgid "Specifying `--no-symlinks` instructs 'git difftool' to create copies instead. `--no-symlinks` is the default on Windows." +#, placeholders:'--no-symlinks':'--no-symlinks', priority:100 msgid "Specifying `--no-symlinks` instructs 'git difftool' to create copies instead. `--no-symlinks` is the default on Windows." msgstr "指定 `---no-symlinks` 会指示 'git difftool' 创建副本。 `--no-symlinks` 是 Windows 上的默认值。" @@ -23270,8 +22782,7 @@ msgstr "--extcmd=<命令>" #. type: Plain text #: en/git-difftool.txt:95 -#, fuzzy, priority:100, placeholders:'git-difftool':'$LOCAL':'$REMOTE':'$BASE' -#| msgid "Specify a custom command for viewing diffs. 'git-difftool' ignores the configured defaults and runs `$command $LOCAL $REMOTE` when this option is specified. Additionally, `$BASE` is set in the environment." +#, 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 "指定一个用于查看差异的自定义命令。 'git-difftool' 忽略了配置的默认值，当这个选项被指定时，运行`$command $LOCAL $REMOTE`。 此外，`$BASE`在环境中被设置。" @@ -23302,8 +22813,7 @@ msgstr "--[no-]trust-exit-code" #. type: Plain text #: en/git-difftool.txt:112 -#, fuzzy, priority:100, placeholders:'git-difftool':'--trust-exit-code':'git-difftool' -#| msgid "'git-difftool' invokes a diff tool individually on each file. Errors reported by the diff tool are ignored by default. Use `--trust-exit-code` to make 'git-difftool' exit when an invoked diff tool returns a non-zero exit code." +#, placeholders:'git-difftool':'--trust-exit-code':'git-difftool', priority:100 msgid "'git-difftool' invokes a diff tool individually on each file. Errors reported by the diff tool are ignored by default. Use `--trust-exit-code` to make 'git-difftool' exit when an invoked diff tool returns a non-zero exit code." msgstr "'git-difftool' 在每个文件上单独调用一个差异工具。 默认情况下，差异工具报告的错误会被忽略。 使用 `--trust-exit-code` 使 'git-difftool' 在被调用的差异工具返回非零的退出代码时退出。" @@ -23560,8 +23070,7 @@ msgstr "'git diff' [<选项>] [--] [<路径>...]" #. type: Plain text #: en/git-diff.txt:33 -#, fuzzy, priority:280, placeholders:'linkgit:git-add[1]' -#| msgid "This form is to view the changes you made relative to the index (staging area for the next commit). In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't. You can stage these changes by using linkgit:git-add[1]." +#, placeholders:'linkgit:git-add[1]', priority:280 msgid "This form is to view the changes you made relative to the index (staging area for the next commit). In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't. You can stage these changes by using linkgit:git-add[1]." msgstr "这个表格是用来查看你相对于索引（下次提交的暂存区域）所做的修改。 换句话说，这些差异是你_可以告诉 Git 进一步添加到索引中，但你仍然没有。 你可以用linkgit:git-add[1]来对这些改动进行分期。" @@ -23573,8 +23082,7 @@ msgstr "'git diff' [<选项>] --no-index [--] <路径> <路径>" #. type: Plain text #: en/git-diff.txt:42 -#, fuzzy, priority:280, placeholders:'--no-index':'--exit-code' -#| msgid "This form is to compare the given two paths on the filesystem. You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`." +#, placeholders:'--no-index':'--exit-code', priority:280 msgid "This form is to compare the given two paths on the filesystem. You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`." msgstr "这种形式是为了比较文件系统上给定的两个路径。 当在一个由Git控制的工作树中运行该命令，并且至少有一个路径指向工作树之外，或者在一个由Git控制的工作树之外运行该命令时，你可以省略`--no-index`选项。这种形式意味着`--exit-code`。" @@ -23587,15 +23095,13 @@ msgstr "'git diff' [<选项>] --cached [--merge-base] [<提交>] [--] [<路径>. #. type: Plain text #: en/git-diff.txt:52 -#, fuzzy, priority:280, placeholders:'HEAD':'HEAD':'--staged':'--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." +#, placeholders:'HEAD':'HEAD':'--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." msgstr "这个表单是用来查看你为下一次提交所做的相对于的修改。 通常情况下，你希望与最新的提交进行比较，所以如果你没有给出 ，它默认为 HEAD。 如果HEAD不存在（例如未出生的分支），并且没有给出，它将显示所有已缓存的修改。 --staged是--cached的同义词。" #. type: Plain text #: en/git-diff.txt:56 -#, fuzzy, priority:280, placeholders:'--merge-base':'HEAD':'--cached':'--merge-base':'--cached':'git merge-base':'HEAD' -#| 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)`." +#, placeholders:'--merge-base':'HEAD':'--cached':'--merge-base':'--cached':'git merge-base':'HEAD', 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 "如果给出 --merge-base，则不使用 <提交>，而使用 <提交> 和 HEAD 的合并基数。 `git diff --cached --merge-base A` 等同于 `git diff --cached $(git merge-base A HEAD)`。" @@ -23607,15 +23113,13 @@ msgstr "'git diff' [<选项>] [--merge-base] <提交> [--] [<路径>...]" #. type: Plain text #: en/git-diff.txt:64 -#, fuzzy, priority:280, placeholders:'HEAD' -#| 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." +#, placeholders:'HEAD', 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." msgstr "这个表格是用来查看你的工作树中相对于命名为的修改。 您可以使用 HEAD 来与最新的提交进行比较，或者使用分支名称来与不同分支的顶端进行比较。" #. type: Plain text #: en/git-diff.txt:68 -#, fuzzy, priority:280, placeholders:'--merge-base':'HEAD':'--merge-base':'git merge-base':'HEAD' -#| 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)`." +#, placeholders:'--merge-base':'HEAD':'--merge-base':'git merge-base':'HEAD', 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 "如果给出了 --merge-base，则不使用，而使用和HEAD的合并基数。 `git diff --merge-base A`等同于`git diff $(git merge-base A HEAD)`。" @@ -23634,8 +23138,7 @@ msgstr "这是为了查看两个任意之间的变化。" #. type: Plain text #: en/git-diff.txt:77 -#, fuzzy, priority:280, placeholders:'--merge-base':'--merge-base':'git merge-base' -#| msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side. `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`." +#, placeholders:'--merge-base':'--merge-base':'git merge-base', priority:280 msgid "If --merge-base is given, use the merge base of the two commits for the \"before\" side. `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`." msgstr "如果给出了 --merge-base，则使用两个提交的合并基础作为 \"之前 \"的一方。 `git diff --merge-base A B`等同于`git diff $(git merge-base A B) B`。" @@ -23647,8 +23150,7 @@ msgstr "'git diff' [<选项>] <提交> <提交>... <提交> [--] [<路径>...]" #. type: Plain text #: en/git-diff.txt:86 -#, fuzzy, priority:280 -#| msgid "This form is to view the results of a merge commit. The first listed must be the merge itself; the remaining two or more commits should be its parents. Convenient ways to produce the desired set of revisions are to use the suffixes `^@` and `^!`. If A is a merge commit, then `git diff A A^@`, `git diff A^!` and `git show A` all give the same combined diff." +#, priority:280 msgid "This form is to view the results of a merge commit. The first listed must be the merge itself; the remaining two or more commits should be its parents. Convenient ways to produce the desired set of revisions are to use the suffixes `^@` and `^!`. If A is a merge commit, then `git diff A A^@`, `git diff A^!` and `git show A` all give the same combined diff." msgstr "此表单用于查看合并提交的结果。 第一个列出的 <提交> 必须是合并本身；其余两个或更多的提交应该是它的父提交。 使用后缀 `^@` 和 `^!` 可以方便地生成所需的修订集。 如果 A 是合并提交，那么 `git diff A A^@` 、`git diff A^!` 和 `git show A` 都会得到相同的合并差异。" @@ -23660,8 +23162,7 @@ msgstr "'git diff' [<选项>] <提交>..<提交> [--] [<路径>...]" #. type: Plain text #: en/git-diff.txt:93 -#, fuzzy, priority:280, placeholders:'HEAD' -#| 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." +#, placeholders:'HEAD', 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 "这与早期的形式（没有`.`）是同义的，用于查看两个任意之间的变化。 如果省略了一侧的，将产生与使用HEAD相同的效果。" @@ -23673,22 +23174,19 @@ msgstr "'git diff' [<选项>] <提交>\\...<提交> [--] [<路径>...]" #. type: Plain text #: en/git-diff.txt:101 -#, fuzzy, ignore-ellipsis, priority:280, placeholders:'git merge-base':'HEAD' -#| 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." +#, ignore-ellipsis, placeholders:'git merge-base':'HEAD', 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 "这种形式是为了查看包含和直到第二个的分支上的变化，从两个的共同祖先开始。 `git diff A...B`等同于`git diff $(git merge-base A B) B`。 你可以省略中的任何一个，这与使用HEAD的效果相同。" #. type: Plain text #: en/git-diff.txt:110 -#, fuzzy, priority:280, placeholders:'--merge-base':'AUTO_MERGE':'linkgit:git-merge[1]':'AUTO_MERGE' -#| msgid "Just in case you are doing something exotic, it should be noted that all of the in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any . A tree of interest is the one pointed to by the special ref `AUTO_MERGE`, which is written by the 'ort' merge strategy upon hitting merge conflicts (see linkgit:git-merge[1]). Comparing the working tree with `AUTO_MERGE` shows changes you've made so far to resolve textual conflicts (see the examples below)." +#, placeholders:'--merge-base':'AUTO_MERGE':'linkgit:git-merge[1]':'AUTO_MERGE', priority:280 msgid "Just in case you are doing something exotic, it should be noted that all of the in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any . A tree of interest is the one pointed to by the ref named `AUTO_MERGE`, which is written by the 'ort' merge strategy upon hitting merge conflicts (see linkgit:git-merge[1]). Comparing the working tree with `AUTO_MERGE` shows changes you've made so far to resolve textual conflicts (see the examples below)." -msgstr "为了以防万一，需要注意的是，上述描述中的所有 都可以是任何 ，除了 `--merge-base` 和最后两种使用 `...` 符号的形式。我们感兴趣的树是由特殊引用 `AUTO_MERGE` 指向的树，它是在遇到合并冲突时由 'ort' 合并策略写入的（参见 linkgit:git-merge[1]）。 将工作树与 `AUTO_MERGE` 进行比较，就能看到迄今为止为解决文本冲突所做的改动（参见下面的示例）。" +msgstr "为了以防万一，需要注意的是，上述描述中的所有 都可以是任何 ，除了 `--merge-base` 和最后两种使用 `...` 符号的形式。我们感兴趣的树是由名为 `AUTO_MERGE` 的引用指向的树，它是在遇到合并冲突时由 'ort' 合并策略写入的（参见 linkgit:git-merge[1]）。 将工作树与 `AUTO_MERGE` 进行比较，就能看到迄今为止为解决文本冲突所做的改动（参见下面的示例）。" #. type: Plain text #: en/git-diff.txt:117 -#, fuzzy, ignore-ellipsis, priority:280, placeholders:'linkgit:gitrevisions[7]':'linkgit:gitrevisions[7]' -#| msgid "For a more complete list of ways to spell , see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]. However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (`..` and `...`) do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]." +#, ignore-ellipsis, placeholders:'linkgit:gitrevisions[7]':'linkgit:gitrevisions[7]', priority:280 msgid "For a more complete list of ways to spell , see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]. However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (`..` and `...`) do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]." msgstr "关于的更完整的拼写方式，见linkgit:gitrevisions[7]中的 \"SPECIFYING REVISIONS \"部分。 然而，\"diff \"是关于比较两个_端点，而不是范围，而且范围符号（`...`和`...`）并不意味着linkgit:gitrevisions[7]中 \"SPECIFYING RANGES \"部分所定义的范围。" @@ -23706,15 +23204,13 @@ msgstr "这种形式是为了查看两个blob对象的原始内容之间的差 #. type: Plain text #: en/git-diff.txt:136 -#, fuzzy, priority:280, placeholders:'linkgit:git-read-tree[1]' -#| msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3). The index contains these stages only for unmerged entries i.e. while resolving conflicts. See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information." +#, placeholders:'linkgit:git-read-tree[1]', priority:280 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3). The index contains these stages only for unmerged entries i.e. while resolving conflicts. See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information." msgstr "将工作树与 \"基础 \"版本（阶段#1）、\"我们的分支\"（阶段#2）或 \"他们的分支\"（阶段#3）进行比较。 索引只对未合并的条目包含这些阶段，即在解决冲突时。 详细情况见 linkgit:git-read-tree[1] \"3-Way Merge\" 部分。" #. type: Plain text #: en/git-diff.txt:141 -#, fuzzy, priority:280 -#| msgid "Omit diff output for unmerged entries and just show \"Unmerged\". Can be used only when comparing the working tree with the index." +#, priority:280 msgid "Omit diff output for unmerged entries and just show \"Unmerged\". Can be used only when comparing the working tree with the index." msgstr "省略未合并的条目的差异输出，只显示 \"Unmerged\"。 只能在比较工作树和索引的时候使用。" @@ -27164,22 +26660,19 @@ msgstr "" #. type: Plain text #: en/git-fetch.txt:24 -#, fuzzy, priority:220 -#| msgid "Fetch branches and/or tags (collectively, \"refs\") from one or more other repositories, along with the objects necessary to complete their histories. Remote-tracking branches are updated (see the description of below for ways to control this behavior)." +#, priority:220 msgid "Fetch branches and/or tags (collectively, \"refs\") from one or more other repositories, along with the objects necessary to complete their histories. Remote-tracking branches are updated (see the description of below for ways to control this behavior)." msgstr "从一个或多个其它仓库获取分支和/或标记（统称为 \"refs\"），以及完成其历史所需的对象。 远程跟踪的分支会被更新（关于控制这种行为的方法，请参见下面 <引用规范> 的描述）。" #. type: Plain text #: en/git-fetch.txt:32 -#, fuzzy, priority:220, placeholders:'--tags':'--no-tags' -#| msgid "By default, any tag that points into the histories being fetched is also fetched; the effect is to fetch tags that point at branches that you are interested in. This default behavior can be changed by using the --tags or --no-tags options or by configuring remote..tagOpt. By using a refspec that fetches tags explicitly, you can fetch tags that do not point into branches you are interested in as well." +#, placeholders:'--tags':'--no-tags', priority:220 msgid "By default, any tag that points into the histories being fetched is also fetched; the effect is to fetch tags that point at branches that you are interested in. This default behavior can be changed by using the --tags or --no-tags options or by configuring remote..tagOpt. By using a refspec that fetches tags explicitly, you can fetch tags that do not point into branches you are interested in as well." msgstr "默认情况下，任何指向被获取的历史的标签也会被获取；其效果是获取指向你感兴趣的分支的标签。 这个默认行为可以通过使用 --tags 或 --no-tags 选项或者配置 remote.<远程仓库名称>.tagOpt 来改变。 通过使用明确获取标签的引用规范，你也可以获取那些没有指向你感兴趣的分支的标签。" #. type: Plain text #: en/git-fetch.txt:37 -#, fuzzy, priority:220, placeholders:'linkgit:git-config[1]' -#| msgid "'git fetch' can fetch from either a single named repository or URL, or from several repositories at once if is given and there is a remotes. entry in the configuration file. (See linkgit:git-config[1])." +#, placeholders:'linkgit:git-config[1]', priority:220 msgid "'git fetch' can fetch from either a single named repository or URL, or from several repositories at once if is given and there is a remotes. entry in the configuration file. (See linkgit:git-config[1])." msgstr "'git fetch' 可以从一个命名的仓库或 URL 中获取，或者如果给定了 <组> 并且在配置文件中有 remotes.<组> 项，则可以同时从几个仓库获取。 (参见 linkgit:git-config[1]）。" @@ -27191,8 +26684,7 @@ msgstr "当没有指定远程仓库时，默认情况下将使用 `origin` 远 #. type: Plain text #: en/git-fetch.txt:44 -#, fuzzy, priority:220, placeholders:'FETCH_HEAD':'linkgit:git-pull[1]' -#| 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]." +#, placeholders:'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 "被获取的引用名称，以及它们所指向的对象名称，被写到 `.git/FETCH_HEAD`。 这些信息可以被脚本或其他 git 命令使用，比如linkgit:git-pull[1]。" @@ -27210,8 +26702,7 @@ msgstr "配置的远程跟踪分支 [[CRTB]]" #. type: Plain text #: en/git-fetch.txt:65 -#, fuzzy, priority:220 -#| msgid "You often interact with the same remote repository by regularly and repeatedly fetching from it. In order to keep track of the progress of such a remote repository, `git fetch` allows you to configure `remote..fetch` configuration variables." +#, priority:220 msgid "You often interact with the same remote repository by regularly and repeatedly fetching from it. In order to keep track of the progress of such a remote repository, `git fetch` allows you to configure `remote..fetch` configuration variables." msgstr "你通过经常定期和重复地从同一个远程仓库取东西来与之互动。 为了跟踪这种远程仓库的进度，`git fetch` 允许你配置 `remote.<仓库>.fetch` 配置变量。" @@ -27239,15 +26730,13 @@ msgstr "这种配置有两种使用方式：" #. type: Plain text #: en/git-fetch.txt:84 -#, fuzzy, priority:220 -#| msgid "When `git fetch` is run without specifying what branches and/or tags to fetch on the command line, e.g. `git fetch origin` or `git fetch`, `remote..fetch` values are used as the refspecs--they specify which refs to fetch and which local refs to update. The example above will fetch all branches that exist in the `origin` (i.e. any ref that matches the left-hand side of the value, `refs/heads/*`) and update the corresponding remote-tracking branches in the `refs/remotes/origin/*` hierarchy." +#, priority:220 msgid "When `git fetch` is run without specifying what branches and/or tags to fetch on the command line, e.g. `git fetch origin` or `git fetch`, `remote..fetch` values are used as the refspecs--they specify which refs to fetch and which local refs to update. The example above will fetch all branches that exist in the `origin` (i.e. any ref that matches the left-hand side of the value, `refs/heads/*`) and update the corresponding remote-tracking branches in the `refs/remotes/origin/*` hierarchy." msgstr "当 `git fetch` 运行时，没有在命令行中指定要取哪些分支和/或标记，例如 `git fetch origin` 或 `git fetch`，`remote.<仓库>.fetch` 值被用作引用规范——它们指定要取哪些引用和要更新哪些本地引用。 上面的例子将获取所有存在于 `origin` 中的分支（即任何与数值左边的`refs/heads/*`相匹配的引用），并更新 `refs/remotes/origin/*` 层次结构中相应的远程跟踪的分支。" #. type: Plain text #: en/git-fetch.txt:101 -#, fuzzy, priority:220 -#| msgid "When `git fetch` is run with explicit branches and/or tags to fetch on the command line, e.g. `git fetch origin master`, the s given on the command line determine what are to be fetched (e.g. `master` in the example, which is a short-hand for `master:`, which in turn means \"fetch the 'master' branch but I do not explicitly say what remote-tracking branch to update with it from the command line\"), and the example command will fetch _only_ the 'master' branch. The `remote..fetch` values determine which remote-tracking branch, if any, is updated. When used in this way, the `remote..fetch` values do not have any effect in deciding _what_ gets fetched (i.e. the values are not used as refspecs when the command-line lists refspecs); they are only used to decide _where_ the refs that are fetched are stored by acting as a mapping." +#, priority:220 msgid "When `git fetch` is run with explicit branches and/or tags to fetch on the command line, e.g. `git fetch origin master`, the s given on the command line determine what are to be fetched (e.g. `master` in the example, which is a short-hand for `master:`, which in turn means \"fetch the 'master' branch but I do not explicitly say what remote-tracking branch to update with it from the command line\"), and the example command will fetch _only_ the 'master' branch. The `remote..fetch` values determine which remote-tracking branch, if any, is updated. When used in this way, the `remote..fetch` values do not have any effect in deciding _what_ gets fetched (i.e. the values are not used as refspecs when the command-line lists refspecs); they are only used to decide _where_ the refs that are fetched are stored by acting as a mapping." msgstr "当 `git fetch` 运行时，命令行上有明确的要取的分支和/或标记，例如 `git fetch origin master`，命令行上给出的所有 <引用规范> 决定了要取的是什么（例如例子中的 `master` 是 `master:` 的简称，意思是 \"获取 'master' 分支，但我没有明确说要在命令行中更新哪个远程跟踪分支\"），而这个例子的命令将「只」获取 'master' 分支。 `remote.<仓库>.fetch`值决定了哪个远程跟踪分支（如果有的话）被更新。 当以这种方式使用时，`remote.<仓库>.fetch` 值对决定获取什么没有任何影响（即当命令行列出引用规范时，这些值不会被用作引用规范）；它们只是通过作为一个映射来决定获取的引用被存储在哪里。" @@ -27375,22 +26864,13 @@ msgstr "使用 `--prune-tags` 修剪标签，在获取一个URL而不是一个 #. type: delimited block - #: en/git-fetch.txt:191 -#, fuzzy, no-wrap, priority:220, placeholders:'--prune':'--prune-tags':'--prune':'--prune':'--prune-tags':'--prune' -#| msgid "" -#| "$ git fetch origin --prune --prune-tags\n" -#| "$ git fetch origin --prune 'refs/tags/*:refs/tags/*'\n" -#| "$ git fetch --prune --prune-tags\n" -#| "$ git fetch --prune 'refs/tags/*:refs/tags/*'\n" +#, no-wrap, placeholders:'--prune':'--prune-tags':'--prune':'--prune':'--prune-tags':'--prune', priority:220 msgid "" "$ git fetch origin --prune --prune-tags\n" "$ git fetch origin --prune 'refs/tags/*:refs/tags/*'\n" "$ git fetch --prune --prune-tags\n" "$ git fetch --prune 'refs/tags/*:refs/tags/*'\n" -msgstr "" -"$ git fetch origin --prune --prune-tags\n" -"$ git fetch origin --prune 'refs/tags/*:refs/tags/*'\n" -"$ git fetch --prune --prune-tags\n" -"$ git fetch --prune 'refs/tags/*:refs/tags/*'\n" +msgstr "$ git fetch origin --prune --prune-tags\n$ git fetch origin --prune 'refs/tags/*:refs/tags/*'\n$ git fetch --prune --prune-tags\n$ git fetch --prune 'refs/tags/*:refs/tags/*'\n" #. type: Plain text #: en/git-fetch.txt:199 @@ -27610,8 +27090,7 @@ msgstr "$ git fetch origin +seen:seen maint:tmp\n" #. type: Plain text #: en/git-fetch.txt:277 -#, fuzzy, priority:220 -#| msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively) `seen` and `maint` from the remote repository." +#, priority:220 msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively) `seen` and `maint` from the remote repository." msgstr "这通过从远程存储库的分支（分别）获取 `seen` 和 `maint` 来更新（或根据需要创建）本地存储库中的分支 `seen` 和 `tmp`。" @@ -27639,8 +27118,7 @@ msgstr "" #. type: Plain text #: en/git-fetch.txt:294 -#, fuzzy, priority:220, placeholders:'git.kernel.org':'git.git':'FETCH_HEAD':'linkgit:git-log[1]':'linkgit:git-gc[1]' -#| msgid "The first command fetches the `maint` branch from the repository at `git://git.kernel.org/pub/scm/git/git.git` and the second command uses `FETCH_HEAD` to examine the branch with linkgit:git-log[1]. The fetched objects will eventually be removed by git's built-in housekeeping (see linkgit:git-gc[1])." +#, placeholders:'git.kernel.org':'git.git':'FETCH_HEAD':'linkgit:git-log[1]':'linkgit:git-gc[1]', priority:220 msgid "The first command fetches the `maint` branch from the repository at `git://git.kernel.org/pub/scm/git/git.git` and the second command uses `FETCH_HEAD` to examine the branch with linkgit:git-log[1]. The fetched objects will eventually be removed by git's built-in housekeeping (see linkgit:git-gc[1])." msgstr "第一条命令从 `git://git.kernel.org/pub/scm/git.git` 的存储库中获取 `maint` 分支，第二条命令使用 `FETCH_HEAD` 用 linkgit:git-log[1] 来检查该分支。 取出的对象最终会被 git 内置的内务管理删除（见 linkgit:git-gc[1]）。" @@ -28710,8 +28188,7 @@ msgstr "--log[=]" #. type: Plain text #: en/git-fmt-merge-msg.txt:33 -#, fuzzy, priority:100, placeholders:'merge.log' -#| msgid "In addition to branch names, populate the log message with one-line descriptions from the actual commits that are being merged. At most commits from each merge parent will be used (20 if is omitted). This overrides the `merge.log` configuration variable." +#, placeholders:'merge.log', priority:100 msgid "In addition to branch names, populate the log message with one-line descriptions from the actual commits that are being merged. At most commits from each merge parent will be used (20 if is omitted). This overrides the `merge.log` configuration variable." msgstr "除了分支名称外，在日志信息中加入被合并的实际提交内容的单行描述。 最多使用每个合并父分支的 个提交（如果 被省略，则为 20 个）。 这覆盖了 `merge.log` 配置变量。" @@ -28747,8 +28224,7 @@ msgstr "--message <信息>" #. type: Plain text #: en/git-fmt-merge-msg.txt:46 -#, fuzzy, priority:100, placeholders:'--log' -#| msgid "Use instead of the branch names for the first line of the log message. For use with `--log`." +#, placeholders:'--log', priority:100 msgid "Use instead of the branch names for the first line of the log message. For use with `--log`." msgstr "在日志信息的第一行使用 而不是分支名称。 与 `--log` 一起使用。" @@ -29384,7 +28860,7 @@ msgstr "对于提交和标记对象，特殊的 `creatordate` 和 `creator` 字 #: en/git-for-each-ref.txt:301 #, priority:80 msgid "For tag objects, a `fieldname` prefixed with an asterisk (`*`) expands to the `fieldname` value of the peeled object, rather than that of the tag object itself." -msgstr "" +msgstr "对于标签对象，前缀为星号 (`*`) 的 `fieldname` 会扩展为剥离对象的 `fieldname` 值，而不是标签对象本身的值。" #. type: Plain text #: en/git-for-each-ref.txt:312 @@ -29829,8 +29305,7 @@ msgstr "" #. type: Plain text #: en/git-format-patch.txt:43 -#, fuzzy, priority:100 -#| msgid "Prepare each non-merge commit with its \"patch\" in one \"message\" per commit, formatted to resemble a UNIX mailbox. The output of this command is convenient for e-mail submission or for use with 'git am'." +#, priority:100 msgid "Prepare each non-merge commit with its \"patch\" in one \"message\" per commit, formatted to resemble a UNIX mailbox. The output of this command is convenient for e-mail submission or for use with 'git am'." msgstr "将每个非合并提交及其 “补丁” 准备在每个提交的一个 “消息” 中，格式类似于 UNIX 邮箱。 这条命令的输出便于提交电子邮件或与 \"git am\" 一起使用。" @@ -29878,29 +29353,25 @@ msgstr "单一的提交，<从>，指定导致当前分支顶端的提交不在 #. type: Plain text #: en/git-format-patch.txt:70 -#, fuzzy, priority:100, placeholders:'linkgit:gitrevisions[7]' -#| msgid "Generic expression (see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]) means the commits in the specified range." +#, placeholders:'linkgit:gitrevisions[7]', priority:100 msgid "Generic expression (see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]) means the commits in the specified range." msgstr "通用的 <修订范围> 表达式（见 linkgit:gitrevisions[7]中的 \"指定修订\" 一节）表示指定范围内的提交。" #. type: Plain text #: en/git-format-patch.txt:76 -#, fuzzy, priority:100, placeholders:'--root':'git format-patch':'--root':'git format-patch' -#| msgid "The first rule takes precedence in the case of a single . To apply the second rule, i.e., format everything since the beginning of history up until , use the `--root` option: `git format-patch --root `. If you want to format only itself, you can do this with `git format-patch -1 `." +#, placeholders:'--root':'git format-patch':'--root':'git format-patch', priority:100 msgid "The first rule takes precedence in the case of a single . To apply the second rule, i.e., format everything since the beginning of history up until , use the `--root` option: `git format-patch --root `. If you want to format only itself, you can do this with `git format-patch -1 `." msgstr "在只有一个 <提交> 的情况下，第一条规则具有优先权。 要应用第二条规则，即格式化从历史开始到 <提交> 为止的所有内容，使用 `--root` 选项：`git format-patch --root <提交>`。 如果你只想格式化 <提交> 本身，你可以用`git format-patch -1 <提交>`来做。" #. type: Plain text #: en/git-format-patch.txt:83 -#, fuzzy, priority:100, placeholders:'--numbered-files':'--stdout' -#| msgid "By default, each output file is numbered sequentially from 1, and uses the first line of the commit message (massaged for pathname safety) as the filename. With the `--numbered-files` option, the output file names will only be numbers, without the first line of the commit appended. The names of the output files are printed to standard output, unless the `--stdout` option is specified." +#, placeholders:'--numbered-files':'--stdout', priority:100 msgid "By default, each output file is numbered sequentially from 1, and uses the first line of the commit message (massaged for pathname safety) as the filename. With the `--numbered-files` option, the output file names will only be numbers, without the first line of the commit appended. The names of the output files are printed to standard output, unless the `--stdout` option is specified." msgstr "默认情况下，每个输出文件从 1 开始依次编号，并使用提交信息的第一行（为保证路径名的安全而进行了调整）作为文件名。使用 `--numbered-files` 选项，输出文件名将只有数字，而没有附加提交信息的第一行。 除非指定 `--stdout` 选项，否则输出文件的名称将被打印到标准输出。" #. type: Plain text #: en/git-format-patch.txt:91 -#, fuzzy, priority:100, placeholders:'format.outputDirectory':'format.outputDirectory':'format.outputDirectory' -#| msgid "If `-o` is specified, output files are created in . Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created." +#, placeholders:'format.outputDirectory':'format.outputDirectory':'format.outputDirectory', priority:100 msgid "If `-o` is specified, output files are created in . Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created." msgstr "如果指定了 `-o`，输出文件将在<目录>创建。 否则，它们将在当前工作目录下创建。默认路径可以通过 `format.outputDirectory` 配置选项来设置。 `-o` 选项优先于 `format.outputDirectory`。 要在当前工作目录下存储补丁，即使 `format.outputDirectory` 指向其他地方，使用 `-o .`。所有的目录组件都将被创建。" @@ -29912,8 +29383,7 @@ msgstr "默认情况下，单个补丁的主题是 \"[PATCH]\"，后面是提交 #. type: Plain text #: en/git-format-patch.txt:99 -#, fuzzy, priority:100 -#| msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`." +#, priority:100 msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`." msgstr "当输出多个补丁时，主题前缀将改为 \"[PATCH n/m] \"。 要强制为单个补丁添加 1/1，使用 `-n`。 要从主题中省略补丁编号，使用 `-N`。" @@ -30075,43 +29545,37 @@ msgstr "--no-thread" #. type: Plain text #: en/git-format-patch.txt:168 -#, fuzzy, priority:100 -#| msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-ID` header to reference." +#, priority:100 msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-ID` header to reference." msgstr "控制添加 `In-Reply-To` 和 `References` 标头，使第二封及以后的邮件显示为对第一封邮件的回复。 还控制生成 `Message-ID` 头，以便参考。" #. type: Plain text #: en/git-format-patch.txt:174 -#, fuzzy, priority:100, placeholders:'--in-reply-to' -#| msgid "The optional