1be7bf6e33 · 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-03-14 07:18+0100\n"

11 +"POT-Creation-Date: 2008-08-02 14:45-0700\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:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744

20 -#: git-gui.sh:763

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

21 msgid "git-gui: fatal error"

22 msgstr ""

23

24 -#: git-gui.sh:593

24 +#: git-gui.sh:644

25 #, tcl-format

26 msgid "Invalid font specified in %s:"

27 msgstr ""

28

29 -#: git-gui.sh:620

29 +#: git-gui.sh:674

30 msgid "Main Font"

31 msgstr ""

32

33 -#: git-gui.sh:621

33 +#: git-gui.sh:675

34 msgid "Diff/Console Font"

35 msgstr ""

36

37 -#: git-gui.sh:635

37 +#: git-gui.sh:689

38 msgid "Cannot find git in PATH."

39 msgstr ""

40

41 -#: git-gui.sh:662

41 +#: git-gui.sh:716

42 msgid "Cannot parse Git version string:"

43 msgstr ""

44

45 -#: git-gui.sh:680

45 +#: git-gui.sh:734

46 #, tcl-format

47 msgid ""

48 "Git version cannot be determined.\n"

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

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

55 msgstr ""

56

57 -#: git-gui.sh:918

57 +#: git-gui.sh:972

58 msgid "Git directory not found:"

59 msgstr ""

60

61 -#: git-gui.sh:925

61 +#: git-gui.sh:979

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

63 msgstr ""

64

65 -#: git-gui.sh:932

65 +#: git-gui.sh:986

66 msgid "Cannot use funny .git directory:"

67 msgstr ""

68

69 -#: git-gui.sh:937

69 +#: git-gui.sh:991

70 msgid "No working directory"

71 msgstr ""

72

73 -#: git-gui.sh:1084 lib/checkout_op.tcl:283

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

74 msgid "Refreshing file status..."

75 msgstr ""

76

77 -#: git-gui.sh:1149

77 +#: git-gui.sh:1194

78 msgid "Scanning for modified files ..."

79 msgstr ""

80

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

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

82 msgid "Ready."

83 msgstr ""

84

85 -#: git-gui.sh:1590

85 +#: git-gui.sh:1635

86 msgid "Unmodified"

87 msgstr ""

88

89 -#: git-gui.sh:1592

89 +#: git-gui.sh:1637

90 msgid "Modified, not staged"

91 msgstr ""

92

93 -#: git-gui.sh:1593 git-gui.sh:1598

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

94 msgid "Staged for commit"

95 msgstr ""

96

97 -#: git-gui.sh:1594 git-gui.sh:1599

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

98 msgid "Portions staged for commit"

99 msgstr ""

100

101 -#: git-gui.sh:1595 git-gui.sh:1600

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

102 msgid "Staged for commit, missing"

103 msgstr ""

104

105 -#: git-gui.sh:1597

105 +#: git-gui.sh:1642

106 msgid "Untracked, not staged"

107 msgstr ""

108

109 -#: git-gui.sh:1602

109 +#: git-gui.sh:1647

110 msgid "Missing"

111 msgstr ""

112

113 -#: git-gui.sh:1603

113 +#: git-gui.sh:1648

114 msgid "Staged for removal"

115 msgstr ""

116

117 -#: git-gui.sh:1604

117 +#: git-gui.sh:1649

118 msgid "Staged for removal, still present"

119 msgstr ""

120

121 -#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609

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

122 msgid "Requires merge resolution"

123 msgstr ""

124

125 -#: git-gui.sh:1644

125 +#: git-gui.sh:1689

126 msgid "Starting gitk... please wait..."

127 msgstr ""

128

129 -#: git-gui.sh:1653

130 -#, tcl-format

131 -msgid ""

132 -"Unable to start gitk:\n"

133 -"\n"

134 -"%s does not exist"

129 +#: git-gui.sh:1698

130 +msgid "Couldn't find gitk in PATH"

131 msgstr ""

132

137 -#: git-gui.sh:1860 lib/choose_repository.tcl:36

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

134 msgid "Repository"

135 msgstr ""

136

141 -#: git-gui.sh:1861

137 +#: git-gui.sh:1949

138 msgid "Edit"

139 msgstr ""

140

145 -#: git-gui.sh:1863 lib/choose_rev.tcl:561

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

142 msgid "Branch"

143 msgstr ""

144

149 -#: git-gui.sh:1866 lib/choose_rev.tcl:548

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

146 msgid "Commit@@noun"

147 msgstr ""

148

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

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

150 msgid "Merge"

151 msgstr ""

152

157 -#: git-gui.sh:1870 lib/choose_rev.tcl:557

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

154 msgid "Remote"

155 msgstr ""

156

161 -#: git-gui.sh:1879

157 +#: git-gui.sh:1967

158 msgid "Browse Current Branch's Files"

159 msgstr ""

160

165 -#: git-gui.sh:1883

161 +#: git-gui.sh:1971

162 msgid "Browse Branch Files..."

163 msgstr ""

164

169 -#: git-gui.sh:1888

165 +#: git-gui.sh:1976

166 msgid "Visualize Current Branch's History"

167 msgstr ""

168

173 -#: git-gui.sh:1892

169 +#: git-gui.sh:1980

170 msgid "Visualize All Branch History"

171 msgstr ""

172

177 -#: git-gui.sh:1899

173 +#: git-gui.sh:1987

174 #, tcl-format

175 msgid "Browse %s's Files"

176 msgstr ""

177

182 -#: git-gui.sh:1901

178 +#: git-gui.sh:1989

179 #, tcl-format

180 msgid "Visualize %s's History"

181 msgstr ""

182

187 -#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67

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

184 msgid "Database Statistics"

185 msgstr ""

186

191 -#: git-gui.sh:1909 lib/database.tcl:34

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

188 msgid "Compress Database"

189 msgstr ""

190

195 -#: git-gui.sh:1912

191 +#: git-gui.sh:2000

192 msgid "Verify Database"

193 msgstr ""

194

199 -#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7

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

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

197 msgid "Create Desktop Icon"

198 msgstr ""

199

204 -#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185

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

201 msgid "Quit"

202 msgstr ""

203

208 -#: git-gui.sh:1939

204 +#: git-gui.sh:2031

205 msgid "Undo"

206 msgstr ""

207

212 -#: git-gui.sh:1942

208 +#: git-gui.sh:2034

209 msgid "Redo"

210 msgstr ""

211

216 -#: git-gui.sh:1946 git-gui.sh:2443

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

213 msgid "Cut"

214 msgstr ""

215

220 -#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614

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

217 #: lib/console.tcl:69

218 msgid "Copy"

219 msgstr ""

220

225 -#: git-gui.sh:1952 git-gui.sh:2449

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

222 msgid "Paste"

223 msgstr ""

224

229 -#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26

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

226 #: lib/remote_branch_delete.tcl:38

227 msgid "Delete"

228 msgstr ""

229

234 -#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71

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

231 msgid "Select All"

232 msgstr ""

233

238 -#: git-gui.sh:1968

234 +#: git-gui.sh:2060

235 msgid "Create..."

236 msgstr ""

237

242 -#: git-gui.sh:1974

238 +#: git-gui.sh:2066

239 msgid "Checkout..."

240 msgstr ""

241

246 -#: git-gui.sh:1980

242 +#: git-gui.sh:2072

243 msgid "Rename..."

244 msgstr ""

245

250 -#: git-gui.sh:1985 git-gui.sh:2085

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

247 msgid "Delete..."

248 msgstr ""

249

254 -#: git-gui.sh:1990

250 +#: git-gui.sh:2082

251 msgid "Reset..."

252 msgstr ""

253

258 -#: git-gui.sh:2002 git-gui.sh:2389

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

255 msgid "New Commit"

256 msgstr ""

257

262 -#: git-gui.sh:2010 git-gui.sh:2396

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

259 msgid "Amend Last Commit"

260 msgstr ""

261

266 -#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99

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

263 msgid "Rescan"

264 msgstr ""

265

270 -#: git-gui.sh:2025

266 +#: git-gui.sh:2117

267 msgid "Stage To Commit"

268 msgstr ""

269

274 -#: git-gui.sh:2031

270 +#: git-gui.sh:2123

271 msgid "Stage Changed Files To Commit"

272 msgstr ""

273

278 -#: git-gui.sh:2037

274 +#: git-gui.sh:2129

275 msgid "Unstage From Commit"

276 msgstr ""

277

282 -#: git-gui.sh:2042 lib/index.tcl:395

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

279 msgid "Revert Changes"

280 msgstr ""

281

286 -#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467

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

283 +msgid "Show Less Context"

284 +msgstr ""

285 +

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

287 +msgid "Show More Context"

288 +msgstr ""

289 +

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

291 msgid "Sign Off"

292 msgstr ""

293

290 -#: git-gui.sh:2053 git-gui.sh:2372

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

295 msgid "Commit@@verb"

296 msgstr ""

297

294 -#: git-gui.sh:2064

298 +#: git-gui.sh:2166

299 msgid "Local Merge..."

300 msgstr ""

301

298 -#: git-gui.sh:2069

302 +#: git-gui.sh:2171

303 msgid "Abort Merge..."

304 msgstr ""

305

302 -#: git-gui.sh:2081

306 +#: git-gui.sh:2183

307 msgid "Push..."

308 msgstr ""

309

306 -#: git-gui.sh:2092 lib/choose_repository.tcl:41

307 -msgid "Apple"

308 -msgstr ""

309 -

310 -#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14

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

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

312 #, tcl-format

313 msgid "About %s"

314 msgstr ""

315

316 -#: git-gui.sh:2099

316 +#: git-gui.sh:2201

317 msgid "Preferences..."

318 msgstr ""

319

320 -#: git-gui.sh:2107 git-gui.sh:2639

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

321 msgid "Options..."

322 msgstr ""

323

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

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

325 msgid "Help"

326 msgstr ""

327

328 -#: git-gui.sh:2154

328 +#: git-gui.sh:2256

329 msgid "Online Documentation"

330 msgstr ""

331

332 -#: git-gui.sh:2238

332 +#: git-gui.sh:2340

333 #, tcl-format

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

335 msgstr ""

336

337 -#: git-gui.sh:2271

337 +#: git-gui.sh:2373

338 msgid "Current Branch:"

339 msgstr ""

340

341 -#: git-gui.sh:2292

341 +#: git-gui.sh:2394

342 msgid "Staged Changes (Will Commit)"

343 msgstr ""

344

345 -#: git-gui.sh:2312

345 +#: git-gui.sh:2414

346 msgid "Unstaged Changes"

347 msgstr ""

348

349 -#: git-gui.sh:2362

349 +#: git-gui.sh:2464

350 msgid "Stage Changed"

351 msgstr ""

352

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

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

354 msgid "Push"

355 msgstr ""

356

357 -#: git-gui.sh:2408

357 +#: git-gui.sh:2510

358 msgid "Initial Commit Message:"

359 msgstr ""

360

361 -#: git-gui.sh:2409

361 +#: git-gui.sh:2511

362 msgid "Amended Commit Message:"

363 msgstr ""

364

365 -#: git-gui.sh:2410

365 +#: git-gui.sh:2512

366 msgid "Amended Initial Commit Message:"

367 msgstr ""

368

369 -#: git-gui.sh:2411

369 +#: git-gui.sh:2513

370 msgid "Amended Merge Commit Message:"

371 msgstr ""

372

373 -#: git-gui.sh:2412

373 +#: git-gui.sh:2514

374 msgid "Merge Commit Message:"

375 msgstr ""

376

377 -#: git-gui.sh:2413

377 +#: git-gui.sh:2515

378 msgid "Commit Message:"

379 msgstr ""

380

381 -#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73

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

382 msgid "Copy All"

383 msgstr ""

384

385 -#: git-gui.sh:2483 lib/blame.tcl:107

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

386 msgid "File:"

387 msgstr ""

388

389 -#: git-gui.sh:2589

389 +#: git-gui.sh:2691

390 msgid "Apply/Reverse Hunk"

391 msgstr ""

392

393 -#: git-gui.sh:2595

394 -msgid "Show Less Context"

395 -msgstr ""

396 -

397 -#: git-gui.sh:2602

398 -msgid "Show More Context"

393 +#: git-gui.sh:2696

394 +msgid "Apply/Reverse Line"

395 msgstr ""

396

401 -#: git-gui.sh:2610

397 +#: git-gui.sh:2711

398 msgid "Refresh"

399 msgstr ""

400

405 -#: git-gui.sh:2631

401 +#: git-gui.sh:2732

402 msgid "Decrease Font Size"

403 msgstr ""

404

409 -#: git-gui.sh:2635

405 +#: git-gui.sh:2736

406 msgid "Increase Font Size"

407 msgstr ""

408

413 -#: git-gui.sh:2646

409 +#: git-gui.sh:2747

410 msgid "Unstage Hunk From Commit"

411 msgstr ""

412

417 -#: git-gui.sh:2648

413 +#: git-gui.sh:2748

414 +msgid "Unstage Line From Commit"

415 +msgstr ""

416 +

417 +#: git-gui.sh:2750

418 msgid "Stage Hunk For Commit"

419 msgstr ""

420

421 -#: git-gui.sh:2667

421 +#: git-gui.sh:2751

422 +msgid "Stage Line For Commit"

423 +msgstr ""

424 +

425 +#: git-gui.sh:2771

426 msgid "Initializing..."

427 msgstr ""

428

425 -#: git-gui.sh:2762

429 +#: git-gui.sh:2876

430 #, tcl-format

431 msgid ""

432 "Possible environment issues exist.\n"

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

437 "\n"

438 msgstr ""

439

436 -#: git-gui.sh:2792

440 +#: git-gui.sh:2906

441 msgid ""

442 "\n"

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

444 "Tcl binary distributed by Cygwin."

445 msgstr ""

446

443 -#: git-gui.sh:2797

447 +#: git-gui.sh:2911

448 #, tcl-format

449 msgid ""

450 "\n"

@@ -455,64 +459,80 @@ msgstr ""

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

460 msgstr ""

461

458 -#: lib/blame.tcl:77

462 +#: lib/blame.tcl:70

463 msgid "File Viewer"

464 msgstr ""

465

462 -#: lib/blame.tcl:81

466 +#: lib/blame.tcl:74

467 msgid "Commit:"

468 msgstr ""

469

466 -#: lib/blame.tcl:264

470 +#: lib/blame.tcl:257

471 msgid "Copy Commit"

472 msgstr ""

473

470 -#: lib/blame.tcl:384

474 +#: lib/blame.tcl:260

475 +msgid "Do Full Copy Detection"

476 +msgstr ""

477 +

478 +#: lib/blame.tcl:388

479 #, tcl-format

480 msgid "Reading %s..."

481 msgstr ""

482

475 -#: lib/blame.tcl:488

483 +#: lib/blame.tcl:492

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

485 msgstr ""

486

479 -#: lib/blame.tcl:508

487 +#: lib/blame.tcl:512

488 msgid "lines annotated"

489 msgstr ""

490

483 -#: lib/blame.tcl:689

491 +#: lib/blame.tcl:704

492 msgid "Loading original location annotations..."

493 msgstr ""

494

487 -#: lib/blame.tcl:692

495 +#: lib/blame.tcl:707

496 msgid "Annotation complete."

497 msgstr ""

498

491 -#: lib/blame.tcl:746

499 +#: lib/blame.tcl:737

500 +msgid "Busy"

501 +msgstr ""

502 +

503 +#: lib/blame.tcl:738

504 +msgid "Annotation process is already running."

505 +msgstr ""

506 +

507 +#: lib/blame.tcl:777

508 +msgid "Running thorough copy detection..."

509 +msgstr ""

510 +

511 +#: lib/blame.tcl:827

512 msgid "Loading annotation..."

513 msgstr ""

514

495 -#: lib/blame.tcl:802

515 +#: lib/blame.tcl:883

516 msgid "Author:"

517 msgstr ""

518

499 -#: lib/blame.tcl:806

519 +#: lib/blame.tcl:887

520 msgid "Committer:"

521 msgstr ""

522

503 -#: lib/blame.tcl:811

523 +#: lib/blame.tcl:892

524 msgid "Original File:"

525 msgstr ""

526

507 -#: lib/blame.tcl:925

527 +#: lib/blame.tcl:1006

528 msgid "Originally By:"

529 msgstr ""

530

511 -#: lib/blame.tcl:931

531 +#: lib/blame.tcl:1012

532 msgid "In File:"

533 msgstr ""

534

515 -#: lib/blame.tcl:936

535 +#: lib/blame.tcl:1017

536 msgid "Copied Or Moved Here By:"

537 msgstr ""

538

@@ -526,7 +546,7 @@ msgstr ""

546

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

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

529 -#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171

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

551 msgid "Cancel"

552 msgstr ""

@@ -535,7 +555,7 @@ msgstr ""

555 msgid "Revision"

556 msgstr ""

557

538 -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242

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

559 msgid "Options"

560 msgstr ""

561

@@ -587,7 +607,7 @@ msgstr ""

607 msgid "Fast Forward Only"

608 msgstr ""

609

590 -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514

610 +#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536

611 msgid "Reset"

612 msgstr ""

613

@@ -672,7 +692,7 @@ msgstr ""

692 msgid "Please select a branch to rename."

693 msgstr ""

694

675 -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179

695 +#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201

696 #, tcl-format

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

698 msgstr ""

@@ -704,31 +724,36 @@ msgid "Browse Branch Files"

724 msgstr ""

725

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

707 -#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484

708 -#: lib/choose_repository.tcl:987

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

728 +#: lib/choose_repository.tcl:985

729 msgid "Browse"

730 msgstr ""

731

712 -#: lib/checkout_op.tcl:79

732 +#: lib/checkout_op.tcl:84

733 #, tcl-format

734 msgid "Fetching %s from %s"

735 msgstr ""

736

717 -#: lib/checkout_op.tcl:127

737 +#: lib/checkout_op.tcl:132

738 #, tcl-format

739 msgid "fatal: Cannot resolve %s"

740 msgstr ""

741

722 -#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31

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

743 msgid "Close"

744 msgstr ""

745

726 -#: lib/checkout_op.tcl:169

746 +#: lib/checkout_op.tcl:174

747 #, tcl-format

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

749 msgstr ""

750

731 -#: lib/checkout_op.tcl:206

751 +#: lib/checkout_op.tcl:193

752 +#, tcl-format

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

754 +msgstr ""

755 +

756 +#: lib/checkout_op.tcl:228

757 #, tcl-format

758 msgid ""

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

@@ -737,21 +762,21 @@ msgid ""

762 "A merge is required."

763 msgstr ""

764

740 -#: lib/checkout_op.tcl:220

765 +#: lib/checkout_op.tcl:242

766 #, tcl-format

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

768 msgstr ""

769

745 -#: lib/checkout_op.tcl:239

770 +#: lib/checkout_op.tcl:261

771 #, tcl-format

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

773 msgstr ""

774

750 -#: lib/checkout_op.tcl:251

775 +#: lib/checkout_op.tcl:273

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

777 msgstr ""

778

754 -#: lib/checkout_op.tcl:266

779 +#: lib/checkout_op.tcl:288

780 msgid ""

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

782 "\n"

@@ -761,30 +786,30 @@ msgid ""

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

787 msgstr ""

788

764 -#: lib/checkout_op.tcl:322

789 +#: lib/checkout_op.tcl:344

790 #, tcl-format

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

792 msgstr ""

793

769 -#: lib/checkout_op.tcl:323

794 +#: lib/checkout_op.tcl:345

795 msgid "files checked out"

796 msgstr ""

797

773 -#: lib/checkout_op.tcl:353

798 +#: lib/checkout_op.tcl:375

799 #, tcl-format

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

801 msgstr ""

802

778 -#: lib/checkout_op.tcl:354

803 +#: lib/checkout_op.tcl:376

804 msgid "File level merge required."

805 msgstr ""

806

782 -#: lib/checkout_op.tcl:358

807 +#: lib/checkout_op.tcl:380

808 #, tcl-format

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

810 msgstr ""

811

787 -#: lib/checkout_op.tcl:429

812 +#: lib/checkout_op.tcl:451

813 msgid ""

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

815 "\n"

@@ -792,30 +817,30 @@ msgid ""

817 "Checkout'."

818 msgstr ""

819

795 -#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450

820 +#: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472

821 #, tcl-format

822 msgid "Checked out '%s'."

823 msgstr ""

824

800 -#: lib/checkout_op.tcl:478

825 +#: lib/checkout_op.tcl:500

826 #, tcl-format

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

828 msgstr ""

829

805 -#: lib/checkout_op.tcl:500

830 +#: lib/checkout_op.tcl:522

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

832 msgstr ""

833

809 -#: lib/checkout_op.tcl:505

834 +#: lib/checkout_op.tcl:527

835 #, tcl-format

836 msgid "Reset '%s'?"

837 msgstr ""

838

814 -#: lib/checkout_op.tcl:510 lib/merge.tcl:163

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

840 msgid "Visualize"

841 msgstr ""

842

818 -#: lib/checkout_op.tcl:578

843 +#: lib/checkout_op.tcl:600

844 #, tcl-format

845 msgid ""

846 "Failed to set current branch.\n"

@@ -860,7 +885,7 @@ msgstr ""

885 msgid "New..."

886 msgstr ""

887

863 -#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460

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

889 msgid "Clone Existing Repository"

890 msgstr ""

891

@@ -868,7 +893,7 @@ msgstr ""

893 msgid "Clone..."

894 msgstr ""

895

871 -#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976

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

897 msgid "Open Existing Repository"

898 msgstr ""

899

@@ -890,183 +915,183 @@ msgstr ""

915 msgid "Failed to create repository %s:"

916 msgstr ""

917

893 -#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478

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

919 msgid "Directory:"

920 msgstr ""

921

897 -#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537

898 -#: lib/choose_repository.tcl:1011

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

923 +#: lib/choose_repository.tcl:1007

924 msgid "Git Repository"

925 msgstr ""

926

902 -#: lib/choose_repository.tcl:437

927 +#: lib/choose_repository.tcl:435

928 #, tcl-format

929 msgid "Directory %s already exists."

930 msgstr ""

931

907 -#: lib/choose_repository.tcl:441

932 +#: lib/choose_repository.tcl:439

933 #, tcl-format

934 msgid "File %s already exists."

935 msgstr ""

936

912 -#: lib/choose_repository.tcl:455

937 +#: lib/choose_repository.tcl:453

938 msgid "Clone"

939 msgstr ""

940

916 -#: lib/choose_repository.tcl:468

941 +#: lib/choose_repository.tcl:466

942 msgid "URL:"

943 msgstr ""

944

920 -#: lib/choose_repository.tcl:489

945 +#: lib/choose_repository.tcl:487

946 msgid "Clone Type:"

947 msgstr ""

948

924 -#: lib/choose_repository.tcl:495

949 +#: lib/choose_repository.tcl:493

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

951 msgstr ""

952

928 -#: lib/choose_repository.tcl:501

953 +#: lib/choose_repository.tcl:499

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

955 msgstr ""

956

932 -#: lib/choose_repository.tcl:507

957 +#: lib/choose_repository.tcl:505

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

959 msgstr ""

960

936 -#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590

937 -#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806

938 -#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025

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

964 #, tcl-format

965 msgid "Not a Git repository: %s"

966 msgstr ""

967

943 -#: lib/choose_repository.tcl:579

968 +#: lib/choose_repository.tcl:577

969 msgid "Standard only available for local repository."

970 msgstr ""

971

947 -#: lib/choose_repository.tcl:583

972 +#: lib/choose_repository.tcl:581

973 msgid "Shared only available for local repository."

974 msgstr ""

975

951 -#: lib/choose_repository.tcl:604

976 +#: lib/choose_repository.tcl:602

977 #, tcl-format

978 msgid "Location %s already exists."

979 msgstr ""

980

956 -#: lib/choose_repository.tcl:615

981 +#: lib/choose_repository.tcl:613

982 msgid "Failed to configure origin"

983 msgstr ""

984

960 -#: lib/choose_repository.tcl:627

985 +#: lib/choose_repository.tcl:625

986 msgid "Counting objects"

987 msgstr ""

988

964 -#: lib/choose_repository.tcl:628

989 +#: lib/choose_repository.tcl:626

990 msgid "buckets"

991 msgstr ""

992

968 -#: lib/choose_repository.tcl:652

993 +#: lib/choose_repository.tcl:650

994 #, tcl-format

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

996 msgstr ""

997

973 -#: lib/choose_repository.tcl:688

998 +#: lib/choose_repository.tcl:686

999 #, tcl-format

1000 msgid "Nothing to clone from %s."

1001 msgstr ""

1002

978 -#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904

979 -#: lib/choose_repository.tcl:916

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

1004 +#: lib/choose_repository.tcl:914

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

1006 msgstr ""

1007

983 -#: lib/choose_repository.tcl:703

1008 +#: lib/choose_repository.tcl:701

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

1010 msgstr ""

1011

987 -#: lib/choose_repository.tcl:715

1012 +#: lib/choose_repository.tcl:713

1013 #, tcl-format

1014 msgid "Cloning from %s"

1015 msgstr ""

1016

992 -#: lib/choose_repository.tcl:746

1017 +#: lib/choose_repository.tcl:744

1018 msgid "Copying objects"

1019 msgstr ""

1020

996 -#: lib/choose_repository.tcl:747

1021 +#: lib/choose_repository.tcl:745

1022 msgid "KiB"

1023 msgstr ""

1024

1000 -#: lib/choose_repository.tcl:771

1025 +#: lib/choose_repository.tcl:769

1026 #, tcl-format

1027 msgid "Unable to copy object: %s"

1028 msgstr ""

1029

1005 -#: lib/choose_repository.tcl:781

1030 +#: lib/choose_repository.tcl:779

1031 msgid "Linking objects"

1032 msgstr ""

1033

1009 -#: lib/choose_repository.tcl:782

1034 +#: lib/choose_repository.tcl:780

1035 msgid "objects"

1036 msgstr ""

1037

1013 -#: lib/choose_repository.tcl:790

1038 +#: lib/choose_repository.tcl:788

1039 #, tcl-format

1040 msgid "Unable to hardlink object: %s"

1041 msgstr ""

1042

1018 -#: lib/choose_repository.tcl:845

1043 +#: lib/choose_repository.tcl:843

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

1045 msgstr ""

1046

1022 -#: lib/choose_repository.tcl:856

1047 +#: lib/choose_repository.tcl:854

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

1049 msgstr ""

1050

1026 -#: lib/choose_repository.tcl:880

1051 +#: lib/choose_repository.tcl:878

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

1053 msgstr ""

1054

1030 -#: lib/choose_repository.tcl:889

1055 +#: lib/choose_repository.tcl:887

1056 #, tcl-format

1057 msgid "Unable to cleanup %s"

1058 msgstr ""

1059

1035 -#: lib/choose_repository.tcl:895

1060 +#: lib/choose_repository.tcl:893

1061 msgid "Clone failed."

1062 msgstr ""

1063

1039 -#: lib/choose_repository.tcl:902

1064 +#: lib/choose_repository.tcl:900

1065 msgid "No default branch obtained."

1066 msgstr ""

1067

1043 -#: lib/choose_repository.tcl:913

1068 +#: lib/choose_repository.tcl:911

1069 #, tcl-format

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

1071 msgstr ""

1072

1048 -#: lib/choose_repository.tcl:925

1073 +#: lib/choose_repository.tcl:923

1074 msgid "Creating working directory"

1075 msgstr ""

1076

1052 -#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127

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

1078 #: lib/index.tcl:193

1079 msgid "files"

1080 msgstr ""

1081

1057 -#: lib/choose_repository.tcl:955

1082 +#: lib/choose_repository.tcl:953

1083 msgid "Initial file checkout failed."

1084 msgstr ""

1085

1061 -#: lib/choose_repository.tcl:971

1086 +#: lib/choose_repository.tcl:969

1087 msgid "Open"

1088 msgstr ""

1089

1065 -#: lib/choose_repository.tcl:981

1090 +#: lib/choose_repository.tcl:979

1091 msgid "Repository:"

1092 msgstr ""

1093

1069 -#: lib/choose_repository.tcl:1031

1094 +#: lib/choose_repository.tcl:1027

1095 #, tcl-format

1096 msgid "Failed to open repository %s:"

1097 msgstr ""

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

1339 msgid "Invalid date from Git: %s"

1340 msgstr ""

1341

1317 -#: lib/diff.tcl:42

1342 +#: lib/diff.tcl:44

1343 #, tcl-format

1344 msgid ""

1345 "No differences detected.\n"

@@ -1328,40 +1353,48 @@ msgid ""

1353 "the same state."

1354 msgstr ""

1355

1331 -#: lib/diff.tcl:81

1356 +#: lib/diff.tcl:83

1357 #, tcl-format

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

1359 msgstr ""

1360

1336 -#: lib/diff.tcl:114 lib/diff.tcl:184

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

1362 #, tcl-format

1363 msgid "Unable to display %s"

1364 msgstr ""

1365

1341 -#: lib/diff.tcl:115

1366 +#: lib/diff.tcl:117

1367 msgid "Error loading file:"

1368 msgstr ""

1369

1345 -#: lib/diff.tcl:122

1370 +#: lib/diff.tcl:124

1371 msgid "Git Repository (subproject)"

1372 msgstr ""

1373

1349 -#: lib/diff.tcl:134

1374 +#: lib/diff.tcl:136

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

1376 msgstr ""

1377

1353 -#: lib/diff.tcl:185

1378 +#: lib/diff.tcl:191

1379 msgid "Error loading diff:"

1380 msgstr ""

1381

1357 -#: lib/diff.tcl:303

1382 +#: lib/diff.tcl:313

1383 msgid "Failed to unstage selected hunk."

1384 msgstr ""

1385

1361 -#: lib/diff.tcl:310

1386 +#: lib/diff.tcl:320

1387 msgid "Failed to stage selected hunk."

1388 msgstr ""

1389

1390 +#: lib/diff.tcl:386

1391 +msgid "Failed to unstage selected line."

1392 +msgstr ""

1393 +

1394 +#: lib/diff.tcl:394

1395 +msgid "Failed to stage selected line."

1396 +msgstr ""

1397 +

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

1399 msgid "error"

1400 msgstr ""

@@ -1527,11 +1560,11 @@ msgstr ""

1560 msgid "files reset"

1561 msgstr ""

1562

1530 -#: lib/merge.tcl:265

1563 +#: lib/merge.tcl:266

1564 msgid "Abort failed."

1565 msgstr ""

1566

1534 -#: lib/merge.tcl:267

1567 +#: lib/merge.tcl:268

1568 msgid "Abort completed. Ready."

1569 msgstr ""

1570

@@ -1585,42 +1618,62 @@ msgid "Match Tracking Branches"

1618 msgstr ""

1619

1620 #: lib/option.tcl:126

1588 -msgid "Number of Diff Context Lines"

1621 +msgid "Blame Copy Only On Changed Files"

1622 msgstr ""

1623

1624 #: lib/option.tcl:127

1592 -msgid "Commit Message Text Width"

1625 +msgid "Minimum Letters To Blame Copy On"

1626 msgstr ""

1627

1628 #: lib/option.tcl:128

1629 +msgid "Number of Diff Context Lines"

1630 +msgstr ""

1631 +

1632 +#: lib/option.tcl:129

1633 +msgid "Commit Message Text Width"

1634 +msgstr ""

1635 +

1636 +#: lib/option.tcl:130

1637 msgid "New Branch Name Template"

1638 msgstr ""

1639

1599 -#: lib/option.tcl:192

1640 +#: lib/option.tcl:194

1641 msgid "Spelling Dictionary:"

1642 msgstr ""

1643

1603 -#: lib/option.tcl:216

1644 +#: lib/option.tcl:218

1645 msgid "Change Font"

1646 msgstr ""

1647

1607 -#: lib/option.tcl:220

1648 +#: lib/option.tcl:222

1649 #, tcl-format

1650 msgid "Choose %s"

1651 msgstr ""

1652

1612 -#: lib/option.tcl:226

1653 +#: lib/option.tcl:228

1654 msgid "pt."

1655 msgstr ""

1656

1616 -#: lib/option.tcl:240

1657 +#: lib/option.tcl:242

1658 msgid "Preferences"

1659 msgstr ""

1660

1620 -#: lib/option.tcl:275

1661 +#: lib/option.tcl:277

1662 msgid "Failed to completely save options:"

1663 msgstr ""

1664

1665 +#: lib/remote.tcl:165

1666 +msgid "Prune from"

1667 +msgstr ""

1668 +

1669 +#: lib/remote.tcl:170

1670 +msgid "Fetch from"

1671 +msgstr ""

1672 +

1673 +#: lib/remote.tcl:213

1674 +msgid "Push to"

1675 +msgstr ""

1676 +

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

1678 msgid "Delete Remote Branch"

1679 msgstr ""

@@ -1697,18 +1750,6 @@ msgstr ""

1750 msgid "Scanning %s..."

1751 msgstr ""

1752

1700 -#: lib/remote.tcl:165

1701 -msgid "Prune from"

1702 -msgstr ""

1703 -

1704 -#: lib/remote.tcl:170

1705 -msgid "Fetch from"

1706 -msgstr ""

1707 -

1708 -#: lib/remote.tcl:213

1709 -msgid "Push to"

1710 -msgstr ""

1711 -

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

1754 msgid "Cannot write shortcut:"

1755 msgstr ""

@@ -1742,15 +1783,15 @@ msgstr ""

1783 msgid "Unrecognized spell checker"

1784 msgstr ""

1785

1745 -#: lib/spellcheck.tcl:180

1786 +#: lib/spellcheck.tcl:186

1787 msgid "No Suggestions"

1788 msgstr ""

1789

1749 -#: lib/spellcheck.tcl:381

1790 +#: lib/spellcheck.tcl:387

1791 msgid "Unexpected EOF from spell checker"

1792 msgstr ""

1793

1753 -#: lib/spellcheck.tcl:385

1794 +#: lib/spellcheck.tcl:391

1795 msgid "Spell Checker Failed"

1796 msgstr ""

1797

git-gui: Update git-gui.pot for 0.11 nearing release