Skip to content
Snippets Groups Projects
Unverified Commit 93f20a22 authored by 冉's avatar 冉 Committed by Hosted Weblate
Browse files

Translated using Weblate (Chinese (Simplified)) 

Currently translated at 13.9% (1484 of 10602 strings)

Translation: Git Manpages/Translations
Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/zh_Hans/


Signed-off-by: default avatar冉 <ranto2012@163.com>
parent 019cb3b2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
po/documentation.zh_HANS-CN.po
+ 23
− 35
View file @ 93f20a22
...@@ -3,19 +3,7 @@ ...@@ -3,19 +3,7 @@
# This file is distributed under the same license as the Git package. # This file is distributed under the same license as the Git package.
# Matthias Aßhauer <mha1993@live.de>, 2019. # Matthias Aßhauer <mha1993@live.de>, 2019.
msgid "" msgid ""
msgstr "" msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-02-27 18:16+0100\nPO-Revision-Date: 2021-03-17 07:42+0000\nLast-Translator: 冉 <ranto2012@163.com>\nLanguage-Team: LANGUAGE <LL@li.org>\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 4.5.2-dev\n"
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
"POT-Creation-Date: 2021-02-27 18:16+0100\n"
"PO-Revision-Date: 2021-02-05 02:41+0000\n"
"Last-Translator: AIzero-01 <iomnvw@outlook.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: zh_HANS-CN\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 4.5-dev\n"
   
#. type: Labeled list #. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:738 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31 #: en/blame-options.txt:1 en/diff-options.txt:738 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
...@@ -1649,8 +1637,8 @@ msgstr "" ...@@ -1649,8 +1637,8 @@ msgstr ""
msgid "linkgit:git-name-rev[1]" msgid "linkgit:git-name-rev[1]"
msgstr "linkgit:git-name-rev[1]" msgstr "linkgit:git-name-rev[1]"
   
#. type: Plain text
# 查找给定版本的符号名称 # 查找给定版本的符号名称
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:39 #: en/cmds-plumbinginterrogators.txt:39
#, priority:100 #, priority:100
msgid "Find symbolic names for given revs." msgid "Find symbolic names for given revs."
...@@ -3100,7 +3088,7 @@ msgstr "此外，日期部分还接受以下格式：`YYYY.MM.DD`，`MM/DD/YYYY` ...@@ -3100,7 +3088,7 @@ msgstr "此外，日期部分还接受以下格式：`YYYY.MM.DD`，`MM/DD/YYYY`
#: en/date-formats.txt:31 #: en/date-formats.txt:31
#, priority:280 #, priority:280
msgid "In addition to recognizing all date formats above, the `--date` option will also try to make sense of other, more human-centric date formats, such as relative dates like \"yesterday\" or \"last Friday at noon\"." msgid "In addition to recognizing all date formats above, the `--date` option will also try to make sense of other, more human-centric date formats, such as relative dates like \"yesterday\" or \"last Friday at noon\"."
msgstr "" msgstr "除了识别上述所有日期格式外，`--date` 选项还将尝试理解其它非标准化的日期格式，如 \"昨天\" 或 \"上周五中午\" 等相对日期。"
   
#. type: Title - #. type: Title -
#: en/diff-format.txt:2 #: en/diff-format.txt:2
...@@ -3934,7 +3922,7 @@ msgstr "不输出差异（diff）。对于显示修补程序的 `git show` 等 ...@@ -3934,7 +3922,7 @@ msgstr "不输出差异（diff）。对于显示修补程序的 `git show` 等
#: en/diff-options.txt:37 #: en/diff-options.txt:37
#, no-wrap, priority:280 #, no-wrap, priority:280
msgid "--diff-merges=(off|none|first-parent|1|separate|m|combined|c|dense-combined|cc)" msgid "--diff-merges=(off|none|first-parent|1|separate|m|combined|c|dense-combined|cc)"
msgstr "" msgstr "--diff-merges=(off|none|first-parent|1|separate|m|combined|c|dense-combined|cc)"
   
#. type: Labeled list #. type: Labeled list
#: en/diff-options.txt:38 #: en/diff-options.txt:38
...@@ -3946,7 +3934,7 @@ msgstr "--no-diff-merges" ...@@ -3946,7 +3934,7 @@ msgstr "--no-diff-merges"
#: en/diff-options.txt:42 #: en/diff-options.txt:42
#, priority:280 #, priority:280
msgid "Specify diff format to be used for merge commits. Default is {diff-merges-default} unless `--first-parent` is in use, in which case `first-parent` is the default." msgid "Specify diff format to be used for merge commits. Default is {diff-merges-default} unless `--first-parent` is in use, in which case `first-parent` is the default."
msgstr "" msgstr "指定合并提交时使用的差异格式。默认为 {diff-merges-default}，但当使用 `--first-parent` 选项时，默认为 `first-parent`。"
   
#. type: Labeled list #. type: Labeled list
#: en/diff-options.txt:43 #: en/diff-options.txt:43
...@@ -3966,7 +3954,7 @@ msgstr "--no-diff-merges" ...@@ -3966,7 +3954,7 @@ msgstr "--no-diff-merges"
#: en/diff-options.txt:47 #: en/diff-options.txt:47
#, priority:280 #, priority:280
msgid "Disable output of diffs for merge commits. Useful to override implied value." msgid "Disable output of diffs for merge commits. Useful to override implied value."
msgstr "" msgstr "禁用合并提交时的差异输出。对覆盖隐含值很有用。"
   
#. type: Labeled list #. type: Labeled list
#: en/diff-options.txt:48 #: en/diff-options.txt:48
...@@ -3986,7 +3974,7 @@ msgstr "diffmerge" ...@@ -3986,7 +3974,7 @@ msgstr "diffmerge"
#: en/diff-options.txt:52 #: en/diff-options.txt:52
#, priority:280 #, priority:280
msgid "This option makes merge commits show the full diff with respect to the first parent only." msgid "This option makes merge commits show the full diff with respect to the first parent only."
msgstr "" msgstr "此选项使合并提交只显示与第一个父提交之间的完整差异。"
   
#. type: Labeled list #. type: Labeled list
#: en/diff-options.txt:53 #: en/diff-options.txt:53
...@@ -4013,7 +4001,7 @@ msgstr "-m" ...@@ -4013,7 +4001,7 @@ msgstr "-m"
#: en/diff-options.txt:59 #: en/diff-options.txt:59
#, priority:280 #, priority:280
msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. `-m` doesn't produce any output without `-p`." msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. `-m` doesn't produce any output without `-p`."
msgstr "" msgstr "这使得合并提交显示了每个父提交之间的完整差异。每个父提交都会产生单独的日志项和差异。`-m` 选项在没有 `-p` 选项时不会产生任何输出。"
   
#. type: Labeled list #. type: Labeled list
#: en/diff-options.txt:60 #: en/diff-options.txt:60
...@@ -4040,7 +4028,7 @@ msgstr "-c" ...@@ -4040,7 +4028,7 @@ msgstr "-c"
#: en/diff-options.txt:69 #: en/diff-options.txt:69
#, priority:280 #, priority:280
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents. `-c` implies `-p`." msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents. `-c` implies `-p`."
msgstr "" msgstr "使用此选项，合并提交的差异输出将同时显示每个父提交与合并结果的差异，而不是一次显示一个父提交与结果之间的成对差异 。此外，它只列出所有父提交中修改的文件。`-c` 选项暗含 `-p` 选项。"
   
#. type: Labeled list #. type: Labeled list
#: en/diff-options.txt:70 #: en/diff-options.txt:70
...@@ -4065,9 +4053,9 @@ msgstr "--cc" ...@@ -4065,9 +4053,9 @@ msgstr "--cc"
   
#. type: Plain text #. type: Plain text
#: en/diff-options.txt:78 #: en/diff-options.txt:78
#, priority:280 #, fuzzy, priority:280
msgid "With this option the output produced by `--diff-merges=combined` is further compressed by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification. `--cc` implies `-p`." msgid "With this option the output produced by `--diff-merges=combined` is further compressed by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification. `--cc` implies `-p`."
msgstr "" msgstr "使用该选项，通过省略不感兴趣的块，进一步压缩 `--diff-merges=combined` 产生的输出，这类块在父提交中的内容只有两个变体，并且合并结果选择了其中一个而没有修改。 `--cc` 选项暗含 `-p`。"
   
#. type: Labeled list #. type: Labeled list
#: en/diff-options.txt:79 en/git-diff-tree.txt:113 #: en/diff-options.txt:79 en/git-diff-tree.txt:113
...@@ -4077,9 +4065,9 @@ msgstr "--combined-all-paths" ...@@ -4077,9 +4065,9 @@ msgstr "--combined-all-paths"
   
#. type: Plain text #. type: Plain text
#: en/diff-options.txt:85 #: en/diff-options.txt:85
#, priority:280 #, fuzzy, priority:280
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when `--diff-merges=[dense-]combined` is in use, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)." msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when `--diff-merges=[dense-]combined` is in use, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr "" msgstr "这个标志会使合并后的差异文件（用于合并提交）列出所有父提交的名称。，因此它只在使用 `--diff-merges=[dense-]combined` 时有效。其可能在检测到文件名变化时有用（例如，当要求检测重命名或复制时）。"
   
#. type: Labeled list #. type: Labeled list
#: en/diff-options.txt:87 #: en/diff-options.txt:87
...@@ -5091,7 +5079,7 @@ msgid "" ...@@ -5091,7 +5079,7 @@ msgid ""
"\t0.5, and is thus the same as `-M50%`. Similarly, `-M05` is\n" "\t0.5, and is thus the same as `-M50%`. Similarly, `-M05` is\n"
"\tthe same as `-M5%`. To limit detection to exact renames, use\n" "\tthe same as `-M5%`. To limit detection to exact renames, use\n"
"\t`-M100%`. The default similarity index is 50%.\n" "\t`-M100%`. The default similarity index is 50%.\n"
msgstr "" msgstr "\t如果指定了 `n`，则其为相似度指数阈值（即相比于文件大小的增/删量）。\n\t例如，`-M90％` 表示如果文件90％以上的内容没有更改，则 Git 应将删除/添加对视为重命名。\n\t如果没有 `％` 符号，则该数字应作为小数读取，并在其前面加上小数点。\n \t即 `-M5` 变为 0.5，因此与 `-M50％` 相同。 同样，`-M05` 与 `-M5％` 相同。\n \t要将检测限制为精确的重命名，请使用 `-M100％`。 默认相似度指数为50％。\n"
   
#. type: Labeled list #. type: Labeled list
#: en/diff-options.txt:553 #: en/diff-options.txt:553
...@@ -5139,25 +5127,25 @@ msgstr "--irreversible-delete" ...@@ -5139,25 +5127,25 @@ msgstr "--irreversible-delete"
#: en/diff-options.txt:576 #: en/diff-options.txt:576
#, priority:280 #, priority:280
msgid "Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and `/dev/null`. The resulting patch is not meant to be applied with `patch` or `git apply`; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lacks enough information to apply such a patch in reverse, even manually, hence the name of the option." msgid "Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and `/dev/null`. The resulting patch is not meant to be applied with `patch` or `git apply`; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lacks enough information to apply such a patch in reverse, even manually, hence the name of the option."
msgstr "" msgstr "删除时省略原内容，即只打印头信息，而不打原内容和 `/dev/null` 之间的差异。所产生的补丁并不是要用于 `patch` 或 `git apply`；这只是为了让人们只专注于审查修改后的文本。此外，输出结果显然缺乏足够的信息来反转，或手动应用这样一个补丁，因此这个选项的名称如此。"
   
#. type: Plain text #. type: Plain text
#: en/diff-options.txt:579 #: en/diff-options.txt:579
#, priority:280 #, priority:280
msgid "When used together with `-B`, omit also the preimage in the deletion part of a delete/create pair." msgid "When used together with `-B`, omit also the preimage in the deletion part of a delete/create pair."
msgstr "" msgstr "当与 `-B` 一起使用时，也省略删除/创建对中删除部分的原内容。"
   
#. type: Labeled list #. type: Labeled list
#: en/diff-options.txt:580 en/git-svn.txt:625 #: en/diff-options.txt:580 en/git-svn.txt:625
#, no-wrap, priority:280 #, no-wrap, priority:280
msgid "-l<num>" msgid "-l<num>"
msgstr "" msgstr "-l<数量>"
   
#. type: Plain text #. type: Plain text
#: en/diff-options.txt:586 #: en/diff-options.txt:586
#, priority:280 #, priority:280
msgid "The `-M` and `-C` options require O(n^2) processing time where n is the number of potential rename/copy targets. This option prevents rename/copy detection from running if the number of rename/copy targets exceeds the specified number." msgid "The `-M` and `-C` options require O(n^2) processing time where n is the number of potential rename/copy targets. This option prevents rename/copy detection from running if the number of rename/copy targets exceeds the specified number."
msgstr "" msgstr "`-M` 和 `-C` 选项需要 O(n^2) 的处理时间，其中 n 是潜在的重命名/复制目标数量。如果重命名/复制目标的数量超过了指定的数量，该选项可防止重命名/复制检测运行。"
   
#. type: Labeled list #. type: Labeled list
#: en/diff-options.txt:588 #: en/diff-options.txt:588
...@@ -5169,19 +5157,19 @@ msgstr "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]" ...@@ -5169,19 +5157,19 @@ msgstr "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
#: en/diff-options.txt:599 #: en/diff-options.txt:599
#, ignore-ellipsis, priority:280 #, ignore-ellipsis, priority:280
msgid "Select only files that are Added (`A`), Copied (`C`), Deleted (`D`), Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, submodule, ...) changed (`T`), are Unmerged (`U`), are Unknown (`X`), or have had their pairing Broken (`B`). Any combination of the filter characters (including none) can be used. When `*` (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected." msgid "Select only files that are Added (`A`), Copied (`C`), Deleted (`D`), Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, submodule, ...) changed (`T`), are Unmerged (`U`), are Unknown (`X`), or have had their pairing Broken (`B`). Any combination of the filter characters (including none) can be used. When `*` (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected."
msgstr "" msgstr "只选择添加（`A`）、复制（`C`）、删除（`D`）、修改（`M`）、重命名（`R`）、类型（即常规文件、符号链接、子模块......）改变（`T`）、未合并（`U`）、未知（`X`）或配对被破坏（`B`）的文件。可以使用过滤字符的任何组合（包括空）。当组合中加入 `*`（全部或空）时，如果在比较中有任何文件与其他条件匹配，则选择所有路径；如果没有符合其他条件的文件，则不会选择任何内容。"
   
#. type: Plain text #. type: Plain text
#: en/diff-options.txt:602 #: en/diff-options.txt:602
#, priority:280 #, priority:280
msgid "Also, these upper-case letters can be downcased to exclude. E.g. `--diff-filter=ad` excludes added and deleted paths." msgid "Also, these upper-case letters can be downcased to exclude. E.g. `--diff-filter=ad` excludes added and deleted paths."
msgstr "" msgstr "另外，这些大写字母也可以通过使用小写排除。例如：`--diff-filter=ad` 排除添加和删除的路径。"
   
#. type: Plain text #. type: Plain text
#: en/diff-options.txt:608 #: en/diff-options.txt:608
#, priority:280 #, priority:280
msgid "Note that not all diffs can feature all types. For instance, diffs from the index to the working tree can never have Added entries (because the set of paths included in the diff is limited by what is in the index). Similarly, copied and renamed entries cannot appear if detection for those types is disabled." msgid "Note that not all diffs can feature all types. For instance, diffs from the index to the working tree can never have Added entries (because the set of paths included in the diff is limited by what is in the index). Similarly, copied and renamed entries cannot appear if detection for those types is disabled."
msgstr "" msgstr "请注意，并不是所有的差异都能包含所有类型。例如，从索引到工作树的差异永远不会有添加（Added）条目（因为差异中包含的路径集受索引中的内容的限制）。同样，如果禁止检测复制和重命名的条目，这些类型也不会出现。"
   
#. type: Labeled list #. type: Labeled list
#: en/diff-options.txt:609 #: en/diff-options.txt:609
...@@ -6890,8 +6878,8 @@ msgstr "删除的内容" ...@@ -6890,8 +6878,8 @@ msgstr "删除的内容"
msgid "Removed content is represented by lines beginning with \"-\". You can prevent staging their removal by converting the \"-\" to a \" \" (space)." msgid "Removed content is represented by lines beginning with \"-\". You can prevent staging their removal by converting the \"-\" to a \" \" (space)."
msgstr "删除的内容以“-”开头的行表示。您可以通过将“-”转换为“ ”（空格）来防止将其删除。" msgstr "删除的内容以“-”开头的行表示。您可以通过将“-”转换为“ ”（空格）来防止将其删除。"
   
#. type: Labeled list
# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
#. type: Labeled list
#: en/git-add.txt:379 #: en/git-add.txt:379
#, fuzzy, no-wrap, priority:300 #, fuzzy, no-wrap, priority:300
msgid "modified content" msgid "modified content"
...@@ -14273,7 +14261,7 @@ msgid "" ...@@ -14273,7 +14261,7 @@ msgid ""
"*NOTE*: this operation can race with concurrent modification to the\n" "*NOTE*: this operation can race with concurrent modification to the\n"
"source repository, similar to running `cp -r src dst` while modifying\n" "source repository, similar to running `cp -r src dst` while modifying\n"
"`src`.\n" "`src`.\n"
msgstr "" msgstr "*注意*：该操作可能与并发的源仓库修改产生产竞争，类似于在运行 `cp -r src dst` 时同时修改 `src`。\n"
   
#. type: Labeled list #. type: Labeled list
#: en/git-clone.txt:65 #: en/git-clone.txt:65
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

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