l10n: zh_CN.po: Disambiguation for rebase
Disambiguate the Chinese translation for "rebase", and update other related entries. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin committed
Feb 2, 2014 at 20:46 UTC
98b2761d5efaf559d67e7ed5694f3a2bddf3e868
1 file changed
+29
-28
po/zh_CN.po
+29
-28
@@ -13,7 +13,7 @@ msgstr ""
13
"Project-Id-Version: Git\n"
14
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
15
"POT-Creation-Date: 2014-02-01 08:06+0800\n"
16
-"PO-Revision-Date: 2014-02-03 10:52+0800\n"
16
+"PO-Revision-Date: 2014-02-03 10:53+0800\n"
17
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
19
"Language: zh_CN\n"
@@ -1320,21 +1320,21 @@ msgstr ""
1320
"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1321
"命令关闭本消息通知。"
1322
1323
-#: sha1_name.c:1109
1323
+#: sha1_name.c:1070
1324
msgid "HEAD does not point to a branch"
1325
msgstr "HEAD 没有指向一个分支"
1326
1327
-#: sha1_name.c:1112
1327
+#: sha1_name.c:1073
1328
#, c-format
1329
msgid "No such branch: '%s'"
1330
msgstr "没有此分支：'%s'"
1331
1332
-#: sha1_name.c:1114
1332
+#: sha1_name.c:1075
1333
#, c-format
1334
msgid "No upstream configured for branch '%s'"
1335
msgstr "尚未给分支 '%s' 设置上游"
1336
1337
-#: sha1_name.c:1118
1337
+#: sha1_name.c:1079
1338
#, c-format
1339
msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1340
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
@@ -1622,7 +1622,7 @@ msgstr " （使用 \"git commit\" 结束合并）"
1622
1623
#: wt-status.c:918
1624
msgid "You are in the middle of an am session."
1625
-msgstr "您正处于一个 am 过程中。"
1625
+msgstr "您正处于 am 操作过程中。"
1626
1627
#: wt-status.c:921
1628
msgid "The current patch is empty."
@@ -1646,11 +1646,11 @@ msgstr " （使用 \"git am --abort\" 恢复原有分支）"
1646
#: wt-status.c:989 wt-status.c:1006
1647
#, c-format
1648
msgid "You are currently rebasing branch '%s' on '%s'."
1649
-msgstr "您正在将分支 '%s' 变基到 '%s'。"
1649
+msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1650
1651
#: wt-status.c:994 wt-status.c:1011
1652
msgid "You are currently rebasing."
1653
-msgstr "您正在变基。"
1653
+msgstr "您在执行变基操作。"
1654
1655
# 译者：注意保持前导空格
1656
#: wt-status.c:997
@@ -1676,11 +1676,11 @@ msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"
1676
#, c-format
1677
msgid ""
1678
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
1679
-msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。"
1679
+msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1680
1681
#: wt-status.c:1023
1682
msgid "You are currently splitting a commit during a rebase."
1683
-msgstr "您正在变基过程中拆分一个提交。"
1683
+msgstr "您在执行变基操作时拆分提交。"
1684
1685
# 译者：注意保持前导空格
1686
#: wt-status.c:1026
@@ -1690,11 +1690,11 @@ msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --contin
1690
#: wt-status.c:1030
1691
#, c-format
1692
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1693
-msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。"
1693
+msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1694
1695
#: wt-status.c:1035
1696
msgid "You are currently editing a commit during a rebase."
1697
-msgstr "您正在变基过程中编辑一个提交。"
1697
+msgstr "您在执行变基操作时编辑提交。"
1698
1699
# 译者：注意保持前导空格
1700
#: wt-status.c:1038
@@ -1710,7 +1710,7 @@ msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
1710
#: wt-status.c:1050
1711
#, c-format
1712
msgid "You are currently cherry-picking commit %s."
1713
-msgstr "您正在做拣选提交 %s。"
1713
+msgstr "您在执行拣选提交 %s 的操作。"
1714
1715
# 译者：注意保持前导空格
1716
#: wt-status.c:1055
@@ -1730,7 +1730,7 @@ msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
1730
#: wt-status.c:1069
1731
#, c-format
1732
msgid "You are currently reverting commit %s."
1733
-msgstr "您正在反转提交 %s 。"
1733
+msgstr "您在执行反转提交 %s 的操作。"
1734
1735
# 译者：注意保持前导空格
1736
#: wt-status.c:1074
@@ -1750,11 +1750,11 @@ msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"
1750
#: wt-status.c:1090
1751
#, c-format
1752
msgid "You are currently bisecting, started from branch '%s'."
1753
-msgstr "您正在从分支 '%s' 开始做二分查找。"
1753
+msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1754
1755
#: wt-status.c:1094
1756
msgid "You are currently bisecting."
1757
-msgstr "您正在做二分查找。"
1757
+msgstr "您在执行二分查找操作。"
1758
1759
# 译者：注意保持前导空格
1760
#: wt-status.c:1097
@@ -1767,7 +1767,7 @@ msgstr "位于分支 "
1767
1768
#: wt-status.c:1279
1769
msgid "rebase in progress; onto "
1770
-msgstr "变基正在进行中；至 "
1770
+msgstr "变基操作正在进行中；至 "
1771
1772
#: wt-status.c:1286
1773
msgid "HEAD detached at "
@@ -5254,8 +5254,9 @@ msgstr ""
5254
"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5255
5256
#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702
5257
-#: builtin/merge.c:196 builtin/show-branch.c:654 builtin/show-ref.c:178
5258
-#: builtin/tag.c:446 parse-options.h:135 parse-options.h:242
5257
+#: builtin/merge.c:196 builtin/repack.c:160 builtin/repack.c:164
5258
+#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:446
5259
+#: parse-options.h:135 parse-options.h:242
5260
msgid "n"
5261
msgstr "n"
5262
@@ -6211,17 +6212,17 @@ msgstr "指定 git 版本库是多个用户之间共享的"
6212
msgid "be quiet"
6213
msgstr "保持安静"
6214
6214
-#: builtin/init-db.c:522 builtin/init-db.c:529
6215
+#: builtin/init-db.c:525 builtin/init-db.c:530
6216
#, c-format
6217
msgid "cannot mkdir %s"
6218
msgstr "不能创建目录 %s"
6219
6219
-#: builtin/init-db.c:533
6220
+#: builtin/init-db.c:534
6221
#, c-format
6222
msgid "cannot chdir to %s"
6223
msgstr "不能切换目录到 %s"
6224
6224
-#: builtin/init-db.c:555
6225
+#: builtin/init-db.c:556
6226
#, c-format
6227
msgid ""
6228
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -6230,11 +6231,11 @@ msgstr ""
6231
"不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-"
6232
"dir=<directory>）"
6233
6233
-#: builtin/init-db.c:579
6234
+#: builtin/init-db.c:580
6235
msgid "Cannot access current working directory"
6236
msgstr "不能访问当前工作目录"
6237
6237
-#: builtin/init-db.c:586
6238
+#: builtin/init-db.c:587
6239
#, c-format
6240
msgid "Cannot access work tree '%s'"
6241
msgstr "不能访问工作区 '%s'"
@@ -10118,7 +10119,7 @@ msgstr ""
10119
10120
#: git-rebase.sh:201
10121
msgid "The pre-rebase hook refused to rebase."
10121
-msgstr "钩子 pre-rebase 拒绝变基。"
10122
+msgstr "钩子 pre-rebase 拒绝变基操作。"
10123
10124
#: git-rebase.sh:206
10125
msgid "It looks like git-am is in progress. Cannot rebase."
@@ -10165,12 +10166,12 @@ msgid ""
10166
"and run me again. I am stopping in case you still have something\n"
10167
"valuable there."
10168
msgstr ""
10168
-"好像已有一个 $state_dir_base 目录，我怀疑您正处于另外一个变基过程中。\n"
10169
-"如果是这样，请尝试执行\n"
10169
+"好像已有 $state_dir_base 目录，我怀疑您正处于另外一个变基操作\n"
10170
+"过程中。 如果是这样，请执行\n"
10171
"\t$cmd_live_rebase\n"
10172
"如果不是这样，请执行\n"
10173
"\t$cmd_clear_stale_rebase\n"
10173
-"然后再重新执行变基。为避免您丢失重要数据，我已经停止当前操作。"
10174
+"然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。"
10175
10176
#: git-rebase.sh:456
10177
#, sh-format