diff options
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 104 |
1 files changed, 52 insertions, 52 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index ac7f5b4..dc31222 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -136,7 +136,7 @@ msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "POT-Creation-Date: 2016-08-27 23:21+0800\n" -"PO-Revision-Date: 2016-08-31 00:11+0800\n" +"PO-Revision-Date: 2016-09-05 23:36+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n" @@ -319,7 +319,7 @@ msgstr "远程 git-upload-archive 命令的路径" #: archive.c:461 msgid "Unexpected option --remote" -msgstr "意外的选项 --remote" +msgstr "未知参数 --remote" #: archive.c:463 msgid "Option --exec can only be used together with --remote" @@ -419,7 +419,7 @@ msgstr "" #: bisect.c:798 #, c-format msgid "Bisecting: a merge base must be tested\n" -msgstr "二分查找中：合并基线必须要测试\n" +msgstr "二分查找中：合并基线必须是经过测试的\n" #: bisect.c:849 #, c-format @@ -467,8 +467,8 @@ msgstr[1] "（大概 %d 步）" #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" -msgstr[0] "二分查找中：在 %2$s 之后还剩下 %1$d 个版本\n" -msgstr[1] "二分查找中：在 %2$s 之后还剩下 %1$d 个版本\n" +msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n" +msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n" #: branch.c:53 #, c-format @@ -720,7 +720,7 @@ msgstr "标准输入中错误的配置行 %d" #: config.c:528 #, c-format msgid "bad config line %d in submodule-blob %s" -msgstr "子模组数据 %2$s 中错误的配置行 %1$d" +msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" #: config.c:532 #, c-format @@ -743,37 +743,37 @@ msgstr "无效的单位" #: config.c:661 #, c-format msgid "bad numeric config value '%s' for '%s': %s" -msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s" +msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s" #: config.c:666 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" -msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s': %4$s" +msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" #: config.c:669 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" -msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s': %4$s" +msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" #: config.c:672 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" -msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s': %3$s" +msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s" #: config.c:675 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" -msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s': %4$s" +msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" #: config.c:678 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" -msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s': %4$s" +msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" #: config.c:681 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" -msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s': %4$s" +msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" #: config.c:768 #, c-format @@ -949,7 +949,7 @@ msgstr "外部 diff 退出，停止在 %s" #: diff.c:3415 msgid "--follow requires exactly one pathspec" -msgstr "--follow 参数后只跟一个 pathspec" +msgstr "--follow 明确要求只跟一个路径规格" #: diff.c:3578 #, c-format @@ -1033,7 +1033,7 @@ msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" "Continuing under the assumption that you meant '%s'" msgstr "" -"警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n" +"警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n" "是 '%s'" #: help.c:393 @@ -2059,7 +2059,7 @@ msgid "" "Use '--' to separate paths from revisions, like this:\n" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -"有歧义的参数 '%s'：工作区中未知的版本或路径。\n" +"有歧义的参数 '%s'：未知的版本或路径不存在于工作区中。\n" "使用 '--' 来分隔版本和路径，例如：\n" "'git <command> [<revision>...] -- [<file>...]'" @@ -2070,7 +2070,7 @@ msgid "" "Use '--' to separate paths from revisions, like this:\n" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -"有歧义的参数 '%s'：两者均为版本和文件\n" +"有歧义的参数 '%s'：可同时是版本和文件\n" "使用 '--' 来分隔版本和路径，例如：\n" "'git <command> [<revision>...] -- [<file>...]'" @@ -2107,7 +2107,7 @@ msgid "" "Not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -"不是一个 git 仓库（或者任何向上递归到挂载点 %s）\n" +"不是一个 git 仓库（或者向上递归至挂载点 %s 的任何祖先目录）\n" "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。" #: setup.c:927 @@ -2121,7 +2121,7 @@ msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -"参数 core.sharedRepository 的文件权限值有错(0%.3o)。\n" +"参数 core.sharedRepository 的文件权限值有错（0%.3o）。\n" "文件属主必须始终拥有读写权限。" #: sha1_file.c:1046 @@ -2260,7 +2260,7 @@ msgstr "传输：无效的深度选项 '%s'" msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" -msgstr "如下的子模组路径的修改在任何远程源中都找不到：\n" +msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n" #: transport.c:775 #, c-format @@ -2286,7 +2286,7 @@ msgstr "" "\n" "\tgit push\n" "\n" -"来推送到远程源。\n" +"以推送至远程。\n" "\n" #: transport.c:783 @@ -6815,7 +6815,7 @@ msgstr "[已拒绝]" #: builtin/fetch.c:610 msgid "can't fetch in current branch" -msgstr "不能获取到当前分支" +msgstr "当前分支下不能执行获取操作" #: builtin/fetch.c:619 msgid "[tag update]" @@ -7922,12 +7922,12 @@ msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" #: builtin/init-db.c:407 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" -msgstr "初始化空的共享 Git 仓库于 %s%s\n" +msgstr "已初始化空的共享 Git 仓库于 %s%s\n" #: builtin/init-db.c:408 #, c-format msgid "Initialized empty Git repository in %s%s\n" -msgstr "初始化空的 Git 仓库于 %s%s\n" +msgstr "已初始化空的 Git 仓库于 %s%s\n" #: builtin/init-db.c:455 msgid "" @@ -8718,7 +8718,7 @@ msgstr "对于 %s 没有来自 %s 的远程跟踪分支" #: builtin/merge.c:960 #, c-format msgid "Bad value '%s' in environment '%s'" -msgstr "环境 '%2$s' 坏的取值 '%1$s'" +msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" #: builtin/merge.c:1034 #, c-format @@ -9378,7 +9378,7 @@ msgstr "不能混用 --commit、--abort 或 -s/--strategy" #: builtin/notes.c:797 msgid "Must specify a notes ref to merge" -msgstr "您必须指定一个注解引用来合并" +msgstr "必须指定一个注解引用来合并" #: builtin/notes.c:821 #, c-format @@ -10091,7 +10091,7 @@ msgstr "server-specific" #: builtin/push.c:546 msgid "option to transmit" -msgstr "传输的选项" +msgstr "传输选项" #: builtin/push.c:560 msgid "--delete is incompatible with --all, --mirror and --tags" @@ -11566,7 +11566,7 @@ msgstr "并发任务" #: builtin/submodule--helper.c:840 msgid "whether the initial clone should follow the shallow recommendation" -msgstr "是否初始克隆应该遵守推荐的浅克隆选项" +msgstr "初始克隆是否应该遵守推荐的浅克隆选项" #: builtin/submodule--helper.c:841 msgid "don't print cloning progress" @@ -12422,17 +12422,17 @@ msgstr "坏的 bisect_write 参数：$state" #: git-bisect.sh:262 #, sh-format msgid "Bad rev input: $arg" -msgstr "输入坏的版本：$arg" +msgstr "坏的输入版本：$arg" #: git-bisect.sh:281 #, sh-format msgid "Bad rev input: $bisected_head" -msgstr "输入坏的版本：$bisected_head" +msgstr "坏的输入版本：$bisected_head" #: git-bisect.sh:290 #, sh-format msgid "Bad rev input: $rev" -msgstr "输入坏的版本：$rev" +msgstr "坏的输入版本：$rev" #: git-bisect.sh:299 #, sh-format @@ -12579,7 +12579,7 @@ msgstr "错误：您对下列文件的本地修改将被合并操作覆盖" #: git-merge-octopus.sh:61 msgid "Automated merge did not work." -msgstr "自动合并不工作" +msgstr "自动合并未生效。" #: git-merge-octopus.sh:62 msgid "Should not be doing an Octopus." @@ -12607,7 +12607,7 @@ msgstr "尝试和 $pretty_name 的简单合并" #: git-merge-octopus.sh:102 msgid "Simple merge did not work, trying automatic merge." -msgstr "简单合并不行，尝试自动合并。" +msgstr "简单合并未生效，尝试自动合并。" #: git-rebase.sh:56 msgid "" @@ -12881,7 +12881,7 @@ msgstr "索引的进度没有被恢复。" #: git-stash.sh:551 msgid "The stash is kept in case you need it again." -msgstr "进度保存以免您再需要。" +msgstr "暂存被保留以备您再次需要。" #: git-stash.sh:560 #, sh-format @@ -13003,7 +13003,7 @@ msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" "子模组工作区 '$displaypath' 包含一个 .git 目录\n" -"（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）" +"（如果您真的想删除它及其全部历史，使用 'rm -rf' 命令）" #: git-submodule.sh:447 #, sh-format @@ -13047,7 +13047,7 @@ msgstr "无法在子模组路径 '$sm_path' 中获取" msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" -msgstr "无法在子模组路径 '$sm_path' 中找到当前 ${remote_name}/${branch} 版本" +msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}" #: git-submodule.sh:645 #, sh-format @@ -13181,7 +13181,7 @@ msgstr "" " x, exec = 使用 shell 运行命令（此行剩余部分）\n" " d, drop = 删除提交\n" "\n" -"这些行可以重新排序，从上至下地执行。\n" +"这些行可以被重新排序；它们会被从上至下地执行。\n" "\n" #: git-rebase--interactive.sh:162 @@ -13194,7 +13194,7 @@ msgstr "\n不要删除任意一行。使用 'drop' 显式地删除一个提交 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" -msgstr "\n如果您在这里删除一行，这个提交将会丢失。\n" +msgstr "\n如果您在这里删除一行，对应的提交将会丢失。\n" #: git-rebase--interactive.sh:202 #, sh-format @@ -13211,7 +13211,7 @@ msgstr "" "\n" "\tgit commit --amend $gpg_sign_opt_quoted\n" "\n" -"一旦您对变更满意，执行\n" +"当您对变更感到满意，执行\n" "\n" "\tgit rebase --continue" @@ -13262,12 +13262,12 @@ msgstr "不能拣选 $sha1" #: git-rebase--interactive.sh:407 #, sh-format msgid "This is the commit message #${n}:" -msgstr "这是提交信息 #${n}：" +msgstr "这是提交说明 #${n}：" #: git-rebase--interactive.sh:412 #, sh-format msgid "The commit message #${n} will be skipped:" -msgstr "提交信息 #${n} 将被跳过：" +msgstr "提交说明 #${n} 将被跳过：" #: git-rebase--interactive.sh:423 #, sh-format @@ -13316,7 +13316,7 @@ msgstr "停止在 $sha1_abbrev... $rest" #: git-rebase--interactive.sh:579 #, sh-format msgid "Cannot '$squash_style' without a previous commit" -msgstr "不能在没有前一个提交的情况下 '$squash_style'" +msgstr "没有父提交的情况下不能 '$squash_style'" #: git-rebase--interactive.sh:621 #, sh-format @@ -13370,7 +13370,7 @@ msgstr "要修改请使用命令 'git rebase --edit-todo'。" #: git-rebase--interactive.sh:693 #, sh-format msgid "Successfully rebased and updated $head_name." -msgstr "成功变基并更新 $head_name." +msgstr "成功变基并更新 $head_name。" #: git-rebase--interactive.sh:740 msgid "Could not skip unnecessary pick commands" @@ -13412,17 +13412,17 @@ msgid "" "warnings.\n" "The possible behaviours are: ignore, warn, error." msgstr "" -"为避免这条信息，使用 drop 指令显式地删除一个提交。\n" +"为避免这条信息，使用 \"drop\" 指令显式地删除一个提交。\n" "\n" -"使用 'git config rebase.missingCommitsCheck' 来修改这个级别的警告。\n" -"可以使用：ignore、warn、error。" +"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n" +"可选值有：ignore、warn、error。" #: git-rebase--interactive.sh:1027 #, sh-format msgid "" "Unrecognized setting $check_level for option rebase.missingCommitsCheck. " "Ignoring." -msgstr "选项 rebase.missingCommitsCheck 中无法识别的设置 $check_level。忽略。" +msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。" #: git-rebase--interactive.sh:1044 msgid "You can fix this with 'git rebase --edit-todo'." @@ -13461,19 +13461,19 @@ msgstr "" "\n" " git commit $gpg_sign_opt_quoted\n" "\n" -"两种情况下，一旦执行完毕，继续执行：\n" +"无论哪种情况，当您完成提交，继续执行：\n" "\n" " git rebase --continue\n" #: git-rebase--interactive.sh:1091 msgid "Error trying to find the author identity to amend commit" -msgstr "当在修补提交中查找作者信息时遇到错误" +msgstr "在修补提交中查找作者信息时遇到错误" #: git-rebase--interactive.sh:1096 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." -msgstr "您的工作区中有未提交的变更。请先提交然后再运行 'git rebase --continue'。" +msgstr "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" #: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105 msgid "Could not commit staged changes." @@ -13488,7 +13488,7 @@ msgid "" "\n" msgstr "" "\n" -"您正在修改运行中的交互式变基的 todo 文件。编辑结束后继续变基，\n" +"您正在修改运行中的交互式变基的 todo 文件。若要在编辑结束后继续变基，\n" "请执行：\n" " git rebase --continue\n" "\n" @@ -13549,7 +13549,7 @@ msgstr "用法：$dashless $USAGE" #: git-sh-setup.sh:190 #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" -msgstr "不能更换目录到 $cdup，工作区的顶级目录" +msgstr "不能切换目录到 $cdup，工作区的顶级目录" #: git-sh-setup.sh:199 git-sh-setup.sh:206 #, sh-format |