l10n: Set nplurals of zh_CN.po from 1 to 2
In most cases, plural-forms are unnecessary for Chinese. For example, "apple" and "apples" are the same in Chinese, they are both translated as "苹果". While there are exceptions, e.g., the plural form of "he", "she" and "it" is "they" in English. In Chinese, "他(he)", "她(she)", and "它(it)" have plural forms too, they are "他们", "她们", and "它们". But what makes 'nplurals=1' hard to work right for Chinese is: #: bundle.c:192 #, c-format msgid "The bundle requires this ref" msgid_plural "The bundle requires these %d refs" Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin committed
May 31, 2012 at 17:35 UTC
5ae481e0ad61f3cdf0b0f6bc3f57bae23574db16
1 file changed
+42
-10
po/zh_CN.po
+42
-10
@@ -13,14 +13,14 @@ 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-05-21 08:57+0800\n"
16
-"PO-Revision-Date: 2012-06-01 17:40+0800\n"
16
+"PO-Revision-Date: 2012-06-01 17:43+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"
20
"MIME-Version: 1.0\n"
21
"Content-Type: text/plain; charset=UTF-8\n"
22
"Content-Transfer-Encoding: 8bit\n"
23
-"Plural-Forms: nplurals=1; plural=0;\n"
23
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
24
25
#: advice.c:40
26
#, c-format
@@ -72,6 +72,7 @@ msgstr "版本遍历设置失败"
72
msgid "The bundle contains %d ref"
73
msgid_plural "The bundle contains %d refs"
74
msgstr[0] "这个包中含有 %d 个引用"
75
+msgstr[1] "这个包中含有 %d 个引用"
76
77
#: bundle.c:192
78
#, c-format
@@ -152,54 +153,63 @@ msgstr "在将来"
153
msgid "%lu second ago"
154
msgid_plural "%lu seconds ago"
155
msgstr[0] "%lu 秒钟之前"
156
+msgstr[1] "%lu 秒钟之前"
157
158
#: date.c:108
159
#, c-format
160
msgid "%lu minute ago"
161
msgid_plural "%lu minutes ago"
162
msgstr[0] "%lu 分钟之前"
163
+msgstr[1] "%lu 分钟之前"
164
165
#: date.c:115
166
#, c-format
167
msgid "%lu hour ago"
168
msgid_plural "%lu hours ago"
169
msgstr[0] "%lu 小时之前"
170
+msgstr[1] "%lu 小时之前"
171
172
#: date.c:122
173
#, c-format
174
msgid "%lu day ago"
175
msgid_plural "%lu days ago"
176
msgstr[0] "%lu 天之前"
177
+msgstr[1] "%lu 天之前"
178
179
#: date.c:128
180
#, c-format
181
msgid "%lu week ago"
182
msgid_plural "%lu weeks ago"
183
msgstr[0] "%lu 周之前"
184
+msgstr[1] "%lu 周之前"
185
186
#: date.c:135
187
#, c-format
188
msgid "%lu month ago"
189
msgid_plural "%lu months ago"
190
msgstr[0] "%lu 个月之前"
191
+msgstr[1] "%lu 个月之前"
192
193
#: date.c:146
194
#, c-format
195
msgid "%lu year"
196
msgid_plural "%lu years"
197
msgstr[0] "%lu 年"
198
+msgstr[1] "%lu 年"
199
200
#: date.c:149
201
#, c-format
202
msgid "%s, %lu month ago"
203
msgid_plural "%s, %lu months ago"
204
msgstr[0] "%s，%lu 个月之前"
205
+msgstr[1] "%s，%lu 个月之前"
206
207
#: date.c:154 date.c:159
208
#, c-format
209
msgid "%lu year ago"
210
msgid_plural "%lu years ago"
211
msgstr[0] "%lu 年前"
212
+msgstr[1] "%lu 年前"
213
214
# 译者：注意保持前导空格
215
#: diff.c:105
@@ -231,18 +241,21 @@ msgstr " 0 个文件被修改\n"
241
msgid " %d file changed"
242
msgid_plural " %d files changed"
243
msgstr[0] " %d 个文件被修改"
244
+msgstr[1] " %d 个文件被修改"
245
246
#: diff.c:1421
247
#, c-format
248
msgid ", %d insertion(+)"
249
msgid_plural ", %d insertions(+)"
250
msgstr[0] "，插入 %d 行(+)"
251
+msgstr[1] "，插入 %d 行(+)"
252
253
#: diff.c:1432
254
#, c-format
255
msgid ", %d deletion(-)"
256
msgid_plural ", %d deletions(-)"
257
msgstr[0] "，删除 %d 行(-)"
258
+msgstr[1] "，删除 %d 行(-)"
259
260
#: diff.c:3478
261
#, c-format
@@ -362,6 +375,7 @@ msgstr " %s"
375
msgid "Your branch is ahead of '%s' by %d commit.\n"
376
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
377
msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
378
+msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
379
380
#: remote.c:1613
381
#, c-format
@@ -369,6 +383,7 @@ msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
383
msgid_plural ""
384
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
385
msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
386
+msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
387
388
#: remote.c:1621
389
#, c-format
@@ -381,6 +396,9 @@ msgid_plural ""
396
msgstr[0] ""
397
"您的分支和 '%s' 出现了偏离，\n"
398
"并且各自分别有 %d 和 %d 处不同的提交。\n"
399
+msgstr[1] ""
400
+"您的分支和 '%s' 出现了偏离，\n"
401
+"并且各自分别有 %d 和 %d 处不同的提交。\n"
402
403
#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
404
#: builtin/merge.c:1088 builtin/merge.c:1098
@@ -1070,8 +1088,8 @@ msgid ""
1088
msgid_plural ""
1089
"git diff header lacks filename information when removing %d leading pathname "
1090
"components (line %d)"
1073
-msgstr[0] ""
1074
-"当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
1091
+msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
1092
+msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
1093
1094
#: builtin/apply.c:1628
1095
msgid "new file depends on old contents"
@@ -1141,6 +1159,7 @@ msgstr "无效的行首字符：'%c'"
1159
msgid "Hunk #%d succeeded at %d (offset %d line)."
1160
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1161
msgstr[0] "块 #%d 成功应用于 %d (偏移 %d 行）"
1162
+msgstr[1] "块 #%d 成功应用于 %d (偏移 %d 行）"
1163
1164
#: builtin/apply.c:2775
1165
#, c-format
@@ -1300,6 +1319,7 @@ msgstr "内部错误"
1319
msgid "Applying patch %%s with %d reject..."
1320
msgid_plural "Applying patch %%s with %d rejects..."
1321
msgstr[0] "应用补丁 %%s 时 %d 个被拒绝..."
1322
+msgstr[1] "应用补丁 %%s 时 %d 个被拒绝..."
1323
1324
#: builtin/apply.c:3681
1325
#, c-format
@@ -1454,12 +1474,14 @@ msgstr "不能打开补丁 '%s'"
1474
msgid "squelched %d whitespace error"
1475
msgid_plural "squelched %d whitespace errors"
1476
msgstr[0] "抑制下仍有 %d 个空白字符误用"
1477
+msgstr[1] "抑制下仍有 %d 个空白字符误用"
1478
1479
#: builtin/apply.c:4081 builtin/apply.c:4091
1480
#, c-format
1481
msgid "%d line adds whitespace errors."
1482
msgid_plural "%d lines add whitespace errors."
1483
msgstr[0] "%d 行有空白字符误用。"
1484
+msgstr[1] "%d 行有空白字符误用。"
1485
1486
#: builtin/archive.c:17
1487
#, c-format
@@ -1530,6 +1552,7 @@ msgid "Cannot delete the branch '%s' which you are currently on."
1552
msgstr "无法删除您当前所在的分支 '%s'。"
1553
1554
#: builtin/branch.c:202
1555
+#, c-format
1556
msgid "remote branch '%s' not found."
1557
msgstr "远程分支 '%s' 未发现。"
1558
@@ -1794,6 +1817,10 @@ msgstr[0] ""
1817
"警告：您正丢下 %d 个提交，未和任何分支关联：\n"
1818
"\n"
1819
"%s\n"
1820
+msgstr[1] ""
1821
+"警告：您正丢下 %d 个提交，未和任何分支关联：\n"
1822
+"\n"
1823
+"%s\n"
1824
1825
#: builtin/checkout.c:664
1826
#, c-format
@@ -2868,6 +2895,7 @@ msgstr "意外的类型的对象"
2895
msgid "cannot fill %d byte"
2896
msgid_plural "cannot fill %d bytes"
2897
msgstr[0] "无法填充 %d 字节"
2898
+msgstr[1] "无法填充 %d 字节"
2899
2900
#: builtin/index-pack.c:236
2901
msgid "early EOF"
@@ -2931,6 +2959,7 @@ msgstr "无法读取包文件"
2959
msgid "premature end of pack file, %lu byte missing"
2960
msgid_plural "premature end of pack file, %lu bytes missing"
2961
msgstr[0] "包文件过早结束，缺少 %lu 字节"
2962
+msgstr[1] "包文件过早结束，缺少 %lu 字节"
2963
2964
#: builtin/index-pack.c:510
2965
msgid "serious inflate inconsistency"
@@ -3002,6 +3031,7 @@ msgstr "不可理喻"
3031
msgid "pack has %d unresolved delta"
3032
msgid_plural "pack has %d unresolved deltas"
3033
msgstr[0] "包有 %d 个未解决的 delta"
3034
+msgstr[1] "包有 %d 个未解决的 delta"
3035
3036
#: builtin/index-pack.c:998
3037
#, c-format
@@ -3050,12 +3080,14 @@ msgstr "无法为 %s 打开包索引文件"
3080
msgid "non delta: %d object"
3081
msgid_plural "non delta: %d objects"
3082
msgstr[0] "非 delta：%d 个对象"
3083
+msgstr[1] "非 delta：%d 个对象"
3084
3085
#: builtin/index-pack.c:1303
3086
#, c-format
3087
msgid "chain length = %d: %lu object"
3088
msgid_plural "chain length = %d: %lu objects"
3089
msgstr[0] "链长 = %d: %lu 对象"
3090
+msgstr[1] "链长 = %d: %lu 对象"
3091
3092
#: builtin/index-pack.c:1330
3093
msgid "Cannot come back to cwd"
@@ -4129,10 +4161,8 @@ msgid ""
4161
msgid_plural ""
4162
"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
4163
"to delete them, use:"
4132
-msgstr[0] ""
4133
-"注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："
4134
-msgstr[1] ""
4135
-"注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："
4164
+msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："
4165
+msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："
4166
4167
#: builtin/remote.c:943
4168
#, c-format
@@ -4247,14 +4277,14 @@ msgstr " HEAD分支：%s"
4277
#, c-format
4278
msgid ""
4279
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
4250
-msgstr ""
4251
-" HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
4280
+msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
4281
4282
#: builtin/remote.c:1151
4283
#, c-format
4284
msgid " Remote branch:%s"
4285
msgid_plural " Remote branches:%s"
4286
msgstr[0] " 远程分支：%s"
4287
+msgstr[1] " 远程分支：%s"
4288
4289
# 译者：中文字符串拼接，可删除前导空格
4290
#: builtin/remote.c:1154 builtin/remote.c:1181
@@ -4265,6 +4295,7 @@ msgstr "（状态未查询）"
4295
msgid " Local branch configured for 'git pull':"
4296
msgid_plural " Local branches configured for 'git pull':"
4297
msgstr[0] " 为 'git pull' 配置的本地分支："
4298
+msgstr[1] " 为 'git pull' 配置的本地分支："
4299
4300
#: builtin/remote.c:1171
4301
msgid " Local refs will be mirrored by 'git push'"
@@ -4275,6 +4306,7 @@ msgstr " 本地引用将在 'git push' 时被镜像"
4306
msgid " Local ref configured for 'git push'%s:"
4307
msgid_plural " Local refs configured for 'git push'%s:"
4308
msgstr[0] " 为 'git push' 配置的本地引用%s："
4309
+msgstr[1] " 为 'git push' 配置的本地引用%s："
4310
4311
#: builtin/remote.c:1216
4312
msgid "Cannot determine remote HEAD"