l10n: zh_CN: review for git v2.10.0 l10n
Signed-off-by: Ray Chen <oldsharp@gmail.com>
Ray Chen committed
Sep 7, 2016 at 18:03 UTC
9a4b694c539fead26833c2104c1a93d3a2b4c50a
1 file changed
+50
-50
po/zh_CN.po
+50
-50
@@ -319,7 +319,7 @@ msgstr "远程 git-upload-archive 命令的路径"
319
320
#: archive.c:461
321
msgid "Unexpected option --remote"
322
-msgstr "意外的选项 --remote"
322
+msgstr "未知参数 --remote"
323
324
#: archive.c:463
325
msgid "Option --exec can only be used together with --remote"
@@ -419,7 +419,7 @@ msgstr ""
419
#: bisect.c:798
420
#, c-format
421
msgid "Bisecting: a merge base must be tested\n"
422
-msgstr "二分查找中：合并基线必须要测试\n"
422
+msgstr "二分查找中：合并基线必须是经过测试的\n"
423
424
#: bisect.c:849
425
#, c-format
@@ -467,8 +467,8 @@ msgstr[1] "（大概 %d 步）"
467
#, c-format
468
msgid "Bisecting: %d revision left to test after this %s\n"
469
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
470
-msgstr[0] "二分查找中：在 %2$s 之后还剩下 %1$d 个版本\n"
471
-msgstr[1] "二分查找中：在 %2$s 之后还剩下 %1$d 个版本\n"
470
+msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
471
+msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
472
473
#: branch.c:53
474
#, c-format
@@ -720,7 +720,7 @@ msgstr "标准输入中错误的配置行 %d"
720
#: config.c:528
721
#, c-format
722
msgid "bad config line %d in submodule-blob %s"
723
-msgstr "子模组数据 %2$s 中错误的配置行 %1$d"
723
+msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
724
725
#: config.c:532
726
#, c-format
@@ -743,37 +743,37 @@ msgstr "无效的单位"
743
#: config.c:661
744
#, c-format
745
msgid "bad numeric config value '%s' for '%s': %s"
746
-msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
746
+msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
747
748
#: config.c:666
749
#, c-format
750
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
751
-msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s': %4$s"
751
+msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
752
753
#: config.c:669
754
#, c-format
755
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
756
-msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s': %4$s"
756
+msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
757
758
#: config.c:672
759
#, c-format
760
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
761
-msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s': %3$s"
761
+msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"
762
763
#: config.c:675
764
#, c-format
765
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
766
-msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s': %4$s"
766
+msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
767
768
#: config.c:678
769
#, c-format
770
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
771
-msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s': %4$s"
771
+msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
772
773
#: config.c:681
774
#, c-format
775
msgid "bad numeric config value '%s' for '%s' in %s: %s"
776
-msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s': %4$s"
776
+msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
777
778
#: config.c:768
779
#, c-format
@@ -949,7 +949,7 @@ msgstr "外部 diff 退出，停止在 %s"
949
950
#: diff.c:3415
951
msgid "--follow requires exactly one pathspec"
952
-msgstr "--follow 参数需要一个路径"
952
+msgstr "--follow 明确要求只跟一个路径规格"
953
954
#: diff.c:3578
955
#, c-format
@@ -2059,7 +2059,7 @@ msgid ""
2059
"Use '--' to separate paths from revisions, like this:\n"
2060
"'git <command> [<revision>...] -- [<file>...]'"
2061
msgstr ""
2062
-"有歧义的参数 '%s'：工作区中未知的版本或路径。\n"
2062
+"有歧义的参数 '%s'：未知的版本或路径不存在于工作区中。\n"
2063
"使用 '--' 来分隔版本和路径，例如：\n"
2064
"'git <command> [<revision>...] -- [<file>...]'"
2065
@@ -2070,7 +2070,7 @@ msgid ""
2070
"Use '--' to separate paths from revisions, like this:\n"
2071
"'git <command> [<revision>...] -- [<file>...]'"
2072
msgstr ""
2073
-"有歧义的参数 '%s'：两者均为版本和文件\n"
2073
+"有歧义的参数 '%s'：可同时是版本和文件\n"
2074
"使用 '--' 来分隔版本和路径，例如：\n"
2075
"'git <command> [<revision>...] -- [<file>...]'"
2076
@@ -2107,7 +2107,7 @@ msgid ""
2107
"Not a git repository (or any parent up to mount point %s)\n"
2108
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
2109
msgstr ""
2110
-"不是一个 git 仓库（或者任何向上递归到挂载点 %s）\n"
2110
+"不是一个 git 仓库（或者向上递归至挂载点 %s 的任何祖先目录）\n"
2111
"停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
2112
2113
#: setup.c:927
@@ -2121,7 +2121,7 @@ msgid ""
2121
"Problem with core.sharedRepository filemode value (0%.3o).\n"
2122
"The owner of files must always have read and write permissions."
2123
msgstr ""
2124
-"参数 core.sharedRepository 的文件权限值有错(0%.3o)。\n"
2124
+"参数 core.sharedRepository 的文件权限值有错（0%.3o）。\n"
2125
"文件属主必须始终拥有读写权限。"
2126
2127
#: sha1_file.c:1046
@@ -2260,7 +2260,7 @@ msgstr "传输：无效的深度选项 '%s'"
2260
msgid ""
2261
"The following submodule paths contain changes that can\n"
2262
"not be found on any remote:\n"
2263
-msgstr "如下的子模组路径的修改在任何远程源中都找不到：\n"
2263
+msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"
2264
2265
#: transport.c:775
2266
#, c-format
@@ -2286,7 +2286,7 @@ msgstr ""
2286
"\n"
2287
"\tgit push\n"
2288
"\n"
2289
-"来推送到远程源。\n"
2289
+"以推送至远程。\n"
2290
"\n"
2291
2292
#: transport.c:783
@@ -6815,7 +6815,7 @@ msgstr "[已拒绝]"
6815
6816
#: builtin/fetch.c:610
6817
msgid "can't fetch in current branch"
6818
-msgstr "不能获取到当前分支"
6818
+msgstr "当前分支下不能执行获取操作"
6819
6820
#: builtin/fetch.c:619
6821
msgid "[tag update]"
@@ -7922,12 +7922,12 @@ msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
7922
#: builtin/init-db.c:407
7923
#, c-format
7924
msgid "Initialized empty shared Git repository in %s%s\n"
7925
-msgstr "初始化空的共享 Git 仓库于 %s%s\n"
7925
+msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
7926
7927
#: builtin/init-db.c:408
7928
#, c-format
7929
msgid "Initialized empty Git repository in %s%s\n"
7930
-msgstr "初始化空的 Git 仓库于 %s%s\n"
7930
+msgstr "已初始化空的 Git 仓库于 %s%s\n"
7931
7932
#: builtin/init-db.c:455
7933
msgid ""
@@ -8718,7 +8718,7 @@ msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
8718
#: builtin/merge.c:960
8719
#, c-format
8720
msgid "Bad value '%s' in environment '%s'"
8721
-msgstr "环境 '%2$s' 坏的取值 '%1$s'"
8721
+msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
8722
8723
#: builtin/merge.c:1034
8724
#, c-format
@@ -9378,7 +9378,7 @@ msgstr "不能混用 --commit、--abort 或 -s/--strategy"
9378
9379
#: builtin/notes.c:797
9380
msgid "Must specify a notes ref to merge"
9381
-msgstr "您必须指定一个注解引用来合并"
9381
+msgstr "必须指定一个注解引用来合并"
9382
9383
#: builtin/notes.c:821
9384
#, c-format
@@ -10091,7 +10091,7 @@ msgstr "server-specific"
10091
10092
#: builtin/push.c:546
10093
msgid "option to transmit"
10094
-msgstr "传输的选项"
10094
+msgstr "传输选项"
10095
10096
#: builtin/push.c:560
10097
msgid "--delete is incompatible with --all, --mirror and --tags"
@@ -11566,7 +11566,7 @@ msgstr "并发任务"
11566
11567
#: builtin/submodule--helper.c:840
11568
msgid "whether the initial clone should follow the shallow recommendation"
11569
-msgstr "是否初始克隆应该遵守推荐的浅克隆选项"
11569
+msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
11570
11571
#: builtin/submodule--helper.c:841
11572
msgid "don't print cloning progress"
@@ -12422,17 +12422,17 @@ msgstr "坏的 bisect_write 参数：$state"
12422
#: git-bisect.sh:262
12423
#, sh-format
12424
msgid "Bad rev input: $arg"
12425
-msgstr "输入坏的版本：$arg"
12425
+msgstr "坏的输入版本：$arg"
12426
12427
#: git-bisect.sh:281
12428
#, sh-format
12429
msgid "Bad rev input: $bisected_head"
12430
-msgstr "输入坏的版本：$bisected_head"
12430
+msgstr "坏的输入版本：$bisected_head"
12431
12432
#: git-bisect.sh:290
12433
#, sh-format
12434
msgid "Bad rev input: $rev"
12435
-msgstr "输入坏的版本：$rev"
12435
+msgstr "坏的输入版本：$rev"
12436
12437
#: git-bisect.sh:299
12438
#, sh-format
@@ -12579,7 +12579,7 @@ msgstr "错误：您对下列文件的本地修改将被合并操作覆盖"
12579
12580
#: git-merge-octopus.sh:61
12581
msgid "Automated merge did not work."
12582
-msgstr "自动合并不工作"
12582
+msgstr "自动合并未生效。"
12583
12584
#: git-merge-octopus.sh:62
12585
msgid "Should not be doing an Octopus."
@@ -12607,7 +12607,7 @@ msgstr "尝试和 $pretty_name 的简单合并"
12607
12608
#: git-merge-octopus.sh:102
12609
msgid "Simple merge did not work, trying automatic merge."
12610
-msgstr "简单合并不行，尝试自动合并。"
12610
+msgstr "简单合并未生效，尝试自动合并。"
12611
12612
#: git-rebase.sh:56
12613
msgid ""
@@ -12881,7 +12881,7 @@ msgstr "索引的进度没有被恢复。"
12881
12882
#: git-stash.sh:551
12883
msgid "The stash is kept in case you need it again."
12884
-msgstr "保存以备您再次需要。"
12884
+msgstr "暂存被保留以备您再次需要。"
12885
12886
#: git-stash.sh:560
12887
#, sh-format
@@ -13003,7 +13003,7 @@ msgid ""
13003
"(use 'rm -rf' if you really want to remove it including all of its history)"
13004
msgstr ""
13005
"子模组工作区 '$displaypath' 包含一个 .git 目录\n"
13006
-"（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）"
13006
+"（如果您真的想删除它及其全部历史，使用 'rm -rf' 命令）"
13007
13008
#: git-submodule.sh:447
13009
#, sh-format
@@ -13047,7 +13047,7 @@ msgstr "无法在子模组路径 '$sm_path' 中获取"
13047
msgid ""
13048
"Unable to find current ${remote_name}/${branch} revision in submodule path "
13049
"'$sm_path'"
13050
-msgstr "无法在子模组路径 '$sm_path' 中找到当前 ${remote_name}/${branch} 版本"
13050
+msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
13051
13052
#: git-submodule.sh:645
13053
#, sh-format
@@ -13181,7 +13181,7 @@ msgstr ""
13181
" x, exec = 使用 shell 运行命令（此行剩余部分）\n"
13182
" d, drop = 删除提交\n"
13183
"\n"
13184
-"这些行可以重新排序，从上至下地执行。\n"
13184
+"这些行可以被重新排序；它们会被从上至下地执行。\n"
13185
"\n"
13186
13187
#: git-rebase--interactive.sh:162
@@ -13194,7 +13194,7 @@ msgstr "\n不要删除任意一行。使用 'drop' 显式地删除一个提交
13194
msgid ""
13195
"\n"
13196
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
13197
-msgstr "\n如果您在这里删除一行，这个提交将会丢失。\n"
13197
+msgstr "\n如果您在这里删除一行，对应的提交将会丢失。\n"
13198
13199
#: git-rebase--interactive.sh:202
13200
#, sh-format
@@ -13211,7 +13211,7 @@ msgstr ""
13211
"\n"
13212
"\tgit commit --amend $gpg_sign_opt_quoted\n"
13213
"\n"
13214
-"一旦您对变更满意，执行\n"
13214
+"当您对变更感到满意，执行\n"
13215
"\n"
13216
"\tgit rebase --continue"
13217
@@ -13262,12 +13262,12 @@ msgstr "不能拣选 $sha1"
13262
#: git-rebase--interactive.sh:407
13263
#, sh-format
13264
msgid "This is the commit message #${n}:"
13265
-msgstr "这是提交信息 #${n}："
13265
+msgstr "这是提交说明 #${n}："
13266
13267
#: git-rebase--interactive.sh:412
13268
#, sh-format
13269
msgid "The commit message #${n} will be skipped:"
13270
-msgstr "提交信息 #${n} 将被跳过："
13270
+msgstr "提交说明 #${n} 将被跳过："
13271
13272
#: git-rebase--interactive.sh:423
13273
#, sh-format
@@ -13316,7 +13316,7 @@ msgstr "停止在 $sha1_abbrev... $rest"
13316
#: git-rebase--interactive.sh:579
13317
#, sh-format
13318
msgid "Cannot '$squash_style' without a previous commit"
13319
-msgstr "不能在没有前一个提交的情况下 '$squash_style'"
13319
+msgstr "没有父提交的情况下不能 '$squash_style'"
13320
13321
#: git-rebase--interactive.sh:621
13322
#, sh-format
@@ -13370,7 +13370,7 @@ msgstr "要修改请使用命令 'git rebase --edit-todo'。"
13370
#: git-rebase--interactive.sh:693
13371
#, sh-format
13372
msgid "Successfully rebased and updated $head_name."
13373
-msgstr "成功变基并更新 $head_name."
13373
+msgstr "成功变基并更新 $head_name。"
13374
13375
#: git-rebase--interactive.sh:740
13376
msgid "Could not skip unnecessary pick commands"
@@ -13412,17 +13412,17 @@ msgid ""
13412
"warnings.\n"
13413
"The possible behaviours are: ignore, warn, error."
13414
msgstr ""
13415
-"为避免这条信息，使用 drop 指令显式地删除一个提交。\n"
13415
+"为避免这条信息，使用 \"drop\" 指令显式地删除一个提交。\n"
13416
"\n"
13417
-"使用 'git config rebase.missingCommitsCheck' 来修改这个级别的警告。\n"
13418
-"可以使用：ignore、warn、error。"
13417
+"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
13418
+"可选值有：ignore、warn、error。"
13419
13420
#: git-rebase--interactive.sh:1027
13421
#, sh-format
13422
msgid ""
13423
"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
13424
"Ignoring."
13425
-msgstr "选项 rebase.missingCommitsCheck 中无法识别的设置 $check_level。忽略。"
13425
+msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。"
13426
13427
#: git-rebase--interactive.sh:1044
13428
msgid "You can fix this with 'git rebase --edit-todo'."
@@ -13461,19 +13461,19 @@ msgstr ""
13461
"\n"
13462
" git commit $gpg_sign_opt_quoted\n"
13463
"\n"
13464
-"两种情况下，一旦执行完毕，继续执行：\n"
13464
+"无论哪种情况，当您完成提交，继续执行：\n"
13465
"\n"
13466
" git rebase --continue\n"
13467
13468
#: git-rebase--interactive.sh:1091
13469
msgid "Error trying to find the author identity to amend commit"
13470
-msgstr "当在修补提交中查找作者信息时遇到错误"
13470
+msgstr "在修补提交中查找作者信息时遇到错误"
13471
13472
#: git-rebase--interactive.sh:1096
13473
msgid ""
13474
"You have uncommitted changes in your working tree. Please commit them\n"
13475
"first and then run 'git rebase --continue' again."
13476
-msgstr "您的工作区中有未提交的变更。请先提交然后再运行 'git rebase --continue'。"
13476
+msgstr "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
13477
13478
#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
13479
msgid "Could not commit staged changes."
@@ -13488,7 +13488,7 @@ msgid ""
13488
"\n"
13489
msgstr ""
13490
"\n"
13491
-"您正在修改运行中的交互式变基的 todo 文件。编辑结束后继续变基，\n"
13491
+"您正在修改运行中的交互式变基的 todo 文件。若要在编辑结束后继续变基，\n"
13492
"请执行：\n"
13493
" git rebase --continue\n"
13494
"\n"
@@ -13549,7 +13549,7 @@ msgstr "用法：$dashless $USAGE"
13549
#: git-sh-setup.sh:190
13550
#, sh-format
13551
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
13552
-msgstr "不能更换目录到 $cdup，工作区的顶级目录"
13552
+msgstr "不能切换目录到 $cdup，工作区的顶级目录"
13553
13554
#: git-sh-setup.sh:199 git-sh-setup.sh:206
13555
#, sh-format