@matheusbsbs / matheus-bagliano / commits / 81809b9984

l10n: zh_CN.po: translate 323 new messages

Update Simplified Chinese translation for 134 fuzzy, 189 new messages from Git v1.7.10.2-548-g9de96. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Zhuang Ya <zhuangya@me.com>

Jiang Xin committed May 30, 2012 at 12:19 UTC 81809b9984e782f1c48e1b3c823484d54d28dbb2
1 file changed +447 -473
po/zh_CN.po
+447 -473
@@ -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: 2012-05-21 08:57+0800\n"
16 -"PO-Revision-Date: 2012-01-30 00:00+0800\n"
16 +"PO-Revision-Date: 2012-06-01 17:40+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"
@@ -45,12 +45,12 @@ msgstr ""
45 #: bundle.c:36
46 #, c-format
47 msgid "'%s' does not look like a v2 bundle file"
48 -msgstr ""
48 +msgstr "'%s' 不像是一个 v2 版本的包文件"
49
50 #: bundle.c:63
51 -#, fuzzy, c-format
51 +#, c-format
52 msgid "unrecognized header: %s%s (%d)"
53 -msgstr "未识别的参数：%s"
53 +msgstr "未能识别的包头：%s%s (%d)"
54
55 #: bundle.c:89 builtin/commit.c:697
56 #, c-format
@@ -59,7 +59,7 @@ msgstr "不能打开 '%s'"
59
60 #: bundle.c:140
61 msgid "Repository lacks these prerequisite commits:"
62 -msgstr ""
62 +msgstr "版本库缺少这些必备的提交："
63
64 #: bundle.c:164 sequencer.c:533 sequencer.c:965 builtin/log.c:289
65 #: builtin/log.c:719 builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347
@@ -71,50 +71,49 @@ msgstr "版本遍历设置失败"
71 #, c-format
72 msgid "The bundle contains %d ref"
73 msgid_plural "The bundle contains %d refs"
74 -msgstr[0] ""
74 +msgstr[0] "这个包中含有 %d 个引用"
75
76 #: bundle.c:192
77 #, c-format
78 msgid "The bundle requires this ref"
79 msgid_plural "The bundle requires these %d refs"
80 -msgstr[0] ""
80 +msgstr[0] "这个包需要这个引用"
81 +msgstr[1] "这个包需要 %d 个这些引用"
82
83 #: bundle.c:290
84 msgid "rev-list died"
84 -msgstr ""
85 +msgstr "rev-list 终止"
86
87 #: bundle.c:296 builtin/log.c:1231 builtin/shortlog.c:284
88 #, c-format
89 msgid "unrecognized argument: %s"
89 -msgstr "未识别的参数：%s"
90 +msgstr "未能识别的参数：%s"
91
92 #: bundle.c:331
93 #, c-format
94 msgid "ref '%s' is excluded by the rev-list options"
94 -msgstr ""
95 +msgstr "引用 '%s' 被 rev-list 选项排除"
96
97 #: bundle.c:376
97 -#, fuzzy
98 msgid "Refusing to create empty bundle."
99 -msgstr "不能创建临时索引"
99 +msgstr "不能创建空包。"
100
101 #: bundle.c:394
102 -#, fuzzy
102 msgid "Could not spawn pack-objects"
104 -msgstr "不能读取对象 %s"
103 +msgstr "不能生成 pack-objects 进程"
104
105 #: bundle.c:412
106 msgid "pack-objects died"
108 -msgstr ""
107 +msgstr "pack-objects 终止"
108
109 #: bundle.c:415
111 -#, fuzzy, c-format
110 +#, c-format
111 msgid "cannot create '%s'"
113 -msgstr "不能读取 '%s'"
112 +msgstr "不能创建 '%s'"
113
114 #: bundle.c:437
115 msgid "index-pack died"
117 -msgstr ""
116 +msgstr "index-pack 终止"
117
118 #: commit.c:48
119 #, c-format
@@ -146,61 +145,61 @@ msgstr "无法关闭 rev-list 的标准输入：%s"
145
146 #: date.c:95
147 msgid "in the future"
149 -msgstr ""
148 +msgstr "在将来"
149
150 #: date.c:101
151 #, c-format
152 msgid "%lu second ago"
153 msgid_plural "%lu seconds ago"
155 -msgstr[0] ""
154 +msgstr[0] "%lu 秒钟之前"
155
156 #: date.c:108
157 #, c-format
158 msgid "%lu minute ago"
159 msgid_plural "%lu minutes ago"
161 -msgstr[0] ""
160 +msgstr[0] "%lu 分钟之前"
161
162 #: date.c:115
163 #, c-format
164 msgid "%lu hour ago"
165 msgid_plural "%lu hours ago"
167 -msgstr[0] ""
166 +msgstr[0] "%lu 小时之前"
167
168 #: date.c:122
169 #, c-format
170 msgid "%lu day ago"
171 msgid_plural "%lu days ago"
173 -msgstr[0] ""
172 +msgstr[0] "%lu 天之前"
173
174 #: date.c:128
175 #, c-format
176 msgid "%lu week ago"
177 msgid_plural "%lu weeks ago"
179 -msgstr[0] ""
178 +msgstr[0] "%lu 周之前"
179
180 #: date.c:135
181 #, c-format
182 msgid "%lu month ago"
183 msgid_plural "%lu months ago"
185 -msgstr[0] ""
184 +msgstr[0] "%lu 个月之前"
185
186 #: date.c:146
187 #, c-format
188 msgid "%lu year"
189 msgid_plural "%lu years"
191 -msgstr[0] ""
190 +msgstr[0] "%lu 年"
191
192 #: date.c:149
193 #, c-format
194 msgid "%s, %lu month ago"
195 msgid_plural "%s, %lu months ago"
197 -msgstr[0] ""
196 +msgstr[0] "%s，%lu 个月之前"
197
198 #: date.c:154 date.c:159
199 #, c-format
200 msgid "%lu year ago"
201 msgid_plural "%lu years ago"
203 -msgstr[0] ""
202 +msgstr[0] "%lu 年前"
203
204 # 译者：注意保持前导空格
205 #: diff.c:105
@@ -282,13 +281,13 @@ msgid "'%s': short read %s"
281 msgstr "'%s'：读取不完整 %s"
282
283 #: help.c:207
285 -#, fuzzy, c-format
284 +#, c-format
285 msgid "available git commands in '%s'"
287 -msgstr "无法创建链接 '%s'"
286 +msgstr "在 '%s' 下可用的 git 命令"
287
288 #: help.c:214
289 msgid "git commands available from elsewhere on your $PATH"
291 -msgstr ""
290 +msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
291
292 #: help.c:270
293 #, c-format
@@ -301,7 +300,7 @@ msgstr ""
300
301 #: help.c:327
302 msgid "Uh oh. Your system reports no Git commands at all."
304 -msgstr ""
303 +msgstr "唉呀，您的系统中未发现 Git 命令。"
304
305 #: help.c:349
306 #, c-format
@@ -309,16 +308,18 @@ msgid ""
308 "WARNING: You called a Git command named '%s', which does not exist.\n"
309 "Continuing under the assumption that you meant '%s'"
310 msgstr ""
311 +"警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
312 +"是 '%s'"
313
314 #: help.c:354
315 #, c-format
316 msgid "in %0.1f seconds automatically..."
316 -msgstr ""
317 +msgstr "在 %0.1f 秒钟后自动运行..."
318
319 #: help.c:361
320 #, c-format
321 msgid "git: '%s' is not a git command. See 'git --help'."
321 -msgstr ""
322 +msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
323
324 #: help.c:365
325 msgid ""
@@ -328,28 +329,33 @@ msgid_plural ""
329 "\n"
330 "Did you mean one of these?"
331 msgstr[0] ""
332 +"\n"
333 +"您指的是这个么？"
334 +msgstr[1] ""
335 +"\n"
336 +"您指的是这些其中一个么？"
337
338 #: parse-options.c:493
339 msgid "..."
334 -msgstr ""
340 +msgstr "..."
341
342 #: parse-options.c:511
337 -#, fuzzy, c-format
343 +#, c-format
344 msgid "usage: %s"
339 -msgstr "'%s'：%s"
345 +msgstr "用法：%s"
346
347 #. TRANSLATORS: the colon here should align with the
348 #. one in "usage: %s" translation
349 #: parse-options.c:515
344 -#, fuzzy, c-format
350 +#, c-format
351 msgid " or: %s"
346 -msgstr "HEAD（非分支）"
352 +msgstr " 或：%s"
353
354 # 译者：为保证在输出中对齐，注意调整句中空格！
355 #: parse-options.c:518
350 -#, fuzzy, c-format
356 +#, c-format
357 msgid " %s"
352 -msgstr "删除： %s"
358 +msgstr " %s"
359
360 #: remote.c:1607
361 #, c-format
@@ -434,24 +440,22 @@ msgid "%s: Unable to write new index file"
440 msgstr "%s：无法写入新索引文件"
441
442 #: sequencer.c:261
437 -#, fuzzy
443 msgid "Could not resolve HEAD commit\n"
439 -msgstr "不能解析 HEAD 提交"
444 +msgstr "不能解析 HEAD 提交\n"
445
446 #: sequencer.c:282
442 -#, fuzzy
447 msgid "Unable to update cache tree\n"
444 -msgstr "不能更新本地引用"
448 +msgstr "不能更新缓存\n"
449
450 #: sequencer.c:323
447 -#, fuzzy, c-format
451 +#, c-format
452 msgid "Could not parse commit %s\n"
449 -msgstr "不能解析 HEAD 提交"
453 +msgstr "不能解析提交 %s\n"
454
455 #: sequencer.c:328
452 -#, fuzzy, c-format
456 +#, c-format
457 msgid "Could not parse parent commit %s\n"
454 -msgstr "%s：不能解析父提交 %s"
458 +msgstr "不能解析父提交 %s\n"
459
460 #: sequencer.c:358
461 msgid "Your index file is unmerged."
@@ -549,7 +553,7 @@ msgstr "无效键名：%s"
553 #: sequencer.c:689
554 #, c-format
555 msgid "Invalid value for %s: %s"
552 -msgstr "无效的 %s 值：%s"
556 +msgstr "%s 的值无效：%s"
557
558 #: sequencer.c:701
559 #, c-format
@@ -1001,62 +1005,62 @@ msgstr "无法写入新索引文件"
1005
1006 #: builtin/apply.c:53
1007 msgid "git apply [options] [<patch>...]"
1004 -msgstr ""
1008 +msgstr "git apply [选项] [<补丁>...]"
1009
1010 #: builtin/apply.c:106
1007 -#, fuzzy, c-format
1011 +#, c-format
1012 msgid "unrecognized whitespace option '%s'"
1009 -msgstr "未识别的选项：'$arg'"
1013 +msgstr "未能识别的空白字符选项 '%s'"
1014
1015 #: builtin/apply.c:121
1012 -#, fuzzy, c-format
1016 +#, c-format
1017 msgid "unrecognized whitespace ignore option '%s'"
1014 -msgstr "未识别的选项：'$arg'"
1018 +msgstr "未能识别的空白字符忽略选项 '%s'"
1019
1020 #: builtin/apply.c:815
1021 #, c-format
1022 msgid "Cannot prepare timestamp regexp %s"
1019 -msgstr ""
1023 +msgstr "无法准备时间戳正则表达式 %s"
1024
1025 #: builtin/apply.c:824
1026 #, c-format
1027 msgid "regexec returned %d for input: %s"
1024 -msgstr ""
1028 +msgstr "regexec 返回 %d，输入为：%s"
1029
1030 #: builtin/apply.c:905
1027 -#, fuzzy, c-format
1031 +#, c-format
1032 msgid "unable to find filename in patch at line %d"
1029 -msgstr "不能处理 %d 类型的文件"
1033 +msgstr "不能在补丁的第 %d 行找到文件名"
1034
1035 #: builtin/apply.c:937
1036 #, c-format
1037 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1034 -msgstr ""
1038 +msgstr "git apply：错误的 git-diff - 期望 /dev/null，但在第 %2$d 行得到 %1$s"
1039
1040 #: builtin/apply.c:941
1041 #, c-format
1042 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1039 -msgstr ""
1043 +msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
1044
1045 #: builtin/apply.c:942
1046 #, c-format
1047 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1044 -msgstr ""
1048 +msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
1049
1050 #: builtin/apply.c:949
1051 #, c-format
1052 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1049 -msgstr ""
1053 +msgstr "git apply：错误的 git-diff - 期望 /dev/null 于第 %d 行"
1054
1055 #: builtin/apply.c:1394
1056 #, c-format
1057 msgid "recount: unexpected line: %.*s"
1054 -msgstr ""
1058 +msgstr "recount：意外的行：%.*s"
1059
1060 #: builtin/apply.c:1451
1061 #, c-format
1062 msgid "patch fragment without header at line %d: %.*s"
1059 -msgstr ""
1063 +msgstr "第 %d 行的补丁片段没有头信息：%.*s"
1064
1065 #: builtin/apply.c:1468
1066 #, c-format
@@ -1067,80 +1071,81 @@ msgid_plural ""
1071 "git diff header lacks filename information when removing %d leading pathname "
1072 "components (line %d)"
1073 msgstr[0] ""
1074 +"当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
1075
1076 #: builtin/apply.c:1628
1077 msgid "new file depends on old contents"
1073 -msgstr ""
1078 +msgstr "新文件依赖旧内容"
1079
1080 #: builtin/apply.c:1630
1081 msgid "deleted file still has contents"
1077 -msgstr ""
1082 +msgstr "删除的文件仍有内容"
1083
1084 #: builtin/apply.c:1656
1085 #, c-format
1086 msgid "corrupt patch at line %d"
1082 -msgstr ""
1087 +msgstr "补丁损坏位于第 %d 行"
1088
1089 #: builtin/apply.c:1692
1090 #, c-format
1091 msgid "new file %s depends on old contents"
1087 -msgstr ""
1092 +msgstr "新文件 %s 依赖旧内容"
1093
1094 #: builtin/apply.c:1694
1095 #, c-format
1096 msgid "deleted file %s still has contents"
1092 -msgstr ""
1097 +msgstr "删除的文件 %s 仍有内容"
1098
1099 #: builtin/apply.c:1697
1100 #, c-format
1101 msgid "** warning: file %s becomes empty but is not deleted"
1097 -msgstr ""
1102 +msgstr "** 警告：文件 %s 成为空文件但并未删除"
1103
1104 #: builtin/apply.c:1843
1105 #, c-format
1106 msgid "corrupt binary patch at line %d: %.*s"
1102 -msgstr ""
1107 +msgstr "二进制补丁在第 %d 行损坏：%.*s"
1108
1109 #. there has to be one hunk (forward hunk)
1110 #: builtin/apply.c:1872
1111 #, c-format
1112 msgid "unrecognized binary patch at line %d"
1108 -msgstr ""
1113 +msgstr "未能识别的二进制补丁位于第 %d 行"
1114
1115 #: builtin/apply.c:1958
1116 #, c-format
1117 msgid "patch with only garbage at line %d"
1113 -msgstr ""
1118 +msgstr "补丁文件的第 %d 行只有垃圾数据"
1119
1120 #: builtin/apply.c:2048
1116 -#, fuzzy, c-format
1121 +#, c-format
1122 msgid "unable to read symlink %s"
1118 -msgstr "无法读取树（%s）"
1123 +msgstr "无法读取符号链接 %s"
1124
1125 #: builtin/apply.c:2052
1121 -#, fuzzy, c-format
1126 +#, c-format
1127 msgid "unable to open or read %s"
1123 -msgstr "不能打开或读取 '%s'"
1128 +msgstr "不能打开或读取 %s"
1129
1130 #: builtin/apply.c:2123
1131 msgid "oops"
1127 -msgstr ""
1132 +msgstr "哎哟"
1133
1134 #: builtin/apply.c:2645
1130 -#, fuzzy, c-format
1135 +#, c-format
1136 msgid "invalid start of line: '%c'"
1132 -msgstr "无效引用：%s"
1137 +msgstr "无效的行首字符：'%c'"
1138
1139 #: builtin/apply.c:2763
1140 #, c-format
1141 msgid "Hunk #%d succeeded at %d (offset %d line)."
1142 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1138 -msgstr[0] ""
1143 +msgstr[0] "块 #%d 成功应用于 %d (偏移 %d 行）"
1144
1145 #: builtin/apply.c:2775
1146 #, c-format
1147 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1143 -msgstr ""
1148 +msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
1149
1150 #: builtin/apply.c:2781
1151 #, c-format
@@ -1148,95 +1153,97 @@ msgid ""
1153 "while searching for:\n"
1154 "%.*s"
1155 msgstr ""
1156 +"当查询：\n"
1157 +"%.*s"
1158
1159 #: builtin/apply.c:2800
1160 #, c-format
1161 msgid "missing binary patch data for '%s'"
1155 -msgstr ""
1162 +msgstr "缺失 '%s' 的二进制补丁数据"
1163
1164 #: builtin/apply.c:2903
1165 #, c-format
1166 msgid "binary patch does not apply to '%s'"
1160 -msgstr ""
1167 +msgstr "二进制补丁未应用到 '%s'"
1168
1169 #: builtin/apply.c:2909
1170 #, c-format
1171 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1165 -msgstr ""
1172 +msgstr "到 '%s' 的二进制补丁产生了不正确的结果（预期 %s，得到 %s）"
1173
1174 #: builtin/apply.c:2930
1175 #, c-format
1176 msgid "patch failed: %s:%ld"
1170 -msgstr ""
1177 +msgstr "打补丁失败：%s:%ld"
1178
1179 #: builtin/apply.c:3045
1180 #, c-format
1181 msgid "patch %s has been renamed/deleted"
1175 -msgstr ""
1182 +msgstr "补丁 %s 已经被重命名/删除"
1183
1184 #: builtin/apply.c:3052 builtin/apply.c:3069
1178 -#, fuzzy, c-format
1185 +#, c-format
1186 msgid "read of %s failed"
1180 -msgstr "重命名 '%s' 失败"
1187 +msgstr "读取 %s 失败"
1188
1189 #: builtin/apply.c:3084
1190 msgid "removal patch leaves file contents"
1184 -msgstr ""
1191 +msgstr "移除补丁仍留下了文件内容"
1192
1193 #: builtin/apply.c:3105
1187 -#, fuzzy, c-format
1194 +#, c-format
1195 msgid "%s: already exists in working directory"
1189 -msgstr "%s 存在且不是一个目录"
1196 +msgstr "%s：已经存在于工作区中"
1197
1198 #: builtin/apply.c:3143
1199 #, c-format
1200 msgid "%s: has been deleted/renamed"
1194 -msgstr ""
1201 +msgstr "%s：已经被删除/重命名"
1202
1203 #: builtin/apply.c:3148 builtin/apply.c:3179
1197 -#, fuzzy, c-format
1204 +#, c-format
1205 msgid "%s: %s"
1199 -msgstr "'%s'：%s"
1206 +msgstr "%s：%s"
1207
1208 #: builtin/apply.c:3159
1209 #, c-format
1210 msgid "%s: does not exist in index"
1204 -msgstr ""
1211 +msgstr "%s：不存在于索引中"
1212
1213 #: builtin/apply.c:3173
1207 -#, fuzzy, c-format
1214 +#, c-format
1215 msgid "%s: does not match index"
1209 -msgstr "不能读取索引"
1216 +msgstr "%s：和索引不匹配"
1217
1218 #: builtin/apply.c:3190
1219 #, c-format
1220 msgid "%s: wrong type"
1214 -msgstr ""
1221 +msgstr "%s：错误类型"
1222
1223 #: builtin/apply.c:3192
1224 #, c-format
1225 msgid "%s has type %o, expected %o"
1219 -msgstr ""
1226 +msgstr "%s 的类型是 %o，预期是 %o"
1227
1228 #: builtin/apply.c:3247
1222 -#, fuzzy, c-format
1229 +#, c-format
1230 msgid "%s: already exists in index"
1224 -msgstr "%s 已经存在"
1231 +msgstr "%s：已经存在于索引中"
1232
1233 #: builtin/apply.c:3266
1227 -#, c-format
1234 +#, fuzzy, c-format
1235 msgid "new mode (%o) of %s does not match old mode (%o)%s%s"
1229 -msgstr ""
1236 +msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）%4$s%5$s 不匹配"
1237
1238 #: builtin/apply.c:3272
1239 #, c-format
1240 msgid "%s: patch does not apply"
1234 -msgstr ""
1241 +msgstr "%s：补丁未应用"
1242
1243 #: builtin/apply.c:3285
1244 #, c-format
1245 msgid "Checking patch %s..."
1239 -msgstr ""
1246 +msgstr "检查补丁 %s..."
1247
1248 #: builtin/apply.c:3340 builtin/checkout.c:212 builtin/reset.c:158
1249 #, c-format
@@ -1244,220 +1251,215 @@ msgid "make_cache_entry failed for path '%s'"
1251 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1252
1253 #: builtin/apply.c:3483
1247 -#, fuzzy, c-format
1254 +#, c-format
1255 msgid "unable to remove %s from index"
1249 -msgstr "不能移动 %s 至 %s"
1256 +msgstr "不能从索引中移除 %s"
1257
1258 #: builtin/apply.c:3510
1259 #, c-format
1260 msgid "corrupt patch for subproject %s"
1254 -msgstr ""
1261 +msgstr "子项目 %s 损坏的补丁"
1262
1263 #: builtin/apply.c:3514
1257 -#, fuzzy, c-format
1264 +#, c-format
1265 msgid "unable to stat newly created file '%s'"
1259 -msgstr "不能创建文件 '%s'"
1266 +msgstr "不能枚举新建文件 '%s' 的状态"
1267
1268 #: builtin/apply.c:3519
1269 #, c-format
1270 msgid "unable to create backing store for newly created file %s"
1264 -msgstr ""
1271 +msgstr "不能为新建文件 %s 创建后端存储"
1272
1273 #: builtin/apply.c:3522
1267 -#, fuzzy, c-format
1274 +#, c-format
1275 msgid "unable to add cache entry for %s"
1269 -msgstr "无法为 '%s' 添加合并结果"
1276 +msgstr "无法为 %s 添加缓存条目"
1277
1278 #: builtin/apply.c:3555
1272 -#, fuzzy, c-format
1279 +#, c-format
1280 msgid "closing file '%s'"
1274 -msgstr "正克隆到 '%s'...\n"
1281 +msgstr "关闭文件 '%s'"
1282
1283 #: builtin/apply.c:3604
1277 -#, fuzzy, c-format
1284 +#, c-format
1285 msgid "unable to write file '%s' mode %o"
1279 -msgstr "不能写 %s"
1286 +msgstr "不能写文件 '%s' 权限 %o"
1287
1288 #: builtin/apply.c:3660
1289 #, c-format
1290 msgid "Applied patch %s cleanly."
1284 -msgstr ""
1291 +msgstr "成功应用补丁 %s。"
1292
1293 #: builtin/apply.c:3668
1287 -#, fuzzy
1294 msgid "internal error"
1289 -msgstr "在版本遍历时遇到内部错误"
1295 +msgstr "内部错误"
1296
1297 #. Say this even without --verbose
1298 #: builtin/apply.c:3671
1299 #, c-format
1300 msgid "Applying patch %%s with %d reject..."
1301 msgid_plural "Applying patch %%s with %d rejects..."
1296 -msgstr[0] ""
1302 +msgstr[0] "应用补丁 %%s 时 %d 个被拒绝..."
1303
1304 #: builtin/apply.c:3681
1305 #, c-format
1306 msgid "truncating .rej filename to %.*s.rej"
1301 -msgstr ""
1307 +msgstr "截短 .rej 文件名为 %.*s.rej"
1308
1309 #: builtin/apply.c:3702
1310 #, c-format
1311 msgid "Hunk #%d applied cleanly."
1306 -msgstr ""
1312 +msgstr "第 #%d 个片段成功应用。"
1313
1314 #: builtin/apply.c:3705
1315 #, c-format
1316 msgid "Rejected hunk #%d."
1311 -msgstr ""
1317 +msgstr "拒绝第 #%d 个片段。"
1318
1319 #: builtin/apply.c:3836
1314 -#, fuzzy
1320 msgid "unrecognized input"
1316 -msgstr "未识别的参数：%s"
1321 +msgstr "未能识别的输入"
1322
1323 #: builtin/apply.c:3847
1319 -#, fuzzy
1324 msgid "unable to read index file"
1321 -msgstr "无法写新的索引文件"
1325 +msgstr "无法读取索引文件"
1326
1327 #: builtin/apply.c:3962 builtin/apply.c:3965
1328 msgid "path"
1325 -msgstr ""
1329 +msgstr "路径"
1330
1331 #: builtin/apply.c:3963
1332 msgid "don't apply changes matching the given path"
1329 -msgstr ""
1333 +msgstr "不要应用与给出路径向匹配的变更"
1334
1335 #: builtin/apply.c:3966
1336 msgid "apply changes matching the given path"
1333 -msgstr ""
1337 +msgstr "应用与给出路径向匹配的变更"
1338
1339 #: builtin/apply.c:3968
1340 msgid "num"
1337 -msgstr ""
1341 +msgstr "数字"
1342
1343 #: builtin/apply.c:3969
1344 msgid "remove <num> leading slashes from traditional diff paths"
1341 -msgstr ""
1345 +msgstr "从传统的 diff 路径中移除 <数字> 个前导路径"
1346
1347 #: builtin/apply.c:3972
1348 msgid "ignore additions made by the patch"
1345 -msgstr ""
1349 +msgstr "忽略补丁中的添加的文件"
1350
1351 #: builtin/apply.c:3974
1352 msgid "instead of applying the patch, output diffstat for the input"
1349 -msgstr ""
1353 +msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
1354
1355 #: builtin/apply.c:3978
1356 msgid "shows number of added and deleted lines in decimal notation"
1353 -msgstr ""
1357 +msgstr "以数字方式显示添加或删除行的数量"
1358
1359 #: builtin/apply.c:3980
1360 msgid "instead of applying the patch, output a summary for the input"
1357 -msgstr ""
1361 +msgstr "不应用补丁，而是显示输入的概要"
1362
1363 #: builtin/apply.c:3982
1364 msgid "instead of applying the patch, see if the patch is applicable"
1361 -msgstr ""
1365 +msgstr "不应用补丁，而是查看补丁是否可应用"
1366
1367 #: builtin/apply.c:3984
1368 msgid "make sure the patch is applicable to the current index"
1365 -msgstr ""
1369 +msgstr "确认补丁可以应用到当前索引"
1370
1371 #: builtin/apply.c:3986
1372 msgid "apply a patch without touching the working tree"
1369 -msgstr ""
1373 +msgstr "应用补丁而不修改工作区"
1374
1375 #: builtin/apply.c:3988
1376 msgid "also apply the patch (use with --stat/--summary/--check)"
1373 -msgstr ""
1377 +msgstr "同时应用此补丁（和 --stat/--summary/--check 共用）"
1378
1379 #: builtin/apply.c:3990
1380 msgid "build a temporary index based on embedded index information"
1377 -msgstr ""
1381 +msgstr "创建一个临时索引基于嵌入的索引信息"
1382
1383 #: builtin/apply.c:3992
1384 msgid "paths are separated with NUL character"
1381 -msgstr ""
1385 +msgstr "路径以 NUL 字符分隔"
1386
1387 #: builtin/apply.c:3995
1388 msgid "ensure at least <n> lines of context match"
1385 -msgstr ""
1389 +msgstr "确保至少匹配 <n> 行上下文"
1390
1391 #: builtin/apply.c:3996
1392 msgid "action"
1389 -msgstr ""
1393 +msgstr "动作"
1394
1395 #: builtin/apply.c:3997
1396 msgid "detect new or modified lines that have whitespace errors"
1393 -msgstr ""
1397 +msgstr "检查新增和修改的行中间的空白字符滥用"
1398
1399 #: builtin/apply.c:4000 builtin/apply.c:4003
1400 msgid "ignore changes in whitespace when finding context"
1397 -msgstr ""
1401 +msgstr "查找上下文时忽略空白字符的变更"
1402
1403 #: builtin/apply.c:4006
1404 msgid "apply the patch in reverse"
1401 -msgstr ""
1405 +msgstr "反向应用补丁"
1406
1407 #: builtin/apply.c:4008
1408 msgid "don't expect at least one line of context"
1405 -msgstr ""
1409 +msgstr "无需至少一行上下文"
1410
1411 #: builtin/apply.c:4010
1412 msgid "leave the rejected hunks in corresponding *.rej files"
1409 -msgstr ""
1413 +msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
1414
1415 #: builtin/apply.c:4012
1416 msgid "allow overlapping hunks"
1413 -msgstr ""
1417 +msgstr "允许重叠的补丁片段"
1418
1419 #: builtin/apply.c:4013
1420 msgid "be verbose"
1417 -msgstr ""
1421 +msgstr "冗长输出"
1422
1423 #: builtin/apply.c:4015
1424 msgid "tolerate incorrectly detected missing new-line at the end of file"
1421 -msgstr ""
1425 +msgstr "宽容不正确的文件末尾换行符"
1426
1427 #: builtin/apply.c:4018
1428 msgid "do not trust the line counts in the hunk headers"
1425 -msgstr ""
1429 +msgstr "不信任补丁片段的头信息中的行号"
1430
1431 #: builtin/apply.c:4020
1432 msgid "root"
1429 -msgstr ""
1433 +msgstr "根目录"
1434
1435 #: builtin/apply.c:4021
1436 msgid "prepend <root> to all filenames"
1433 -msgstr ""
1437 +msgstr "为所有文件名前添加 <根目录>"
1438
1439 #: builtin/apply.c:4042
1436 -#, fuzzy
1440 msgid "--index outside a repository"
1438 -msgstr "不是一个 git 版本库"
1441 +msgstr "--index 在一个版本库之外"
1442
1443 #: builtin/apply.c:4045
1441 -#, fuzzy
1444 msgid "--cached outside a repository"
1443 -msgstr "不是一个 git 版本库"
1445 +msgstr "--cached 在一个版本库之外"
1446
1447 #: builtin/apply.c:4061
1446 -#, fuzzy, c-format
1448 +#, c-format
1449 msgid "can't open patch '%s'"
1448 -msgstr "不能打开 '%s'"
1450 +msgstr "不能打开补丁 '%s'"
1451
1452 #: builtin/apply.c:4075
1453 #, c-format
1454 msgid "squelched %d whitespace error"
1455 msgid_plural "squelched %d whitespace errors"
1454 -msgstr[0] ""
1456 +msgstr[0] "抑制下仍有 %d 个空白字符误用"
1457
1458 #: builtin/apply.c:4081 builtin/apply.c:4091
1459 #, c-format
1460 msgid "%d line adds whitespace errors."
1461 msgid_plural "%d lines add whitespace errors."
1460 -msgstr[0] ""
1462 +msgstr[0] "%d 行有空白字符误用。"
1463
1464 #: builtin/archive.c:17
1465 #, c-format
@@ -1528,14 +1530,13 @@ msgid "Cannot delete the branch '%s' which you are currently on."
1530 msgstr "无法删除您当前所在的分支 '%s'。"
1531
1532 #: builtin/branch.c:202
1531 -#, fuzzy, c-format
1533 msgid "remote branch '%s' not found."
1533 -msgstr "%s分支 '%s' 未发现。"
1534 +msgstr "远程分支 '%s' 未发现。"
1535
1536 #: builtin/branch.c:203
1536 -#, fuzzy, c-format
1537 +#, c-format
1538 msgid "branch '%s' not found."
1538 -msgstr "%s分支 '%s' 未发现。"
1539 +msgstr "分支 '%s' 未发现。"
1540
1541 #: builtin/branch.c:210
1542 #, c-format
@@ -1552,24 +1553,24 @@ msgstr ""
1553 "如果您确认要删除它，执行 'git branch -D %s'。"
1554
1555 #: builtin/branch.c:225
1555 -#, fuzzy, c-format
1556 +#, c-format
1557 msgid "Error deleting remote branch '%s'"
1557 -msgstr "删除 %s分支 '%s' 时出错"
1558 +msgstr "删除远程分支 '%s' 时出错"
1559
1560 #: builtin/branch.c:226
1560 -#, fuzzy, c-format
1561 +#, c-format
1562 msgid "Error deleting branch '%s'"
1562 -msgstr "删除 %s分支 '%s' 时出错"
1563 +msgstr "删除分支 '%s' 时出错"
1564
1565 #: builtin/branch.c:233
1565 -#, fuzzy, c-format
1566 +#, c-format
1567 msgid "Deleted remote branch %s (was %s).\n"
1567 -msgstr "已删除 %s分支 %s（曾为 %s）。\n"
1568 +msgstr "已删除远程分支 %s（曾为 %s）。\n"
1569
1570 #: builtin/branch.c:234
1570 -#, fuzzy, c-format
1571 +#, c-format
1572 msgid "Deleted branch %s (was %s).\n"
1572 -msgstr "已删除 %s分支 %s（曾为 %s）。\n"
1573 +msgstr "已删除分支 %s（曾为 %s）。\n"
1574
1575 #: builtin/branch.c:239
1576 msgid "Update of config-file failed"
@@ -1580,41 +1581,35 @@ msgstr "无法更新 config 文件"
1581 msgid "branch '%s' does not point at a commit"
1582 msgstr "分支 '%s' 未指向一个提交"
1583
1583 -# 译者：注意保持句尾空格
1584 #: builtin/branch.c:409
1585 -#, fuzzy, c-format
1585 +#, c-format
1586 msgid "[%s: behind %d]"
1587 -msgstr "落后 %d] "
1587 +msgstr "[%s：落后 %d]"
1588
1589 -# 译者：注意保持句尾空格
1589 #: builtin/branch.c:411
1591 -#, fuzzy, c-format
1590 +#, c-format
1591 msgid "[behind %d]"
1593 -msgstr "落后 %d] "
1592 +msgstr "[落后 %d]"
1593
1595 -# 译者：注意保持句尾空格
1594 #: builtin/branch.c:415
1597 -#, fuzzy, c-format
1595 +#, c-format
1596 msgid "[%s: ahead %d]"
1599 -msgstr "领先 %d] "
1597 +msgstr "[%s：领先 %d]"
1598
1601 -# 译者：注意保持句尾空格
1599 #: builtin/branch.c:417
1603 -#, fuzzy, c-format
1600 +#, c-format
1601 msgid "[ahead %d]"
1605 -msgstr "领先 %d] "
1602 +msgstr "[领先 %d]"
1603
1607 -# 译者：注意保持句尾空格
1604 #: builtin/branch.c:420
1609 -#, fuzzy, c-format
1605 +#, c-format
1606 msgid "[%s: ahead %d, behind %d]"
1611 -msgstr "领先 %d，落后 %d] "
1607 +msgstr "[%s：领先 %d，落后 %d]"
1608
1613 -# 译者：注意保持句尾空格
1609 #: builtin/branch.c:423
1615 -#, fuzzy, c-format
1610 +#, c-format
1611 msgid "[ahead %d, behind %d]"
1617 -msgstr "领先 %d，落后 %d] "
1612 +msgstr "[领先 %d，落后 %d]"
1613
1614 #: builtin/branch.c:535
1615 msgid "(no branch)"
@@ -1657,9 +1652,9 @@ msgid "malformed object name %s"
1652 msgstr "非法的对象名 %s"
1653
1654 #: builtin/branch.c:692
1660 -#, fuzzy, c-format
1655 +#, c-format
1656 msgid "could not write branch description template: %s"
1662 -msgstr "不能写分支描述模版：%s\n"
1657 +msgstr "不能写分支描述模版：%s"
1658
1659 #: builtin/branch.c:783
1660 msgid "Failed to resolve HEAD as a valid ref."
@@ -1670,9 +1665,8 @@ msgid "HEAD not found below refs/heads!"
1665 msgstr "HEAD 没有位于 /refs/heads 之下！"
1666
1667 #: builtin/branch.c:808
1673 -#, fuzzy
1668 msgid "--column and --verbose are incompatible"
1675 -msgstr "--all 和 --mirror 不兼容"
1669 +msgstr "--column 和 --verbose 不兼容"
1670
1671 #: builtin/branch.c:857
1672 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
@@ -2081,7 +2075,7 @@ msgstr "您似乎克隆了一个空版本库。"
2075
2076 #: builtin/column.c:51
2077 msgid "--command must be the first argument"
2084 -msgstr ""
2078 +msgstr "--command 必须是第一个参数"
2079
2080 #: builtin/commit.c:43
2081 msgid ""
@@ -2147,17 +2141,13 @@ msgstr "交互式添加失败"
2141 msgid "unable to write new_index file"
2142 msgstr "无法写 new_index 文件"
2143
2150 -# 译者：%s若翻为中文，前后不需要空格
2144 #: builtin/commit.c:386
2152 -#, fuzzy
2145 msgid "cannot do a partial commit during a merge."
2154 -msgstr "在%s过程中不能做部分提交。"
2146 +msgstr "在合并过程中不能做部分提交。"
2147
2156 -# 译者：%s若翻为中文，前后不需要空格
2148 #: builtin/commit.c:388
2158 -#, fuzzy
2149 msgid "cannot do a partial commit during a cherry-pick."
2160 -msgstr "在%s过程中不能做部分提交。"
2150 +msgstr "在拣选过程中不能做部分提交。"
2151
2152 #: builtin/commit.c:398
2153 msgid "cannot read the index"
@@ -2221,9 +2211,8 @@ msgstr "不能读取 '%s'"
2211 msgid "could not write commit template"
2212 msgstr "不能写提交模版"
2213
2224 -# 译者：%s若翻为中文，前后不需要空格
2214 #: builtin/commit.c:732
2226 -#, fuzzy, c-format
2215 +#, c-format
2216 msgid ""
2217 "\n"
2218 "It looks like you may be committing a merge.\n"
@@ -2232,14 +2221,12 @@ msgid ""
2221 "and try again.\n"
2222 msgstr ""
2223 "\n"
2235 -"看起来您正在提交一个%s。\n"
2236 -"如果不是这样，请删除文件\n"
2224 +"看起来您正在做一个合并提交。如果不对，请删除文件\n"
2225 "\t%s\n"
2226 "然后重试。\n"
2227
2240 -# 译者：%s若翻为中文，前后不需要空格
2228 #: builtin/commit.c:737
2242 -#, fuzzy, c-format
2229 +#, c-format
2230 msgid ""
2231 "\n"
2232 "It looks like you may be committing a cherry-pick.\n"
@@ -2248,32 +2235,26 @@ msgid ""
2235 "and try again.\n"
2236 msgstr ""
2237 "\n"
2251 -"看起来您正在提交一个%s。\n"
2252 -"如果不是这样，请删除文件\n"
2238 +"看起来您正在做一个拣选提交。如果不对，请删除文件\n"
2239 "\t%s\n"
2240 "然后重试。\n"
2241
2256 -# 译者：中文字符串拼接，可删除前导空格
2242 #: builtin/commit.c:749
2258 -#, fuzzy
2243 msgid ""
2244 "Please enter the commit message for your changes. Lines starting\n"
2245 "with '#' will be ignored, and an empty message aborts the commit.\n"
2246 msgstr ""
2263 -"以 '#' 开头\n"
2264 -"的行将被忽略，并且空的提交说明将会中止提交。\n"
2247 +"请为您的变更输入提交说明。以 '#' 开始的行将被忽略，而一个空的提交\n"
2248 +"说明将会终止提交。\n"
2249
2266 -# 译者：中文字符串拼接，可删除前导空格
2250 #: builtin/commit.c:754
2268 -#, fuzzy
2251 msgid ""
2252 "Please enter the commit message for your changes. Lines starting\n"
2253 "with '#' will be kept; you may remove them yourself if you want to.\n"
2254 "An empty message aborts the commit.\n"
2255 msgstr ""
2274 -"以 '#' 开头\n"
2275 -"的行将被保留，您可以删除它们如果您想这样做的话。空的提交说明将会\n"
2276 -"中止提交。\n"
2256 +"请为您的变更输入提交说明。以 '#' 开始的行将被保留，您可以删除它们\n"
2257 +"如果您想这样做的话。而一个空的提交说明将会终止提交。\n"
2258
2259 # 译者：为保证在输出中对齐，注意调整句中空格！
2260 #: builtin/commit.c:767
@@ -2318,17 +2299,13 @@ msgstr "同时使用 --reset-author 和 --author 没有意义"
2299 msgid "You have nothing to amend."
2300 msgstr "您没有可修补的提交。"
2301
2321 -# 译者：%s若翻为中文，前后不需要空格
2302 #: builtin/commit.c:1012
2323 -#, fuzzy
2303 msgid "You are in the middle of a merge -- cannot amend."
2325 -msgstr "您正处于一个%s的过程中 -- 无法修补提交。"
2304 +msgstr "您正处于一个合并过程中 -- 无法修补提交。"
2305
2327 -# 译者：%s若翻为中文，前后不需要空格
2306 #: builtin/commit.c:1014
2329 -#, fuzzy
2307 msgid "You are in the middle of a cherry-pick -- cannot amend."
2331 -msgstr "您正处于一个%s的过程中 -- 无法修补提交。"
2308 +msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
2309
2310 #: builtin/commit.c:1017
2311 msgid "Options --squash and --fixup cannot be used together"
@@ -2641,15 +2618,15 @@ msgstr ""
2618
2619 # 译者：注意保持前导空格
2620 #: builtin/fetch.c:549
2644 -#, fuzzy, c-format
2621 +#, c-format
2622 msgid " (%s will become dangling)"
2646 -msgstr " （%s 将成为悬空状态）\n"
2623 +msgstr " （%s 将成为悬空状态）"
2624
2625 # 译者：注意保持前导空格
2626 #: builtin/fetch.c:550
2650 -#, fuzzy, c-format
2627 +#, c-format
2628 msgid " (%s has become dangling)"
2652 -msgstr " （%s 已成为悬空状态）\n"
2629 +msgstr " （%s 已成为悬空状态）"
2630
2631 #: builtin/fetch.c:557
2632 msgid "[deleted]"
@@ -2677,7 +2654,7 @@ msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
2654 #: builtin/fetch.c:789
2655 #, c-format
2656 msgid "Option \"%s\" is ignored for %s\n"
2680 -msgstr "选项 \"%s\" 对于 %s 被忽略\n"
2657 +msgstr "选项 \"%s\" 为 %s 所忽略\n"
2658
2659 #: builtin/fetch.c:888
2660 #, c-format
@@ -2805,29 +2782,27 @@ msgid "both --cached and trees are given."
2782 msgstr "同时给出了 --cached 和树对象。"
2783
2784 #: builtin/help.c:59
2808 -#, fuzzy, c-format
2785 +#, c-format
2786 msgid "unrecognized help format '%s'"
2810 -msgstr "未识别的参数：%s"
2787 +msgstr "未能识别的帮助格式 '%s'"
2788
2789 #: builtin/help.c:87
2813 -#, fuzzy
2790 msgid "Failed to start emacsclient."
2815 -msgstr "无法枚举 %s 状态\n"
2791 +msgstr "无法启动 emacsclient。"
2792
2793 #: builtin/help.c:100
2818 -#, fuzzy
2794 msgid "Failed to parse emacsclient version."
2820 -msgstr "无法读取对象 '%s'。"
2795 +msgstr "无法解析 emacsclient 版本。"
2796
2797 #: builtin/help.c:108
2798 #, c-format
2799 msgid "emacsclient version '%d' too old (< 22)."
2825 -msgstr ""
2800 +msgstr "emacsclient 版本 '%d' 太老 (< 22)。"
2801
2802 #: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
2828 -#, fuzzy, c-format
2803 +#, c-format
2804 msgid "failed to exec '%s': %s"
2830 -msgstr "无法打开 '%s'"
2805 +msgstr "无法执行 '%s'：%s"
2806
2807 #: builtin/help.c:211
2808 #, c-format
@@ -2835,6 +2810,8 @@ msgid ""
2810 "'%s': path for unsupported man viewer.\n"
2811 "Please consider using 'man.<tool>.cmd' instead."
2812 msgstr ""
2813 +"'%s'：不支持的 man 手册查看器的路径。\n"
2814 +"请使用 'man.<tool>.cmd'。"
2815
2816 #: builtin/help.c:223
2817 #, c-format
@@ -2842,274 +2819,266 @@ msgid ""
2819 "'%s': cmd for supported man viewer.\n"
2820 "Please consider using 'man.<tool>.path' instead."
2821 msgstr ""
2822 +"'%s': 支持的 man 手册查看器命令。\n"
2823 +"请使用 'man.<tool>.path'。"
2824
2825 #: builtin/help.c:287
2826 msgid "The most commonly used git commands are:"
2848 -msgstr ""
2827 +msgstr "最常用的 git 命令有："
2828
2829 #: builtin/help.c:355
2830 #, c-format
2831 msgid "'%s': unknown man viewer."
2853 -msgstr ""
2832 +msgstr "'%s'：未知的 man 查看器。"
2833
2834 #: builtin/help.c:372
2856 -#, fuzzy
2835 msgid "no man viewer handled the request"
2858 -msgstr "没有合并策略处理此合并。\n"
2836 +msgstr "没有 man 查看器处理此请求"
2837
2838 #: builtin/help.c:380
2839 msgid "no info viewer handled the request"
2862 -msgstr ""
2840 +msgstr "没有 info 查看器处理此请求"
2841
2842 #: builtin/help.c:391
2865 -#, fuzzy, c-format
2843 +#, c-format
2844 msgid "'%s': not a documentation directory."
2867 -msgstr "不能访问当前工作目录"
2845 +msgstr "'%s'：不是一个文档目录。"
2846
2847 #: builtin/help.c:432 builtin/help.c:439
2848 #, c-format
2849 msgid "usage: %s%s"
2872 -msgstr ""
2850 +msgstr "用法：%s%s"
2851
2852 #: builtin/help.c:453
2853 #, c-format
2854 msgid "`git %s' is aliased to `%s'"
2877 -msgstr ""
2855 +msgstr "`git %s' 是 `%s' 的别名"
2856
2857 #: builtin/index-pack.c:169
2858 #, c-format
2859 msgid "object type mismatch at %s"
2882 -msgstr ""
2860 +msgstr "%s 的对象类型不匹配"
2861
2862 #: builtin/index-pack.c:189
2863 msgid "object of unexpected type"
2886 -msgstr ""
2864 +msgstr "意外的类型的对象"
2865
2866 #: builtin/index-pack.c:226
2889 -#, fuzzy, c-format
2867 +#, c-format
2868 msgid "cannot fill %d byte"
2869 msgid_plural "cannot fill %d bytes"
2892 -msgstr[0] "无法获知当前路径"
2870 +msgstr[0] "无法填充 %d 字节"
2871
2872 #: builtin/index-pack.c:236
2873 msgid "early EOF"
2896 -msgstr ""
2874 +msgstr "过早的文件结束符（EOF）"
2875
2876 #: builtin/index-pack.c:237
2877 msgid "read error on input"
2900 -msgstr ""
2878 +msgstr "输入上的读错误"
2879
2880 #: builtin/index-pack.c:249
2881 msgid "used more bytes than were available"
2904 -msgstr ""
2882 +msgstr "用掉了超过可用的字节"
2883
2884 #: builtin/index-pack.c:256
2885 msgid "pack too large for current definition of off_t"
2908 -msgstr ""
2886 +msgstr "包太大超过了当前 off_t 的定义"
2887
2888 #: builtin/index-pack.c:272
2911 -#, fuzzy, c-format
2889 +#, c-format
2890 msgid "unable to create '%s'"
2913 -msgstr "不能写 %s"
2891 +msgstr "不能创建 '%s'"
2892
2893 #: builtin/index-pack.c:277
2916 -#, fuzzy, c-format
2894 +#, c-format
2895 msgid "cannot open packfile '%s'"
2918 -msgstr "无法打开补丁文件 %s"
2896 +msgstr "无法打开包文件 '%s'"
2897
2898 #: builtin/index-pack.c:291
2899 msgid "pack signature mismatch"
2922 -msgstr ""
2900 +msgstr "包签名不匹配"
2901
2902 #: builtin/index-pack.c:311
2903 #, c-format
2904 msgid "pack has bad object at offset %lu: %s"
2927 -msgstr ""
2905 +msgstr "包中有错误的对象位于 %lu：%s"
2906
2907 #: builtin/index-pack.c:405
2908 #, c-format
2909 msgid "inflate returned %d"
2932 -msgstr ""
2910 +msgstr "解压缩返回 %d"
2911
2912 #: builtin/index-pack.c:450
2913 msgid "offset value overflow for delta base object"
2936 -msgstr ""
2914 +msgstr "偏移值覆盖了 delta 基准对象"
2915
2916 #: builtin/index-pack.c:458
2917 msgid "delta base offset is out of bound"
2940 -msgstr ""
2918 +msgstr "delta 基准偏移越界"
2919
2920 #: builtin/index-pack.c:466
2943 -#, fuzzy, c-format
2921 +#, c-format
2922 msgid "unknown object type %d"
2945 -msgstr "未知类型：%d"
2923 +msgstr "未知对象类型 %d"
2924
2925 #: builtin/index-pack.c:495
2948 -#, fuzzy
2926 msgid "cannot pread pack file"
2950 -msgstr "无法打开补丁文件 %s"
2927 +msgstr "无法读取包文件"
2928
2929 #: builtin/index-pack.c:497
2930 #, c-format
2931 msgid "premature end of pack file, %lu byte missing"
2932 msgid_plural "premature end of pack file, %lu bytes missing"
2956 -msgstr[0] ""
2933 +msgstr[0] "包文件过早结束，缺少 %lu 字节"
2934
2935 #: builtin/index-pack.c:510
2936 msgid "serious inflate inconsistency"
2960 -msgstr ""
2937 +msgstr "解压缩严重的不一致"
2938
2939 #: builtin/index-pack.c:583
2963 -#, fuzzy, c-format
2940 +#, c-format
2941 msgid "cannot read existing object %s"
2965 -msgstr "不能读取对象 %s"
2942 +msgstr "不能读取现存对象 %s"
2943
2944 #: builtin/index-pack.c:586
2945 #, c-format
2946 msgid "SHA1 COLLISION FOUND WITH %s !"
2970 -msgstr ""
2947 +msgstr "发现 %s 出现 SHA1 冲突！"
2948
2949 #: builtin/index-pack.c:598
2973 -#, fuzzy, c-format
2950 +#, c-format
2951 msgid "invalid blob object %s"
2975 -msgstr "不是一个有效对象：%s"
2952 +msgstr "无效的 blob 对象 %s"
2953
2954 #: builtin/index-pack.c:610
2978 -#, fuzzy, c-format
2955 +#, c-format
2956 msgid "invalid %s"
2980 -msgstr "无效键名：%s"
2957 +msgstr "无效的 %s"
2958
2959 #: builtin/index-pack.c:612
2960 msgid "Error in object"
2984 -msgstr ""
2961 +msgstr "对象中出错"
2962
2963 #: builtin/index-pack.c:614
2964 #, c-format
2965 msgid "Not all child objects of %s are reachable"
2989 -msgstr ""
2966 +msgstr "%s 的所有子对象并非都可达"
2967
2968 #: builtin/index-pack.c:687 builtin/index-pack.c:713
2992 -#, fuzzy
2969 msgid "failed to apply delta"
2994 -msgstr "无法拷贝文件至 '%s'"
2970 +msgstr "无法应用 delta"
2971
2972 #: builtin/index-pack.c:850
2997 -#, fuzzy
2973 msgid "Receiving objects"
2999 -msgstr "删除对象 %s 的注解\n"
2974 +msgstr "接收对象中"
2975
2976 #: builtin/index-pack.c:850
3002 -#, fuzzy
2977 msgid "Indexing objects"
3004 -msgstr "坏对象 %s"
2978 +msgstr "索引对象中"
2979
2980 #: builtin/index-pack.c:872
2981 msgid "pack is corrupted (SHA1 mismatch)"
3008 -msgstr ""
2982 +msgstr "包冲突（SHA1 不匹配）"
2983
2984 #: builtin/index-pack.c:877
3011 -#, fuzzy
2985 msgid "cannot fstat packfile"
3013 -msgstr "不能枚举模版 '%s' 状态"
2986 +msgstr "不能枚举包文件状态"
2987
2988 #: builtin/index-pack.c:880
2989 msgid "pack has junk at the end"
3017 -msgstr ""
2990 +msgstr "包的结尾有垃圾数据"
2991
2992 #: builtin/index-pack.c:903
3020 -#, fuzzy
2993 msgid "Resolving deltas"
3022 -msgstr "正删除 %s\n"
2994 +msgstr "处理 delta 中"
2995
2996 #: builtin/index-pack.c:954
2997 msgid "confusion beyond insanity"
3026 -msgstr ""
2998 +msgstr "不可理喻"
2999
3000 #: builtin/index-pack.c:973
3001 #, c-format
3002 msgid "pack has %d unresolved delta"
3003 msgid_plural "pack has %d unresolved deltas"
3032 -msgstr[0] ""
3004 +msgstr[0] "包有 %d 个未解决的 delta"
3005
3006 #: builtin/index-pack.c:998
3035 -#, fuzzy, c-format
3007 +#, c-format
3008 msgid "unable to deflate appended object (%d)"
3037 -msgstr "不能写注解对象"
3009 +msgstr "不能缩小附加对象（%d）"
3010
3011 #: builtin/index-pack.c:1077
3012 #, c-format
3013 msgid "local object %s is corrupt"
3042 -msgstr ""
3014 +msgstr "本地对象 %s 已损坏"
3015
3016 #: builtin/index-pack.c:1101
3017 msgid "error while closing pack file"
3046 -msgstr ""
3018 +msgstr "关闭包文件时出错"
3019
3020 #: builtin/index-pack.c:1114
3049 -#, fuzzy, c-format
3021 +#, c-format
3022 msgid "cannot write keep file '%s'"
3051 -msgstr "不能枚举模版 '%s' 状态"
3023 +msgstr "无法写保留文件 '%s'"
3024
3025 #: builtin/index-pack.c:1122
3054 -#, fuzzy, c-format
3026 +#, c-format
3027 msgid "cannot close written keep file '%s'"
3056 -msgstr "不能枚举模版 '%s' 状态"
3028 +msgstr "无法关闭保留文件 '%s'"
3029
3030 #: builtin/index-pack.c:1135
3059 -#, fuzzy
3031 msgid "cannot store pack file"
3061 -msgstr "无法打开补丁文件 %s"
3032 +msgstr "无法存储包文件"
3033
3034 #: builtin/index-pack.c:1146
3064 -#, fuzzy
3035 msgid "cannot store index file"
3066 -msgstr "无法读取索引"
3036 +msgstr "无法存储索引文件"
3037
3038 #: builtin/index-pack.c:1247
3069 -#, fuzzy, c-format
3039 +#, c-format
3040 msgid "Cannot open existing pack file '%s'"
3071 -msgstr "无法打开补丁文件 %s"
3041 +msgstr "无法打开现存包文件 '%s'"
3042
3043 #: builtin/index-pack.c:1249
3074 -#, fuzzy, c-format
3044 +#, c-format
3045 msgid "Cannot open existing pack idx file for '%s'"
3076 -msgstr "无法打开补丁文件 %s"
3046 +msgstr "无法为 %s 打开包索引文件"
3047
3048 #: builtin/index-pack.c:1296
3079 -#, fuzzy, c-format
3049 +#, c-format
3050 msgid "non delta: %d object"
3051 msgid_plural "non delta: %d objects"
3082 -msgstr[0] "不是一个有效对象：%s"
3052 +msgstr[0] "非 delta：%d 个对象"
3053
3054 #: builtin/index-pack.c:1303
3055 #, c-format
3056 msgid "chain length = %d: %lu object"
3057 msgid_plural "chain length = %d: %lu objects"
3088 -msgstr[0] ""
3058 +msgstr[0] "链长 = %d: %lu 对象"
3059
3060 #: builtin/index-pack.c:1330
3061 msgid "Cannot come back to cwd"
3092 -msgstr ""
3062 +msgstr "无法返回当前工作目录"
3063
3064 #: builtin/index-pack.c:1374 builtin/index-pack.c:1377
3065 #: builtin/index-pack.c:1389 builtin/index-pack.c:1393
3096 -#, fuzzy, c-format
3066 +#, c-format
3067 msgid "bad %s"
3098 -msgstr "坏对象 %s"
3068 +msgstr "错误选项 %s"
3069
3070 #: builtin/index-pack.c:1407
3101 -#, fuzzy
3071 msgid "--fix-thin cannot be used without --stdin"
3103 -msgstr "--orphan 不能和 -t 共用"
3072 +msgstr "--fix-thin 不能和 --stdin 共用"
3073
3074 #: builtin/index-pack.c:1411 builtin/index-pack.c:1421
3075 #, c-format
3076 msgid "packfile name '%s' does not end with '.pack'"
3108 -msgstr ""
3077 +msgstr "包名 '%s' 没有以 '.pack' 结尾"
3078
3079 #: builtin/index-pack.c:1430
3080 msgid "--verify with no packfile name given"
3112 -msgstr ""
3081 +msgstr "--verify 没有提供包名参数"
3082
3083 #: builtin/init-db.c:35
3084 #, c-format
@@ -3174,7 +3143,7 @@ msgstr "模版未找到 %s"
3143 #: builtin/init-db.c:154
3144 #, c-format
3145 msgid "not copying templates of a wrong format version %d from '%s'"
3177 -msgstr "未复制错误版本 %d 的模版自 '%s'"
3146 +msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
3147
3148 #: builtin/init-db.c:192
3149 #, c-format
@@ -3852,7 +3821,7 @@ msgstr "选项 %s 不接受否定格式"
3821 #: builtin/pack-objects.c:2346
3822 #, c-format
3823 msgid "unable to parse value '%s' for option %s"
3855 -msgstr "不能解析值 '%s' 针对于选项 %s"
3824 +msgstr "不能解析选项 %1$s 的值 '%2$s'"
3825
3826 #: builtin/push.c:45
3827 msgid "tag shorthand without <tag>"
@@ -3867,6 +3836,8 @@ msgid ""
3836 "\n"
3837 "To choose either option permanently, see push.default in 'git help config'."
3838 msgstr ""
3839 +"\n"
3840 +"为了永久地选择任一选项，参见 'git help config' 中的 push.default。"
3841
3842 #: builtin/push.c:102
3843 #, c-format
@@ -3882,6 +3853,15 @@ msgid ""
3853 " git push %s %s\n"
3854 "%s"
3855 msgstr ""
3856 +"如果您当前分支的上游分支和您当前分支名不匹配，为推送到远程的\n"
3857 +"上游分支，使用\n"
3858 +"\n"
3859 +" git push %s HEAD:%s\n"
3860 +"\n"
3861 +"为推送至远程同名分支，使用\n"
3862 +"\n"
3863 +" git push %s %s\n"
3864 +"%s"
3865
3866 #: builtin/push.c:121
3867 #, c-format
@@ -4028,82 +4008,83 @@ msgid "--delete doesn't make sense without any refs"
4008 msgstr "--delete 未接任何引用没有意义"
4009
4010 #: builtin/remote.c:98
4031 -#, fuzzy, c-format
4011 +#, c-format
4012 msgid "Updating %s"
4033 -msgstr "更新 %s..%s\n"
4013 +msgstr "更新 %s 中"
4014
4015 #: builtin/remote.c:130
4016 msgid ""
4017 "--mirror is dangerous and deprecated; please\n"
4018 "\t use --mirror=fetch or --mirror=push instead"
4019 msgstr ""
4020 +"--mirror 选项危险且过时，请使用 --mirror=fetch\n"
4021 +"\t 或 --mirror=push"
4022
4023 #: builtin/remote.c:147
4042 -#, fuzzy, c-format
4024 +#, c-format
4025 msgid "unknown mirror argument: %s"
4044 -msgstr "未识别的参数：%s"
4026 +msgstr "未知的镜像参数：%s"
4027
4028 #: builtin/remote.c:185
4029 msgid "specifying a master branch makes no sense with --mirror"
4048 -msgstr ""
4030 +msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
4031
4032 #: builtin/remote.c:187
4033 msgid "specifying branches to track makes sense only with fetch mirrors"
4052 -msgstr ""
4034 +msgstr "指定要跟踪的分支只在与获取镜像共用才有意义"
4035
4036 #: builtin/remote.c:195 builtin/remote.c:646
4055 -#, fuzzy, c-format
4037 +#, c-format
4038 msgid "remote %s already exists."
4057 -msgstr "%s 已经存在"
4039 +msgstr "远程 %s 已经存在。"
4040
4041 #: builtin/remote.c:199 builtin/remote.c:650
4060 -#, fuzzy, c-format
4042 +#, c-format
4043 msgid "'%s' is not a valid remote name"
4062 -msgstr "'%s' 不是一个有效的tag名称。"
4044 +msgstr "'%s' 不是一个有效的远程名称"
4045
4046 #: builtin/remote.c:243
4065 -#, fuzzy, c-format
4047 +#, c-format
4048 msgid "Could not setup master '%s'"
4067 -msgstr "不能查看文件状态 '%s'"
4049 +msgstr "无法设置 master '%s'"
4050
4051 #: builtin/remote.c:299
4070 -#, fuzzy, c-format
4052 +#, c-format
4053 msgid "more than one %s"
4072 -msgstr "提供了超过两个 blob 对象：'%s'"
4054 +msgstr "多于一个 %s"
4055
4056 #: builtin/remote.c:339
4075 -#, fuzzy, c-format
4057 +#, c-format
4058 msgid "Could not get fetch map for refspec %s"
4077 -msgstr "不能获取 %s"
4059 +msgstr "无法得到引用表达式 %s 的获取列表"
4060
4061 #: builtin/remote.c:440 builtin/remote.c:448
4062 msgid "(matching)"
4081 -msgstr ""
4063 +msgstr "（匹配）"
4064
4065 #: builtin/remote.c:452
4084 -#, fuzzy
4066 msgid "(delete)"
4086 -msgstr "[已删除]"
4067 +msgstr "（删除）"
4068
4069 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
4089 -#, fuzzy, c-format
4070 +#, c-format
4071 msgid "Could not append '%s' to '%s'"
4091 -msgstr "不能应用 '%s'"
4072 +msgstr "不能添加 '%s' 至 '%s'"
4073
4074 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
4094 -#, fuzzy, c-format
4075 +#, c-format
4076 msgid "No such remote: %s"
4096 -msgstr "没有这样的远程或远程组：%s"
4077 +msgstr "没有这样的远程：%s"
4078
4079 #: builtin/remote.c:656
4099 -#, fuzzy, c-format
4080 +#, c-format
4081 msgid "Could not rename config section '%s' to '%s'"
4101 -msgstr "不能创建目录 '%s'"
4082 +msgstr "不能重命名配置小节 '%s' 到 '%s'"
4083
4084 #: builtin/remote.c:662 builtin/remote.c:799
4104 -#, fuzzy, c-format
4085 +#, c-format
4086 msgid "Could not remove config section '%s'"
4106 -msgstr "不能创建目录 '%s'"
4087 +msgstr "不能移除配置小节 '%s'"
4088
4089 #: builtin/remote.c:677
4090 #, c-format
@@ -4112,31 +4093,34 @@ msgid ""
4093 "\t%s\n"
4094 "\tPlease update the configuration manually if necessary."
4095 msgstr ""
4096 +"没有更新非默认的获取引用表达式\n"
4097 +"\t%s\n"
4098 +"\t如果必要请手动更新配置。"
4099
4100 #: builtin/remote.c:683
4117 -#, fuzzy, c-format
4101 +#, c-format
4102 msgid "Could not append '%s'"
4119 -msgstr "不能应用 '%s'"
4103 +msgstr "不能追加 '%s'"
4104
4105 #: builtin/remote.c:694
4122 -#, fuzzy, c-format
4106 +#, c-format
4107 msgid "Could not set '%s'"
4124 -msgstr "不能查看文件状态 '%s'"
4108 +msgstr "不能设置 '%s'"
4109
4110 #: builtin/remote.c:716
4127 -#, fuzzy, c-format
4111 +#, c-format
4112 msgid "deleting '%s' failed"
4129 -msgstr "重命名 '%s' 失败"
4113 +msgstr "删除 '%s' 失败"
4114
4115 #: builtin/remote.c:750
4132 -#, fuzzy, c-format
4116 +#, c-format
4117 msgid "creating '%s' failed"
4134 -msgstr "重命名 '%s' 失败"
4118 +msgstr "创建 '%s' 失败"
4119
4120 #: builtin/remote.c:764
4137 -#, fuzzy, c-format
4121 +#, c-format
4122 msgid "Could not remove branch %s"
4139 -msgstr "不会删除 %s\n"
4123 +msgstr "无法移除分支 %s"
4124
4125 #: builtin/remote.c:834
4126 msgid ""
@@ -4146,236 +4130,233 @@ msgid_plural ""
4130 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
4131 "to delete them, use:"
4132 msgstr[0] ""
4133 +"注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："
4134 +msgstr[1] ""
4135 +"注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："
4136
4137 #: builtin/remote.c:943
4138 #, c-format
4139 msgid " new (next fetch will store in remotes/%s)"
4153 -msgstr ""
4140 +msgstr " 新的（下一次获取将存储于 remotes/%s）"
4141
4142 #: builtin/remote.c:946
4156 -#, fuzzy
4143 msgid " tracked"
4158 -msgstr "未跟踪的"
4144 +msgstr " 已跟踪"
4145
4146 #: builtin/remote.c:948
4147 msgid " stale (use 'git remote prune' to remove)"
4162 -msgstr ""
4148 +msgstr " 过时（使用 'git remote prune' 来移除）"
4149
4150 #: builtin/remote.c:950
4151 msgid " ???"
4166 -msgstr ""
4152 +msgstr " ???"
4153
4154 #: builtin/remote.c:991
4155 #, c-format
4156 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
4171 -msgstr ""
4157 +msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"
4158
4159 #: builtin/remote.c:998
4174 -#, fuzzy, c-format
4160 +#, c-format
4161 msgid "rebases onto remote %s"
4176 -msgstr "无法删除 %s"
4162 +msgstr "变基到远程 %s"
4163
4164 #: builtin/remote.c:1001
4179 -#, fuzzy, c-format
4165 +#, c-format
4166 msgid " merges with remote %s"
4181 -msgstr "使用策略 %s 合并失败。\n"
4167 +msgstr " 与远程 %s 合并"
4168
4169 #: builtin/remote.c:1002
4170 msgid " and with remote"
4185 -msgstr ""
4171 +msgstr " 且有远程"
4172
4173 #: builtin/remote.c:1004
4188 -#, fuzzy, c-format
4174 +#, c-format
4175 msgid "merges with remote %s"
4190 -msgstr "使用策略 %s 合并失败。\n"
4176 +msgstr "与远程 %s 合并"
4177
4178 #: builtin/remote.c:1005
4179 msgid " and with remote"
4194 -msgstr ""
4180 +msgstr " 且有远程"
4181
4182 #: builtin/remote.c:1051
4183 msgid "create"
4198 -msgstr ""
4184 +msgstr "创建"
4185
4186 #: builtin/remote.c:1054
4201 -#, fuzzy
4187 msgid "delete"
4203 -msgstr "[已删除]"
4188 +msgstr "删除"
4189
4190 #: builtin/remote.c:1058
4206 -#, fuzzy
4191 msgid "up to date"
4208 -msgstr "[最新]"
4192 +msgstr "最新"
4193
4194 #: builtin/remote.c:1061
4211 -#, fuzzy
4195 msgid "fast-forwardable"
4213 -msgstr "（非快进式）"
4196 +msgstr "可快进"
4197
4198 #: builtin/remote.c:1064
4199 msgid "local out of date"
4217 -msgstr ""
4200 +msgstr "本地已过时"
4201
4202 #: builtin/remote.c:1071
4203 #, c-format
4204 msgid " %-*s forces to %-*s (%s)"
4222 -msgstr ""
4205 +msgstr " %-*s 强制推送至 %-*s (%s)"
4206
4207 #: builtin/remote.c:1074
4208 #, c-format
4209 msgid " %-*s pushes to %-*s (%s)"
4227 -msgstr ""
4210 +msgstr " %-*s 推送至 %-*s (%s)"
4211
4212 #: builtin/remote.c:1078
4213 #, c-format
4214 msgid " %-*s forces to %s"
4232 -msgstr ""
4215 +msgstr " %-*s 强制推送至 %s"
4216
4217 #: builtin/remote.c:1081
4218 #, c-format
4219 msgid " %-*s pushes to %s"
4237 -msgstr ""
4220 +msgstr " %-*s 推送至 %s"
4221
4239 -# 译者：汉字之间无空格，故删除尾部空格
4222 #: builtin/remote.c:1118
4241 -#, fuzzy, c-format
4223 +#, c-format
4224 msgid "* remote %s"
4243 -msgstr "远程"
4225 +msgstr "* 远程 %s"
4226
4227 #: builtin/remote.c:1119
4228 #, c-format
4229 msgid " Fetch URL: %s"
4248 -msgstr ""
4230 +msgstr " 获取地址：%s"
4231
4232 #: builtin/remote.c:1120 builtin/remote.c:1285
4233 msgid "(no URL)"
4252 -msgstr ""
4234 +msgstr "(无 URL)"
4235
4236 #: builtin/remote.c:1129 builtin/remote.c:1131
4237 #, c-format
4238 msgid " Push URL: %s"
4257 -msgstr ""
4239 +msgstr " 推送地址：%s"
4240
4241 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
4260 -#, fuzzy, c-format
4242 +#, c-format
4243 msgid " HEAD branch: %s"
4262 -msgstr "HEAD（非分支）"
4244 +msgstr " HEAD分支：%s"
4245
4246 #: builtin/remote.c:1139
4247 #, c-format
4248 msgid ""
4249 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
4250 msgstr ""
4251 +" HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
4252
4253 #: builtin/remote.c:1151
4271 -#, fuzzy, c-format
4254 +#, c-format
4255 msgid " Remote branch:%s"
4256 msgid_plural " Remote branches:%s"
4274 -msgstr[0] "重置分支 '%s'\n"
4257 +msgstr[0] " 远程分支：%s"
4258
4259 +# 译者：中文字符串拼接，可删除前导空格
4260 #: builtin/remote.c:1154 builtin/remote.c:1181
4261 msgid " (status not queried)"
4278 -msgstr ""
4262 +msgstr "（状态未查询）"
4263
4264 #: builtin/remote.c:1163
4265 msgid " Local branch configured for 'git pull':"
4266 msgid_plural " Local branches configured for 'git pull':"
4283 -msgstr[0] ""
4267 +msgstr[0] " 为 'git pull' 配置的本地分支："
4268
4269 #: builtin/remote.c:1171
4270 msgid " Local refs will be mirrored by 'git push'"
4287 -msgstr ""
4271 +msgstr " 本地引用将在 'git push' 时被镜像"
4272
4273 #: builtin/remote.c:1178
4290 -#, fuzzy, c-format
4274 +#, c-format
4275 msgid " Local ref configured for 'git push'%s:"
4276 msgid_plural " Local refs configured for 'git push'%s:"
4293 -msgstr[0] "尚未给分支 '%s' 设置上游"
4277 +msgstr[0] " 为 'git push' 配置的本地引用%s："
4278
4279 #: builtin/remote.c:1216
4296 -#, fuzzy
4280 msgid "Cannot determine remote HEAD"
4298 -msgstr "不能解析 HEAD"
4281 +msgstr "无法确定远程 HEAD"
4282
4283 #: builtin/remote.c:1218
4284 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
4302 -msgstr ""
4285 +msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
4286
4287 #: builtin/remote.c:1228
4305 -#, fuzzy, c-format
4288 +#, c-format
4289 msgid "Could not delete %s"
4307 -msgstr "不能获取 %s"
4290 +msgstr "无法删除 %s"
4291
4292 #: builtin/remote.c:1236
4310 -#, fuzzy, c-format
4293 +#, c-format
4294 msgid "Not a valid ref: %s"
4312 -msgstr "不是一个有效对象：%s"
4295 +msgstr "不是一个有效引用：%s"
4296
4297 #: builtin/remote.c:1238
4315 -#, fuzzy, c-format
4298 +#, c-format
4299 msgid "Could not setup %s"
4317 -msgstr "不能获取 %s"
4300 +msgstr "不能设置 %s"
4301
4302 # 译者：注意保持前导空格
4303 #: builtin/remote.c:1274
4321 -#, fuzzy, c-format
4304 +#, c-format
4305 msgid " %s will become dangling!"
4323 -msgstr " （%s 将成为悬空状态）\n"
4306 +msgstr " %s 将成为悬空状态！"
4307
4308 # 译者：注意保持前导空格
4309 #: builtin/remote.c:1275
4327 -#, fuzzy, c-format
4310 +#, c-format
4311 msgid " %s has become dangling!"
4329 -msgstr " （%s 已成为悬空状态）\n"
4312 +msgstr " %s 已成为悬空状态！"
4313
4314 #: builtin/remote.c:1281
4332 -#, fuzzy, c-format
4315 +#, c-format
4316 msgid "Pruning %s"
4334 -msgstr "推送到 %s\n"
4317 +msgstr "修剪 %s"
4318
4319 #: builtin/remote.c:1282
4320 #, c-format
4321 msgid "URL: %s"
4339 -msgstr ""
4322 +msgstr "URL：%s"
4323
4324 #: builtin/remote.c:1295
4325 #, c-format
4326 msgid " * [would prune] %s"
4344 -msgstr ""
4327 +msgstr " * [将删除] %s"
4328
4329 #: builtin/remote.c:1298
4330 #, c-format
4331 msgid " * [pruned] %s"
4349 -msgstr ""
4332 +msgstr " * [已删除] %s"
4333
4334 #: builtin/remote.c:1387 builtin/remote.c:1461
4352 -#, fuzzy, c-format
4335 +#, c-format
4336 msgid "No such remote '%s'"
4354 -msgstr "没有此分支：'%s'"
4337 +msgstr "没有此远程 '%s'"
4338
4339 #: builtin/remote.c:1414
4357 -#, fuzzy
4340 msgid "no remote specified"
4359 -msgstr "未指定分支名"
4341 +msgstr "未指定远程"
4342
4343 #: builtin/remote.c:1447
4362 -#, fuzzy
4344 msgid "--add --delete doesn't make sense"
4364 -msgstr "--name-only 无意义"
4345 +msgstr "--add --delete 无意义"
4346
4347 #: builtin/remote.c:1487
4367 -#, fuzzy, c-format
4348 +#, c-format
4349 msgid "Invalid old URL pattern: %s"
4369 -msgstr "无效选项：%s"
4350 +msgstr "无效的旧URL匹配模版：%s"
4351
4352 #: builtin/remote.c:1495
4372 -#, fuzzy, c-format
4353 +#, c-format
4354 msgid "No such URL found: %s"
4374 -msgstr "没有此分支：'%s'"
4355 +msgstr "未找到此URL：%s"
4356
4357 #: builtin/remote.c:1497
4358 msgid "Will not delete all non-push URLs"
4378 -msgstr ""
4359 +msgstr "将不会删除所有非推送URL地址"
4360
4361 #: builtin/reset.c:33
4362 msgid "mixed"
@@ -4611,9 +4592,8 @@ msgid "malformed object name '%s'"
4592 msgstr "非法的对象名 '%s'"
4593
4594 #: builtin/tag.c:506
4614 -#, fuzzy
4595 msgid "--column and -n are incompatible"
4616 -msgstr "--all 和 --tags 不兼容"
4596 +msgstr "--column 和 -n 不兼容"
4597
4598 #: builtin/tag.c:523
4599 msgid "-n option is only allowed with -l."
@@ -4662,129 +4642,123 @@ msgstr "已更新tag '%s'（曾为 %s）\n"
4642
4643 #: git.c:16
4644 msgid "See 'git help <command>' for more information on a specific command."
4665 -msgstr ""
4645 +msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
4646
4647 #: parse-options.h:133 parse-options.h:235
4648 msgid "n"
4669 -msgstr ""
4649 +msgstr "数字"
4650
4651 #: parse-options.h:141
4652 msgid "time"
4673 -msgstr ""
4653 +msgstr "时间"
4654
4655 #: parse-options.h:149
4676 -#, fuzzy
4656 msgid "file"
4678 -msgstr "%s文件："
4657 +msgstr "文件"
4658
4659 #: parse-options.h:151
4660 msgid "when"
4682 -msgstr ""
4661 +msgstr "何时"
4662
4663 #: parse-options.h:156
4664 msgid "no-op (backward compatibility)"
4686 -msgstr ""
4665 +msgstr "空操作（向后兼容）"
4666
4667 #: parse-options.h:228
4668 msgid "be more verbose"
4690 -msgstr ""
4669 +msgstr "更加详细"
4670
4671 #: parse-options.h:230
4672 msgid "be more quiet"
4694 -msgstr ""
4673 +msgstr "更加安静"
4674
4675 #: parse-options.h:236
4676 msgid "use <n> digits to display SHA-1s"
4698 -msgstr ""
4677 +msgstr "用 <n> 位数字显示 SHA-1 哈希值"
4678
4679 #: common-cmds.h:8
4680 msgid "Add file contents to the index"
4702 -msgstr ""
4681 +msgstr "添加文件内容至索引"
4682
4683 #: common-cmds.h:9
4684 msgid "Find by binary search the change that introduced a bug"
4706 -msgstr ""
4685 +msgstr "通过二分查找定位引入 bug 的变更"
4686
4687 #: common-cmds.h:10
4709 -#, fuzzy
4688 msgid "List, create, or delete branches"
4711 -msgstr "无法变基到多个分支"
4689 +msgstr "列出、创建或删除分支"
4690
4691 #: common-cmds.h:11
4692 msgid "Checkout a branch or paths to the working tree"
4715 -msgstr ""
4693 +msgstr "检出一个分支或路径到工作区"
4694
4695 #: common-cmds.h:12
4718 -#, fuzzy
4696 msgid "Clone a repository into a new directory"
4720 -msgstr "引用版本库 '%s' 不是一个本地目录。"
4697 +msgstr "克隆一个版本库到一个新目录"
4698
4699 #: common-cmds.h:13
4723 -#, fuzzy
4700 msgid "Record changes to the repository"
4725 -msgstr "不是一个 git 版本库"
4701 +msgstr "记录变更到版本库"
4702
4703 #: common-cmds.h:14
4704 msgid "Show changes between commits, commit and working tree, etc"
4729 -msgstr ""
4705 +msgstr "显示提交之间、提交和工作区之间等的差异"
4706
4707 #: common-cmds.h:15
4708 msgid "Download objects and refs from another repository"
4733 -msgstr ""
4709 +msgstr "从另外一个版本库下载对象和引用"
4710
4711 #: common-cmds.h:16
4712 msgid "Print lines matching a pattern"
4737 -msgstr ""
4713 +msgstr "输出和模式匹配的行"
4714
4715 #: common-cmds.h:17
4716 msgid "Create an empty git repository or reinitialize an existing one"
4741 -msgstr ""
4717 +msgstr "创建一个空的 git 版本库或者重新初始化一个"
4718
4719 #: common-cmds.h:18
4744 -#, fuzzy
4720 msgid "Show commit logs"
4746 -msgstr "未知提交 %s"
4721 +msgstr "显示提交日志"
4722
4723 #: common-cmds.h:19
4724 msgid "Join two or more development histories together"
4750 -msgstr ""
4725 +msgstr "合并两个或更多开发历史"
4726
4727 #: common-cmds.h:20
4728 msgid "Move or rename a file, a directory, or a symlink"
4754 -msgstr ""
4729 +msgstr "移动或重命名一个文件、目录或符号链接"
4730
4731 #: common-cmds.h:21
4732 msgid "Fetch from and merge with another repository or a local branch"
4758 -msgstr ""
4733 +msgstr "获取并合并另外的版本库或一个本地分支"
4734
4735 #: common-cmds.h:22
4736 msgid "Update remote refs along with associated objects"
4762 -msgstr ""
4737 +msgstr "更新远程引用和相关的对象"
4738
4739 #: common-cmds.h:23
4740 msgid "Forward-port local commits to the updated upstream head"
4766 -msgstr ""
4741 +msgstr "本地提交转移至更新后的上游分支中"
4742
4743 #: common-cmds.h:24
4744 msgid "Reset current HEAD to the specified state"
4770 -msgstr ""
4745 +msgstr "重置当前HEAD到指定状态"
4746
4747 #: common-cmds.h:25
4748 msgid "Remove files from the working tree and from the index"
4774 -msgstr ""
4749 +msgstr "从工作区和索引中删除文件"
4750
4751 #: common-cmds.h:26
4752 msgid "Show various types of objects"
4778 -msgstr ""
4753 +msgstr "显示各种类型的对象"
4754
4755 #: common-cmds.h:27
4781 -#, fuzzy
4756 msgid "Show the working tree status"
4783 -msgstr "不能记录工作区状态"
4757 +msgstr "显示工作区状态"
4758
4759 #: common-cmds.h:28
4760 msgid "Create, list, delete or verify a tag object signed with GPG"
4787 -msgstr ""
4761 +msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
4762
4763 #: git-am.sh:50
4764 msgid "You need to set your committer info first"
@@ -4877,7 +4851,7 @@ msgstr "您想让我为您这样做么[Y/n]？ "
4851 #: git-bisect.sh:95
4852 #, sh-format
4853 msgid "unrecognised option: '$arg'"
4880 -msgstr "未识别的选项：'$arg'"
4854 +msgstr "未能识别的选项：'$arg'"
4855
4856 #: git-bisect.sh:99
4857 #, sh-format