60eb4f1bd0 · matheusbsbs/matheus-bagliano

@@ -8,7 +8,7 @@ msgid ""

8 msgstr ""

9 "Project-Id-Version: PACKAGE VERSION\n"

10 "Report-Msgid-Bugs-To: \n"

11 -"POT-Creation-Date: 2008-12-08 08:31-0800\n"

11 +"POT-Creation-Date: 2010-01-26 15:47-0800\n"

12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14 "Language-Team: LANGUAGE <LL@li.org>\n"

@@ -16,33 +16,33 @@ msgstr ""

16 "Content-Type: text/plain; charset=CHARSET\n"

17 "Content-Transfer-Encoding: 8bit\n"

18

19 -#: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847

20 -#: git-gui.sh:866

19 +#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903

20 +#: git-gui.sh:922

21 msgid "git-gui: fatal error"

22 msgstr ""

23

24 -#: git-gui.sh:689

24 +#: git-gui.sh:743

25 #, tcl-format

26 msgid "Invalid font specified in %s:"

27 msgstr ""

28

29 -#: git-gui.sh:723

29 +#: git-gui.sh:779

30 msgid "Main Font"

31 msgstr ""

32

33 -#: git-gui.sh:724

33 +#: git-gui.sh:780

34 msgid "Diff/Console Font"

35 msgstr ""

36

37 -#: git-gui.sh:738

37 +#: git-gui.sh:794

38 msgid "Cannot find git in PATH."

39 msgstr ""

40

41 -#: git-gui.sh:765

41 +#: git-gui.sh:821

42 msgid "Cannot parse Git version string:"

43 msgstr ""

44

45 -#: git-gui.sh:783

45 +#: git-gui.sh:839

46 #, tcl-format

47 msgid ""

48 "Git version cannot be determined.\n"

@@ -54,449 +54,473 @@ msgid ""

54 "Assume '%s' is version 1.5.0?\n"

55 msgstr ""

56

57 -#: git-gui.sh:1062

57 +#: git-gui.sh:1128

58 msgid "Git directory not found:"

59 msgstr ""

60

61 -#: git-gui.sh:1069

61 +#: git-gui.sh:1146

62 msgid "Cannot move to top of working directory:"

63 msgstr ""

64

65 -#: git-gui.sh:1076

66 -msgid "Cannot use funny .git directory:"

65 +#: git-gui.sh:1154

66 +msgid "Cannot use bare repository:"

67 msgstr ""

68

69 -#: git-gui.sh:1081

69 +#: git-gui.sh:1162

70 msgid "No working directory"

71 msgstr ""

72

73 -#: git-gui.sh:1247 lib/checkout_op.tcl:305

73 +#: git-gui.sh:1334 lib/checkout_op.tcl:306

74 msgid "Refreshing file status..."

75 msgstr ""

76

77 -#: git-gui.sh:1303

77 +#: git-gui.sh:1390

78 msgid "Scanning for modified files ..."

79 msgstr ""

80

81 -#: git-gui.sh:1367

81 +#: git-gui.sh:1454

82 msgid "Calling prepare-commit-msg hook..."

83 msgstr ""

84

85 -#: git-gui.sh:1384

85 +#: git-gui.sh:1471

86 msgid "Commit declined by prepare-commit-msg hook."

87 msgstr ""

88

89 -#: git-gui.sh:1542 lib/browser.tcl:246

89 +#: git-gui.sh:1629 lib/browser.tcl:246

90 msgid "Ready."

91 msgstr ""

92

93 -#: git-gui.sh:1726

93 +#: git-gui.sh:1787

94 #, tcl-format

95 msgid "Displaying only %s of %s files."

96 msgstr ""

97

98 -#: git-gui.sh:1819

98 +#: git-gui.sh:1913

99 msgid "Unmodified"

100 msgstr ""

101

102 -#: git-gui.sh:1821

102 +#: git-gui.sh:1915

103 msgid "Modified, not staged"

104 msgstr ""

105

106 -#: git-gui.sh:1822 git-gui.sh:1830

106 +#: git-gui.sh:1916 git-gui.sh:1924

107 msgid "Staged for commit"

108 msgstr ""

109

110 -#: git-gui.sh:1823 git-gui.sh:1831

110 +#: git-gui.sh:1917 git-gui.sh:1925

111 msgid "Portions staged for commit"

112 msgstr ""

113

114 -#: git-gui.sh:1824 git-gui.sh:1832

114 +#: git-gui.sh:1918 git-gui.sh:1926

115 msgid "Staged for commit, missing"

116 msgstr ""

117

118 -#: git-gui.sh:1826

118 +#: git-gui.sh:1920

119 msgid "File type changed, not staged"

120 msgstr ""

121

122 -#: git-gui.sh:1827

122 +#: git-gui.sh:1921

123 msgid "File type changed, staged"

124 msgstr ""

125

126 -#: git-gui.sh:1829

126 +#: git-gui.sh:1923

127 msgid "Untracked, not staged"

128 msgstr ""

129

130 -#: git-gui.sh:1834

130 +#: git-gui.sh:1928

131 msgid "Missing"

132 msgstr ""

133

134 -#: git-gui.sh:1835

134 +#: git-gui.sh:1929

135 msgid "Staged for removal"

136 msgstr ""

137

138 -#: git-gui.sh:1836

138 +#: git-gui.sh:1930

139 msgid "Staged for removal, still present"

140 msgstr ""

141

142 -#: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841

143 -#: git-gui.sh:1842 git-gui.sh:1843

142 +#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935

143 +#: git-gui.sh:1936 git-gui.sh:1937

144 msgid "Requires merge resolution"

145 msgstr ""

146

147 -#: git-gui.sh:1878

147 +#: git-gui.sh:1972

148 msgid "Starting gitk... please wait..."

149 msgstr ""

150

151 -#: git-gui.sh:1887

151 +#: git-gui.sh:1984

152 msgid "Couldn't find gitk in PATH"

153 msgstr ""

154

155 -#: git-gui.sh:2280 lib/choose_repository.tcl:36

155 +#: git-gui.sh:2043

156 +msgid "Couldn't find git gui in PATH"

157 +msgstr ""

158 +

159 +#: git-gui.sh:2455 lib/choose_repository.tcl:36

160 msgid "Repository"

161 msgstr ""

162

159 -#: git-gui.sh:2281

163 +#: git-gui.sh:2456

164 msgid "Edit"

165 msgstr ""

166

163 -#: git-gui.sh:2283 lib/choose_rev.tcl:561

167 +#: git-gui.sh:2458 lib/choose_rev.tcl:561

168 msgid "Branch"

169 msgstr ""

170

167 -#: git-gui.sh:2286 lib/choose_rev.tcl:548

171 +#: git-gui.sh:2461 lib/choose_rev.tcl:548

172 msgid "Commit@@noun"

173 msgstr ""

174

171 -#: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168

175 +#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168

176 msgid "Merge"

177 msgstr ""

178

175 -#: git-gui.sh:2290 lib/choose_rev.tcl:557

179 +#: git-gui.sh:2465 lib/choose_rev.tcl:557

180 msgid "Remote"

181 msgstr ""

182

179 -#: git-gui.sh:2293

183 +#: git-gui.sh:2468

184 msgid "Tools"

185 msgstr ""

186

183 -#: git-gui.sh:2302

187 +#: git-gui.sh:2477

188 msgid "Explore Working Copy"

189 msgstr ""

190

187 -#: git-gui.sh:2307

191 +#: git-gui.sh:2483

192 msgid "Browse Current Branch's Files"

193 msgstr ""

194

191 -#: git-gui.sh:2311

195 +#: git-gui.sh:2487

196 msgid "Browse Branch Files..."

197 msgstr ""

198

195 -#: git-gui.sh:2316

199 +#: git-gui.sh:2492

200 msgid "Visualize Current Branch's History"

201 msgstr ""

202

199 -#: git-gui.sh:2320

203 +#: git-gui.sh:2496

204 msgid "Visualize All Branch History"

205 msgstr ""

206

203 -#: git-gui.sh:2327

207 +#: git-gui.sh:2503

208 #, tcl-format

209 msgid "Browse %s's Files"

210 msgstr ""

211

208 -#: git-gui.sh:2329

212 +#: git-gui.sh:2505

213 #, tcl-format

214 msgid "Visualize %s's History"

215 msgstr ""

216

213 -#: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67

217 +#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67

218 msgid "Database Statistics"

219 msgstr ""

220

217 -#: git-gui.sh:2337 lib/database.tcl:34

221 +#: git-gui.sh:2513 lib/database.tcl:34

222 msgid "Compress Database"

223 msgstr ""

224

221 -#: git-gui.sh:2340

225 +#: git-gui.sh:2516

226 msgid "Verify Database"

227 msgstr ""

228

225 -#: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7

226 -#: lib/shortcut.tcl:39 lib/shortcut.tcl:71

229 +#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8

230 +#: lib/shortcut.tcl:40 lib/shortcut.tcl:72

231 msgid "Create Desktop Icon"

232 msgstr ""

233

230 -#: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191

234 +#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191

235 msgid "Quit"

236 msgstr ""

237

234 -#: git-gui.sh:2371

238 +#: git-gui.sh:2547

239 msgid "Undo"

240 msgstr ""

241

238 -#: git-gui.sh:2374

242 +#: git-gui.sh:2550

243 msgid "Redo"

244 msgstr ""

245

242 -#: git-gui.sh:2378 git-gui.sh:2937

246 +#: git-gui.sh:2554 git-gui.sh:3109

247 msgid "Cut"

248 msgstr ""

249

246 -#: git-gui.sh:2381 git-gui.sh:2940 git-gui.sh:3014 git-gui.sh:3096

250 +#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259

251 #: lib/console.tcl:69

252 msgid "Copy"

253 msgstr ""

254

251 -#: git-gui.sh:2384 git-gui.sh:2943

255 +#: git-gui.sh:2560 git-gui.sh:3115

256 msgid "Paste"

257 msgstr ""

258

255 -#: git-gui.sh:2387 git-gui.sh:2946 lib/branch_delete.tcl:26

259 +#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26

260 #: lib/remote_branch_delete.tcl:38

261 msgid "Delete"

262 msgstr ""

263

260 -#: git-gui.sh:2391 git-gui.sh:2950 git-gui.sh:3100 lib/console.tcl:71

264 +#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71

265 msgid "Select All"

266 msgstr ""

267

264 -#: git-gui.sh:2400

268 +#: git-gui.sh:2576

269 msgid "Create..."

270 msgstr ""

271

268 -#: git-gui.sh:2406

272 +#: git-gui.sh:2582

273 msgid "Checkout..."

274 msgstr ""

275

272 -#: git-gui.sh:2412

276 +#: git-gui.sh:2588

277 msgid "Rename..."

278 msgstr ""

279

276 -#: git-gui.sh:2417

280 +#: git-gui.sh:2593

281 msgid "Delete..."

282 msgstr ""

283

280 -#: git-gui.sh:2422

284 +#: git-gui.sh:2598

285 msgid "Reset..."

286 msgstr ""

287

284 -#: git-gui.sh:2432

288 +#: git-gui.sh:2608

289 msgid "Done"

290 msgstr ""

291

288 -#: git-gui.sh:2434

292 +#: git-gui.sh:2610

293 msgid "Commit@@verb"

294 msgstr ""

295

292 -#: git-gui.sh:2443 git-gui.sh:2878

296 +#: git-gui.sh:2619 git-gui.sh:3050

297 msgid "New Commit"

298 msgstr ""

299

296 -#: git-gui.sh:2451 git-gui.sh:2885

300 +#: git-gui.sh:2627 git-gui.sh:3057

301 msgid "Amend Last Commit"

302 msgstr ""

303

300 -#: git-gui.sh:2461 git-gui.sh:2839 lib/remote_branch_delete.tcl:99

304 +#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99

305 msgid "Rescan"

306 msgstr ""

307

304 -#: git-gui.sh:2467

308 +#: git-gui.sh:2643

309 msgid "Stage To Commit"

310 msgstr ""

311

308 -#: git-gui.sh:2473

312 +#: git-gui.sh:2649

313 msgid "Stage Changed Files To Commit"

314 msgstr ""

315

312 -#: git-gui.sh:2479

316 +#: git-gui.sh:2655

317 msgid "Unstage From Commit"

318 msgstr ""

319

316 -#: git-gui.sh:2484 lib/index.tcl:410

320 +#: git-gui.sh:2661 lib/index.tcl:412

321 msgid "Revert Changes"

322 msgstr ""

323

320 -#: git-gui.sh:2491 git-gui.sh:3083

324 +#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341

325 msgid "Show Less Context"

326 msgstr ""

327

324 -#: git-gui.sh:2495 git-gui.sh:3087

328 +#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345

329 msgid "Show More Context"

330 msgstr ""

331

328 -#: git-gui.sh:2502 git-gui.sh:2852 git-gui.sh:2961

332 +#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133

333 msgid "Sign Off"

334 msgstr ""

335

332 -#: git-gui.sh:2518

336 +#: git-gui.sh:2696

337 msgid "Local Merge..."

338 msgstr ""

339

336 -#: git-gui.sh:2523

340 +#: git-gui.sh:2701

341 msgid "Abort Merge..."

342 msgstr ""

343

340 -#: git-gui.sh:2535 git-gui.sh:2575

344 +#: git-gui.sh:2713 git-gui.sh:2741

345 msgid "Add..."

346 msgstr ""

347

344 -#: git-gui.sh:2539

348 +#: git-gui.sh:2717

349 msgid "Push..."

350 msgstr ""

351

348 -#: git-gui.sh:2543

352 +#: git-gui.sh:2721

353 msgid "Delete Branch..."

354 msgstr ""

355

352 -#: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14

353 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53

354 -#, tcl-format

355 -msgid "About %s"

356 -msgstr ""

357 -

358 -#: git-gui.sh:2557

359 -msgid "Preferences..."

360 -msgstr ""

361 -

362 -#: git-gui.sh:2565 git-gui.sh:3129

356 +#: git-gui.sh:2731 git-gui.sh:3292

357 msgid "Options..."

358 msgstr ""

359

366 -#: git-gui.sh:2576

360 +#: git-gui.sh:2742

361 msgid "Remove..."

362 msgstr ""

363

370 -#: git-gui.sh:2585 lib/choose_repository.tcl:50

364 +#: git-gui.sh:2751 lib/choose_repository.tcl:50

365 msgid "Help"

366 msgstr ""

367

374 -#: git-gui.sh:2611

368 +#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14

369 +#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53

370 +#, tcl-format

371 +msgid "About %s"

372 +msgstr ""

373 +

374 +#: git-gui.sh:2783

375 msgid "Online Documentation"

376 msgstr ""

377

378 -#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56

378 +#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56

379 msgid "Show SSH Key"

380 msgstr ""

381

382 -#: git-gui.sh:2721

382 +#: git-gui.sh:2893

383 #, tcl-format

384 msgid "fatal: cannot stat path %s: No such file or directory"

385 msgstr ""

386

387 -#: git-gui.sh:2754

387 +#: git-gui.sh:2926

388 msgid "Current Branch:"

389 msgstr ""

390

391 -#: git-gui.sh:2775

391 +#: git-gui.sh:2947

392 msgid "Staged Changes (Will Commit)"

393 msgstr ""

394

395 -#: git-gui.sh:2795

395 +#: git-gui.sh:2967

396 msgid "Unstaged Changes"

397 msgstr ""

398

399 -#: git-gui.sh:2845

399 +#: git-gui.sh:3017

400 msgid "Stage Changed"

401 msgstr ""

402

403 -#: git-gui.sh:2864 lib/transport.tcl:104 lib/transport.tcl:193

403 +#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193

404 msgid "Push"

405 msgstr ""

406

407 -#: git-gui.sh:2899

407 +#: git-gui.sh:3071

408 msgid "Initial Commit Message:"

409 msgstr ""

410

411 -#: git-gui.sh:2900

411 +#: git-gui.sh:3072

412 msgid "Amended Commit Message:"

413 msgstr ""

414

415 -#: git-gui.sh:2901

415 +#: git-gui.sh:3073

416 msgid "Amended Initial Commit Message:"

417 msgstr ""

418

419 -#: git-gui.sh:2902

419 +#: git-gui.sh:3074

420 msgid "Amended Merge Commit Message:"

421 msgstr ""

422

423 -#: git-gui.sh:2903

423 +#: git-gui.sh:3075

424 msgid "Merge Commit Message:"

425 msgstr ""

426

427 -#: git-gui.sh:2904

427 +#: git-gui.sh:3076

428 msgid "Commit Message:"

429 msgstr ""

430

431 -#: git-gui.sh:2953 git-gui.sh:3104 lib/console.tcl:73

431 +#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73

432 msgid "Copy All"

433 msgstr ""

434

435 -#: git-gui.sh:2977 lib/blame.tcl:104

435 +#: git-gui.sh:3149 lib/blame.tcl:104

436 msgid "File:"

437 msgstr ""

438

439 -#: git-gui.sh:3092

439 +#: git-gui.sh:3255

440 msgid "Refresh"

441 msgstr ""

442

443 -#: git-gui.sh:3113

443 +#: git-gui.sh:3276

444 msgid "Decrease Font Size"

445 msgstr ""

446

447 -#: git-gui.sh:3117

447 +#: git-gui.sh:3280

448 msgid "Increase Font Size"

449 msgstr ""

450

451 -#: git-gui.sh:3125 lib/blame.tcl:281

451 +#: git-gui.sh:3288 lib/blame.tcl:281

452 msgid "Encoding"

453 msgstr ""

454

455 -#: git-gui.sh:3136

455 +#: git-gui.sh:3299

456 msgid "Apply/Reverse Hunk"

457 msgstr ""

458

459 -#: git-gui.sh:3141

459 +#: git-gui.sh:3304

460 msgid "Apply/Reverse Line"

461 msgstr ""

462

463 -#: git-gui.sh:3151

463 +#: git-gui.sh:3323

464 msgid "Run Merge Tool"

465 msgstr ""

466

467 -#: git-gui.sh:3156

467 +#: git-gui.sh:3328

468 msgid "Use Remote Version"

469 msgstr ""

470

471 -#: git-gui.sh:3160

471 +#: git-gui.sh:3332

472 msgid "Use Local Version"

473 msgstr ""

474

475 -#: git-gui.sh:3164

475 +#: git-gui.sh:3336

476 msgid "Revert To Base"

477 msgstr ""

478

479 -#: git-gui.sh:3183

479 +#: git-gui.sh:3354

480 +msgid "Visualize These Changes In The Submodule"

481 +msgstr ""

482 +

483 +#: git-gui.sh:3358

484 +msgid "Visualize Current Branch History In The Submodule"

485 +msgstr ""

486 +

487 +#: git-gui.sh:3362

488 +msgid "Visualize All Branch History In The Submodule"

489 +msgstr ""

490 +

491 +#: git-gui.sh:3367

492 +msgid "Start git gui In The Submodule"

493 +msgstr ""

494 +

495 +#: git-gui.sh:3389

496 msgid "Unstage Hunk From Commit"

497 msgstr ""

498

483 -#: git-gui.sh:3184

499 +#: git-gui.sh:3391

500 +msgid "Unstage Lines From Commit"

501 +msgstr ""

502 +

503 +#: git-gui.sh:3393

504 msgid "Unstage Line From Commit"

505 msgstr ""

506

487 -#: git-gui.sh:3186

507 +#: git-gui.sh:3396

508 msgid "Stage Hunk For Commit"

509 msgstr ""

510

491 -#: git-gui.sh:3187

511 +#: git-gui.sh:3398

512 +msgid "Stage Lines For Commit"

513 +msgstr ""

514 +

515 +#: git-gui.sh:3400

516 msgid "Stage Line For Commit"

517 msgstr ""

518

495 -#: git-gui.sh:3210

519 +#: git-gui.sh:3424

520 msgid "Initializing..."

521 msgstr ""

522

499 -#: git-gui.sh:3315

523 +#: git-gui.sh:3541

524 #, tcl-format

525 msgid ""

526 "Possible environment issues exist.\n"

@@ -507,14 +531,14 @@ msgid ""

531 "\n"

532 msgstr ""

533

510 -#: git-gui.sh:3345

534 +#: git-gui.sh:3570

535 msgid ""

536 "\n"

537 "This is due to a known issue with the\n"

538 "Tcl binary distributed by Cygwin."

539 msgstr ""

540

517 -#: git-gui.sh:3350

541 +#: git-gui.sh:3575

542 #, tcl-format

543 msgid ""

544 "\n"

@@ -618,7 +642,7 @@ msgstr ""

642 msgid "Unable to display parent"

643 msgstr ""

644

621 -#: lib/blame.tcl:1091 lib/diff.tcl:297

645 +#: lib/blame.tcl:1091 lib/diff.tcl:320

646 msgid "Error loading diff:"

647 msgstr ""

648

@@ -644,7 +668,7 @@ msgstr ""

668

669 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35

670 #: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282

647 -#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172

671 +#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172

672 #: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42

673 #: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352

674 #: lib/transport.tcl:108

@@ -675,7 +699,7 @@ msgstr ""

699 msgid "Create New Branch"

700 msgstr ""

701

678 -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:377

702 +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381

703 msgid "Create"

704 msgstr ""

705

@@ -707,7 +731,7 @@ msgstr ""

731 msgid "Fast Forward Only"

732 msgstr ""

733

710 -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536

734 +#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571

735 msgid "Reset"

736 msgstr ""

737

@@ -749,8 +773,8 @@ msgstr ""

773 msgid "Delete Only If Merged Into"

774 msgstr ""

775

752 -#: lib/branch_delete.tcl:54

753 -msgid "Always (Do not perform merge test.)"

776 +#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119

777 +msgid "Always (Do not perform merge checks)"

778 msgstr ""

779

780 #: lib/branch_delete.tcl:103

@@ -758,6 +782,13 @@ msgstr ""

782 msgid "The following branches are not completely merged into %s:"

783 msgstr ""

784

785 +#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217

786 +msgid ""

787 +"Recovering deleted branches is difficult.\n"

788 +"\n"

789 +"Delete the selected branches?"

790 +msgstr ""

791 +

792 #: lib/branch_delete.tcl:141

793 #, tcl-format

794 msgid ""

@@ -785,7 +816,7 @@ msgstr ""

816 msgid "Please select a branch to rename."

817 msgstr ""

818

788 -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201

819 +#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202

820 #, tcl-format

821 msgid "Branch '%s' already exists."

822 msgstr ""

@@ -816,38 +847,38 @@ msgstr ""

847 msgid "Browse Branch Files"

848 msgstr ""

849

819 -#: lib/browser.tcl:278 lib/choose_repository.tcl:394

820 -#: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491

821 -#: lib/choose_repository.tcl:995

850 +#: lib/browser.tcl:278 lib/choose_repository.tcl:398

851 +#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497

852 +#: lib/choose_repository.tcl:1028

853 msgid "Browse"

854 msgstr ""

855

825 -#: lib/checkout_op.tcl:84

856 +#: lib/checkout_op.tcl:85

857 #, tcl-format

858 msgid "Fetching %s from %s"

859 msgstr ""

860

830 -#: lib/checkout_op.tcl:132

861 +#: lib/checkout_op.tcl:133

862 #, tcl-format

863 msgid "fatal: Cannot resolve %s"

864 msgstr ""

865

835 -#: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31

866 +#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31

867 #: lib/sshkey.tcl:53

868 msgid "Close"

869 msgstr ""

870

840 -#: lib/checkout_op.tcl:174

871 +#: lib/checkout_op.tcl:175

872 #, tcl-format

873 msgid "Branch '%s' does not exist."

874 msgstr ""

875

845 -#: lib/checkout_op.tcl:193

876 +#: lib/checkout_op.tcl:194

877 #, tcl-format

878 msgid "Failed to configure simplified git-pull for '%s'."

879 msgstr ""

880

850 -#: lib/checkout_op.tcl:228

881 +#: lib/checkout_op.tcl:229

882 #, tcl-format

883 msgid ""

884 "Branch '%s' already exists.\n"

@@ -856,21 +887,21 @@ msgid ""

887 "A merge is required."

888 msgstr ""

889

859 -#: lib/checkout_op.tcl:242

890 +#: lib/checkout_op.tcl:243

891 #, tcl-format

892 msgid "Merge strategy '%s' not supported."

893 msgstr ""

894

864 -#: lib/checkout_op.tcl:261

895 +#: lib/checkout_op.tcl:262

896 #, tcl-format

897 msgid "Failed to update '%s'."

898 msgstr ""

899

869 -#: lib/checkout_op.tcl:273

900 +#: lib/checkout_op.tcl:274

901 msgid "Staging area (index) is already locked."

902 msgstr ""

903

873 -#: lib/checkout_op.tcl:288

904 +#: lib/checkout_op.tcl:289

905 msgid ""

906 "Last scanned state does not match repository state.\n"

907 "\n"

@@ -880,30 +911,30 @@ msgid ""

911 "The rescan will be automatically started now.\n"

912 msgstr ""

913

883 -#: lib/checkout_op.tcl:344

914 +#: lib/checkout_op.tcl:345

915 #, tcl-format

916 msgid "Updating working directory to '%s'..."

917 msgstr ""

918

888 -#: lib/checkout_op.tcl:345

919 +#: lib/checkout_op.tcl:346

920 msgid "files checked out"

921 msgstr ""

922

892 -#: lib/checkout_op.tcl:375

923 +#: lib/checkout_op.tcl:376

924 #, tcl-format

925 msgid "Aborted checkout of '%s' (file level merging is required)."

926 msgstr ""

927

897 -#: lib/checkout_op.tcl:376

928 +#: lib/checkout_op.tcl:377

929 msgid "File level merge required."

930 msgstr ""

931

901 -#: lib/checkout_op.tcl:380

932 +#: lib/checkout_op.tcl:381

933 #, tcl-format

934 msgid "Staying on branch '%s'."

935 msgstr ""

936

906 -#: lib/checkout_op.tcl:451

937 +#: lib/checkout_op.tcl:452

938 msgid ""

939 "You are no longer on a local branch.\n"

940 "\n"

@@ -911,30 +942,30 @@ msgid ""

942 "Checkout'."

943 msgstr ""

944

914 -#: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472

945 +#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507

946 #, tcl-format

947 msgid "Checked out '%s'."

948 msgstr ""

949

919 -#: lib/checkout_op.tcl:500

950 +#: lib/checkout_op.tcl:535

951 #, tcl-format

952 msgid "Resetting '%s' to '%s' will lose the following commits:"

953 msgstr ""

954

924 -#: lib/checkout_op.tcl:522

955 +#: lib/checkout_op.tcl:557

956 msgid "Recovering lost commits may not be easy."

957 msgstr ""

958

928 -#: lib/checkout_op.tcl:527

959 +#: lib/checkout_op.tcl:562

960 #, tcl-format

961 msgid "Reset '%s'?"

962 msgstr ""

963

933 -#: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343

964 +#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343

965 msgid "Visualize"

966 msgstr ""

967

937 -#: lib/checkout_op.tcl:600

968 +#: lib/checkout_op.tcl:635

969 #, tcl-format

970 msgid ""

971 "Failed to set current branch.\n"

@@ -971,7 +1002,7 @@ msgstr ""

1002 msgid "Git Gui"

1003 msgstr ""

1004

974 -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382

1005 +#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386

1006 msgid "Create New Repository"

1007 msgstr ""

1008

@@ -979,7 +1010,7 @@ msgstr ""

1010 msgid "New..."

1011 msgstr ""

1012

982 -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465

1013 +#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471

1014 msgid "Clone Existing Repository"

1015 msgstr ""

1016

@@ -987,7 +1018,7 @@ msgstr ""

1018 msgid "Clone..."

1019 msgstr ""

1020

990 -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983

1021 +#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016

1022 msgid "Open Existing Repository"

1023 msgstr ""

1024

@@ -1003,193 +1034,193 @@ msgstr ""

1034 msgid "Open Recent Repository:"

1035 msgstr ""

1036

1006 -#: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309

1007 -#: lib/choose_repository.tcl:316

1037 +#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313

1038 +#: lib/choose_repository.tcl:320

1039 #, tcl-format

1040 msgid "Failed to create repository %s:"

1041 msgstr ""

1042

1012 -#: lib/choose_repository.tcl:387

1043 +#: lib/choose_repository.tcl:391

1044 msgid "Directory:"

1045 msgstr ""

1046

1016 -#: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544

1017 -#: lib/choose_repository.tcl:1017

1047 +#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550

1048 +#: lib/choose_repository.tcl:1052

1049 msgid "Git Repository"

1050 msgstr ""

1051

1021 -#: lib/choose_repository.tcl:442

1052 +#: lib/choose_repository.tcl:448

1053 #, tcl-format

1054 msgid "Directory %s already exists."

1055 msgstr ""

1056

1026 -#: lib/choose_repository.tcl:446

1057 +#: lib/choose_repository.tcl:452

1058 #, tcl-format

1059 msgid "File %s already exists."

1060 msgstr ""

1061

1031 -#: lib/choose_repository.tcl:460

1062 +#: lib/choose_repository.tcl:466

1063 msgid "Clone"

1064 msgstr ""

1065

1035 -#: lib/choose_repository.tcl:473

1066 +#: lib/choose_repository.tcl:479

1067 msgid "Source Location:"

1068 msgstr ""

1069

1039 -#: lib/choose_repository.tcl:484

1070 +#: lib/choose_repository.tcl:490

1071 msgid "Target Directory:"

1072 msgstr ""

1073

1043 -#: lib/choose_repository.tcl:496

1074 +#: lib/choose_repository.tcl:502

1075 msgid "Clone Type:"

1076 msgstr ""

1077

1047 -#: lib/choose_repository.tcl:502

1078 +#: lib/choose_repository.tcl:508

1079 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"

1080 msgstr ""

1081

1051 -#: lib/choose_repository.tcl:508

1082 +#: lib/choose_repository.tcl:514

1083 msgid "Full Copy (Slower, Redundant Backup)"

1084 msgstr ""

1085

1055 -#: lib/choose_repository.tcl:514

1086 +#: lib/choose_repository.tcl:520

1087 msgid "Shared (Fastest, Not Recommended, No Backup)"

1088 msgstr ""

1089

1059 -#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597

1060 -#: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813

1061 -#: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031

1090 +#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603

1091 +#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819

1092 +#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066

1093 #, tcl-format

1094 msgid "Not a Git repository: %s"

1095 msgstr ""

1096

1066 -#: lib/choose_repository.tcl:586

1097 +#: lib/choose_repository.tcl:592

1098 msgid "Standard only available for local repository."

1099 msgstr ""

1100

1070 -#: lib/choose_repository.tcl:590

1101 +#: lib/choose_repository.tcl:596

1102 msgid "Shared only available for local repository."

1103 msgstr ""

1104

1074 -#: lib/choose_repository.tcl:611

1105 +#: lib/choose_repository.tcl:617

1106 #, tcl-format

1107 msgid "Location %s already exists."

1108 msgstr ""

1109

1079 -#: lib/choose_repository.tcl:622

1110 +#: lib/choose_repository.tcl:628

1111 msgid "Failed to configure origin"

1112 msgstr ""

1113

1083 -#: lib/choose_repository.tcl:634

1114 +#: lib/choose_repository.tcl:640

1115 msgid "Counting objects"

1116 msgstr ""

1117

1087 -#: lib/choose_repository.tcl:635

1118 +#: lib/choose_repository.tcl:641

1119 msgid "buckets"

1120 msgstr ""

1121

1091 -#: lib/choose_repository.tcl:659

1122 +#: lib/choose_repository.tcl:665

1123 #, tcl-format

1124 msgid "Unable to copy objects/info/alternates: %s"

1125 msgstr ""

1126

1096 -#: lib/choose_repository.tcl:695

1127 +#: lib/choose_repository.tcl:701

1128 #, tcl-format

1129 msgid "Nothing to clone from %s."

1130 msgstr ""

1131

1101 -#: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911

1102 -#: lib/choose_repository.tcl:923

1132 +#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917

1133 +#: lib/choose_repository.tcl:929

1134 msgid "The 'master' branch has not been initialized."

1135 msgstr ""

1136

1106 -#: lib/choose_repository.tcl:710

1137 +#: lib/choose_repository.tcl:716

1138 msgid "Hardlinks are unavailable. Falling back to copying."

1139 msgstr ""

1140

1110 -#: lib/choose_repository.tcl:722

1141 +#: lib/choose_repository.tcl:728

1142 #, tcl-format

1143 msgid "Cloning from %s"

1144 msgstr ""

1145

1115 -#: lib/choose_repository.tcl:753

1146 +#: lib/choose_repository.tcl:759

1147 msgid "Copying objects"

1148 msgstr ""

1149

1119 -#: lib/choose_repository.tcl:754

1150 +#: lib/choose_repository.tcl:760

1151 msgid "KiB"

1152 msgstr ""

1153

1123 -#: lib/choose_repository.tcl:778

1154 +#: lib/choose_repository.tcl:784

1155 #, tcl-format

1156 msgid "Unable to copy object: %s"

1157 msgstr ""

1158

1128 -#: lib/choose_repository.tcl:788

1159 +#: lib/choose_repository.tcl:794

1160 msgid "Linking objects"

1161 msgstr ""

1162

1132 -#: lib/choose_repository.tcl:789

1163 +#: lib/choose_repository.tcl:795

1164 msgid "objects"

1165 msgstr ""

1166

1136 -#: lib/choose_repository.tcl:797

1167 +#: lib/choose_repository.tcl:803

1168 #, tcl-format

1169 msgid "Unable to hardlink object: %s"

1170 msgstr ""

1171

1141 -#: lib/choose_repository.tcl:852

1172 +#: lib/choose_repository.tcl:858

1173 msgid "Cannot fetch branches and objects. See console output for details."

1174 msgstr ""

1175

1145 -#: lib/choose_repository.tcl:863

1176 +#: lib/choose_repository.tcl:869

1177 msgid "Cannot fetch tags. See console output for details."

1178 msgstr ""

1179

1149 -#: lib/choose_repository.tcl:887

1180 +#: lib/choose_repository.tcl:893

1181 msgid "Cannot determine HEAD. See console output for details."

1182 msgstr ""

1183

1153 -#: lib/choose_repository.tcl:896

1184 +#: lib/choose_repository.tcl:902

1185 #, tcl-format

1186 msgid "Unable to cleanup %s"

1187 msgstr ""

1188

1158 -#: lib/choose_repository.tcl:902

1189 +#: lib/choose_repository.tcl:908

1190 msgid "Clone failed."

1191 msgstr ""

1192

1162 -#: lib/choose_repository.tcl:909

1193 +#: lib/choose_repository.tcl:915

1194 msgid "No default branch obtained."

1195 msgstr ""

1196

1166 -#: lib/choose_repository.tcl:920

1197 +#: lib/choose_repository.tcl:926

1198 #, tcl-format

1199 msgid "Cannot resolve %s as a commit."

1200 msgstr ""

1201

1171 -#: lib/choose_repository.tcl:932

1202 +#: lib/choose_repository.tcl:938

1203 msgid "Creating working directory"

1204 msgstr ""

1205

1175 -#: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128

1176 -#: lib/index.tcl:196

1206 +#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130

1207 +#: lib/index.tcl:198

1208 msgid "files"

1209 msgstr ""

1210

1180 -#: lib/choose_repository.tcl:962

1211 +#: lib/choose_repository.tcl:968

1212 msgid "Initial file checkout failed."

1213 msgstr ""

1214

1184 -#: lib/choose_repository.tcl:978

1215 +#: lib/choose_repository.tcl:1011

1216 msgid "Open"

1217 msgstr ""

1218

1188 -#: lib/choose_repository.tcl:988

1219 +#: lib/choose_repository.tcl:1021

1220 msgid "Repository:"

1221 msgstr ""

1222

1192 -#: lib/choose_repository.tcl:1037

1223 +#: lib/choose_repository.tcl:1072

1224 #, tcl-format

1225 msgid "Failed to open repository %s:"

1226 msgstr ""

@@ -1264,7 +1295,12 @@ msgstr ""

1295 msgid "Invalid GIT_COMMITTER_IDENT:"

1296 msgstr ""

1297

1267 -#: lib/commit.tcl:132

1298 +#: lib/commit.tcl:129

1299 +#, tcl-format

1300 +msgid "warning: Tcl does not support encoding '%s'."

1301 +msgstr ""

1302 +

1303 +#: lib/commit.tcl:149

1304 msgid ""

1305 "Last scanned state does not match repository state.\n"

1306 "\n"

@@ -1274,7 +1310,7 @@ msgid ""

1310 "The rescan will be automatically started now.\n"

1311 msgstr ""

1312

1277 -#: lib/commit.tcl:155

1313 +#: lib/commit.tcl:172

1314 #, tcl-format

1315 msgid ""

1316 "Unmerged files cannot be committed.\n"

@@ -1283,7 +1319,7 @@ msgid ""

1319 "before committing.\n"

1320 msgstr ""

1321

1286 -#: lib/commit.tcl:163

1322 +#: lib/commit.tcl:180

1323 #, tcl-format

1324 msgid ""

1325 "Unknown file state %s detected.\n"

@@ -1291,14 +1327,14 @@ msgid ""

1327 "File %s cannot be committed by this program.\n"

1328 msgstr ""

1329

1294 -#: lib/commit.tcl:171

1330 +#: lib/commit.tcl:188

1331 msgid ""

1332 "No changes to commit.\n"

1333 "\n"

1334 "You must stage at least 1 file before you can commit.\n"

1335 msgstr ""

1336

1301 -#: lib/commit.tcl:186

1337 +#: lib/commit.tcl:203

1338 msgid ""

1339 "Please supply a commit message.\n"

1340 "\n"

@@ -1309,45 +1345,40 @@ msgid ""

1345 "- Remaining lines: Describe why this change is good.\n"

1346 msgstr ""

1347

1312 -#: lib/commit.tcl:210

1313 -#, tcl-format

1314 -msgid "warning: Tcl does not support encoding '%s'."

1315 -msgstr ""

1316 -

1317 -#: lib/commit.tcl:226

1348 +#: lib/commit.tcl:234

1349 msgid "Calling pre-commit hook..."

1350 msgstr ""

1351

1321 -#: lib/commit.tcl:241

1352 +#: lib/commit.tcl:249

1353 msgid "Commit declined by pre-commit hook."

1354 msgstr ""

1355

1325 -#: lib/commit.tcl:264

1356 +#: lib/commit.tcl:272

1357 msgid "Calling commit-msg hook..."

1358 msgstr ""

1359

1329 -#: lib/commit.tcl:279

1360 +#: lib/commit.tcl:287

1361 msgid "Commit declined by commit-msg hook."

1362 msgstr ""

1363

1333 -#: lib/commit.tcl:292

1364 +#: lib/commit.tcl:300

1365 msgid "Committing changes..."

1366 msgstr ""

1367

1337 -#: lib/commit.tcl:308

1368 +#: lib/commit.tcl:316

1369 msgid "write-tree failed:"

1370 msgstr ""

1371

1341 -#: lib/commit.tcl:309 lib/commit.tcl:353 lib/commit.tcl:373

1372 +#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382

1373 msgid "Commit failed."

1374 msgstr ""

1375

1345 -#: lib/commit.tcl:326

1376 +#: lib/commit.tcl:334

1377 #, tcl-format

1378 msgid "Commit %s appears to be corrupt"

1379 msgstr ""

1380

1350 -#: lib/commit.tcl:331

1381 +#: lib/commit.tcl:339

1382 msgid ""

1383 "No changes to commit.\n"

1384 "\n"

@@ -1356,19 +1387,19 @@ msgid ""

1387 "A rescan will be automatically started now.\n"

1388 msgstr ""

1389

1359 -#: lib/commit.tcl:338

1390 +#: lib/commit.tcl:346

1391 msgid "No changes to commit."

1392 msgstr ""

1393

1363 -#: lib/commit.tcl:352

1394 +#: lib/commit.tcl:360

1395 msgid "commit-tree failed:"

1396 msgstr ""

1397

1367 -#: lib/commit.tcl:372

1398 +#: lib/commit.tcl:381

1399 msgid "update-ref failed:"

1400 msgstr ""

1401

1371 -#: lib/commit.tcl:460

1402 +#: lib/commit.tcl:469

1403 #, tcl-format

1404 msgid "Created commit %s: %s"

1405 msgstr ""

@@ -1421,13 +1452,13 @@ msgstr ""

1452 msgid "Verifying the object database with fsck-objects"

1453 msgstr ""

1454

1424 -#: lib/database.tcl:108

1455 +#: lib/database.tcl:107

1456 #, tcl-format

1457 msgid ""

1458 "This repository currently has approximately %i loose objects.\n"

1459 "\n"

1460 "To maintain optimal performance it is strongly recommended that you compress "

1430 -"the database when more than %i loose objects exist.\n"

1461 +"the database.\n"

1462 "\n"

1463 "Compress the database now?"

1464 msgstr ""

@@ -1437,7 +1468,7 @@ msgstr ""

1468 msgid "Invalid date from Git: %s"

1469 msgstr ""

1470

1440 -#: lib/diff.tcl:59

1471 +#: lib/diff.tcl:64

1472 #, tcl-format

1473 msgid ""

1474 "No differences detected.\n"

@@ -1451,56 +1482,56 @@ msgid ""

1482 "the same state."

1483 msgstr ""

1484

1454 -#: lib/diff.tcl:99

1485 +#: lib/diff.tcl:104

1486 #, tcl-format

1487 msgid "Loading diff of %s..."

1488 msgstr ""

1489

1459 -#: lib/diff.tcl:120

1490 +#: lib/diff.tcl:125

1491 msgid ""

1492 "LOCAL: deleted\n"

1493 "REMOTE:\n"

1494 msgstr ""

1495

1465 -#: lib/diff.tcl:125

1496 +#: lib/diff.tcl:130

1497 msgid ""

1498 "REMOTE: deleted\n"

1499 "LOCAL:\n"

1500 msgstr ""

1501

1471 -#: lib/diff.tcl:132

1502 +#: lib/diff.tcl:137

1503 msgid "LOCAL:\n"

1504 msgstr ""

1505

1475 -#: lib/diff.tcl:135

1506 +#: lib/diff.tcl:140

1507 msgid "REMOTE:\n"

1508 msgstr ""

1509

1479 -#: lib/diff.tcl:197 lib/diff.tcl:296

1510 +#: lib/diff.tcl:202 lib/diff.tcl:319

1511 #, tcl-format

1512 msgid "Unable to display %s"

1513 msgstr ""

1514

1484 -#: lib/diff.tcl:198

1515 +#: lib/diff.tcl:203

1516 msgid "Error loading file:"

1517 msgstr ""

1518

1488 -#: lib/diff.tcl:205

1519 +#: lib/diff.tcl:210

1520 msgid "Git Repository (subproject)"

1521 msgstr ""

1522

1492 -#: lib/diff.tcl:217

1523 +#: lib/diff.tcl:222

1524 msgid "* Binary file (not showing content)."

1525 msgstr ""

1526

1496 -#: lib/diff.tcl:222

1527 +#: lib/diff.tcl:227

1528 #, tcl-format

1529 msgid ""

1530 "* Untracked file is %d bytes.\n"

1531 "* Showing only first %d bytes.\n"

1532 msgstr ""

1533

1503 -#: lib/diff.tcl:228

1534 +#: lib/diff.tcl:233

1535 #, tcl-format

1536 msgid ""

1537 "\n"

@@ -1508,19 +1539,19 @@ msgid ""

1539 "* To see the entire file, use an external editor.\n"

1540 msgstr ""

1541

1511 -#: lib/diff.tcl:436

1542 +#: lib/diff.tcl:482

1543 msgid "Failed to unstage selected hunk."

1544 msgstr ""

1545

1515 -#: lib/diff.tcl:443

1546 +#: lib/diff.tcl:489

1547 msgid "Failed to stage selected hunk."

1548 msgstr ""

1549

1519 -#: lib/diff.tcl:509

1550 +#: lib/diff.tcl:568

1551 msgid "Failed to unstage selected line."

1552 msgstr ""

1553

1523 -#: lib/diff.tcl:517

1554 +#: lib/diff.tcl:576

1555 msgid "Failed to stage selected line."

1556 msgstr ""

1557

@@ -1557,13 +1588,13 @@ msgstr ""

1588 msgid "Index Error"

1589 msgstr ""

1590

1560 -#: lib/index.tcl:21

1591 +#: lib/index.tcl:17

1592 msgid ""

1593 "Updating the Git index failed. A rescan will be automatically started to "

1594 "resynchronize git-gui."

1595 msgstr ""

1596

1566 -#: lib/index.tcl:27

1597 +#: lib/index.tcl:28

1598 msgid "Continue"

1599 msgstr ""

1600

@@ -1571,43 +1602,43 @@ msgstr ""

1602 msgid "Unlock Index"

1603 msgstr ""

1604

1574 -#: lib/index.tcl:287

1605 +#: lib/index.tcl:289

1606 #, tcl-format

1607 msgid "Unstaging %s from commit"

1608 msgstr ""

1609

1579 -#: lib/index.tcl:326

1610 +#: lib/index.tcl:328

1611 msgid "Ready to commit."

1612 msgstr ""

1613

1583 -#: lib/index.tcl:339

1614 +#: lib/index.tcl:341

1615 #, tcl-format

1616 msgid "Adding %s"

1617 msgstr ""

1618

1588 -#: lib/index.tcl:396

1619 +#: lib/index.tcl:398

1620 #, tcl-format

1621 msgid "Revert changes in file %s?"

1622 msgstr ""

1623

1593 -#: lib/index.tcl:398

1624 +#: lib/index.tcl:400

1625 #, tcl-format

1626 msgid "Revert changes in these %i files?"

1627 msgstr ""

1628

1598 -#: lib/index.tcl:406

1629 +#: lib/index.tcl:408

1630 msgid "Any unstaged changes will be permanently lost by the revert."

1631 msgstr ""

1632

1602 -#: lib/index.tcl:409

1633 +#: lib/index.tcl:411

1634 msgid "Do Nothing"

1635 msgstr ""

1636

1606 -#: lib/index.tcl:427

1637 +#: lib/index.tcl:429

1638 msgid "Reverting selected files"

1639 msgstr ""

1640

1610 -#: lib/index.tcl:431

1641 +#: lib/index.tcl:433

1642 #, tcl-format

1643 msgid "Reverting %s"

1644 msgstr ""

@@ -2036,10 +2067,6 @@ msgstr ""

2067 msgid "Merged Into:"

2068 msgstr ""

2069

2039 -#: lib/remote_branch_delete.tcl:119

2040 -msgid "Always (Do not perform merge checks)"

2041 -msgstr ""

2042 -

2070 #: lib/remote_branch_delete.tcl:152

2071 msgid "A branch is required for 'Merged Into'."

2072 msgstr ""

@@ -2063,23 +2090,16 @@ msgstr ""

2090 msgid "Please select one or more branches to delete."

2091 msgstr ""

2092

2066 -#: lib/remote_branch_delete.tcl:216

2067 -msgid ""

2068 -"Recovering deleted branches is difficult.\n"

2069 -"\n"

2070 -"Delete the selected branches?"

2071 -msgstr ""

2072 -

2093 #: lib/remote_branch_delete.tcl:226

2094 #, tcl-format

2095 msgid "Deleting branches from %s"

2096 msgstr ""

2097

2078 -#: lib/remote_branch_delete.tcl:286

2098 +#: lib/remote_branch_delete.tcl:292

2099 msgid "No repository selected."

2100 msgstr ""

2101

2082 -#: lib/remote_branch_delete.tcl:291

2102 +#: lib/remote_branch_delete.tcl:297

2103 #, tcl-format

2104 msgid "Scanning %s..."

2105 msgstr ""

@@ -2100,11 +2120,11 @@ msgstr ""

2120 msgid "Case-Sensitive"

2121 msgstr ""

2122

2103 -#: lib/shortcut.tcl:20 lib/shortcut.tcl:61

2123 +#: lib/shortcut.tcl:21 lib/shortcut.tcl:62

2124 msgid "Cannot write shortcut:"

2125 msgstr ""

2126

2107 -#: lib/shortcut.tcl:136

2127 +#: lib/shortcut.tcl:137

2128 msgid "Cannot write icon:"

2129 msgstr ""

2130

git-gui: Update translation template