bd45bd91e6 · 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-08-02 14:45-0700\n"

11 +"POT-Creation-Date: 2008-11-16 13:56-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:688 git-gui.sh:702 git-gui.sh:715 git-gui.sh:798

20 -#: git-gui.sh:817

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

21 msgid "git-gui: fatal error"

22 msgstr ""

23

24 -#: git-gui.sh:644

24 +#: git-gui.sh:689

25 #, tcl-format

26 msgid "Invalid font specified in %s:"

27 msgstr ""

28

29 -#: git-gui.sh:674

29 +#: git-gui.sh:723

30 msgid "Main Font"

31 msgstr ""

32

33 -#: git-gui.sh:675

33 +#: git-gui.sh:724

34 msgid "Diff/Console Font"

35 msgstr ""

36

37 -#: git-gui.sh:689

37 +#: git-gui.sh:738

38 msgid "Cannot find git in PATH."

39 msgstr ""

40

41 -#: git-gui.sh:716

41 +#: git-gui.sh:765

42 msgid "Cannot parse Git version string:"

43 msgstr ""

44

45 -#: git-gui.sh:734

45 +#: git-gui.sh:783

46 #, tcl-format

47 msgid ""

48 "Git version cannot be determined.\n"

@@ -54,379 +54,444 @@ msgid ""

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

55 msgstr ""

56

57 -#: git-gui.sh:972

57 +#: git-gui.sh:1062

58 msgid "Git directory not found:"

59 msgstr ""

60

61 -#: git-gui.sh:979

61 +#: git-gui.sh:1069

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

63 msgstr ""

64

65 -#: git-gui.sh:986

65 +#: git-gui.sh:1076

66 msgid "Cannot use funny .git directory:"

67 msgstr ""

68

69 -#: git-gui.sh:991

69 +#: git-gui.sh:1081

70 msgid "No working directory"

71 msgstr ""

72

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

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

74 msgid "Refreshing file status..."

75 msgstr ""

76

77 -#: git-gui.sh:1194

77 +#: git-gui.sh:1303

78 msgid "Scanning for modified files ..."

79 msgstr ""

80

81 -#: git-gui.sh:1369 lib/browser.tcl:246

81 +#: git-gui.sh:1367

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

83 +msgstr ""

84 +

85 +#: git-gui.sh:1384

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

87 +msgstr ""

88 +

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

90 msgid "Ready."

91 msgstr ""

92

85 -#: git-gui.sh:1635

93 +#: git-gui.sh:1819

94 msgid "Unmodified"

95 msgstr ""

96

89 -#: git-gui.sh:1637

97 +#: git-gui.sh:1821

98 msgid "Modified, not staged"

99 msgstr ""

100

93 -#: git-gui.sh:1638 git-gui.sh:1643

101 +#: git-gui.sh:1822 git-gui.sh:1830

102 msgid "Staged for commit"

103 msgstr ""

104

97 -#: git-gui.sh:1639 git-gui.sh:1644

105 +#: git-gui.sh:1823 git-gui.sh:1831

106 msgid "Portions staged for commit"

107 msgstr ""

108

101 -#: git-gui.sh:1640 git-gui.sh:1645

109 +#: git-gui.sh:1824 git-gui.sh:1832

110 msgid "Staged for commit, missing"

111 msgstr ""

112

105 -#: git-gui.sh:1642

113 +#: git-gui.sh:1826

114 +msgid "File type changed, not staged"

115 +msgstr ""

116 +

117 +#: git-gui.sh:1827

118 +msgid "File type changed, staged"

119 +msgstr ""

120 +

121 +#: git-gui.sh:1829

122 msgid "Untracked, not staged"

123 msgstr ""

124

109 -#: git-gui.sh:1647

125 +#: git-gui.sh:1834

126 msgid "Missing"

127 msgstr ""

128

113 -#: git-gui.sh:1648

129 +#: git-gui.sh:1835

130 msgid "Staged for removal"

131 msgstr ""

132

117 -#: git-gui.sh:1649

133 +#: git-gui.sh:1836

134 msgid "Staged for removal, still present"

135 msgstr ""

136

121 -#: git-gui.sh:1651 git-gui.sh:1652 git-gui.sh:1653 git-gui.sh:1654

137 +#: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841

138 +#: git-gui.sh:1842 git-gui.sh:1843

139 msgid "Requires merge resolution"

140 msgstr ""

141

125 -#: git-gui.sh:1689

142 +#: git-gui.sh:1878

143 msgid "Starting gitk... please wait..."

144 msgstr ""

145

129 -#: git-gui.sh:1698

146 +#: git-gui.sh:1887

147 msgid "Couldn't find gitk in PATH"

148 msgstr ""

149

133 -#: git-gui.sh:1948 lib/choose_repository.tcl:36

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

151 msgid "Repository"

152 msgstr ""

153

137 -#: git-gui.sh:1949

154 +#: git-gui.sh:2281

155 msgid "Edit"

156 msgstr ""

157

141 -#: git-gui.sh:1951 lib/choose_rev.tcl:561

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

159 msgid "Branch"

160 msgstr ""

161

145 -#: git-gui.sh:1954 lib/choose_rev.tcl:548

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

163 msgid "Commit@@noun"

164 msgstr ""

165

149 -#: git-gui.sh:1957 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167

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

167 msgid "Merge"

168 msgstr ""

169

153 -#: git-gui.sh:1958 lib/choose_rev.tcl:557

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

171 msgid "Remote"

172 msgstr ""

173

157 -#: git-gui.sh:1967

174 +#: git-gui.sh:2293

175 +msgid "Tools"

176 +msgstr ""

177 +

178 +#: git-gui.sh:2302

179 +msgid "Explore Working Copy"

180 +msgstr ""

181 +

182 +#: git-gui.sh:2307

183 msgid "Browse Current Branch's Files"

184 msgstr ""

185

161 -#: git-gui.sh:1971

186 +#: git-gui.sh:2311

187 msgid "Browse Branch Files..."

188 msgstr ""

189

165 -#: git-gui.sh:1976

190 +#: git-gui.sh:2316

191 msgid "Visualize Current Branch's History"

192 msgstr ""

193

169 -#: git-gui.sh:1980

194 +#: git-gui.sh:2320

195 msgid "Visualize All Branch History"

196 msgstr ""

197

173 -#: git-gui.sh:1987

198 +#: git-gui.sh:2327

199 #, tcl-format

200 msgid "Browse %s's Files"

201 msgstr ""

202

178 -#: git-gui.sh:1989

203 +#: git-gui.sh:2329

204 #, tcl-format

205 msgid "Visualize %s's History"

206 msgstr ""

207

183 -#: git-gui.sh:1994 lib/database.tcl:27 lib/database.tcl:67

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

209 msgid "Database Statistics"

210 msgstr ""

211

187 -#: git-gui.sh:1997 lib/database.tcl:34

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

213 msgid "Compress Database"

214 msgstr ""

215

191 -#: git-gui.sh:2000

216 +#: git-gui.sh:2340

217 msgid "Verify Database"

218 msgstr ""

219

195 -#: git-gui.sh:2007 git-gui.sh:2011 git-gui.sh:2015 lib/shortcut.tcl:7

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

221 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71

222 msgid "Create Desktop Icon"

223 msgstr ""

224

200 -#: git-gui.sh:2023 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185

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

226 msgid "Quit"

227 msgstr ""

228

204 -#: git-gui.sh:2031

229 +#: git-gui.sh:2371

230 msgid "Undo"

231 msgstr ""

232

208 -#: git-gui.sh:2034

233 +#: git-gui.sh:2374

234 msgid "Redo"

235 msgstr ""

236

212 -#: git-gui.sh:2038 git-gui.sh:2545

237 +#: git-gui.sh:2378 git-gui.sh:2923

238 msgid "Cut"

239 msgstr ""

240

216 -#: git-gui.sh:2041 git-gui.sh:2548 git-gui.sh:2622 git-gui.sh:2715

241 +#: git-gui.sh:2381 git-gui.sh:2926 git-gui.sh:3000 git-gui.sh:3082

242 #: lib/console.tcl:69

243 msgid "Copy"

244 msgstr ""

245

221 -#: git-gui.sh:2044 git-gui.sh:2551

246 +#: git-gui.sh:2384 git-gui.sh:2929

247 msgid "Paste"

248 msgstr ""

249

225 -#: git-gui.sh:2047 git-gui.sh:2554 lib/branch_delete.tcl:26

250 +#: git-gui.sh:2387 git-gui.sh:2932 lib/branch_delete.tcl:26

251 #: lib/remote_branch_delete.tcl:38

252 msgid "Delete"

253 msgstr ""

254

230 -#: git-gui.sh:2051 git-gui.sh:2558 git-gui.sh:2719 lib/console.tcl:71

255 +#: git-gui.sh:2391 git-gui.sh:2936 git-gui.sh:3086 lib/console.tcl:71

256 msgid "Select All"

257 msgstr ""

258

234 -#: git-gui.sh:2060

259 +#: git-gui.sh:2400

260 msgid "Create..."

261 msgstr ""

262

238 -#: git-gui.sh:2066

263 +#: git-gui.sh:2406

264 msgid "Checkout..."

265 msgstr ""

266

242 -#: git-gui.sh:2072

267 +#: git-gui.sh:2412

268 msgid "Rename..."

269 msgstr ""

270

246 -#: git-gui.sh:2077 git-gui.sh:2187

271 +#: git-gui.sh:2417

272 msgid "Delete..."

273 msgstr ""

274

250 -#: git-gui.sh:2082

275 +#: git-gui.sh:2422

276 msgid "Reset..."

277 msgstr ""

278

254 -#: git-gui.sh:2094 git-gui.sh:2491

279 +#: git-gui.sh:2432

280 +msgid "Done"

281 +msgstr ""

282 +

283 +#: git-gui.sh:2434

284 +msgid "Commit@@verb"

285 +msgstr ""

286 +

287 +#: git-gui.sh:2443 git-gui.sh:2864

288 msgid "New Commit"

289 msgstr ""

290

258 -#: git-gui.sh:2102 git-gui.sh:2498

291 +#: git-gui.sh:2451 git-gui.sh:2871

292 msgid "Amend Last Commit"

293 msgstr ""

294

262 -#: git-gui.sh:2111 git-gui.sh:2458 lib/remote_branch_delete.tcl:99

295 +#: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99

296 msgid "Rescan"

297 msgstr ""

298

266 -#: git-gui.sh:2117

299 +#: git-gui.sh:2467

300 msgid "Stage To Commit"

301 msgstr ""

302

270 -#: git-gui.sh:2123

303 +#: git-gui.sh:2473

304 msgid "Stage Changed Files To Commit"

305 msgstr ""

306

274 -#: git-gui.sh:2129

307 +#: git-gui.sh:2479

308 msgid "Unstage From Commit"

309 msgstr ""

310

278 -#: git-gui.sh:2134 lib/index.tcl:395

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

312 msgid "Revert Changes"

313 msgstr ""

314

282 -#: git-gui.sh:2141 git-gui.sh:2702

315 +#: git-gui.sh:2491 git-gui.sh:3069

316 msgid "Show Less Context"

317 msgstr ""

318

286 -#: git-gui.sh:2145 git-gui.sh:2706

319 +#: git-gui.sh:2495 git-gui.sh:3073

320 msgid "Show More Context"

321 msgstr ""

322

290 -#: git-gui.sh:2151 git-gui.sh:2470 git-gui.sh:2569

323 +#: git-gui.sh:2502 git-gui.sh:2838 git-gui.sh:2947

324 msgid "Sign Off"

325 msgstr ""

326

294 -#: git-gui.sh:2155 git-gui.sh:2474

295 -msgid "Commit@@verb"

296 -msgstr ""

297 -

298 -#: git-gui.sh:2166

327 +#: git-gui.sh:2518

328 msgid "Local Merge..."

329 msgstr ""

330

302 -#: git-gui.sh:2171

331 +#: git-gui.sh:2523

332 msgid "Abort Merge..."

333 msgstr ""

334

306 -#: git-gui.sh:2183

335 +#: git-gui.sh:2535 git-gui.sh:2575

336 +msgid "Add..."

337 +msgstr ""

338 +

339 +#: git-gui.sh:2539

340 msgid "Push..."

341 msgstr ""

342

310 -#: git-gui.sh:2197 git-gui.sh:2219 lib/about.tcl:14

311 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50

343 +#: git-gui.sh:2543

344 +msgid "Delete Branch..."

345 +msgstr ""

346 +

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

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

349 #, tcl-format

350 msgid "About %s"

351 msgstr ""

352

316 -#: git-gui.sh:2201

353 +#: git-gui.sh:2557

354 msgid "Preferences..."

355 msgstr ""

356

320 -#: git-gui.sh:2209 git-gui.sh:2740

357 +#: git-gui.sh:2565 git-gui.sh:3115

358 msgid "Options..."

359 msgstr ""

360

324 -#: git-gui.sh:2215 lib/choose_repository.tcl:47

361 +#: git-gui.sh:2576

362 +msgid "Remove..."

363 +msgstr ""

364 +

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

366 msgid "Help"

367 msgstr ""

368

328 -#: git-gui.sh:2256

369 +#: git-gui.sh:2611

370 msgid "Online Documentation"

371 msgstr ""

372

332 -#: git-gui.sh:2340

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

374 +msgid "Show SSH Key"

375 +msgstr ""

376 +

377 +#: git-gui.sh:2707

378 #, tcl-format

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

380 msgstr ""

381

337 -#: git-gui.sh:2373

382 +#: git-gui.sh:2740

383 msgid "Current Branch:"

384 msgstr ""

385

341 -#: git-gui.sh:2394

386 +#: git-gui.sh:2761

387 msgid "Staged Changes (Will Commit)"

388 msgstr ""

389

345 -#: git-gui.sh:2414

390 +#: git-gui.sh:2781

391 msgid "Unstaged Changes"

392 msgstr ""

393

349 -#: git-gui.sh:2464

394 +#: git-gui.sh:2831

395 msgid "Stage Changed"

396 msgstr ""

397

353 -#: git-gui.sh:2480 lib/transport.tcl:93 lib/transport.tcl:182

398 +#: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182

399 msgid "Push"

400 msgstr ""

401

357 -#: git-gui.sh:2510

402 +#: git-gui.sh:2885

403 msgid "Initial Commit Message:"

404 msgstr ""

405

361 -#: git-gui.sh:2511

406 +#: git-gui.sh:2886

407 msgid "Amended Commit Message:"

408 msgstr ""

409

365 -#: git-gui.sh:2512

410 +#: git-gui.sh:2887

411 msgid "Amended Initial Commit Message:"

412 msgstr ""

413

369 -#: git-gui.sh:2513

414 +#: git-gui.sh:2888

415 msgid "Amended Merge Commit Message:"

416 msgstr ""

417

373 -#: git-gui.sh:2514

418 +#: git-gui.sh:2889

419 msgid "Merge Commit Message:"

420 msgstr ""

421

377 -#: git-gui.sh:2515

422 +#: git-gui.sh:2890

423 msgid "Commit Message:"

424 msgstr ""

425

381 -#: git-gui.sh:2561 git-gui.sh:2723 lib/console.tcl:73

426 +#: git-gui.sh:2939 git-gui.sh:3090 lib/console.tcl:73

427 msgid "Copy All"

428 msgstr ""

429

385 -#: git-gui.sh:2585 lib/blame.tcl:100

430 +#: git-gui.sh:2963 lib/blame.tcl:104

431 msgid "File:"

432 msgstr ""

433

389 -#: git-gui.sh:2691

434 +#: git-gui.sh:3078

435 +msgid "Refresh"

436 +msgstr ""

437 +

438 +#: git-gui.sh:3099

439 +msgid "Decrease Font Size"

440 +msgstr ""

441 +

442 +#: git-gui.sh:3103

443 +msgid "Increase Font Size"

444 +msgstr ""

445 +

446 +#: git-gui.sh:3111 lib/blame.tcl:281

447 +msgid "Encoding"

448 +msgstr ""

449 +

450 +#: git-gui.sh:3122

451 msgid "Apply/Reverse Hunk"

452 msgstr ""

453

393 -#: git-gui.sh:2696

454 +#: git-gui.sh:3127

455 msgid "Apply/Reverse Line"

456 msgstr ""

457

397 -#: git-gui.sh:2711

398 -msgid "Refresh"

458 +#: git-gui.sh:3137

459 +msgid "Run Merge Tool"

460 msgstr ""

461

401 -#: git-gui.sh:2732

402 -msgid "Decrease Font Size"

462 +#: git-gui.sh:3142

463 +msgid "Use Remote Version"

464 msgstr ""

465

405 -#: git-gui.sh:2736

406 -msgid "Increase Font Size"

466 +#: git-gui.sh:3146

467 +msgid "Use Local Version"

468 +msgstr ""

469 +

470 +#: git-gui.sh:3150

471 +msgid "Revert To Base"

472 msgstr ""

473

409 -#: git-gui.sh:2747

474 +#: git-gui.sh:3169

475 msgid "Unstage Hunk From Commit"

476 msgstr ""

477

413 -#: git-gui.sh:2748

478 +#: git-gui.sh:3170

479 msgid "Unstage Line From Commit"

480 msgstr ""

481

417 -#: git-gui.sh:2750

482 +#: git-gui.sh:3172

483 msgid "Stage Hunk For Commit"

484 msgstr ""

485

421 -#: git-gui.sh:2751

486 +#: git-gui.sh:3173

487 msgid "Stage Line For Commit"

488 msgstr ""

489

425 -#: git-gui.sh:2771

490 +#: git-gui.sh:3196

491 msgid "Initializing..."

492 msgstr ""

493

429 -#: git-gui.sh:2876

494 +#: git-gui.sh:3301

495 #, tcl-format

496 msgid ""

497 "Possible environment issues exist.\n"

@@ -437,14 +502,14 @@ msgid ""

502 "\n"

503 msgstr ""

504

440 -#: git-gui.sh:2906

505 +#: git-gui.sh:3331

506 msgid ""

507 "\n"

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

509 "Tcl binary distributed by Cygwin."

510 msgstr ""

511

447 -#: git-gui.sh:2911

512 +#: git-gui.sh:3336

513 #, tcl-format

514 msgid ""

515 "\n"

@@ -459,80 +524,108 @@ msgstr ""

524 msgid "git-gui - a graphical user interface for Git."

525 msgstr ""

526

462 -#: lib/blame.tcl:70

527 +#: lib/blame.tcl:72

528 msgid "File Viewer"

529 msgstr ""

530

466 -#: lib/blame.tcl:74

531 +#: lib/blame.tcl:78

532 msgid "Commit:"

533 msgstr ""

534

470 -#: lib/blame.tcl:257

535 +#: lib/blame.tcl:271

536 msgid "Copy Commit"

537 msgstr ""

538

474 -#: lib/blame.tcl:260

539 +#: lib/blame.tcl:275

540 +msgid "Find Text..."

541 +msgstr ""

542 +

543 +#: lib/blame.tcl:284

544 msgid "Do Full Copy Detection"

545 msgstr ""

546

478 -#: lib/blame.tcl:388

547 +#: lib/blame.tcl:288

548 +msgid "Show History Context"

549 +msgstr ""

550 +

551 +#: lib/blame.tcl:291

552 +msgid "Blame Parent Commit"

553 +msgstr ""

554 +

555 +#: lib/blame.tcl:450

556 #, tcl-format

557 msgid "Reading %s..."

558 msgstr ""

559

483 -#: lib/blame.tcl:492

560 +#: lib/blame.tcl:557

561 msgid "Loading copy/move tracking annotations..."

562 msgstr ""

563

487 -#: lib/blame.tcl:512

564 +#: lib/blame.tcl:577

565 msgid "lines annotated"

566 msgstr ""

567

491 -#: lib/blame.tcl:704

568 +#: lib/blame.tcl:769

569 msgid "Loading original location annotations..."

570 msgstr ""

571

495 -#: lib/blame.tcl:707

572 +#: lib/blame.tcl:772

573 msgid "Annotation complete."

574 msgstr ""

575

499 -#: lib/blame.tcl:737

576 +#: lib/blame.tcl:802

577 msgid "Busy"

578 msgstr ""

579

503 -#: lib/blame.tcl:738

580 +#: lib/blame.tcl:803

581 msgid "Annotation process is already running."

582 msgstr ""

583

507 -#: lib/blame.tcl:777

584 +#: lib/blame.tcl:842

585 msgid "Running thorough copy detection..."

586 msgstr ""

587

511 -#: lib/blame.tcl:827

588 +#: lib/blame.tcl:910

589 msgid "Loading annotation..."

590 msgstr ""

591

515 -#: lib/blame.tcl:883

592 +#: lib/blame.tcl:964

593 msgid "Author:"

594 msgstr ""

595

519 -#: lib/blame.tcl:887

596 +#: lib/blame.tcl:968

597 msgid "Committer:"

598 msgstr ""

599

523 -#: lib/blame.tcl:892

600 +#: lib/blame.tcl:973

601 msgid "Original File:"

602 msgstr ""

603

527 -#: lib/blame.tcl:1006

604 +#: lib/blame.tcl:1021

605 +msgid "Cannot find HEAD commit:"

606 +msgstr ""

607 +

608 +#: lib/blame.tcl:1076

609 +msgid "Cannot find parent commit:"

610 +msgstr ""

611 +

612 +#: lib/blame.tcl:1091

613 +msgid "Unable to display parent"

614 +msgstr ""

615 +

616 +#: lib/blame.tcl:1092 lib/diff.tcl:297

617 +msgid "Error loading diff:"

618 +msgstr ""

619 +

620 +#: lib/blame.tcl:1232

621 msgid "Originally By:"

622 msgstr ""

623

531 -#: lib/blame.tcl:1012

624 +#: lib/blame.tcl:1238

625 msgid "In File:"

626 msgstr ""

627

535 -#: lib/blame.tcl:1017

628 +#: lib/blame.tcl:1243

629 msgid "Copied Or Moved Here By:"

630 msgstr ""

631

@@ -546,16 +639,18 @@ msgstr ""

639

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

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

549 -#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:171

550 -#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97

642 +#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172

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

644 +#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352

645 +#: lib/transport.tcl:97

646 msgid "Cancel"

647 msgstr ""

648

554 -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287

649 +#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328

650 msgid "Revision"

651 msgstr ""

652

558 -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:244

653 +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280

654 msgid "Options"

655 msgstr ""

656

@@ -575,7 +670,7 @@ msgstr ""

670 msgid "Create New Branch"

671 msgstr ""

672

578 -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371

673 +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:377

674 msgid "Create"

675 msgstr ""

676

@@ -583,7 +678,7 @@ msgstr ""

678 msgid "Branch Name"

679 msgstr ""

680

586 -#: lib/branch_create.tcl:43

681 +#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50

682 msgid "Name:"

683 msgstr ""

684

@@ -723,9 +818,9 @@ msgstr ""

818 msgid "Browse Branch Files"

819 msgstr ""

820

726 -#: lib/browser.tcl:278 lib/choose_repository.tcl:387

727 -#: lib/choose_repository.tcl:472 lib/choose_repository.tcl:482

728 -#: lib/choose_repository.tcl:985

821 +#: lib/browser.tcl:278 lib/choose_repository.tcl:394

822 +#: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491

823 +#: lib/choose_repository.tcl:995

824 msgid "Browse"

825 msgstr ""

826

@@ -740,6 +835,7 @@ msgid "fatal: Cannot resolve %s"

835 msgstr ""

836

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

838 +#: lib/sshkey.tcl:53

839 msgid "Close"

840 msgstr ""

841

@@ -836,7 +932,7 @@ msgstr ""

932 msgid "Reset '%s'?"

933 msgstr ""

934

839 -#: lib/checkout_op.tcl:532 lib/merge.tcl:163

935 +#: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343

936 msgid "Visualize"

937 msgstr ""

938

@@ -877,221 +973,225 @@ msgstr ""

973 msgid "Git Gui"

974 msgstr ""

975

880 -#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376

976 +#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382

977 msgid "Create New Repository"

978 msgstr ""

979

884 -#: lib/choose_repository.tcl:87

980 +#: lib/choose_repository.tcl:93

981 msgid "New..."

982 msgstr ""

983

888 -#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:458

984 +#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465

985 msgid "Clone Existing Repository"

986 msgstr ""

987

892 -#: lib/choose_repository.tcl:100

988 +#: lib/choose_repository.tcl:106

989 msgid "Clone..."

990 msgstr ""

991

896 -#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:974

992 +#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983

993 msgid "Open Existing Repository"

994 msgstr ""

995

900 -#: lib/choose_repository.tcl:113

996 +#: lib/choose_repository.tcl:119

997 msgid "Open..."

998 msgstr ""

999

904 -#: lib/choose_repository.tcl:126

1000 +#: lib/choose_repository.tcl:132

1001 msgid "Recent Repositories"

1002 msgstr ""

1003

908 -#: lib/choose_repository.tcl:132

1004 +#: lib/choose_repository.tcl:138

1005 msgid "Open Recent Repository:"

1006 msgstr ""

1007

912 -#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303

913 -#: lib/choose_repository.tcl:310

1008 +#: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309

1009 +#: lib/choose_repository.tcl:316

1010 #, tcl-format

1011 msgid "Failed to create repository %s:"

1012 msgstr ""

1013

918 -#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:476

1014 +#: lib/choose_repository.tcl:387

1015 msgid "Directory:"

1016 msgstr ""

1017

922 -#: lib/choose_repository.tcl:410 lib/choose_repository.tcl:535

923 -#: lib/choose_repository.tcl:1007

1018 +#: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544

1019 +#: lib/choose_repository.tcl:1017

1020 msgid "Git Repository"

1021 msgstr ""

1022

927 -#: lib/choose_repository.tcl:435

1023 +#: lib/choose_repository.tcl:442

1024 #, tcl-format

1025 msgid "Directory %s already exists."

1026 msgstr ""

1027

932 -#: lib/choose_repository.tcl:439

1028 +#: lib/choose_repository.tcl:446

1029 #, tcl-format

1030 msgid "File %s already exists."

1031 msgstr ""

1032

937 -#: lib/choose_repository.tcl:453

1033 +#: lib/choose_repository.tcl:460

1034 msgid "Clone"

1035 msgstr ""

1036

941 -#: lib/choose_repository.tcl:466

942 -msgid "URL:"

1037 +#: lib/choose_repository.tcl:473

1038 +msgid "Source Location:"

1039 msgstr ""

1040

945 -#: lib/choose_repository.tcl:487

1041 +#: lib/choose_repository.tcl:484

1042 +msgid "Target Directory:"

1043 +msgstr ""

1044 +

1045 +#: lib/choose_repository.tcl:496

1046 msgid "Clone Type:"

1047 msgstr ""

1048

949 -#: lib/choose_repository.tcl:493

1049 +#: lib/choose_repository.tcl:502

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

1051 msgstr ""

1052

953 -#: lib/choose_repository.tcl:499

1053 +#: lib/choose_repository.tcl:508

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

1055 msgstr ""

1056

957 -#: lib/choose_repository.tcl:505

1057 +#: lib/choose_repository.tcl:514

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

1059 msgstr ""

1060

961 -#: lib/choose_repository.tcl:541 lib/choose_repository.tcl:588

962 -#: lib/choose_repository.tcl:734 lib/choose_repository.tcl:804

963 -#: lib/choose_repository.tcl:1013 lib/choose_repository.tcl:1021

1061 +#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597

1062 +#: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813

1063 +#: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031

1064 #, tcl-format

1065 msgid "Not a Git repository: %s"

1066 msgstr ""

1067

968 -#: lib/choose_repository.tcl:577

1068 +#: lib/choose_repository.tcl:586

1069 msgid "Standard only available for local repository."

1070 msgstr ""

1071

972 -#: lib/choose_repository.tcl:581

1072 +#: lib/choose_repository.tcl:590

1073 msgid "Shared only available for local repository."

1074 msgstr ""

1075

976 -#: lib/choose_repository.tcl:602

1076 +#: lib/choose_repository.tcl:611

1077 #, tcl-format

1078 msgid "Location %s already exists."

1079 msgstr ""

1080

981 -#: lib/choose_repository.tcl:613

1081 +#: lib/choose_repository.tcl:622

1082 msgid "Failed to configure origin"

1083 msgstr ""

1084

985 -#: lib/choose_repository.tcl:625

1085 +#: lib/choose_repository.tcl:634

1086 msgid "Counting objects"

1087 msgstr ""

1088

989 -#: lib/choose_repository.tcl:626

1089 +#: lib/choose_repository.tcl:635

1090 msgid "buckets"

1091 msgstr ""

1092

993 -#: lib/choose_repository.tcl:650

1093 +#: lib/choose_repository.tcl:659

1094 #, tcl-format

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

1096 msgstr ""

1097

998 -#: lib/choose_repository.tcl:686

1098 +#: lib/choose_repository.tcl:695

1099 #, tcl-format

1100 msgid "Nothing to clone from %s."

1101 msgstr ""

1102

1003 -#: lib/choose_repository.tcl:688 lib/choose_repository.tcl:902

1004 -#: lib/choose_repository.tcl:914

1103 +#: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911

1104 +#: lib/choose_repository.tcl:923

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

1106 msgstr ""

1107

1008 -#: lib/choose_repository.tcl:701

1108 +#: lib/choose_repository.tcl:710

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

1110 msgstr ""

1111

1012 -#: lib/choose_repository.tcl:713

1112 +#: lib/choose_repository.tcl:722

1113 #, tcl-format

1114 msgid "Cloning from %s"

1115 msgstr ""

1116

1017 -#: lib/choose_repository.tcl:744

1117 +#: lib/choose_repository.tcl:753

1118 msgid "Copying objects"

1119 msgstr ""

1120

1021 -#: lib/choose_repository.tcl:745

1121 +#: lib/choose_repository.tcl:754

1122 msgid "KiB"

1123 msgstr ""

1124

1025 -#: lib/choose_repository.tcl:769

1125 +#: lib/choose_repository.tcl:778

1126 #, tcl-format

1127 msgid "Unable to copy object: %s"

1128 msgstr ""

1129

1030 -#: lib/choose_repository.tcl:779

1130 +#: lib/choose_repository.tcl:788

1131 msgid "Linking objects"

1132 msgstr ""

1133

1034 -#: lib/choose_repository.tcl:780

1134 +#: lib/choose_repository.tcl:789

1135 msgid "objects"

1136 msgstr ""

1137

1038 -#: lib/choose_repository.tcl:788

1138 +#: lib/choose_repository.tcl:797

1139 #, tcl-format

1140 msgid "Unable to hardlink object: %s"

1141 msgstr ""

1142

1043 -#: lib/choose_repository.tcl:843

1143 +#: lib/choose_repository.tcl:852

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

1145 msgstr ""

1146

1047 -#: lib/choose_repository.tcl:854

1147 +#: lib/choose_repository.tcl:863

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

1149 msgstr ""

1150

1051 -#: lib/choose_repository.tcl:878

1151 +#: lib/choose_repository.tcl:887

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

1153 msgstr ""

1154

1055 -#: lib/choose_repository.tcl:887

1155 +#: lib/choose_repository.tcl:896

1156 #, tcl-format

1157 msgid "Unable to cleanup %s"

1158 msgstr ""

1159

1060 -#: lib/choose_repository.tcl:893

1160 +#: lib/choose_repository.tcl:902

1161 msgid "Clone failed."

1162 msgstr ""

1163

1064 -#: lib/choose_repository.tcl:900

1164 +#: lib/choose_repository.tcl:909

1165 msgid "No default branch obtained."

1166 msgstr ""

1167

1068 -#: lib/choose_repository.tcl:911

1168 +#: lib/choose_repository.tcl:920

1169 #, tcl-format

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

1171 msgstr ""

1172

1073 -#: lib/choose_repository.tcl:923

1173 +#: lib/choose_repository.tcl:932

1174 msgid "Creating working directory"

1175 msgstr ""

1176

1077 -#: lib/choose_repository.tcl:924 lib/index.tcl:65 lib/index.tcl:127

1078 -#: lib/index.tcl:193

1177 +#: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128

1178 +#: lib/index.tcl:196

1179 msgid "files"

1180 msgstr ""

1181

1082 -#: lib/choose_repository.tcl:953

1182 +#: lib/choose_repository.tcl:962

1183 msgid "Initial file checkout failed."

1184 msgstr ""

1185

1086 -#: lib/choose_repository.tcl:969

1186 +#: lib/choose_repository.tcl:978

1187 msgid "Open"

1188 msgstr ""

1189

1090 -#: lib/choose_repository.tcl:979

1190 +#: lib/choose_repository.tcl:988

1191 msgid "Repository:"

1192 msgstr ""

1193

1094 -#: lib/choose_repository.tcl:1027

1194 +#: lib/choose_repository.tcl:1037

1195 #, tcl-format

1196 msgid "Failed to open repository %s:"

1197 msgstr ""

@@ -1176,7 +1276,7 @@ msgid ""

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

1277 msgstr ""

1278

1179 -#: lib/commit.tcl:154

1279 +#: lib/commit.tcl:156

1280 #, tcl-format

1281 msgid ""

1282 "Unmerged files cannot be committed.\n"

@@ -1185,7 +1285,7 @@ msgid ""

1285 "before committing.\n"

1286 msgstr ""

1287

1188 -#: lib/commit.tcl:162

1288 +#: lib/commit.tcl:164

1289 #, tcl-format

1290 msgid ""

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

@@ -1193,14 +1293,14 @@ msgid ""

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

1294 msgstr ""

1295

1196 -#: lib/commit.tcl:170

1296 +#: lib/commit.tcl:172

1297 msgid ""

1298 "No changes to commit.\n"

1299 "\n"

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

1301 msgstr ""

1302

1203 -#: lib/commit.tcl:183

1303 +#: lib/commit.tcl:187

1304 msgid ""

1305 "Please supply a commit message.\n"

1306 "\n"

@@ -1211,45 +1311,45 @@ msgid ""

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

1312 msgstr ""

1313

1214 -#: lib/commit.tcl:207

1314 +#: lib/commit.tcl:211

1315 #, tcl-format

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

1317 msgstr ""

1318

1219 -#: lib/commit.tcl:221

1319 +#: lib/commit.tcl:227

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

1321 msgstr ""

1322

1223 -#: lib/commit.tcl:236

1323 +#: lib/commit.tcl:242

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

1325 msgstr ""

1326

1227 -#: lib/commit.tcl:259

1327 +#: lib/commit.tcl:265

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

1329 msgstr ""

1330

1231 -#: lib/commit.tcl:274

1331 +#: lib/commit.tcl:280

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

1333 msgstr ""

1334

1235 -#: lib/commit.tcl:287

1335 +#: lib/commit.tcl:293

1336 msgid "Committing changes..."

1337 msgstr ""

1338

1239 -#: lib/commit.tcl:303

1339 +#: lib/commit.tcl:309

1340 msgid "write-tree failed:"

1341 msgstr ""

1342

1243 -#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368

1343 +#: lib/commit.tcl:310 lib/commit.tcl:354 lib/commit.tcl:374

1344 msgid "Commit failed."

1345 msgstr ""

1346

1247 -#: lib/commit.tcl:321

1347 +#: lib/commit.tcl:327

1348 #, tcl-format

1349 msgid "Commit %s appears to be corrupt"

1350 msgstr ""

1351

1252 -#: lib/commit.tcl:326

1352 +#: lib/commit.tcl:332

1353 msgid ""

1354 "No changes to commit.\n"

1355 "\n"

@@ -1258,19 +1358,19 @@ msgid ""

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

1359 msgstr ""

1360

1261 -#: lib/commit.tcl:333

1361 +#: lib/commit.tcl:339

1362 msgid "No changes to commit."

1363 msgstr ""

1364

1265 -#: lib/commit.tcl:347

1365 +#: lib/commit.tcl:353

1366 msgid "commit-tree failed:"

1367 msgstr ""

1368

1269 -#: lib/commit.tcl:367

1369 +#: lib/commit.tcl:373

1370 msgid "update-ref failed:"

1371 msgstr ""

1372

1273 -#: lib/commit.tcl:454

1373 +#: lib/commit.tcl:461

1374 #, tcl-format

1375 msgid "Created commit %s: %s"

1376 msgstr ""

@@ -1339,7 +1439,7 @@ msgstr ""

1439 msgid "Invalid date from Git: %s"

1440 msgstr ""

1441

1342 -#: lib/diff.tcl:44

1442 +#: lib/diff.tcl:59

1443 #, tcl-format

1444 msgid ""

1445 "No differences detected.\n"

@@ -1353,48 +1453,92 @@ msgid ""

1453 "the same state."

1454 msgstr ""

1455

1356 -#: lib/diff.tcl:83

1456 +#: lib/diff.tcl:99

1457 #, tcl-format

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

1459 msgstr ""

1460

1361 -#: lib/diff.tcl:116 lib/diff.tcl:190

1461 +#: lib/diff.tcl:120

1462 +msgid ""

1463 +"LOCAL: deleted\n"

1464 +"REMOTE:\n"

1465 +msgstr ""

1466 +

1467 +#: lib/diff.tcl:125

1468 +msgid ""

1469 +"REMOTE: deleted\n"

1470 +"LOCAL:\n"

1471 +msgstr ""

1472 +

1473 +#: lib/diff.tcl:132

1474 +msgid "LOCAL:\n"

1475 +msgstr ""

1476 +

1477 +#: lib/diff.tcl:135

1478 +msgid "REMOTE:\n"

1479 +msgstr ""

1480 +

1481 +#: lib/diff.tcl:197 lib/diff.tcl:296

1482 #, tcl-format

1483 msgid "Unable to display %s"

1484 msgstr ""

1485

1366 -#: lib/diff.tcl:117

1486 +#: lib/diff.tcl:198

1487 msgid "Error loading file:"

1488 msgstr ""

1489

1370 -#: lib/diff.tcl:124

1490 +#: lib/diff.tcl:205

1491 msgid "Git Repository (subproject)"

1492 msgstr ""

1493

1374 -#: lib/diff.tcl:136

1494 +#: lib/diff.tcl:217

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

1496 msgstr ""

1497

1378 -#: lib/diff.tcl:191

1379 -msgid "Error loading diff:"

1498 +#: lib/diff.tcl:222

1499 +#, tcl-format

1500 +msgid ""

1501 +"* Untracked file is %d bytes.\n"

1502 +"* Showing only first %d bytes.\n"

1503 +msgstr ""

1504 +

1505 +#: lib/diff.tcl:228

1506 +#, tcl-format

1507 +msgid ""

1508 +"\n"

1509 +"* Untracked file clipped here by %s.\n"

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

1511 msgstr ""

1512

1382 -#: lib/diff.tcl:313

1513 +#: lib/diff.tcl:436

1514 msgid "Failed to unstage selected hunk."

1515 msgstr ""

1516

1386 -#: lib/diff.tcl:320

1517 +#: lib/diff.tcl:443

1518 msgid "Failed to stage selected hunk."

1519 msgstr ""

1520

1390 -#: lib/diff.tcl:386

1521 +#: lib/diff.tcl:509

1522 msgid "Failed to unstage selected line."

1523 msgstr ""

1524

1394 -#: lib/diff.tcl:394

1525 +#: lib/diff.tcl:517

1526 msgid "Failed to stage selected line."

1527 msgstr ""

1528

1529 +#: lib/encoding.tcl:443

1530 +msgid "Default"

1531 +msgstr ""

1532 +

1533 +#: lib/encoding.tcl:448

1534 +#, tcl-format

1535 +msgid "System (%s)"

1536 +msgstr ""

1537 +

1538 +#: lib/encoding.tcl:459 lib/encoding.tcl:465

1539 +msgid "Other"

1540 +msgstr ""

1541 +

1542 #: lib/error.tcl:20 lib/error.tcl:114

1543 msgid "error"

1544 msgstr ""

@@ -1429,38 +1573,47 @@ msgstr ""

1573 msgid "Unlock Index"

1574 msgstr ""

1575

1432 -#: lib/index.tcl:282

1576 +#: lib/index.tcl:287

1577 #, tcl-format

1578 msgid "Unstaging %s from commit"

1579 msgstr ""

1580

1437 -#: lib/index.tcl:313

1581 +#: lib/index.tcl:326

1582 msgid "Ready to commit."

1583 msgstr ""

1584

1441 -#: lib/index.tcl:326

1585 +#: lib/index.tcl:339

1586 #, tcl-format

1587 msgid "Adding %s"

1588 msgstr ""

1589

1446 -#: lib/index.tcl:381

1590 +#: lib/index.tcl:396

1591 #, tcl-format

1592 msgid "Revert changes in file %s?"

1593 msgstr ""

1594

1451 -#: lib/index.tcl:383

1595 +#: lib/index.tcl:398

1596 #, tcl-format

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

1598 msgstr ""

1599

1456 -#: lib/index.tcl:391

1600 +#: lib/index.tcl:406

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

1602 msgstr ""

1603

1460 -#: lib/index.tcl:394

1604 +#: lib/index.tcl:409

1605 msgid "Do Nothing"

1606 msgstr ""

1607

1608 +#: lib/index.tcl:427

1609 +msgid "Reverting selected files"

1610 +msgstr ""

1611 +

1612 +#: lib/index.tcl:431

1613 +#, tcl-format

1614 +msgid "Reverting %s"

1615 +msgstr ""

1616 +

1617 #: lib/merge.tcl:13

1618 msgid ""

1619 "Cannot merge while amending.\n"

@@ -1478,7 +1631,7 @@ msgid ""

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

1632 msgstr ""

1633

1481 -#: lib/merge.tcl:44

1634 +#: lib/merge.tcl:45

1635 #, tcl-format

1636 msgid ""

1637 "You are in the middle of a conflicted merge.\n"

@@ -1489,7 +1642,7 @@ msgid ""

1642 "merge. Only then can you begin another merge.\n"

1643 msgstr ""

1644

1492 -#: lib/merge.tcl:54

1645 +#: lib/merge.tcl:55

1646 #, tcl-format

1647 msgid ""

1648 "You are in the middle of a change.\n"

@@ -1500,41 +1653,41 @@ msgid ""

1653 "will help you abort a failed merge, should the need arise.\n"

1654 msgstr ""

1655

1503 -#: lib/merge.tcl:106

1656 +#: lib/merge.tcl:107

1657 #, tcl-format

1658 msgid "%s of %s"

1659 msgstr ""

1660

1508 -#: lib/merge.tcl:119

1661 +#: lib/merge.tcl:120

1662 #, tcl-format

1663 msgid "Merging %s and %s..."

1664 msgstr ""

1665

1513 -#: lib/merge.tcl:130

1666 +#: lib/merge.tcl:131

1667 msgid "Merge completed successfully."

1668 msgstr ""

1669

1517 -#: lib/merge.tcl:132

1670 +#: lib/merge.tcl:133

1671 msgid "Merge failed. Conflict resolution is required."

1672 msgstr ""

1673

1521 -#: lib/merge.tcl:157

1674 +#: lib/merge.tcl:158

1675 #, tcl-format

1676 msgid "Merge Into %s"

1677 msgstr ""

1678

1526 -#: lib/merge.tcl:176

1679 +#: lib/merge.tcl:177

1680 msgid "Revision To Merge"

1681 msgstr ""

1682

1530 -#: lib/merge.tcl:211

1683 +#: lib/merge.tcl:212

1684 msgid ""

1685 "Cannot abort while amending.\n"

1686 "\n"

1687 "You must finish amending this commit.\n"

1688 msgstr ""

1689

1537 -#: lib/merge.tcl:221

1690 +#: lib/merge.tcl:222

1691 msgid ""

1692 "Abort merge?\n"

1693 "\n"

@@ -1543,7 +1696,7 @@ msgid ""

1696 "Continue with aborting the current merge?"

1697 msgstr ""

1698

1546 -#: lib/merge.tcl:227

1699 +#: lib/merge.tcl:228

1700 msgid ""

1701 "Reset changes?\n"

1702 "\n"

@@ -1552,130 +1705,312 @@ msgid ""

1705 "Continue with resetting the current changes?"

1706 msgstr ""

1707

1555 -#: lib/merge.tcl:238

1708 +#: lib/merge.tcl:239

1709 msgid "Aborting"

1710 msgstr ""

1711

1559 -#: lib/merge.tcl:238

1712 +#: lib/merge.tcl:239

1713 msgid "files reset"

1714 msgstr ""

1715

1563 -#: lib/merge.tcl:266

1716 +#: lib/merge.tcl:267

1717 msgid "Abort failed."

1718 msgstr ""

1719

1567 -#: lib/merge.tcl:268

1720 +#: lib/merge.tcl:269

1721 msgid "Abort completed. Ready."

1722 msgstr ""

1723

1571 -#: lib/option.tcl:95

1724 +#: lib/mergetool.tcl:8

1725 +msgid "Force resolution to the base version?"

1726 +msgstr ""

1727 +

1728 +#: lib/mergetool.tcl:9

1729 +msgid "Force resolution to this branch?"

1730 +msgstr ""

1731 +

1732 +#: lib/mergetool.tcl:10

1733 +msgid "Force resolution to the other branch?"

1734 +msgstr ""

1735 +

1736 +#: lib/mergetool.tcl:14

1737 +#, tcl-format

1738 +msgid ""

1739 +"Note that the diff shows only conflicting changes.\n"

1740 +"\n"

1741 +"%s will be overwritten.\n"

1742 +"\n"

1743 +"This operation can be undone only by restarting the merge."

1744 +msgstr ""

1745 +

1746 +#: lib/mergetool.tcl:45

1747 +#, tcl-format

1748 +msgid "File %s seems to have unresolved conflicts, still stage?"

1749 +msgstr ""

1750 +

1751 +#: lib/mergetool.tcl:60

1752 +#, tcl-format

1753 +msgid "Adding resolution for %s"

1754 +msgstr ""

1755 +

1756 +#: lib/mergetool.tcl:141

1757 +msgid "Cannot resolve deletion or link conflicts using a tool"

1758 +msgstr ""

1759 +

1760 +#: lib/mergetool.tcl:146

1761 +msgid "Conflict file does not exist"

1762 +msgstr ""

1763 +

1764 +#: lib/mergetool.tcl:264

1765 +#, tcl-format

1766 +msgid "Not a GUI merge tool: '%s'"

1767 +msgstr ""

1768 +

1769 +#: lib/mergetool.tcl:268

1770 +#, tcl-format

1771 +msgid "Unsupported merge tool '%s'"

1772 +msgstr ""

1773 +

1774 +#: lib/mergetool.tcl:303

1775 +msgid "Merge tool is already running, terminate it?"

1776 +msgstr ""

1777 +

1778 +#: lib/mergetool.tcl:323

1779 +#, tcl-format

1780 +msgid ""

1781 +"Error retrieving versions:\n"

1782 +"%s"

1783 +msgstr ""

1784 +

1785 +#: lib/mergetool.tcl:343

1786 +#, tcl-format

1787 +msgid ""

1788 +"Could not start the merge tool:\n"

1789 +"\n"

1790 +"%s"

1791 +msgstr ""

1792 +

1793 +#: lib/mergetool.tcl:347

1794 +msgid "Running merge tool..."

1795 +msgstr ""

1796 +

1797 +#: lib/mergetool.tcl:375 lib/mergetool.tcl:383

1798 +msgid "Merge tool failed."

1799 +msgstr ""

1800 +

1801 +#: lib/option.tcl:11

1802 +#, tcl-format

1803 +msgid "Invalid global encoding '%s'"

1804 +msgstr ""

1805 +

1806 +#: lib/option.tcl:19

1807 +#, tcl-format

1808 +msgid "Invalid repo encoding '%s'"

1809 +msgstr ""

1810 +

1811 +#: lib/option.tcl:117

1812 msgid "Restore Defaults"

1813 msgstr ""

1814

1575 -#: lib/option.tcl:99

1815 +#: lib/option.tcl:121

1816 msgid "Save"

1817 msgstr ""

1818

1579 -#: lib/option.tcl:109

1819 +#: lib/option.tcl:131

1820 #, tcl-format

1821 msgid "%s Repository"

1822 msgstr ""

1823

1584 -#: lib/option.tcl:110

1824 +#: lib/option.tcl:132

1825 msgid "Global (All Repositories)"

1826 msgstr ""

1827

1588 -#: lib/option.tcl:116

1828 +#: lib/option.tcl:138

1829 msgid "User Name"

1830 msgstr ""

1831

1592 -#: lib/option.tcl:117

1832 +#: lib/option.tcl:139

1833 msgid "Email Address"

1834 msgstr ""

1835

1596 -#: lib/option.tcl:119

1836 +#: lib/option.tcl:141

1837 msgid "Summarize Merge Commits"

1838 msgstr ""

1839

1600 -#: lib/option.tcl:120

1840 +#: lib/option.tcl:142

1841 msgid "Merge Verbosity"

1842 msgstr ""

1843

1604 -#: lib/option.tcl:121

1844 +#: lib/option.tcl:143

1845 msgid "Show Diffstat After Merge"

1846 msgstr ""

1847

1608 -#: lib/option.tcl:123

1848 +#: lib/option.tcl:144

1849 +msgid "Use Merge Tool"

1850 +msgstr ""

1851 +

1852 +#: lib/option.tcl:146

1853 msgid "Trust File Modification Timestamps"

1854 msgstr ""

1855

1612 -#: lib/option.tcl:124

1856 +#: lib/option.tcl:147

1857 msgid "Prune Tracking Branches During Fetch"

1858 msgstr ""

1859

1616 -#: lib/option.tcl:125

1860 +#: lib/option.tcl:148

1861 msgid "Match Tracking Branches"

1862 msgstr ""

1863

1620 -#: lib/option.tcl:126

1864 +#: lib/option.tcl:149

1865 msgid "Blame Copy Only On Changed Files"

1866 msgstr ""

1867

1624 -#: lib/option.tcl:127

1868 +#: lib/option.tcl:150

1869 msgid "Minimum Letters To Blame Copy On"

1870 msgstr ""

1871

1628 -#: lib/option.tcl:128

1872 +#: lib/option.tcl:151

1873 +msgid "Blame History Context Radius (days)"

1874 +msgstr ""

1875 +

1876 +#: lib/option.tcl:152

1877 msgid "Number of Diff Context Lines"

1878 msgstr ""

1879

1632 -#: lib/option.tcl:129

1880 +#: lib/option.tcl:153

1881 msgid "Commit Message Text Width"

1882 msgstr ""

1883

1636 -#: lib/option.tcl:130

1884 +#: lib/option.tcl:154

1885 msgid "New Branch Name Template"

1886 msgstr ""

1887

1640 -#: lib/option.tcl:194

1888 +#: lib/option.tcl:155

1889 +msgid "Default File Contents Encoding"

1890 +msgstr ""

1891 +

1892 +#: lib/option.tcl:203

1893 +msgid "Change"

1894 +msgstr ""

1895 +

1896 +#: lib/option.tcl:230

1897 msgid "Spelling Dictionary:"

1898 msgstr ""

1899

1644 -#: lib/option.tcl:218

1900 +#: lib/option.tcl:254

1901 msgid "Change Font"

1902 msgstr ""

1903

1648 -#: lib/option.tcl:222

1904 +#: lib/option.tcl:258

1905 #, tcl-format

1906 msgid "Choose %s"

1907 msgstr ""

1908

1653 -#: lib/option.tcl:228

1909 +#: lib/option.tcl:264

1910 msgid "pt."

1911 msgstr ""

1912

1657 -#: lib/option.tcl:242

1913 +#: lib/option.tcl:278

1914 msgid "Preferences"

1915 msgstr ""

1916

1661 -#: lib/option.tcl:277

1917 +#: lib/option.tcl:314

1918 msgid "Failed to completely save options:"

1919 msgstr ""

1920

1665 -#: lib/remote.tcl:165

1921 +#: lib/remote.tcl:163

1922 +msgid "Remove Remote"

1923 +msgstr ""

1924 +

1925 +#: lib/remote.tcl:168

1926 msgid "Prune from"

1927 msgstr ""

1928

1669 -#: lib/remote.tcl:170

1929 +#: lib/remote.tcl:173

1930 msgid "Fetch from"

1931 msgstr ""

1932

1673 -#: lib/remote.tcl:213

1933 +#: lib/remote.tcl:215

1934 msgid "Push to"

1935 msgstr ""

1936

1937 +#: lib/remote_add.tcl:19

1938 +msgid "Add Remote"

1939 +msgstr ""

1940 +

1941 +#: lib/remote_add.tcl:24

1942 +msgid "Add New Remote"

1943 +msgstr ""

1944 +

1945 +#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36

1946 +msgid "Add"

1947 +msgstr ""

1948 +

1949 +#: lib/remote_add.tcl:37

1950 +msgid "Remote Details"

1951 +msgstr ""

1952 +

1953 +#: lib/remote_add.tcl:50

1954 +msgid "Location:"

1955 +msgstr ""

1956 +

1957 +#: lib/remote_add.tcl:62

1958 +msgid "Further Action"

1959 +msgstr ""

1960 +

1961 +#: lib/remote_add.tcl:65

1962 +msgid "Fetch Immediately"

1963 +msgstr ""

1964 +

1965 +#: lib/remote_add.tcl:71

1966 +msgid "Initialize Remote Repository and Push"

1967 +msgstr ""

1968 +

1969 +#: lib/remote_add.tcl:77

1970 +msgid "Do Nothing Else Now"

1971 +msgstr ""

1972 +

1973 +#: lib/remote_add.tcl:101

1974 +msgid "Please supply a remote name."

1975 +msgstr ""

1976 +

1977 +#: lib/remote_add.tcl:114

1978 +#, tcl-format

1979 +msgid "'%s' is not an acceptable remote name."

1980 +msgstr ""

1981 +

1982 +#: lib/remote_add.tcl:125

1983 +#, tcl-format

1984 +msgid "Failed to add remote '%s' of location '%s'."

1985 +msgstr ""

1986 +

1987 +#: lib/remote_add.tcl:133 lib/transport.tcl:6

1988 +#, tcl-format

1989 +msgid "fetch %s"

1990 +msgstr ""

1991 +

1992 +#: lib/remote_add.tcl:134

1993 +#, tcl-format

1994 +msgid "Fetching the %s"

1995 +msgstr ""

1996 +

1997 +#: lib/remote_add.tcl:157

1998 +#, tcl-format

1999 +msgid "Do not know how to initialize repository at location '%s'."

2000 +msgstr ""

2001 +

2002 +#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71

2003 +#, tcl-format

2004 +msgid "push %s"

2005 +msgstr ""

2006 +

2007 +#: lib/remote_add.tcl:164

2008 +#, tcl-format

2009 +msgid "Setting up the %s (at %s)"

2010 +msgstr ""

2011 +

2012 #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34

1678 -msgid "Delete Remote Branch"

2013 +msgid "Delete Branch Remotely"

2014 msgstr ""

2015

2016 #: lib/remote_branch_delete.tcl:47

@@ -1687,7 +2022,7 @@ msgid "Remote:"

2022 msgstr ""

2023

2024 #: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138

1690 -msgid "Arbitrary URL:"

2025 +msgid "Arbitrary Location:"

2026 msgstr ""

2027

2028 #: lib/remote_branch_delete.tcl:84

@@ -1750,6 +2085,22 @@ msgstr ""

2085 msgid "Scanning %s..."

2086 msgstr ""

2087

2088 +#: lib/search.tcl:21

2089 +msgid "Find:"

2090 +msgstr ""

2091 +

2092 +#: lib/search.tcl:23

2093 +msgid "Next"

2094 +msgstr ""

2095 +

2096 +#: lib/search.tcl:24

2097 +msgid "Prev"

2098 +msgstr ""

2099 +

2100 +#: lib/search.tcl:25

2101 +msgid "Case-Sensitive"

2102 +msgstr ""

2103 +

2104 #: lib/shortcut.tcl:20 lib/shortcut.tcl:61

2105 msgid "Cannot write shortcut:"

2106 msgstr ""

@@ -1787,22 +2138,182 @@ msgstr ""

2138 msgid "No Suggestions"

2139 msgstr ""

2140

1790 -#: lib/spellcheck.tcl:387

2141 +#: lib/spellcheck.tcl:388

2142 msgid "Unexpected EOF from spell checker"

2143 msgstr ""

2144

1794 -#: lib/spellcheck.tcl:391

2145 +#: lib/spellcheck.tcl:392

2146 msgid "Spell Checker Failed"

2147 msgstr ""

2148

2149 +#: lib/sshkey.tcl:31

2150 +msgid "No keys found."

2151 +msgstr ""

2152 +

2153 +#: lib/sshkey.tcl:34

2154 +#, tcl-format

2155 +msgid "Found a public key in: %s"

2156 +msgstr ""

2157 +

2158 +#: lib/sshkey.tcl:40

2159 +msgid "Generate Key"

2160 +msgstr ""

2161 +

2162 +#: lib/sshkey.tcl:56

2163 +msgid "Copy To Clipboard"

2164 +msgstr ""

2165 +

2166 +#: lib/sshkey.tcl:70

2167 +msgid "Your OpenSSH Public Key"

2168 +msgstr ""

2169 +

2170 +#: lib/sshkey.tcl:78

2171 +msgid "Generating..."

2172 +msgstr ""

2173 +

2174 +#: lib/sshkey.tcl:84

2175 +#, tcl-format

2176 +msgid ""

2177 +"Could not start ssh-keygen:\n"

2178 +"\n"

2179 +"%s"

2180 +msgstr ""

2181 +

2182 +#: lib/sshkey.tcl:111

2183 +msgid "Generation failed."

2184 +msgstr ""

2185 +

2186 +#: lib/sshkey.tcl:118

2187 +msgid "Generation succeded, but no keys found."

2188 +msgstr ""

2189 +

2190 +#: lib/sshkey.tcl:121

2191 +#, tcl-format

2192 +msgid "Your key is in: %s"

2193 +msgstr ""

2194 +

2195 #: lib/status_bar.tcl:83

2196 #, tcl-format

2197 msgid "%s ... %*i of %*i %s (%3i%%)"

2198 msgstr ""

2199

1803 -#: lib/transport.tcl:6

2200 +#: lib/tools.tcl:75

2201 #, tcl-format

1805 -msgid "fetch %s"

2202 +msgid "Running %s requires a selected file."

2203 +msgstr ""

2204 +

2205 +#: lib/tools.tcl:90

2206 +#, tcl-format

2207 +msgid "Are you sure you want to run %s?"

2208 +msgstr ""

2209 +

2210 +#: lib/tools.tcl:110

2211 +#, tcl-format

2212 +msgid "Tool: %s"

2213 +msgstr ""

2214 +

2215 +#: lib/tools.tcl:111

2216 +#, tcl-format

2217 +msgid "Running: %s"

2218 +msgstr ""

2219 +

2220 +#: lib/tools.tcl:149

2221 +#, tcl-format

2222 +msgid "Tool completed succesfully: %s"

2223 +msgstr ""

2224 +

2225 +#: lib/tools.tcl:151

2226 +#, tcl-format

2227 +msgid "Tool failed: %s"

2228 +msgstr ""

2229 +

2230 +#: lib/tools_dlg.tcl:22

2231 +msgid "Add Tool"

2232 +msgstr ""

2233 +

2234 +#: lib/tools_dlg.tcl:28

2235 +msgid "Add New Tool Command"

2236 +msgstr ""

2237 +

2238 +#: lib/tools_dlg.tcl:33

2239 +msgid "Add globally"

2240 +msgstr ""

2241 +

2242 +#: lib/tools_dlg.tcl:45

2243 +msgid "Tool Details"

2244 +msgstr ""

2245 +

2246 +#: lib/tools_dlg.tcl:48

2247 +msgid "Use '/' separators to create a submenu tree:"

2248 +msgstr ""

2249 +

2250 +#: lib/tools_dlg.tcl:61

2251 +msgid "Command:"

2252 +msgstr ""

2253 +

2254 +#: lib/tools_dlg.tcl:74

2255 +msgid "Show a dialog before running"

2256 +msgstr ""

2257 +

2258 +#: lib/tools_dlg.tcl:80

2259 +msgid "Ask the user to select a revision (sets $REVISION)"

2260 +msgstr ""

2261 +

2262 +#: lib/tools_dlg.tcl:85

2263 +msgid "Ask the user for additional arguments (sets $ARGS)"

2264 +msgstr ""

2265 +

2266 +#: lib/tools_dlg.tcl:92

2267 +msgid "Don't show the command output window"

2268 +msgstr ""

2269 +

2270 +#: lib/tools_dlg.tcl:97

2271 +msgid "Run only if a diff is selected ($FILENAME not empty)"

2272 +msgstr ""

2273 +

2274 +#: lib/tools_dlg.tcl:121

2275 +msgid "Please supply a name for the tool."

2276 +msgstr ""

2277 +

2278 +#: lib/tools_dlg.tcl:129

2279 +#, tcl-format

2280 +msgid "Tool '%s' already exists."

2281 +msgstr ""

2282 +

2283 +#: lib/tools_dlg.tcl:151

2284 +#, tcl-format

2285 +msgid ""

2286 +"Could not add tool:\n"

2287 +"%s"

2288 +msgstr ""

2289 +

2290 +#: lib/tools_dlg.tcl:190

2291 +msgid "Remove Tool"

2292 +msgstr ""

2293 +

2294 +#: lib/tools_dlg.tcl:196

2295 +msgid "Remove Tool Commands"

2296 +msgstr ""

2297 +

2298 +#: lib/tools_dlg.tcl:200

2299 +msgid "Remove"

2300 +msgstr ""

2301 +

2302 +#: lib/tools_dlg.tcl:236

2303 +msgid "(Blue denotes repository-local tools)"

2304 +msgstr ""

2305 +

2306 +#: lib/tools_dlg.tcl:297

2307 +#, tcl-format

2308 +msgid "Run Command: %s"

2309 +msgstr ""

2310 +

2311 +#: lib/tools_dlg.tcl:311

2312 +msgid "Arguments"

2313 +msgstr ""

2314 +

2315 +#: lib/tools_dlg.tcl:348

2316 +msgid "OK"

2317 msgstr ""

2318

2319 #: lib/transport.tcl:7

@@ -1820,11 +2331,6 @@ msgstr ""

2331 msgid "Pruning tracking branches deleted from %s"

2332 msgstr ""

2333

1823 -#: lib/transport.tcl:25 lib/transport.tcl:71

1824 -#, tcl-format

1825 -msgid "push %s"

1826 -msgstr ""

1827 -

2334 #: lib/transport.tcl:26

2335 #, tcl-format

2336 msgid "Pushing changes to %s"

Update the po template