l10n: Update zh_CN translation for Git 1.7.10-rc1
Translate 1 new message from Git 1.7.10-rc1: "Gitdir '$a' is ..." Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin committed
Mar 16, 2012 at 22:35 UTC
dac1de7de5f13d5bd2b69c8580ae213f166f16c5
1 file changed
+17
-12
po/zh_CN.po
+17
-12
@@ -12,7 +12,7 @@ msgid ""
12
msgstr ""
13
"Project-Id-Version: Git\n"
14
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
15
-"POT-Creation-Date: 2012-03-08 10:19+0800\n"
15
+"POT-Creation-Date: 2012-03-16 20:18+0800\n"
16
"PO-Revision-Date: 2012-01-30 00:00+0800\n"
17
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
@@ -3241,29 +3241,29 @@ msgstr "不支持 $patch_format 补丁格式。"
3241
msgid "Patch format detection failed."
3242
msgstr "补丁格式检测失败。"
3243
3244
-#: git-am.sh:409
3244
+#: git-am.sh:411
3245
msgid "-d option is no longer supported. Do not use."
3246
msgstr "不再支持 -d 选项。不要使用。"
3247
3248
-#: git-am.sh:472
3248
+#: git-am.sh:474
3249
#, sh-format
3250
msgid "previous rebase directory $dotest still exists but mbox given."
3251
msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
3252
3253
-#: git-am.sh:477
3253
+#: git-am.sh:479
3254
msgid "Please make up your mind. --skip or --abort?"
3255
msgstr "请下决心。--skip 或是 --abort ？"
3256
3257
-#: git-am.sh:504
3257
+#: git-am.sh:506
3258
msgid "Resolve operation not in progress, we are not resuming."
3259
msgstr "解决操作未进行，我们不会继续。"
3260
3261
-#: git-am.sh:570
3261
+#: git-am.sh:572
3262
#, sh-format
3263
msgid "Dirty index: cannot apply patches (dirty: $files)"
3264
msgstr "脏的暂存区：不能应用补丁（脏文件：$files）"
3265
3266
-#: git-am.sh:746
3266
+#: git-am.sh:748
3267
msgid "cannot be interactive without stdin connected to a terminal."
3268
msgstr "没有和终端关联的标准输入不能进行交互式操作。"
3269
@@ -3271,20 +3271,20 @@ msgstr "没有和终端关联的标准输入不能进行交互式操作。"
3271
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
3272
#. in your translation. The program will only accept English
3273
#. input at this point.
3274
-#: git-am.sh:757
3274
+#: git-am.sh:759
3275
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
3276
msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
3277
3278
-#: git-am.sh:793
3278
+#: git-am.sh:795
3279
#, sh-format
3280
msgid "Applying: $FIRSTLINE"
3281
msgstr "正应用：$FIRSTLINE"
3282
3283
-#: git-am.sh:838
3283
+#: git-am.sh:840
3284
msgid "No changes -- Patch already applied."
3285
msgstr "没有变更 -- 补丁已经应用过。"
3286
3287
-#: git-am.sh:864
3287
+#: git-am.sh:866
3288
msgid "applying to an empty history"
3289
msgstr "正应用到一个空历史上"
3290
@@ -3528,11 +3528,16 @@ msgstr "无法从 url '$remoteurl' 剥离一个组件"
3528
msgid "No submodule mapping found in .gitmodules for path '$path'"
3529
msgstr "未在 .gitmodules 中发现路径 '$path' 的子模组映射"
3530
3531
-#: git-submodule.sh:173
3531
+#: git-submodule.sh:149
3532
#, sh-format
3533
msgid "Clone of '$url' into submodule path '$path' failed"
3534
msgstr "克隆 '$url' 到子模组路径 '$path' 失败"
3535
3536
+#: git-submodule.sh:159
3537
+#, sh-format
3538
+msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
3539
+msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
3540
+
3541
#: git-submodule.sh:247
3542
#, sh-format
3543
msgid "repo URL: '$repo' must be absolute or begin with ./|../"