14c8bced15 · matheusbsbs/matheus-bagliano

@@ -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-02-28 09:17+0800\n"

15 +"POT-Creation-Date: 2012-03-08 10:19+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"

@@ -71,18 +71,18 @@ msgid "failed to close rev-list's stdin: %s"

71 msgstr "无法关闭 rev-list 的标准输入：%s"

72

73 # 注意保持前导空格

74 -#: diff.c:104

74 +#: diff.c:105

75 #, c-format

76 msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"

77 msgstr " 无法解析 dirstat 阈值 '%.*s'\n"

78

79 # 注意保持前导空格

80 -#: diff.c:109

80 +#: diff.c:110

81 #, c-format

82 msgid " Unknown dirstat parameter '%.*s'\n"

83 msgstr " 未知 dirstat 参数 '%.*s'\n"

84

85 -#: diff.c:205

85 +#: diff.c:210

86 #, c-format

87 msgid ""

88 "Found errors in 'diff.dirstat' config variable:\n"

@@ -91,29 +91,29 @@ msgstr ""

91 "配置变量 'diff.dirstat' 出错：\n"

92 "%s"

93

94 -#: diff.c:1331

94 +#: diff.c:1336

95 msgid " 0 files changed\n"

96 msgstr "0 个文件被修改\n"

97

98 -#: diff.c:1335

98 +#: diff.c:1340

99 #, c-format

100 msgid " %d file changed"

101 msgid_plural " %d files changed"

102 msgstr[0] " %d 个文件被修改"

103

104 -#: diff.c:1352

104 +#: diff.c:1357

105 #, c-format

106 msgid ", %d insertion(+)"

107 msgid_plural ", %d insertions(+)"

108 msgstr[0] "，插入 %d 行(+)"

109

110 -#: diff.c:1363

110 +#: diff.c:1368

111 #, c-format

112 msgid ", %d deletion(-)"

113 msgid_plural ", %d deletions(-)"

114 msgstr[0] "，删除 %d 行(-)"

115

116 -#: diff.c:3364

116 +#: diff.c:3424

117 #, c-format

118 msgid ""

119 "Failed to parse --dirstat/-X option parameter:\n"

@@ -134,17 +134,17 @@ msgstr "gpg 没有接受数据"

134 msgid "gpg failed to sign the data"

135 msgstr "gpg 无法为数据签名"

136

137 -#: grep.c:1285

137 +#: grep.c:1280

138 #, c-format

139 msgid "'%s': unable to read %s"

140 msgstr "'%s'：无法读取 %s"

141

142 -#: grep.c:1302

142 +#: grep.c:1297

143 #, c-format

144 msgid "'%s': %s"

145 msgstr "'%s'：%s"

146

147 -#: grep.c:1313

147 +#: grep.c:1308

148 #, c-format

149 msgid "'%s': short read %s"

150 msgstr "'%s'：读取不完整 %s"

@@ -183,19 +183,27 @@ msgstr[0] ""

183 "您的分支和 '%s' 出现了偏离，\n"

184 "并且各自分别有 %d 和 %d 处不同的提交。\n"

185

186 -#: sequencer.c:120 builtin/merge.c:862 builtin/merge.c:983

187 -#: builtin/merge.c:1093 builtin/merge.c:1103

186 +#: sequencer.c:120 builtin/merge.c:864 builtin/merge.c:985

187 +#: builtin/merge.c:1095 builtin/merge.c:1105

188 #, c-format

189 msgid "Could not open '%s' for writing"

190 msgstr "无法打开 '%s' 以写入"

191

192 -#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:865

193 -#: builtin/merge.c:1095 builtin/merge.c:1108

192 +#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:867

193 +#: builtin/merge.c:1097 builtin/merge.c:1110

194 #, c-format

195 msgid "Could not write to '%s'"

196 msgstr "无法写入 '%s'"

197

198 -#: sequencer.c:142

198 +#: sequencer.c:143

199 +msgid ""

200 +"after resolving the conflicts, mark the corrected paths\n"

201 +"with 'git add <paths>' or 'git rm <paths>'"

202 +msgstr ""

203 +"冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"

204 +"命令标记修正后的文件"

205 +

206 +#: sequencer.c:146

207 msgid ""

208 "after resolving the conflicts, mark the corrected paths\n"

209 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -204,202 +212,202 @@ msgstr ""

212 "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"

213 "对修正后的文件做标记，然后用 'git commit' 提交"

214

207 -#: sequencer.c:154 sequencer.c:680 sequencer.c:763

215 +#: sequencer.c:159 sequencer.c:685 sequencer.c:768

216 #, c-format

217 msgid "Could not write to %s"

218 msgstr "不能写入 %s"

219

212 -#: sequencer.c:157

220 +#: sequencer.c:162

221 #, c-format

222 msgid "Error wrapping up %s"

223 msgstr "错误收尾 %s"

224

217 -#: sequencer.c:172

225 +#: sequencer.c:177

226 msgid "Your local changes would be overwritten by cherry-pick."

227 msgstr "您的本地修改将被拣选操作覆盖。"

228

221 -#: sequencer.c:174

229 +#: sequencer.c:179

230 msgid "Your local changes would be overwritten by revert."

231 msgstr "您的本地修改将被还原操作覆盖。"

232

225 -#: sequencer.c:177

233 +#: sequencer.c:182

234 msgid "Commit your changes or stash them to proceed."

235 msgstr "提交您的修改或保存进度后再继续。"

236

237 #. TRANSLATORS: %s will be "revert" or "cherry-pick"

230 -#: sequencer.c:227

238 +#: sequencer.c:232

239 #, c-format

240 msgid "%s: Unable to write new index file"

241 msgstr "%s：无法写入新暂存区文件"

242

235 -#: sequencer.c:293

243 +#: sequencer.c:298

244 msgid "Your index file is unmerged."

245 msgstr "您的暂存区文件未完成合并。"

246

239 -#: sequencer.c:296

247 +#: sequencer.c:301

248 msgid "You do not have a valid HEAD"

249 msgstr "您没有一个有效的 HEAD"

250

243 -#: sequencer.c:311

251 +#: sequencer.c:316

252 #, c-format

253 msgid "Commit %s is a merge but no -m option was given."

254 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"

255

248 -#: sequencer.c:319

256 +#: sequencer.c:324

257 #, c-format

258 msgid "Commit %s does not have parent %d"

259 msgstr "提交 %s 没有父提交 %d"

260

253 -#: sequencer.c:323

261 +#: sequencer.c:328

262 #, c-format

263 msgid "Mainline was specified but commit %s is not a merge."

264 msgstr "提供了主线但提交 %s 不是一个合并。"

265

266 #. TRANSLATORS: The first %s will be "revert" or

267 #. "cherry-pick", the second %s a SHA1

260 -#: sequencer.c:334

268 +#: sequencer.c:339

269 #, c-format

270 msgid "%s: cannot parse parent commit %s"

271 msgstr "%s：不能解析父提交 %s"

272

265 -#: sequencer.c:338

273 +#: sequencer.c:343

274 #, c-format

275 msgid "Cannot get commit message for %s"

276 msgstr "不能得到 %s 的提交说明"

277

270 -#: sequencer.c:422

278 +#: sequencer.c:427

279 #, c-format

280 msgid "could not revert %s... %s"

281 msgstr "不能还原 %s... %s"

282

275 -#: sequencer.c:423

283 +#: sequencer.c:428

284 #, c-format

285 msgid "could not apply %s... %s"

286 msgstr "不能应用 %s... %s"

287

280 -#: sequencer.c:445 sequencer.c:904 builtin/log.c:286 builtin/log.c:709

281 -#: builtin/log.c:1325 builtin/log.c:1544 builtin/merge.c:348

288 +#: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713

289 +#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:348

290 #: builtin/shortlog.c:181

291 msgid "revision walk setup failed"

292 msgstr "版本遍历设置失败"

293

286 -#: sequencer.c:448

294 +#: sequencer.c:453

295 msgid "empty commit set passed"

296 msgstr "提供了空的提交集"

297

290 -#: sequencer.c:456

298 +#: sequencer.c:461

299 #, c-format

300 msgid "git %s: failed to read the index"

301 msgstr "git %s: 无法读取暂存区"

302

295 -#: sequencer.c:461

303 +#: sequencer.c:466

304 #, c-format

305 msgid "git %s: failed to refresh the index"

306 msgstr "git %s: 无法刷新暂存区"

307

300 -#: sequencer.c:546

308 +#: sequencer.c:551

309 #, c-format

310 msgid "Cannot %s during a %s"

311 msgstr "无法 %s 在 %s 过程中"

312

305 -#: sequencer.c:568

313 +#: sequencer.c:573

314 #, c-format

315 msgid "Could not parse line %d."

316 msgstr "无法解析第 %d 行。"

317

310 -#: sequencer.c:573

318 +#: sequencer.c:578

319 msgid "No commits parsed."

320 msgstr "未有提交被解析。"

321

314 -#: sequencer.c:586

322 +#: sequencer.c:591

323 #, c-format

324 msgid "Could not open %s"

325 msgstr "不能打开 %s"

326

319 -#: sequencer.c:590

327 +#: sequencer.c:595

328 #, c-format

329 msgid "Could not read %s."

330 msgstr "不能读取 %s。"

331

324 -#: sequencer.c:597

332 +#: sequencer.c:602

333 #, c-format

334 msgid "Unusable instruction sheet: %s"

335 msgstr "无用的指令表单：%s"

336

329 -#: sequencer.c:625

337 +#: sequencer.c:630

338 #, c-format

339 msgid "Invalid key: %s"

340 msgstr "无效键名：%s"

341

334 -#: sequencer.c:628

342 +#: sequencer.c:633

343 #, c-format

344 msgid "Invalid value for %s: %s"

345 msgstr "无效的 %s 值：%s"

346

339 -#: sequencer.c:640

347 +#: sequencer.c:645

348 #, c-format

349 msgid "Malformed options sheet: %s"

350 msgstr "非法的选项表单：%s"

351

344 -#: sequencer.c:661

352 +#: sequencer.c:666

353 msgid "a cherry-pick or revert is already in progress"

354 msgstr "一个拣选或还原操作已在进行"

355

348 -#: sequencer.c:662

356 +#: sequencer.c:667

357 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

358 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""

359

352 -#: sequencer.c:666

360 +#: sequencer.c:671

361 #, c-format

362 msgid "Could not create sequencer directory %s"

363 msgstr "无法创建序列目录 %s"

364

357 -#: sequencer.c:682 sequencer.c:767

365 +#: sequencer.c:687 sequencer.c:772

366 #, c-format

367 msgid "Error wrapping up %s."

368 msgstr "错误收尾 %s。"

369

362 -#: sequencer.c:701 sequencer.c:835

370 +#: sequencer.c:706 sequencer.c:840

371 msgid "no cherry-pick or revert in progress"

372 msgstr "没有拣选或还原操作在进行"

373

366 -#: sequencer.c:703

374 +#: sequencer.c:708

375 msgid "cannot resolve HEAD"

376 msgstr "不能解析 HEAD"

377

370 -#: sequencer.c:705

378 +#: sequencer.c:710

379 msgid "cannot abort from a branch yet to be born"

380 msgstr "不能从未初始分支终止"

381

374 -#: sequencer.c:727

382 +#: sequencer.c:732

383 #, c-format

384 msgid "cannot open %s: %s"

385 msgstr "不能打开 %s：%s"

386

379 -#: sequencer.c:730

387 +#: sequencer.c:735

388 #, c-format

389 msgid "cannot read %s: %s"

390 msgstr "不能读取 %s：%s"

391

384 -#: sequencer.c:731

392 +#: sequencer.c:736

393 msgid "unexpected end of file"

394 msgstr "未预期的文件结束"

395

388 -#: sequencer.c:737

396 +#: sequencer.c:742

397 #, c-format

398 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

399 msgstr "保存预拣选提交的 HEAD 文件 '%s' 损坏"

400

393 -#: sequencer.c:760

401 +#: sequencer.c:765

402 #, c-format

403 msgid "Could not format %s."

404 msgstr "不能格式化 %s。"

405

398 -#: sequencer.c:922

406 +#: sequencer.c:927

407 msgid "Can't revert as initial commit"

408 msgstr "不能作为初始提交还原"

409

402 -#: sequencer.c:923

410 +#: sequencer.c:928

411 msgid "Can't cherry-pick into empty head"

412 msgstr "不能拣选到空分支"

413

@@ -896,56 +904,56 @@ msgstr "领先 %d，落后 %d] "

904 msgid "(no branch)"

905 msgstr "（非分支）"

906

899 -#: builtin/branch.c:562

907 +#: builtin/branch.c:566

908 msgid "some refs could not be read"

909 msgstr "一些引用无法读取"

910

903 -#: builtin/branch.c:575

911 +#: builtin/branch.c:579

912 msgid "cannot rename the current branch while not on any."

913 msgstr "无法重命名不存在的当前分支。"

914

907 -#: builtin/branch.c:585

915 +#: builtin/branch.c:589

916 #, c-format

917 msgid "Invalid branch name: '%s'"

918 msgstr "无效的分支名：'%s'"

919

912 -#: builtin/branch.c:600

920 +#: builtin/branch.c:604

921 msgid "Branch rename failed"

922 msgstr "分支重命名失败"

923

916 -#: builtin/branch.c:604

924 +#: builtin/branch.c:608

925 #, c-format

926 msgid "Renamed a misnamed branch '%s' away"

927 msgstr "重命名掉一个错误命名的旧分支 '%s'"

928

921 -#: builtin/branch.c:608

929 +#: builtin/branch.c:612

930 #, c-format

931 msgid "Branch renamed to %s, but HEAD is not updated!"

932 msgstr "分支重命名为 %s，但 HEAD 没有更新！"

933

926 -#: builtin/branch.c:615

934 +#: builtin/branch.c:619

935 msgid "Branch is renamed, but update of config-file failed"

936 msgstr "分支被重命名，但更新 config 文件失败"

937

930 -#: builtin/branch.c:630

938 +#: builtin/branch.c:634

939 #, c-format

940 msgid "malformed object name %s"

941 msgstr "非法的对象名 %s"

942

935 -#: builtin/branch.c:654

943 +#: builtin/branch.c:658

944 #, c-format

945 msgid "could not write branch description template: %s\n"

946 msgstr "不能写分支描述模版：%s\n"

947

940 -#: builtin/branch.c:742

948 +#: builtin/branch.c:746

949 msgid "Failed to resolve HEAD as a valid ref."

950 msgstr "无法将 HEAD 解析为有效引用。"

951

944 -#: builtin/branch.c:747 builtin/clone.c:558

952 +#: builtin/branch.c:751 builtin/clone.c:558

953 msgid "HEAD not found below refs/heads!"

954 msgstr "未在 /refs/heads 下发现 HEAD！"

955

948 -#: builtin/branch.c:805

956 +#: builtin/branch.c:809

957 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

958 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"

959

@@ -1007,11 +1015,11 @@ msgid "path '%s' is unmerged"

1015 msgstr "路径 '%s' 未合并"

1016

1017 #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583

1010 -#: builtin/merge.c:809

1018 +#: builtin/merge.c:811

1019 msgid "unable to write new index file"

1020 msgstr "无法写新的暂存区文件"

1021

1014 -#: builtin/checkout.c:319 builtin/diff.c:298 builtin/merge.c:406

1022 +#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408

1023 msgid "diff_setup_done failed"

1024 msgstr "diff_setup_done 失败"

1025

@@ -1652,7 +1660,7 @@ msgstr " （根提交）"

1660 msgid "could not parse HEAD commit"

1661 msgstr "无法解析 HEAD 提交"

1662

1655 -#: builtin/commit.c:1452 builtin/merge.c:507

1663 +#: builtin/commit.c:1452 builtin/merge.c:509

1664 #, c-format

1665 msgid "could not open '%s' for reading"

1666 msgstr "无法打开 '%s' 读取"

@@ -1676,7 +1684,7 @@ msgstr "无法读取提交说明：%s"

1684 msgid "Aborting commit due to empty commit message.\n"

1685 msgstr "终止提交因为提交说明为空。\n"

1686

1679 -#: builtin/commit.c:1514 builtin/merge.c:933 builtin/merge.c:966

1687 +#: builtin/commit.c:1514 builtin/merge.c:935 builtin/merge.c:968

1688 msgid "failed to write commit object"

1689 msgstr "写提交对象失败"

1690

@@ -1791,26 +1799,26 @@ msgstr "'%s'：不是一个正规文件或符号链接"

1799 msgid "invalid option: %s"

1800 msgstr "无效选项：%s"

1801

1794 -#: builtin/diff.c:293

1802 +#: builtin/diff.c:297

1803 msgid "Not a git repository"

1804 msgstr "不是一个 git 版本库"

1805

1798 -#: builtin/diff.c:343

1806 +#: builtin/diff.c:347

1807 #, c-format

1808 msgid "invalid object '%s' given."

1809 msgstr "提供了无效对象 '%s'。"

1810

1803 -#: builtin/diff.c:348

1811 +#: builtin/diff.c:352

1812 #, c-format

1813 msgid "more than %d trees given: '%s'"

1814 msgstr "提供了超过 %d 个树对象：'%s'"

1815

1808 -#: builtin/diff.c:358

1816 +#: builtin/diff.c:362

1817 #, c-format

1818 msgid "more than two blobs given: '%s'"

1819 msgstr "提供了超过两个 blob 对象：'%s'"

1820

1813 -#: builtin/diff.c:366

1821 +#: builtin/diff.c:370

1822 #, c-format

1823 msgid "unhandled object '%s' given."

1824 msgstr "提供了无法处理的对象 '%s'。"

@@ -2030,32 +2038,32 @@ msgstr "开关 `%c' 期望一个数字值"

2038 msgid "cannot open '%s'"

2039 msgstr "不能打开 '%s'"

2040

2033 -#: builtin/grep.c:889

2041 +#: builtin/grep.c:888

2042 msgid "no pattern given."

2043 msgstr "未提供模式匹配。"

2044

2037 -#: builtin/grep.c:903

2045 +#: builtin/grep.c:902

2046 #, c-format

2047 msgid "bad object %s"

2048 msgstr "坏对象 %s"

2049

2042 -#: builtin/grep.c:944

2050 +#: builtin/grep.c:943

2051 msgid "--open-files-in-pager only works on the worktree"

2052 msgstr "--open-files-in-pager 仅用于工作区"

2053

2046 -#: builtin/grep.c:967

2054 +#: builtin/grep.c:966

2055 msgid "--cached or --untracked cannot be used with --no-index."

2056 msgstr "--cached 或 --untracked 不能与 --no-index 共用"

2057

2050 -#: builtin/grep.c:972

2058 +#: builtin/grep.c:971

2059 msgid "--no-index or --untracked cannot be used with revs."

2060 msgstr "--no-index 或 --untracked 不能和版本共用。"

2061

2054 -#: builtin/grep.c:975

2062 +#: builtin/grep.c:974

2063 msgid "--[no-]exclude-standard cannot be used for tracked contents."

2064 msgstr "--[no-]exclude-standard 不能用于跟踪内容。"

2065

2058 -#: builtin/grep.c:983

2066 +#: builtin/grep.c:982

2067 msgid "both --cached and trees are given."

2068 msgstr "同时给出了 --cached 和树对象。"

2069

@@ -2203,109 +2211,109 @@ msgstr "不能访问当前工作目录"

2211 msgid "Cannot access work tree '%s'"

2212 msgstr "不能访问工作区 '%s'"

2213

2206 -#: builtin/log.c:185

2214 +#: builtin/log.c:187

2215 #, c-format

2216 msgid "Final output: %d %s\n"

2217 msgstr "最终输出：%d %s\n"

2218

2211 -#: builtin/log.c:393 builtin/log.c:479

2219 +#: builtin/log.c:395 builtin/log.c:483

2220 #, c-format

2221 msgid "Could not read object %s"

2222 msgstr "无法读取对象 %s"

2223

2216 -#: builtin/log.c:503

2224 +#: builtin/log.c:507

2225 #, c-format

2226 msgid "Unknown type: %d"

2227 msgstr "未知类型：%d"

2228

2221 -#: builtin/log.c:592

2229 +#: builtin/log.c:596

2230 msgid "format.headers without value"

2231 msgstr "format.headers 没有值"

2232

2225 -#: builtin/log.c:665

2233 +#: builtin/log.c:669

2234 msgid "name of output directory is too long"

2235 msgstr "输出目录名太长"

2236

2229 -#: builtin/log.c:676

2237 +#: builtin/log.c:680

2238 #, c-format

2239 msgid "Cannot open patch file %s"

2240 msgstr "无法打开补丁文件 %s"

2241

2234 -#: builtin/log.c:690

2242 +#: builtin/log.c:694

2243 msgid "Need exactly one range."

2244 msgstr "只需要一个范围。"

2245

2238 -#: builtin/log.c:698

2246 +#: builtin/log.c:702

2247 msgid "Not a range."

2248 msgstr "不是一个范围。"

2249

2242 -#: builtin/log.c:735

2250 +#: builtin/log.c:739

2251 msgid "Could not extract email from committer identity."

2252 msgstr "无法从提交者身份中提取邮件地址。"

2253

2246 -#: builtin/log.c:781

2254 +#: builtin/log.c:785

2255 msgid "Cover letter needs email format"

2256 msgstr "信封需要邮件地址格式"

2257

2250 -#: builtin/log.c:875

2258 +#: builtin/log.c:879

2259 #, c-format

2260 msgid "insane in-reply-to: %s"

2261 msgstr "不正常的 in-reply-to：%s"

2262

2255 -#: builtin/log.c:948

2263 +#: builtin/log.c:952

2264 msgid "Two output directories?"

2265 msgstr "两个输出目录？"

2266

2259 -#: builtin/log.c:1169

2267 +#: builtin/log.c:1173

2268 #, c-format

2269 msgid "bogus committer info %s"

2270 msgstr "虚假的提交者信息 %s"

2271

2264 -#: builtin/log.c:1214

2272 +#: builtin/log.c:1218

2273 msgid "-n and -k are mutually exclusive."

2274 msgstr "-n 和 -k 互斥。"

2275

2268 -#: builtin/log.c:1216

2276 +#: builtin/log.c:1220

2277 msgid "--subject-prefix and -k are mutually exclusive."

2278 msgstr "--subject-prefix 和 -k 互斥。"

2279

2272 -#: builtin/log.c:1221 builtin/shortlog.c:284

2280 +#: builtin/log.c:1225 builtin/shortlog.c:284

2281 #, c-format

2282 msgid "unrecognized argument: %s"

2283 msgstr "未识别的参数：%s"

2284

2277 -#: builtin/log.c:1224

2285 +#: builtin/log.c:1228

2286 msgid "--name-only does not make sense"

2287 msgstr "--name-only 无意义"

2288

2281 -#: builtin/log.c:1226

2289 +#: builtin/log.c:1230

2290 msgid "--name-status does not make sense"

2291 msgstr "--name-status 无意义"

2292

2285 -#: builtin/log.c:1228

2293 +#: builtin/log.c:1232

2294 msgid "--check does not make sense"

2295 msgstr "--check 无意义"

2296

2289 -#: builtin/log.c:1251

2297 +#: builtin/log.c:1255

2298 msgid "standard output, or directory, which one?"

2299 msgstr "标准输出或目录，哪一个？"

2300

2293 -#: builtin/log.c:1253

2301 +#: builtin/log.c:1257

2302 #, c-format

2303 msgid "Could not create directory '%s'"

2304 msgstr "无法创建目录 '%s'"

2305

2298 -#: builtin/log.c:1406

2306 +#: builtin/log.c:1410

2307 msgid "Failed to create output files"

2308 msgstr "无法创建输出文件"

2309

2302 -#: builtin/log.c:1510

2310 +#: builtin/log.c:1514

2311 #, c-format

2312 msgid ""

2313 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

2314 msgstr "无法找到跟踪的远程分支，请手工提供 <upstream>。\n"

2315

2308 -#: builtin/log.c:1526 builtin/log.c:1528 builtin/log.c:1540

2316 +#: builtin/log.c:1530 builtin/log.c:1532 builtin/log.c:1544

2317 #, c-format

2318 msgid "Unknown commit %s"

2319 msgstr "未知提交 %s"

@@ -2369,53 +2377,53 @@ msgstr "完成 SQUASH_MSG"

2377 msgid "No merge message -- not updating HEAD\n"

2378 msgstr "无合并信息 -- 未更新 HEAD\n"

2379

2372 -#: builtin/merge.c:435

2380 +#: builtin/merge.c:437

2381 #, c-format

2382 msgid "'%s' does not point to a commit"

2383 msgstr "'%s' 没有指向一个提交"

2384

2377 -#: builtin/merge.c:534

2385 +#: builtin/merge.c:536

2386 #, c-format

2387 msgid "Bad branch.%s.mergeoptions string: %s"

2388 msgstr "错的 branch.%s.mergeoptions 字串：%s"

2389

2382 -#: builtin/merge.c:627

2390 +#: builtin/merge.c:629

2391 msgid "git write-tree failed to write a tree"

2392 msgstr "git write-tree 无法写入一树对象"

2393

2386 -#: builtin/merge.c:677

2394 +#: builtin/merge.c:679

2395 msgid "failed to read the cache"

2396 msgstr "无法读取缓存"

2397

2390 -#: builtin/merge.c:694

2398 +#: builtin/merge.c:696

2399 msgid "Unable to write index."

2400 msgstr "不能写暂存区。"

2401

2394 -#: builtin/merge.c:707

2402 +#: builtin/merge.c:709

2403 msgid "Not handling anything other than two heads merge."

2404 msgstr "不能处理两个头合并之外的任何操作。"

2405

2398 -#: builtin/merge.c:721

2406 +#: builtin/merge.c:723

2407 #, c-format

2408 msgid "Unknown option for merge-recursive: -X%s"

2409 msgstr "merge-recursive 的未知选项：-X%s"

2410

2403 -#: builtin/merge.c:735

2411 +#: builtin/merge.c:737

2412 #, c-format

2413 msgid "unable to write %s"

2414 msgstr "不能写 %s"

2415

2408 -#: builtin/merge.c:874

2416 +#: builtin/merge.c:876

2417 #, c-format

2418 msgid "Could not read from '%s'"

2419 msgstr "不能从 '%s' 读取"

2420

2413 -#: builtin/merge.c:883

2421 +#: builtin/merge.c:885

2422 #, c-format

2423 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

2424 msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"

2425

2418 -#: builtin/merge.c:889

2426 +#: builtin/merge.c:891

2427 msgid ""

2428 "Please enter a commit message to explain why this merge is necessary,\n"

2429 "especially if it merges an updated upstream into a topic branch.\n"

@@ -2428,47 +2436,47 @@ msgstr ""

2436 "\n"

2437 "以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。\n"

2438

2431 -#: builtin/merge.c:913

2439 +#: builtin/merge.c:915

2440 msgid "Empty commit message."

2441 msgstr "空提交信息。"

2442

2435 -#: builtin/merge.c:925

2443 +#: builtin/merge.c:927

2444 #, c-format

2445 msgid "Wonderful.\n"

2446 msgstr "太棒了。\n"

2447

2440 -#: builtin/merge.c:998

2448 +#: builtin/merge.c:1000

2449 #, c-format

2450 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

2451 msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"

2452

2445 -#: builtin/merge.c:1014

2453 +#: builtin/merge.c:1016

2454 #, c-format

2455 msgid "'%s' is not a commit"

2456 msgstr "'%s' 不是一个提交"

2457

2450 -#: builtin/merge.c:1055

2458 +#: builtin/merge.c:1057

2459 msgid "No current branch."

2460 msgstr "当前不在分支上。"

2461

2454 -#: builtin/merge.c:1057

2462 +#: builtin/merge.c:1059

2463 msgid "No remote for the current branch."

2464 msgstr "当前分支没有远程版本库。"

2465

2458 -#: builtin/merge.c:1059

2466 +#: builtin/merge.c:1061

2467 msgid "No default upstream defined for the current branch."

2468 msgstr "当前分支未定义默认上游分支。"

2469

2462 -#: builtin/merge.c:1064

2470 +#: builtin/merge.c:1066

2471 #, c-format

2472 msgid "No remote tracking branch for %s from %s"

2473 msgstr "%s 没有来自 %s 的远程跟踪分支"

2474

2467 -#: builtin/merge.c:1186

2475 +#: builtin/merge.c:1188

2476 msgid "There is no merge to abort (MERGE_HEAD missing)."

2477 msgstr "没有要终止的合并（MERGE_HEAD 丢失）"

2478

2471 -#: builtin/merge.c:1202 git-pull.sh:31

2479 +#: builtin/merge.c:1204 git-pull.sh:31

2480 msgid ""

2481 "You have not concluded your merge (MERGE_HEAD exists).\n"

2482 "Please, commit your changes before you can merge."

@@ -2476,11 +2484,11 @@ msgstr ""

2484 "您尚未结束您的合并（存在 MERGE_HEAD）。\n"

2485 "请先提交您的修改，您才能合并。"

2486

2479 -#: builtin/merge.c:1205 git-pull.sh:34

2487 +#: builtin/merge.c:1207 git-pull.sh:34

2488 msgid "You have not concluded your merge (MERGE_HEAD exists)."

2489 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"

2490

2483 -#: builtin/merge.c:1209

2491 +#: builtin/merge.c:1211

2492 msgid ""

2493 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

2494 "Please, commit your changes before you can merge."

@@ -2488,84 +2496,84 @@ msgstr ""

2496 "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"

2497 "请先提交您的修改，您才能合并。"

2498

2491 -#: builtin/merge.c:1212

2499 +#: builtin/merge.c:1214

2500 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

2501 msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"

2502

2495 -#: builtin/merge.c:1221

2503 +#: builtin/merge.c:1223

2504 msgid "You cannot combine --squash with --no-ff."

2505 msgstr "您不能将 --squash 与 --no-ff 共用。"

2506

2499 -#: builtin/merge.c:1226

2507 +#: builtin/merge.c:1228

2508 msgid "You cannot combine --no-ff with --ff-only."

2509 msgstr "您不能将 --no-ff 与 --ff-only 共用。"

2510

2503 -#: builtin/merge.c:1233

2511 +#: builtin/merge.c:1235

2512 msgid "No commit specified and merge.defaultToUpstream not set."

2513 msgstr "未指出提交并且 merge.defaultToUpstream 未设置。"

2514

2507 -#: builtin/merge.c:1264

2515 +#: builtin/merge.c:1266

2516 msgid "Can merge only exactly one commit into empty head"

2517 msgstr "只可将一个提交合并到空分支上"

2518

2511 -#: builtin/merge.c:1267

2519 +#: builtin/merge.c:1269

2520 msgid "Squash commit into empty head not supported yet"

2521 msgstr "尚不支持到空分支的压缩提交"

2522

2515 -#: builtin/merge.c:1269

2523 +#: builtin/merge.c:1271

2524 msgid "Non-fast-forward commit does not make sense into an empty head"

2525 msgstr "到空分支的非快进式提交没有意义"

2526

2519 -#: builtin/merge.c:1273 builtin/merge.c:1317

2527 +#: builtin/merge.c:1275 builtin/merge.c:1319

2528 #, c-format

2529 msgid "%s - not something we can merge"

2530 msgstr "%s - 不是我们可以合并的东西"

2531

2524 -#: builtin/merge.c:1383

2532 +#: builtin/merge.c:1385

2533 #, c-format

2534 msgid "Updating %s..%s\n"

2535 msgstr "更新 %s..%s\n"

2536

2529 -#: builtin/merge.c:1421

2537 +#: builtin/merge.c:1423

2538 #, c-format

2539 msgid "Trying really trivial in-index merge...\n"

2540 msgstr "尝试非常小的暂存区内合并...\n"

2541

2534 -#: builtin/merge.c:1428

2542 +#: builtin/merge.c:1430

2543 #, c-format

2544 msgid "Nope.\n"

2545 msgstr "无。\n"

2546

2539 -#: builtin/merge.c:1460

2547 +#: builtin/merge.c:1462

2548 msgid "Not possible to fast-forward, aborting."

2549 msgstr "不可能快进式，终止。"

2550

2543 -#: builtin/merge.c:1483 builtin/merge.c:1560

2551 +#: builtin/merge.c:1485 builtin/merge.c:1562

2552 #, c-format

2553 msgid "Rewinding the tree to pristine...\n"

2554 msgstr "将树回滚至原始状态...\n"

2555

2548 -#: builtin/merge.c:1487

2556 +#: builtin/merge.c:1489

2557 #, c-format

2558 msgid "Trying merge strategy %s...\n"

2559 msgstr "尝试合并策略 %s...\n"

2560

2553 -#: builtin/merge.c:1551

2561 +#: builtin/merge.c:1553

2562 #, c-format

2563 msgid "No merge strategy handled the merge.\n"

2564 msgstr "没有合并策略处理此合并。\n"

2565

2558 -#: builtin/merge.c:1553

2566 +#: builtin/merge.c:1555

2567 #, c-format

2568 msgid "Merge with strategy %s failed.\n"

2569 msgstr "使用策略 %s 合并失败。\n"

2570

2563 -#: builtin/merge.c:1562

2571 +#: builtin/merge.c:1564

2572 #, c-format

2573 msgid "Using the %s to prepare resolving by hand.\n"

2574 msgstr "使用 %s 以准备手工解决。\n"

2575

2568 -#: builtin/merge.c:1573

2576 +#: builtin/merge.c:1575

2577 #, c-format

2578 msgid "Automatic merge went well; stopped before committing as requested\n"

2579 msgstr "自动合并进展顺利，按要求在提交前停止\n"

@@ -3204,11 +3212,11 @@ msgstr "已更新tag '%s'（曾为 %s）\n"

3212 msgid "You need to set your committer info first"

3213 msgstr "您需要先设置你的提交者信息"

3214

3207 -#: git-am.sh:135

3215 +#: git-am.sh:136

3216 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

3217 msgstr "版本库缺乏必要的 blob 数据以进行三路合并。"

3218

3211 -#: git-am.sh:144

3219 +#: git-am.sh:147

3220 msgid ""

3221 "Did you hand edit your patch?\n"

3222 "It does not apply to blobs recorded in its index."

@@ -3216,46 +3224,46 @@ msgstr ""

3224 "您是否曾手动编辑过您的补丁？\n"

3225 "无法应用补丁到暂存区的数据中。"

3226

3219 -#: git-am.sh:153

3227 +#: git-am.sh:156

3228 msgid "Falling back to patching base and 3-way merge..."

3229 msgstr "转而使用补丁应用的基础版本和三路合并..."

3230

3223 -#: git-am.sh:265

3231 +#: git-am.sh:268

3232 msgid "Only one StGIT patch series can be applied at once"

3233 msgstr "一次只能有一个 StGIT 补丁队列被应用"

3234

3227 -#: git-am.sh:352

3235 +#: git-am.sh:355

3236 #, sh-format

3237 msgid "Patch format $patch_format is not supported."

3238 msgstr "不支持 $patch_format 补丁格式。"

3239

3232 -#: git-am.sh:354

3240 +#: git-am.sh:357

3241 msgid "Patch format detection failed."

3242 msgstr "补丁格式检测失败。"

3243

3236 -#: git-am.sh:406

3244 +#: git-am.sh:409

3245 msgid "-d option is no longer supported. Do not use."

3246 msgstr "不再支持 -d 选项。不要使用。"

3247

3240 -#: git-am.sh:469

3248 +#: git-am.sh:472

3249 #, sh-format

3250 msgid "previous rebase directory $dotest still exists but mbox given."

3251 msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"

3252

3245 -#: git-am.sh:474

3253 +#: git-am.sh:477

3254 msgid "Please make up your mind. --skip or --abort?"

3255 msgstr "请下决心。--skip 或是 --abort ？"

3256

3249 -#: git-am.sh:501

3257 +#: git-am.sh:504

3258 msgid "Resolve operation not in progress, we are not resuming."

3259 msgstr "解决操作未进行，我们不会继续。"

3260

3253 -#: git-am.sh:567

3261 +#: git-am.sh:570

3262 #, sh-format

3263 msgid "Dirty index: cannot apply patches (dirty: $files)"

3264 msgstr "脏的暂存区：不能应用补丁（脏文件：$files）"

3265

3258 -#: git-am.sh:743

3266 +#: git-am.sh:746

3267 msgid "cannot be interactive without stdin connected to a terminal."

3268 msgstr "没有和终端关联的标准输入不能进行交互式操作。"

3269

@@ -3263,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.

3266 -#: git-am.sh:754

3274 +#: git-am.sh:757

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

3270 -#: git-am.sh:790

3278 +#: git-am.sh:793

3279 #, sh-format

3280 msgid "Applying: $FIRSTLINE"

3281 msgstr "正应用：$FIRSTLINE"

3282

3275 -#: git-am.sh:835

3283 +#: git-am.sh:838

3284 msgid "No changes -- Patch already applied."

3285 msgstr "没有变更 -- 补丁已经应用过。"

3286

3279 -#: git-am.sh:861

3287 +#: git-am.sh:864

3288 msgid "applying to an empty history"

3289 msgstr "正应用到一个空历史上"

3290

l10n: Update zh_CN translation for 1.7.10-rc0