~bzr-pqm/bzr/bzr.dev : revision 6472

7

msgstr ""

8

"Project-Id-Version: bzr\n"

9

"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10

"POT-Creation-Date: 2012-02-02 17:39+0100\n"

10

"POT-Creation-Date: 2012-01-16 15:18+0100\n"

11

"PO-Revision-Date: 2012-01-16 16:40+0000\n"

12

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

13

"Language-Team: Galician <gl@li.org>\n"

15

"Content-Type: text/plain; charset=UTF-8\n"

16

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

17

"Plural-Forms: nplurals=2; plural=n != 1;\n"

18

"X-Launchpad-Export-Date: 2012-02-04 06:19+0000\n"

19

"X-Generator: Launchpad (build 14738)\n"

18

"X-Launchpad-Export-Date: 2012-01-17 05:16+0000\n"

19

"X-Generator: Launchpad (build 14676)\n"

20

21

#: bzrlib/add.py:95

22

msgid "skipping {0} (larger than {1} of {2} bytes)"

26

msgid "Unstacking"

27

msgstr ""

28

29

#: bzrlib/branch.py:3205

29

#: bzrlib/branch.py:3183

30

#, python-format

31

msgid "Pushed up to revision %d."

32

msgstr ""

33

34

#: bzrlib/branch.py:3207

34

#: bzrlib/branch.py:3185

35

#, python-format

36

msgid "%d tag updated."

37

msgid_plural "%d tags updated."

38

msgstr[0] ""

39

msgstr[1] ""

40

41

#: bzrlib/branch.py:3210

41

#: bzrlib/branch.py:3188

42

msgid "No new revisions or tags to push."

43

msgstr "Non hai revisións ou etiquetas para empurar (push)."

44

45

#: bzrlib/branch.py:3212

45

#: bzrlib/branch.py:3190

46

msgid "No new revisions to push."

47

msgstr "Non hai revisións novas para empurrar (push)."

48

49

#: bzrlib/branch.py:3232

49

#: bzrlib/branch.py:3210

50

msgid "checked branch {0} format {1}"

51

msgstr ""

52

53

#: bzrlib/branch.py:3235

53

#: bzrlib/branch.py:3213

54

#, python-format

55

msgid "found error:%s"

56

msgstr "atopouse un erro: %s"

57

58

#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315

58

#: bzrlib/builtins.py:121 bzrlib/builtins.py:2923 bzrlib/workingtree.py:315

59

#, python-format

60

msgid "Ignoring files outside view. View is %s"

61

msgstr "Ignorando os ficheiros fóra da vista. A vista é %s"

62

63

#: bzrlib/builtins.py:218

63

#: bzrlib/builtins.py:130

64

#, python-format

65

msgid "bzr %s --revision takes exactly one revision identifier"

66

msgstr "bzr %s --revision toma exactamente un identificador de revisión"

67

68

#: bzrlib/builtins.py:303

68

#: bzrlib/builtins.py:215

69

msgid "Display status summary."

70

msgstr "Mostrar o resumo do estado."

71

72

#: bzrlib/builtins.py:305

72

#: bzrlib/builtins.py:217

73

msgid ""

74

"This reports on versioned and unknown files, reporting them\n"

75

"grouped by state. Possible states are:"

77

"Isto informa sobre ficheiros versionados e descoñecidos, informando\n"

78

"deles agrupados por estado. Os estados posíbeis son:"

79

80

#: bzrlib/builtins.py:308

80

#: bzrlib/builtins.py:220

81

msgid ""

82

"added\n"

83

" Versioned in the working copy but not in the previous revision."

85

"engadido\n"

86

" Versionado na copia de traballo pero non na revisión anterior."

87

88

#: bzrlib/builtins.py:311

88

#: bzrlib/builtins.py:223

89

msgid ""

90

"removed\n"

91

" Versioned in the previous revision but removed or deleted\n"

95

" Versionado na revisión anterior pero quitado ou eliminado\n"

96

" na copia de traballo."

97

98

#: bzrlib/builtins.py:315

98

#: bzrlib/builtins.py:227

99

msgid ""

100

"renamed\n"

101

" Path of this file changed from the previous revision;\n"

107

" o texto semella que cambiou. Isto inclúe os ficheiros cuxo\n"

108

" cartafol pai foi renomeado."

109

110

#: bzrlib/builtins.py:320

110

#: bzrlib/builtins.py:232

111

msgid ""

112

"modified\n"

113

" Text has changed since the previous revision."

115

"modificado\n"

116

" O texto cambiou desde a última revisión."

117

118

#: bzrlib/builtins.py:323

118

#: bzrlib/builtins.py:235

119

msgid ""

120

"kind changed\n"

121

" File kind has been changed (e.g. from file to directory)."

123

"semella cambiado\n"

124

" O ficheiro semella que foi cambiado (p.ex. de ficheiro a cartafol)"

125

126

#: bzrlib/builtins.py:326

126

#: bzrlib/builtins.py:238

127

msgid ""

128

"unknown\n"

129

" Not versioned and not matching an ignore pattern."

131

"descoñecido\n"

132

" Non versionado e non coincide cun patrón de ignorado."

133

134

#: bzrlib/builtins.py:329

134

#: bzrlib/builtins.py:241

135

msgid ""

136

"Additionally for directories, symlinks and files with a changed\n"

137

"executable bit, Bazaar indicates their type using a trailing\n"

139

"disabled using the '--no-classify' option."

140

msgstr ""

141

142

#: bzrlib/builtins.py:334

142

#: bzrlib/builtins.py:246

143

msgid ""

144

"To see ignored files use 'bzr ignored'. For details on the\n"

145

"changes to file texts, use 'bzr diff'."

147

"Para ver os ficheiros use «bzr ignored». Para máis información\n"

148

"sobre os cambios nos textos dos ficheiros use «bzr diff»."

149

150

#: bzrlib/builtins.py:337

150

#: bzrlib/builtins.py:249

151

msgid ""

152

"Note that --short or -S gives status flags for each item, similar\n"

153

"to Subversion's status command. To get output similar to svn -q,\n"

154

"use bzr status -SV."

155

msgstr ""

156

157

#: bzrlib/builtins.py:341

157

#: bzrlib/builtins.py:253

158

msgid ""

159

"If no arguments are specified, the status of the entire working\n"

160

"directory is shown. Otherwise, only the status of the specified\n"

162

"is reported for everything inside that directory."

163

msgstr ""

164

165

#: bzrlib/builtins.py:346

165

#: bzrlib/builtins.py:258

166

msgid ""

167

"Before merges are committed, the pending merge tip revisions are\n"

168

"shown. To see all pending merge revisions, use the -v option.\n"

170

"the no-pending option or specify a file/directory."

171

msgstr ""

172

173

#: bzrlib/builtins.py:351

173

#: bzrlib/builtins.py:263

174

msgid ""

175

"To compare the working directory to a specific revision, pass a\n"

176

"single revision to the revision argument."

178

"Para comparar o cartafol de traballo con unha revisión específica, pase\n"

179

"unha revisión ao argumento «revision»."

180

181

#: bzrlib/builtins.py:354

181

#: bzrlib/builtins.py:266

182

msgid ""

183

"To see which files have changed in a specific revision, or between\n"

184

"two revisions, pass a revision range to the revision argument.\n"

185

"This will produce the same results as calling 'bzr diff --summarize'."

186

msgstr ""

187

188

#: bzrlib/builtins.py:363

188

#: bzrlib/builtins.py:275

189

msgid "Use short status indicators."

190

msgstr "Usar os indicadores de estado curtos"

191

192

#: bzrlib/builtins.py:365

192

#: bzrlib/builtins.py:277

193

msgid "Only show versioned files."

194

msgstr "Mostrar só os ficheiros versionados."

195

196

#: bzrlib/builtins.py:367

196

#: bzrlib/builtins.py:279

197

msgid "Don't show pending merges."

198

msgstr "Non mostrar as combinacións (merge) pendentes"

199

200

#: bzrlib/builtins.py:370

200

#: bzrlib/builtins.py:282

201

msgid "Do not mark object type using indicator."

202

msgstr ""

203

204

#: bzrlib/builtins.py:385

204

#: bzrlib/builtins.py:297

205

msgid "bzr status --revision takes exactly one or two revision specifiers"

206

msgstr ""

207

208

#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183

208

#: bzrlib/builtins.py:341 bzrlib/builtins.py:5090

209

msgid "You can only supply one of revision_id or --revision"

210

msgstr ""

211

212

#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185

212

#: bzrlib/builtins.py:344 bzrlib/builtins.py:5092

213

msgid "You must supply either --revision or a revision_id"

214

msgstr "Debe fornecer ou --revision ou un id_de_revision"

215

216

#: bzrlib/builtins.py:439

216

#: bzrlib/builtins.py:351

217

#, python-format

218

msgid "Repository %r does not support access to raw revision texts"

219

msgstr ""

220

221

#: bzrlib/builtins.py:450

221

#: bzrlib/builtins.py:362

222

msgid "The repository {0} contains no revision {1}."

223

msgstr ""

224

225

#: bzrlib/builtins.py:457

225

#: bzrlib/builtins.py:369

226

msgid "You cannot specify a NULL revision."

227

msgstr ""

228

229

#: bzrlib/builtins.py:549

229

#: bzrlib/builtins.py:461

230

msgid "Remove the working tree from a given branch/checkout."

231

msgstr ""

232

233

#: bzrlib/builtins.py:551

233

#: bzrlib/builtins.py:463

234

msgid ""

235

"Since a lightweight checkout is little more than a working tree\n"

236

"this will refuse to run against one."

237

msgstr ""

238

239

#: bzrlib/builtins.py:554

239

#: bzrlib/builtins.py:466

240

msgid "To re-create the working tree, use \"bzr checkout\"."

241

msgstr ""

242

243

#: bzrlib/builtins.py:560

243

#: bzrlib/builtins.py:472

244

msgid ""

245

"Remove the working tree even if it has uncommitted or shelved changes."

246

msgstr ""

247

248

#: bzrlib/builtins.py:574

248

#: bzrlib/builtins.py:486

249

msgid "No working tree to remove"

250

msgstr ""

251

252

#: bzrlib/builtins.py:576

252

#: bzrlib/builtins.py:488

253

msgid "You cannot remove the working tree of a remote path"

254

msgstr "Non pode eliminar o cartafol de traballo desde unha ruta remota"

255

256

#: bzrlib/builtins.py:585

256

#: bzrlib/builtins.py:497

257

msgid "You cannot remove the working tree from a lightweight checkout"

258

msgstr ""

259

260

#: bzrlib/builtins.py:625

260

#: bzrlib/builtins.py:537

261

msgid ""

262

"The tree does not appear to be corrupt. You probably want \"bzr revert\" "

263

"instead. Use \"--force\" if you are sure you want to reset the working tree."

264

msgstr ""

265

266

#: bzrlib/builtins.py:636

266

#: bzrlib/builtins.py:548

267

msgid ""

268

", the header appears corrupt, try passing -r -1 to set the state to the last "

269

"commit"

270

msgstr ""

271

272

#: bzrlib/builtins.py:640

272

#: bzrlib/builtins.py:552

273

msgid "failed to reset the tree state{0}"

274

msgstr ""

275

276

#: bzrlib/builtins.py:644

276

#: bzrlib/builtins.py:556

277

msgid "Show current revision number."

278

msgstr ""

279

280

#: bzrlib/builtins.py:646

280

#: bzrlib/builtins.py:558

281

msgid "This is equal to the number of revisions on this branch."

282

msgstr ""

283

284

#: bzrlib/builtins.py:659

284

#: bzrlib/builtins.py:571

285

msgid "--tree and --revision can not be used together"

286

msgstr ""

287

288

#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967

288

#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874

289

msgid "Tags can only be placed on a single revision, not on a range"

290

msgstr ""

291

292

#: bzrlib/builtins.py:700

292

#: bzrlib/builtins.py:612

293

msgid "Show revno of working tree."

294

msgstr ""

295

296

#: bzrlib/builtins.py:748

296

#: bzrlib/builtins.py:660

297

msgid "Add specified files or directories."

298

msgstr ""

299

300

#: bzrlib/builtins.py:750

300

#: bzrlib/builtins.py:662

301

msgid ""

302

"In non-recursive mode, all the named items are added, regardless\n"

303

"of whether they were previously ignored. A warning is given if\n"

304

"any of the named files are already versioned."

305

msgstr ""

306

307

#: bzrlib/builtins.py:754

307

#: bzrlib/builtins.py:666

308

msgid ""

309

"In recursive mode (the default), files are treated the same way\n"

310

"but the behaviour for directories is different. Directories that\n"

315

"directories. If no names are given '.' is assumed."

316

msgstr ""

317

318

#: bzrlib/builtins.py:762

318

#: bzrlib/builtins.py:674

319

msgid ""

320

"A warning will be printed when nested trees are encountered,\n"

321

"unless they are explicitly ignored."

322

msgstr ""

323

324

#: bzrlib/builtins.py:765

324

#: bzrlib/builtins.py:677

325

msgid ""

326

"Therefore simply saying 'bzr add' will version all files that\n"

327

"are currently unknown."

328

msgstr ""

329

330

#: bzrlib/builtins.py:768

330

#: bzrlib/builtins.py:680

331

msgid ""

332

"Adding a file whose parent directory is not versioned will\n"

333

"implicitly add the parent, and so on up to the root. This means\n"

335

"get added when you add a file in the directory."

336

msgstr ""

337

338

#: bzrlib/builtins.py:773

338

#: bzrlib/builtins.py:685

339

msgid ""

340

"--dry-run will show which files would be added, but not actually\n"

341

"add them."

342

msgstr ""

343

344

#: bzrlib/builtins.py:776

344

#: bzrlib/builtins.py:688

345

msgid ""

346

"--file-ids-from will try to use the file ids from the supplied path.\n"

347

"It looks up ids trying to find a matching parent directory with the\n"

352

"into a subdirectory of this one."

353

msgstr ""

354

355

#: bzrlib/builtins.py:784

355

#: bzrlib/builtins.py:696

356

msgid ""

357

"Any files matching patterns in the ignore list will not be added\n"

358

"unless they are explicitly mentioned."

359

msgstr ""

360

361

#: bzrlib/builtins.py:787

361

#: bzrlib/builtins.py:699

362

msgid ""

363

"In recursive mode, files larger than the configuration option \n"

364

"add.maximum_file_size will be skipped. Named items are never skipped due\n"

365

"to file size."

366

msgstr ""

367

368

#: bzrlib/builtins.py:794

368

#: bzrlib/builtins.py:706

369

msgid "Don't recursively add the contents of directories."

370

msgstr ""

371

372

#: bzrlib/builtins.py:800

372

#: bzrlib/builtins.py:712

373

msgid "Lookup file ids from this tree."

374

msgstr ""

375

376

#: bzrlib/builtins.py:836

376

#: bzrlib/builtins.py:748

377

msgid "ignored {0} matching \"{1}\"\n"

378

msgstr ""

379

380

#: bzrlib/builtins.py:841

380

#: bzrlib/builtins.py:753

381

msgid "Create a new versioned directory."

382

msgstr ""

383

384

#: bzrlib/builtins.py:843

384

#: bzrlib/builtins.py:755

385

msgid "This is equivalent to creating the directory and then adding it."

386

msgstr ""

387

388

#: bzrlib/builtins.py:850

388

#: bzrlib/builtins.py:762

389

msgid "No error if existing, make parent directories as needed."

390

msgstr ""

391

392

#: bzrlib/builtins.py:884

392

#: bzrlib/builtins.py:796

393

#, python-format

394

msgid "added %s\n"

395

msgstr ""

396

397

#: bzrlib/builtins.py:926

397

#: bzrlib/builtins.py:838

398

#, python-format

399

msgid "invalid kind %r specified"

400

msgstr ""

401

402

#: bzrlib/builtins.py:963

402

#: bzrlib/builtins.py:875

403

msgid "Move or rename a file."

404

msgstr ""

405

406

#: bzrlib/builtins.py:965

406

#: bzrlib/builtins.py:877

407

msgid " bzr mv SOURCE... DESTINATION"

408

msgstr ""

409

410

#: bzrlib/builtins.py:967

410

#: bzrlib/builtins.py:879

411

msgid ""

412

"If the last argument is a versioned directory, all the other names\n"

413

"are moved into it. Otherwise, there must be exactly two arguments\n"

414

"and the file is changed to a new name."

415

msgstr ""

416

417

#: bzrlib/builtins.py:971

417

#: bzrlib/builtins.py:883

418

msgid ""

419

"If OLDNAME does not exist on the filesystem but is versioned and\n"

420

"NEWNAME does exist on the filesystem but is not versioned, mv\n"

423

"The same is valid when moving many SOURCE files to a DESTINATION."

424

msgstr ""

425

426

#: bzrlib/builtins.py:977

426

#: bzrlib/builtins.py:889

427

msgid "Files cannot be moved between branches."

428

msgstr ""

429

430

#: bzrlib/builtins.py:984

430

#: bzrlib/builtins.py:896

431

msgid ""

432

"Move only the bzr identifier of the file, because the file has already been "

433

"moved."

434

msgstr ""

435

436

#: bzrlib/builtins.py:986

436

#: bzrlib/builtins.py:898

437

msgid "Automatically guess renames."

438

msgstr ""

439

440

#: bzrlib/builtins.py:987

440

#: bzrlib/builtins.py:899

441

msgid "Avoid making changes when guessing renames."

442

msgstr ""

443

444

#: bzrlib/builtins.py:996

444

#: bzrlib/builtins.py:908

445

msgid "--dry-run requires --auto."

446

msgstr ""

447

448

#: bzrlib/builtins.py:1000

448

#: bzrlib/builtins.py:912

449

msgid "missing file argument"

450

msgstr ""

451

452

#: bzrlib/builtins.py:1004

452

#: bzrlib/builtins.py:916

453

msgid "can not move root of branch"

454

msgstr ""

455

456

#: bzrlib/builtins.py:1010

456

#: bzrlib/builtins.py:922

457

msgid "Only one path may be specified to --auto."

458

msgstr ""

459

460

#: bzrlib/builtins.py:1013

460

#: bzrlib/builtins.py:925

461

msgid "--after cannot be specified with --auto."

462

msgstr ""

463

464

#: bzrlib/builtins.py:1050

464

#: bzrlib/builtins.py:962

465

msgid "to mv multiple files the destination must be a versioned directory"

466

msgstr ""

467

468

#: bzrlib/builtins.py:1102

468

#: bzrlib/builtins.py:1014

469

msgid "Turn this branch into a mirror of another branch."

470

msgstr ""

471

472

#: bzrlib/builtins.py:1104

472

#: bzrlib/builtins.py:1016

473

msgid ""

474

"By default, this command only works on branches that have not diverged.\n"

475

"Branches are considered diverged if the destination branch's most recent \n"

477

"parent."

478

msgstr ""

479

480

#: bzrlib/builtins.py:1109

480

#: bzrlib/builtins.py:1021

481

msgid ""

482

"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"

483

"from one into the other. Once one branch has merged, the other should\n"

484

"be able to pull it again."

485

msgstr ""

486

487

#: bzrlib/builtins.py:1113

487

#: bzrlib/builtins.py:1025

488

msgid ""

489

"If you want to replace your local changes and just want your branch to\n"

490

"match the remote one, use pull --overwrite. This will work even if the two\n"

491

"branches have diverged."

492

msgstr ""

493

494

#: bzrlib/builtins.py:1117

494

#: bzrlib/builtins.py:1029

495

msgid ""

496

"If there is no default location set, the first pull will set it (use\n"

497

"--no-remember to avoid setting it). After that, you can omit the\n"

499

"value will only be saved if the remote location can be accessed."

500

msgstr ""

501

502

#: bzrlib/builtins.py:1122

502

#: bzrlib/builtins.py:1034

503

msgid ""

504

"The --verbose option will display the revisions pulled using the log_format\n"

505

"configuration option. You can use a different format by overriding it with\n"

506

"-Olog_format=<other_format>."

507

msgstr ""

508

509

#: bzrlib/builtins.py:1126

509

#: bzrlib/builtins.py:1038

510

msgid ""

511

"Note: The location can be specified either in the form of a branch,\n"

512

"or in the form of a path to a file containing a merge directive generated\n"

513

"with bzr send."

514

msgstr ""

515

516

#: bzrlib/builtins.py:1134

516

#: bzrlib/builtins.py:1046

517

msgid "Show logs of pulled revisions."

518

msgstr ""

519

520

#: bzrlib/builtins.py:1136

520

#: bzrlib/builtins.py:1048

521

msgid ""

522

"Branch to pull into, rather than the one containing the working directory."

523

msgstr ""

524

525

#: bzrlib/builtins.py:1139

525

#: bzrlib/builtins.py:1051

526

msgid ""

527

"Perform a local pull in a bound branch. Local pulls are not applied to the "

528

"master branch."

529

msgstr ""

530

531

#: bzrlib/builtins.py:1168

531

#: bzrlib/builtins.py:1080

532

msgid "Need working tree for --show-base."

533

msgstr ""

534

535

#: bzrlib/builtins.py:1184

535

#: bzrlib/builtins.py:1096

536

msgid "No pull location known or specified."

537

msgstr ""

538

539

#: bzrlib/builtins.py:1190

539

#: bzrlib/builtins.py:1102

540

#, python-format

541

msgid "Using saved parent location: %s\n"

542

msgstr ""

543

544

#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393

544

#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300

545

msgid "Cannot use -r with merge directives or bundles"

546

msgstr ""

547

548

#: bzrlib/builtins.py:1238

548

#: bzrlib/builtins.py:1150

549

msgid "Update a mirror of this branch."

550

msgstr ""

551

552

#: bzrlib/builtins.py:1240

552

#: bzrlib/builtins.py:1152

553

msgid ""

554

"The target branch will not have its working tree populated because this\n"

555

"is both expensive, and is not supported on remote file systems."

556

msgstr ""

557

558

#: bzrlib/builtins.py:1243

558

#: bzrlib/builtins.py:1155

559

msgid ""

560

"Some smart servers or protocols *may* put the working tree in place in\n"

561

"the future."

562

msgstr ""

563

564

#: bzrlib/builtins.py:1246

564

#: bzrlib/builtins.py:1158

565

msgid ""

566

"This command only works on branches that have not diverged. Branches are\n"

567

"considered diverged if the destination branch's most recent commit is one\n"

568

"that has not been merged (directly or indirectly) by the source branch."

569

msgstr ""

570

571

#: bzrlib/builtins.py:1250

571

#: bzrlib/builtins.py:1162

572

msgid ""

573

"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"

574

"the other branch completely, discarding its unmerged changes."

575

msgstr ""

576

577

#: bzrlib/builtins.py:1253

577

#: bzrlib/builtins.py:1165

578

msgid ""

579

"If you want to ensure you have the different changes in the other branch,\n"

580

"do a merge (see bzr help merge) from the other branch, and commit that.\n"

581

"After that you will be able to do a push without '--overwrite'."

582

msgstr ""

583

584

#: bzrlib/builtins.py:1257

584

#: bzrlib/builtins.py:1169

585

msgid ""

586

"If there is no default push location set, the first push will set it (use\n"

587

"--no-remember to avoid setting it). After that, you can omit the\n"

589

"value will only be saved if the remote location can be accessed."

590

msgstr ""

591

592

#: bzrlib/builtins.py:1262

592

#: bzrlib/builtins.py:1174

593

msgid ""

594

"The --verbose option will display the revisions pushed using the log_format\n"

595

"configuration option. You can use a different format by overriding it with\n"

596

"-Olog_format=<other_format>."

597

msgstr ""

598

599

#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272

599

#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272

600

msgid ""

601

"Branch to push from, rather than the one containing the working directory."

602

msgstr ""

603

604

#: bzrlib/builtins.py:1276

604

#: bzrlib/builtins.py:1188

605

msgid ""

606

"By default push will fail if the target directory exists, but does not "

607

"already have a control directory. This flag will allow push to proceed."

608

msgstr ""

609

610

#: bzrlib/builtins.py:1281

610

#: bzrlib/builtins.py:1193

611

msgid ""

612

"Create a stacked branch that references the public location of the parent "

613

"branch."

614

msgstr ""

615

616

#: bzrlib/builtins.py:1284

616

#: bzrlib/builtins.py:1196

617

msgid ""

618

"Create a stacked branch that refers to another branch for the commit "

619

"history. Only the work not present in the referenced branch is included in "

620

"the branch created."

621

msgstr ""

622

623

#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279

623

#: bzrlib/builtins.py:1201 bzrlib/foreign.py:279

624

msgid ""

625

"Refuse to push if there are uncommitted changes in the working tree, --no-"

626

"strict disables the check."

627

msgstr ""

628

629

#: bzrlib/builtins.py:1292

629

#: bzrlib/builtins.py:1204

630

msgid "Don't populate the working tree, even for protocols that support it."

631

msgstr ""

632

633

#: bzrlib/builtins.py:1336

633

#: bzrlib/builtins.py:1248

634

msgid "Could not determine branch to refer to."

635

msgstr ""

636

637

#: bzrlib/builtins.py:1345

637

#: bzrlib/builtins.py:1257

638

#, python-format

639

msgid ""

640

"No push location known or specified. To push to the parent branch (at %s), "

641

"use 'bzr push :parent'."

642

msgstr ""

643

644

#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306

644

#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306

645

msgid "No push location known or specified."

646

msgstr ""

647

648

#: bzrlib/builtins.py:1355

648

#: bzrlib/builtins.py:1267

649

#, python-format

650

msgid "Using saved push location: %s"

651

msgstr ""

652

653

#: bzrlib/builtins.py:1365

653

#: bzrlib/builtins.py:1277

654

msgid "Create a new branch that is a copy of an existing branch."

655

msgstr ""

656

657

#: bzrlib/builtins.py:1367

657

#: bzrlib/builtins.py:1279

658

msgid ""

659

"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"

660

"be used. In other words, \"branch ../foo/bar\" will attempt to create "

665

"create ./foo-bar."

666

msgstr ""

667

668

#: bzrlib/builtins.py:1374

668

#: bzrlib/builtins.py:1286

669

msgid ""

670

"To retrieve the branch as of a particular revision, supply the --revision\n"

671

"parameter, as in \"branch foo/bar -r 5\"."

672

msgstr ""

673

674

#: bzrlib/builtins.py:1377

674

#: bzrlib/builtins.py:1289

675

msgid "The synonyms 'clone' and 'get' for this command are deprecated."

676

msgstr ""

677

678

#: bzrlib/builtins.py:1387

678

#: bzrlib/builtins.py:1299

679

msgid "Create a branch without a working-tree."

680

msgstr ""

681

682

#: bzrlib/builtins.py:1389

682

#: bzrlib/builtins.py:1301

683

msgid "Switch the checkout in the current directory to the new branch."

684

msgstr ""

685

686

#: bzrlib/builtins.py:1392

686

#: bzrlib/builtins.py:1304

687

msgid ""

688

"Create a stacked branch referring to the source branch. The new branch will "

689

"depend on the availability of the source branch for all operations."

690

msgstr ""

691

692

#: bzrlib/builtins.py:1396

692

#: bzrlib/builtins.py:1308

693

msgid "Do not use a shared repository, even if available."

694

msgstr ""

695

696

#: bzrlib/builtins.py:1398

696

#: bzrlib/builtins.py:1310

697

msgid ""

698

"By default branch will fail if the target directory exists, but does not "

699

"already have a control directory. This flag will allow branch to proceed."

700

msgstr ""

701

702

#: bzrlib/builtins.py:1403

702

#: bzrlib/builtins.py:1315

703

msgid "Bind new branch to from location."

704

msgstr ""

705

706

#: bzrlib/builtins.py:1450

706

#: bzrlib/builtins.py:1362

707

#, python-format

708

msgid "Target directory \"%s\" already exists."

709

msgstr ""

710

711

#: bzrlib/builtins.py:1462

711

#: bzrlib/builtins.py:1374

712

#, python-format

713

msgid "Parent of \"%s\" does not exist."

714

msgstr ""

715

716

#: bzrlib/builtins.py:1481

716

#: bzrlib/builtins.py:1393

717

msgid "The branch {0} has no revision {1}."

718

msgstr ""

719

720

#: bzrlib/builtins.py:1496 bzrlib/push.py:53

720

#: bzrlib/builtins.py:1403 bzrlib/push.py:53

721

#, python-format

722

msgid "Created new stacked branch referring to %s."

723

msgstr ""

724

725

#: bzrlib/builtins.py:1500

725

#: bzrlib/builtins.py:1407

726

#, python-format

727

msgid "Branched %d revision."

728

msgid_plural "Branched %d revisions."

729

msgstr[0] ""

730

msgstr[1] ""

731

732

#: bzrlib/builtins.py:1505

732

#: bzrlib/builtins.py:1412

733

#, python-format

734

msgid "New branch bound to %s"

735

msgstr ""

736

737

#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256

737

#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187

738

#, python-format

739

msgid "Switched to branch: %s"

740

msgstr ""

741

742

#: bzrlib/builtins.py:1515

742

#: bzrlib/builtins.py:1422

743

msgid "List the branches available at the current location."

744

msgstr ""

745

746

#: bzrlib/builtins.py:1517

746

#: bzrlib/builtins.py:1424

747

msgid ""

748

"This command will print the names of all the branches at the current\n"

749

"location."

750

msgstr ""

751

752

#: bzrlib/builtins.py:1524

752

#: bzrlib/builtins.py:1431

753

msgid ""

754

"Recursively scan for branches rather than just looking in the specified "

755

"location."

756

msgstr ""

757

758

#: bzrlib/builtins.py:1554

758

#: bzrlib/builtins.py:1461

759

msgid "(default)"

760

msgstr ""

761

762

#: bzrlib/builtins.py:1566

762

#: bzrlib/builtins.py:1473

763

msgid "Create a new checkout of an existing branch."

764

msgstr ""

765

766

#: bzrlib/builtins.py:1568

766

#: bzrlib/builtins.py:1475

767

msgid ""

768

"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "

769

"for\n"

773

"location using SFTP."

774

msgstr ""

775

776

#: bzrlib/builtins.py:1573

776

#: bzrlib/builtins.py:1480

777

msgid ""

778

"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "

779

"will\n"

785

"create ./foo-bar."

786

msgstr ""

787

788

#: bzrlib/builtins.py:1580

788

#: bzrlib/builtins.py:1487

789

msgid ""

790

"To retrieve the branch as of a particular revision, supply the --revision\n"

791

"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "

795

"code.)"

796

msgstr ""

797

798

#: bzrlib/builtins.py:1590

798

#: bzrlib/builtins.py:1497

799

msgid ""

800

"Perform a lightweight checkout. Lightweight checkouts depend on access to "

801

"the branch for every operation. Normal checkouts can perform common "

803

"commits."

804

msgstr ""

805

806

#: bzrlib/builtins.py:1597

806

#: bzrlib/builtins.py:1504

807

msgid "Get file contents from this tree."

808

msgstr ""

809

810

#: bzrlib/builtins.py:1599

810

#: bzrlib/builtins.py:1506

811

msgid "Hard-link working tree files where possible."

812

msgstr ""

813

814

#: bzrlib/builtins.py:1640

814

#: bzrlib/builtins.py:1547

815

msgid ""

816

"Show list of renamed files.\n"

817

" "

818

msgstr ""

819

820

#: bzrlib/builtins.py:1670

820

#: bzrlib/builtins.py:1577

821

msgid "Update a working tree to a new revision."

822

msgstr ""

823

824

#: bzrlib/builtins.py:1672

824

#: bzrlib/builtins.py:1579

825

msgid ""

826

"This will perform a merge of the destination revision (the tip of the\n"

827

"branch, or the specified revision) into the working tree, and then make\n"

828

"that revision the basis revision for the working tree. "

829

msgstr ""

830

831

#: bzrlib/builtins.py:1676

831

#: bzrlib/builtins.py:1583

832

msgid ""

833

"You can use this to visit an older revision, or to update a working tree\n"

834

"that is out of date from its branch."

835

msgstr ""

836

837

#: bzrlib/builtins.py:1679

837

#: bzrlib/builtins.py:1586

838

msgid ""

839

"If there are any uncommitted changes in the tree, they will be carried\n"

840

"across and remain as uncommitted changes after the update. To discard\n"

842

"with the changes brought in by the change in basis revision."

843

msgstr ""

844

845

#: bzrlib/builtins.py:1684

845

#: bzrlib/builtins.py:1591

846

msgid ""

847

"If the tree's branch is bound to a master branch, bzr will also update\n"

848

"the branch from the master."

849

msgstr ""

850

851

#: bzrlib/builtins.py:1687

851

#: bzrlib/builtins.py:1594

852

msgid ""

853

"You cannot update just a single file or directory, because each Bazaar\n"

854

"working tree has just a single basis revision. If you want to restore a\n"

858

"out the old content of that file to a new location."

859

msgstr ""

860

861

#: bzrlib/builtins.py:1694

861

#: bzrlib/builtins.py:1601

862

msgid ""

863

"The 'dir' argument, if given, must be the location of the root of a\n"

864

"working tree to update. By default, the working tree that contains the \n"

865

"current working directory is used."

866

msgstr ""

867

868

#: bzrlib/builtins.py:1710

868

#: bzrlib/builtins.py:1617

869

msgid "bzr update --revision takes exactly one revision"

870

msgstr ""

871

872

#: bzrlib/builtins.py:1718

872

#: bzrlib/builtins.py:1625

873

msgid "bzr update can only update a whole tree, not a file or subdirectory"

874

msgstr ""

875

876

#: bzrlib/builtins.py:1749

876

#: bzrlib/builtins.py:1656

877

msgid "Tree is up to date at revision {0} of branch {1}"

878

msgstr ""

879

880

#: bzrlib/builtins.py:1765

880

#: bzrlib/builtins.py:1672

881

#, python-format

882

msgid ""

883

"branch has no revision %s\n"

884

"bzr update --revision only works for a revision in the branch history"

885

msgstr ""

886

887

#: bzrlib/builtins.py:1771

887

#: bzrlib/builtins.py:1678

888

msgid "Updated to revision {0} of branch {1}"

889

msgstr ""

890

891

#: bzrlib/builtins.py:1775

891

#: bzrlib/builtins.py:1682

892

msgid ""

893

"Your local commits will now show as pending merges with 'bzr status', and "

894

"can be committed with 'bzr commit'."

895

msgstr ""

896

897

#: bzrlib/builtins.py:1784

897

#: bzrlib/builtins.py:1691

898

msgid "Show information about a working tree, branch or repository."

899

msgstr ""

900

901

#: bzrlib/builtins.py:1786

901

#: bzrlib/builtins.py:1693

902

msgid ""

903

"This command will show all known locations and formats associated to the\n"

904

"tree, branch or repository."

905

msgstr ""

906

907

#: bzrlib/builtins.py:1789

907

#: bzrlib/builtins.py:1696

908

msgid ""

909

"In verbose mode, statistical information is included with each report.\n"

910

"To see extended statistic information, use a verbosity level of 2 or\n"

911

"higher by specifying the verbose option multiple times, e.g. -vv."

912

msgstr ""

913

914

#: bzrlib/builtins.py:1793

914

#: bzrlib/builtins.py:1700

915

msgid "Branches and working trees will also report any missing revisions."

916

msgstr ""

917

918

#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845

919

#: bzrlib/builtins.py:6442

918

#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752

919

#: bzrlib/builtins.py:6389

920

msgid ":Examples:"

921

msgstr ""

922

923

#: bzrlib/builtins.py:1797

923

#: bzrlib/builtins.py:1704

924

msgid " Display information on the format and related locations:"

925

msgstr ""

926

927

#: bzrlib/builtins.py:1799

927

#: bzrlib/builtins.py:1706

928

msgid " bzr info"

929

msgstr ""

930

931

#: bzrlib/builtins.py:1801

931

#: bzrlib/builtins.py:1708

932

msgid ""

933

" Display the above together with extended format information and\n"

934

" basic statistics (like the number of files in the working tree and\n"

935

" number of revisions in the branch and repository):"

936

msgstr ""

937

938

#: bzrlib/builtins.py:1805

938

#: bzrlib/builtins.py:1712

939

msgid " bzr info -v"

940

msgstr ""

941

942

#: bzrlib/builtins.py:1807

942

#: bzrlib/builtins.py:1714

943

msgid " Display the above together with number of committers to the branch:"

944

msgstr ""

945

946

#: bzrlib/builtins.py:1809

946

#: bzrlib/builtins.py:1716

947

msgid " bzr info -vv"

948

msgstr ""

949

950

#: bzrlib/builtins.py:1828

950

#: bzrlib/builtins.py:1735

951

msgid "Remove files or directories."

952

msgstr ""

953

954

#: bzrlib/builtins.py:1830

954

#: bzrlib/builtins.py:1737

955

msgid ""

956

"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"

957

"delete them if they can easily be recovered using revert otherwise they\n"

960

"Bazaar but missing in your tree and stop tracking them for you."

961

msgstr ""

962

963

#: bzrlib/builtins.py:1838

963

#: bzrlib/builtins.py:1745

964

msgid "Only remove files that have never been committed."

965

msgstr ""

966

967

#: bzrlib/builtins.py:1840

967

#: bzrlib/builtins.py:1747

968

msgid "The file deletion mode to be used."

969

msgstr ""

970

971

#: bzrlib/builtins.py:1841

971

#: bzrlib/builtins.py:1748

972

msgid "Deletion Strategy"

973

msgstr ""

974

975

#: bzrlib/builtins.py:1842

975

#: bzrlib/builtins.py:1749

976

msgid "Backup changed files (default)."

977

msgstr ""

978

979

#: bzrlib/builtins.py:1843

979

#: bzrlib/builtins.py:1750

980

msgid "Delete from bzr but leave the working copy."

981

msgstr ""

982

983

#: bzrlib/builtins.py:1844

983

#: bzrlib/builtins.py:1751

984

msgid "Don't backup changed files."

985

msgstr ""

986

987

#: bzrlib/builtins.py:1845

987

#: bzrlib/builtins.py:1752

988

msgid ""

989

"Delete all the specified files, even if they can not be recovered and even "

990

"if they are non-empty directories. (deprecated, use no-backup)"

991

msgstr ""

992

993

#: bzrlib/builtins.py:1854

993

#: bzrlib/builtins.py:1761

994

msgid "(The --force option is deprecated, rather use --no-backup in future.)"

995

msgstr ""

996

997

#: bzrlib/builtins.py:1871

997

#: bzrlib/builtins.py:1778

998

msgid "No matching files."

999

msgstr ""

1000

1001

#: bzrlib/builtins.py:1932

1001

#: bzrlib/builtins.py:1839

1002

msgid "Reconcile bzr metadata in a branch."

1003

msgstr ""

1004

1005

#: bzrlib/builtins.py:1934

1005

#: bzrlib/builtins.py:1841

1006

msgid ""

1007

"This can correct data mismatches that may have been caused by\n"

1008

"previous ghost operations or bzr upgrades. You should only\n"

1010

"advises you to run it."

1011

msgstr ""

1012

1013

#: bzrlib/builtins.py:1939

1013

#: bzrlib/builtins.py:1846

1014

msgid ""

1015

"If a second branch is provided, cross-branch reconciliation is\n"

1016

"also attempted, which will check that data like the tree root\n"

1018

"correctly in both branches."

1019

msgstr ""

1020

1021

#: bzrlib/builtins.py:1944

1021

#: bzrlib/builtins.py:1851

1022

msgid ""

1023

"At the same time it is run it may recompress data resulting in\n"

1024

"a potential saving in disk space or performance gain."

1025

msgstr ""

1026

1027

#: bzrlib/builtins.py:1947

1027

#: bzrlib/builtins.py:1854

1028

msgid "The branch *MUST* be on a listable system such as local disk or sftp."

1029

msgstr ""

1030

1031

#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750

1031

#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657

1032

msgid ""

1033

"Format for the bzr 2.0 series.\n"

1034

"Uses group-compress storage.\n"

1035

"Provides rich roots which are a one-way transition.\n"

1036

msgstr ""

1037

1038

#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750

1038

#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657

1039

msgid ""

1040

"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "

1041

"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "

1042

msgstr ""

1043

1044

#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750

1044

#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657

1045

msgid "The 2a format with experimental support for colocated branches.\n"

1046

msgstr ""

1047

1048

#: bzrlib/builtins.py:2015

1048

#: bzrlib/builtins.py:1922

1049

msgid "Make a directory into a versioned branch."

1050

msgstr ""

1051

1052

#: bzrlib/builtins.py:2017

1052

#: bzrlib/builtins.py:1924

1053

msgid ""

1054

"Use this to create an empty branch, or before importing an\n"

1055

"existing project."

1056

msgstr ""

1057

1058

#: bzrlib/builtins.py:2020

1058

#: bzrlib/builtins.py:1927

1059

msgid ""

1060

"If there is a repository in a parent directory of the location, then\n"

1061

"the history of the branch will be stored in the repository. Otherwise\n"

1063

"in the .bzr directory."

1064

msgstr ""

1065

1066

#: bzrlib/builtins.py:2025

1066

#: bzrlib/builtins.py:1932

1067

msgid ""

1068

"If there is already a branch at the location but it has no working tree,\n"

1069

"the tree can be populated with 'bzr checkout'."

1070

msgstr ""

1071

1072

#: bzrlib/builtins.py:2028

1072

#: bzrlib/builtins.py:1935

1073

msgid "Recipe for importing a tree of files::"

1074

msgstr ""

1075

1076

#: bzrlib/builtins.py:2030

1076

#: bzrlib/builtins.py:1937

1077

msgid ""

1078

" cd ~/project\n"

1079

" bzr init\n"

1082

" bzr commit -m \"imported project\""

1083

msgstr ""

1084

1085

#: bzrlib/builtins.py:2041

1085

#: bzrlib/builtins.py:1948

1086

msgid ""

1087

"Create the path leading up to the branch if it does not already exist."

1088

msgstr ""

1089

1090

#: bzrlib/builtins.py:2044

1090

#: bzrlib/builtins.py:1951

1091

msgid "Specify a format for this branch. See \"help formats\"."

1092

msgstr ""

1093

1094

#: bzrlib/builtins.py:2052

1094

#: bzrlib/builtins.py:1959

1095

msgid ""

1096

"Never change revnos or the existing log. Append revisions to it only."

1097

msgstr ""

1098

1099

#: bzrlib/builtins.py:2055

1099

#: bzrlib/builtins.py:1962

1100

msgid "Create a branch without a working tree."

1101

msgstr ""

1102

1103

#: bzrlib/builtins.py:2075 bzrlib/push.py:110

1103

#: bzrlib/builtins.py:1982 bzrlib/push.py:110

1104

#, python-format

1105

msgid ""

1106

"Parent directory of %s does not exist.\n"

1107

"You may supply --create-prefix to create all leading parent directories."

1108

msgstr ""

1109

1110

#: bzrlib/builtins.py:2109

1110

#: bzrlib/builtins.py:2016

1111

msgid ""

1112

"This branch format cannot be set to append-revisions-only. Try --default."

1113

msgstr ""

1114

1115

#: bzrlib/builtins.py:2120

1115

#: bzrlib/builtins.py:2027

1116

msgid "Created a {0} (format: {1})\n"

1117

msgstr ""

1118

1119

#: bzrlib/builtins.py:2129

1119

#: bzrlib/builtins.py:2036

1120

#, python-format

1121

msgid "Using shared repository: %s\n"

1122

msgstr ""

1123

1124

#: bzrlib/builtins.py:2133

1124

#: bzrlib/builtins.py:2040

1125

msgid "Create a shared repository for branches to share storage space."

1126

msgstr ""

1127

1128

#: bzrlib/builtins.py:2135

1128

#: bzrlib/builtins.py:2042

1129

msgid ""

1130

"New branches created under the repository directory will store their\n"

1131

"revisions in the repository, not in the branch directory. For branches\n"

1133

"speeds up the creation of new branches."

1134

msgstr ""

1135

1136

#: bzrlib/builtins.py:2140

1136

#: bzrlib/builtins.py:2047

1137

msgid ""

1138

"If the --no-trees option is given then the branches in the repository\n"

1139

"will not have working trees by default. They will still exist as \n"

1143

"branches, such as on a server."

1144

msgstr ""

1145

1146

#: bzrlib/builtins.py:2147

1146

#: bzrlib/builtins.py:2054

1147

msgid ""

1148

":Examples:\n"

1149

" Create a shared repository holding just branches::"

1150

msgstr ""

1151

1152

#: bzrlib/builtins.py:2150

1152

#: bzrlib/builtins.py:2057

1153

msgid ""

1154

" bzr init-repo --no-trees repo\n"

1155

" bzr init repo/trunk"

1156

msgstr ""

1157

1158

#: bzrlib/builtins.py:2153

1158

#: bzrlib/builtins.py:2060

1159

msgid " Make a lightweight checkout elsewhere::"

1160

msgstr ""

1161

1162

#: bzrlib/builtins.py:2155

1162

#: bzrlib/builtins.py:2062

1163

msgid ""

1164

" bzr checkout --lightweight repo/trunk trunk-checkout\n"

1165

" cd trunk-checkout\n"

1166

" (add files here)"

1167

msgstr ""

1168

1169

#: bzrlib/builtins.py:2163

1169

#: bzrlib/builtins.py:2070

1170

msgid ""

1171

"Specify a format for this repository. See \"bzr help formats\" for details."

1172

msgstr ""

1173

1174

#: bzrlib/builtins.py:2167

1174

#: bzrlib/builtins.py:2074

1175

msgid "Repository format"

1176

msgstr ""

1177

1178

#: bzrlib/builtins.py:2169

1178

#: bzrlib/builtins.py:2076

1179

msgid "Branches in the repository will default to not having a working tree."

1180

msgstr ""

1181

1182

#: bzrlib/builtins.py:2195

1182

#: bzrlib/builtins.py:2102

1183

msgid "Show differences in the working tree, between revisions or branches."

1184

msgstr ""

1185

1186

#: bzrlib/builtins.py:2197

1186

#: bzrlib/builtins.py:2104

1187

msgid ""

1188

"If no arguments are given, all changes for the current tree are listed.\n"

1189

"If files are given, only the changes in those files are listed.\n"

1193

"given."

1194

msgstr ""

1195

1196

#: bzrlib/builtins.py:2204

1196

#: bzrlib/builtins.py:2111

1197

msgid ""

1198

"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"

1199

"produces patches suitable for \"patch -p1\"."

1200

msgstr ""

1201

1202

#: bzrlib/builtins.py:2207

1202

#: bzrlib/builtins.py:2114

1203

msgid ""

1204

"Note that when using the -r argument with a range of revisions, the\n"

1205

"differences are computed between the two specified revisions. That\n"

1209

"in the range."

1210

msgstr ""

1211

1212

#: bzrlib/builtins.py:2214

1212

#: bzrlib/builtins.py:2121

1213

msgid ""

1214

":Exit values:\n"

1215

" 1 - changed\n"

1218

" 0 - no change"

1219

msgstr ""

1220

1221

#: bzrlib/builtins.py:2220

1221

#: bzrlib/builtins.py:2127

1222

msgid ""

1223

":Examples:\n"

1224

" Shows the difference in the working tree versus the last commit::"

1225

msgstr ""

1226

1227

#: bzrlib/builtins.py:2223

1227

#: bzrlib/builtins.py:2130

1228

msgid " bzr diff"

1229

msgstr ""

1230

1231

#: bzrlib/builtins.py:2225

1231

#: bzrlib/builtins.py:2132

1232

msgid " Difference between the working tree and revision 1::"

1233

msgstr ""

1234

1235

#: bzrlib/builtins.py:2227

1235

#: bzrlib/builtins.py:2134

1236

msgid " bzr diff -r1"

1237

msgstr ""

1238

1239

#: bzrlib/builtins.py:2229

1239

#: bzrlib/builtins.py:2136

1240

msgid " Difference between revision 3 and revision 1::"

1241

msgstr ""

1242

1243

#: bzrlib/builtins.py:2231

1243

#: bzrlib/builtins.py:2138

1244

msgid " bzr diff -r1..3"

1245

msgstr ""

1246

1247

#: bzrlib/builtins.py:2233

1247

#: bzrlib/builtins.py:2140

1248

msgid " Difference between revision 3 and revision 1 for branch xxx::"

1249

msgstr ""

1250

1251

#: bzrlib/builtins.py:2235

1251

#: bzrlib/builtins.py:2142

1252

msgid " bzr diff -r1..3 xxx"

1253

msgstr ""

1254

1255

#: bzrlib/builtins.py:2237

1255

#: bzrlib/builtins.py:2144

1256

msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"

1257

msgstr ""

1258

1259

#: bzrlib/builtins.py:2239

1259

#: bzrlib/builtins.py:2146

1260

msgid " bzr diff -c2"

1261

msgstr ""

1262

1263

#: bzrlib/builtins.py:2241

1263

#: bzrlib/builtins.py:2148

1264

msgid ""

1265

" To see the changes introduced by revision X::\n"

1266

" \n"

1267

" bzr diff -cX"

1268

msgstr ""

1269

1270

#: bzrlib/builtins.py:2245

1270

#: bzrlib/builtins.py:2152

1271

msgid ""

1272

" Note that in the case of a merge, the -c option shows the changes\n"

1273

" compared to the left hand parent. To see the changes against\n"

1274

" another parent, use::"

1275

msgstr ""

1276

1277

#: bzrlib/builtins.py:2249

1277

#: bzrlib/builtins.py:2156

1278

msgid " bzr diff -r<chosen_parent>..X"

1279

msgstr ""

1280

1281

#: bzrlib/builtins.py:2251

1281

#: bzrlib/builtins.py:2158

1282

msgid ""

1283

" The changes between the current revision and the previous revision\n"

1284

" (equivalent to -c-1 and -r-2..-1)"

1285

msgstr ""

1286

1287

#: bzrlib/builtins.py:2254

1287

#: bzrlib/builtins.py:2161

1288

msgid " bzr diff -r-2.."

1289

msgstr ""

1290

1291

#: bzrlib/builtins.py:2256

1291

#: bzrlib/builtins.py:2163

1292

msgid " Show just the differences for file NEWS::"

1293

msgstr ""

1294

1295

#: bzrlib/builtins.py:2258

1295

#: bzrlib/builtins.py:2165

1296

msgid " bzr diff NEWS"

1297

msgstr ""

1298

1299

#: bzrlib/builtins.py:2260

1299

#: bzrlib/builtins.py:2167

1300

msgid " Show the differences in working tree xxx for file NEWS::"

1301

msgstr ""

1302

1303

#: bzrlib/builtins.py:2262

1303

#: bzrlib/builtins.py:2169

1304

msgid " bzr diff xxx/NEWS"

1305

msgstr ""

1306

1307

#: bzrlib/builtins.py:2264

1307

#: bzrlib/builtins.py:2171

1308

msgid " Show the differences from branch xxx to this working tree:"

1309

msgstr ""

1310

1311

#: bzrlib/builtins.py:2266

1311

#: bzrlib/builtins.py:2173

1312

msgid " bzr diff --old xxx"

1313

msgstr ""

1314

1315

#: bzrlib/builtins.py:2268

1315

#: bzrlib/builtins.py:2175

1316

msgid " Show the differences between two branches for file NEWS::"

1317

msgstr ""

1318

1319

#: bzrlib/builtins.py:2270

1319

#: bzrlib/builtins.py:2177

1320

msgid " bzr diff --old xxx --new yyy NEWS"

1321

msgstr ""

1322

1323

#: bzrlib/builtins.py:2272

1323

#: bzrlib/builtins.py:2179

1324

msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"

1325

msgstr ""

1326

1327

#: bzrlib/builtins.py:2274

1327

#: bzrlib/builtins.py:2181

1328

msgid ""

1329

" bzr diff --prefix old/:new/\n"

1330

" \n"

1333

" bzr diff --using /usr/bin/diff --diff-options -wu"

1334

msgstr ""

1335

1336

#: bzrlib/builtins.py:2284

1336

#: bzrlib/builtins.py:2191

1337

msgid "Pass these options to the external diff program."

1338

msgstr ""

1339

1340

#: bzrlib/builtins.py:2287

1340

#: bzrlib/builtins.py:2194

1341

msgid ""

1342

"Set prefixes added to old and new filenames, as two values separated by a "

1343

"colon. (eg \"old/:new/\")."

1344

msgstr ""

1345

1346

#: bzrlib/builtins.py:2290

1346

#: bzrlib/builtins.py:2197

1347

msgid "Branch/tree to compare from."

1348

msgstr ""

1349

1350

#: bzrlib/builtins.py:2294

1350

#: bzrlib/builtins.py:2201

1351

msgid "Branch/tree to compare to."

1352

msgstr ""

1353

1354

#: bzrlib/builtins.py:2300

1354

#: bzrlib/builtins.py:2207

1355

msgid "Use this command to compare files."

1356

msgstr ""

1357

1358

#: bzrlib/builtins.py:2305

1358

#: bzrlib/builtins.py:2212

1359

msgid "Diff format to use."

1360

msgstr ""

1361

1362

#: bzrlib/builtins.py:2307

1362

#: bzrlib/builtins.py:2214

1363

msgid "Diff format"

1364

msgstr ""

1365

1366

#: bzrlib/builtins.py:2329

1366

#: bzrlib/builtins.py:2236

1367

msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"

1368

msgstr ""

1369

1370

#: bzrlib/builtins.py:2333

1370

#: bzrlib/builtins.py:2240

1371

msgid "bzr diff --revision takes exactly one or two revision specifiers"

1372

msgstr ""

1373

1374

#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749

1375

#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919

1374

#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656

1375

#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826

1376

msgid "{0} and {1} are mutually exclusive"

1377

msgstr ""

1378

1379

#: bzrlib/builtins.py:2358

1379

#: bzrlib/builtins.py:2265

1380

msgid ""

1381

"List files deleted in the working tree.\n"

1382

" "

1383

msgstr ""

1384

1385

#: bzrlib/builtins.py:2436

1385

#: bzrlib/builtins.py:2343

1386

msgid "Show the tree root directory."

1387

msgstr ""

1388

1389

#: bzrlib/builtins.py:2438

1389

#: bzrlib/builtins.py:2345

1390

msgid ""

1391

"The root is the nearest enclosing directory with a .bzr control\n"

1392

"directory."

1393

msgstr ""

1394

1395

#: bzrlib/builtins.py:2453

1395

#: bzrlib/builtins.py:2360

1396

msgid "The limit argument must be an integer."

1397

msgstr ""

1398

1399

#: bzrlib/builtins.py:2461

1399

#: bzrlib/builtins.py:2368

1400

msgid "The levels argument must be an integer."

1401

msgstr ""

1402

1403

#: bzrlib/builtins.py:2466

1403

#: bzrlib/builtins.py:2373

1404

msgid "Show historical log for a branch or subset of a branch."

1405

msgstr ""

1406

1407

#: bzrlib/builtins.py:2468

1407

#: bzrlib/builtins.py:2375

1408

msgid ""

1409

"log is bzr's default tool for exploring the history of a branch.\n"

1410

"The branch to use is taken from the first parameter. If no parameters\n"

1412

"Here are some simple examples::"

1413

msgstr ""

1414

1415

#: bzrlib/builtins.py:2473

1415

#: bzrlib/builtins.py:2380

1416

msgid ""

1417

" bzr log log the current branch\n"

1418

" bzr log foo.py log a file in its branch\n"

1419

" bzr log http://server/branch log a branch on a server"

1420

msgstr ""

1421

1422

#: bzrlib/builtins.py:2477

1422

#: bzrlib/builtins.py:2384

1423

msgid ""

1424

"The filtering, ordering and information shown for each revision can\n"

1425

"be controlled as explained below. By default, all revisions are\n"

1429

"were merged."

1430

msgstr ""

1431

1432

#: bzrlib/builtins.py:2484

1432

#: bzrlib/builtins.py:2391

1433

msgid ":Output control:"

1434

msgstr ""

1435

1436

#: bzrlib/builtins.py:2486

1436

#: bzrlib/builtins.py:2393

1437

msgid ""

1438

" The log format controls how information about each revision is\n"

1439

" displayed. The standard log formats are called ``long``, ``short``\n"

1441

" for more details on log formats."

1442

msgstr ""

1443

1444

#: bzrlib/builtins.py:2491

1444

#: bzrlib/builtins.py:2398

1445

msgid ""

1446

" The following options can be used to control what information is\n"

1447

" displayed::"

1448

msgstr ""

1449

1450

#: bzrlib/builtins.py:2494

1450

#: bzrlib/builtins.py:2401

1451

msgid ""

1452

" -l N display a maximum of N revisions\n"

1453

" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"

1456

" --show-ids display revision-ids (and file-ids), not just revnos"

1457

msgstr ""

1458

1459

#: bzrlib/builtins.py:2500

1459

#: bzrlib/builtins.py:2407

1460

msgid ""

1461

" Note that the default number of levels to display is a function of the\n"

1462

" log format. If the -n option is not used, the standard log formats show\n"

1463

" just the top level (mainline)."

1464

msgstr ""

1465

1466

#: bzrlib/builtins.py:2504

1466

#: bzrlib/builtins.py:2411

1467

msgid ""

1468

" Status summaries are shown using status flags like A, M, etc. To see\n"

1469

" the changes explained using words like ``added`` and ``modified``\n"

1470

" instead, use the -vv option."

1471

msgstr ""

1472

1473

#: bzrlib/builtins.py:2508

1473

#: bzrlib/builtins.py:2415

1474

msgid ":Ordering control:"

1475

msgstr ""

1476

1477

#: bzrlib/builtins.py:2510

1477

#: bzrlib/builtins.py:2417

1478

msgid ""

1479

" To display revisions from oldest to newest, use the --forward option.\n"

1480

" In most cases, using this option will have little impact on the total\n"

1482

" display revisions like --reverse does when it can."

1483

msgstr ""

1484

1485

#: bzrlib/builtins.py:2515

1485

#: bzrlib/builtins.py:2422

1486

msgid ":Revision filtering:"

1487

msgstr ""

1488

1489

#: bzrlib/builtins.py:2517

1489

#: bzrlib/builtins.py:2424

1490

msgid ""

1491

" The -r option can be used to specify what revision or range of revisions\n"

1492

" to filter against. The various forms are shown below::"

1493

msgstr ""

1494

1495

#: bzrlib/builtins.py:2520

1495

#: bzrlib/builtins.py:2427

1496

msgid ""

1497

" -rX display revision X\n"

1498

" -rX.. display revision X and later\n"

1500

" -rX..Y display from X to Y inclusive"

1501

msgstr ""

1502

1503

#: bzrlib/builtins.py:2525

1503

#: bzrlib/builtins.py:2432

1504

msgid ""

1505

" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"

1506

" Some common examples are given below::"

1507

msgstr ""

1508

1509

#: bzrlib/builtins.py:2528

1509

#: bzrlib/builtins.py:2435

1510

msgid ""

1511

" -r-1 show just the tip\n"

1512

" -r-10.. show the last 10 mainline revisions\n"

1516

" -rdate:yesterday.. show changes since yesterday"

1517

msgstr ""

1518

1519

#: bzrlib/builtins.py:2535

1519

#: bzrlib/builtins.py:2442

1520

msgid ""

1521

" When logging a range of revisions using -rX..Y, log starts at\n"

1522

" revision Y and searches back in history through the primary\n"

1526

" a nested merge revision and the log will be truncated accordingly."

1527

msgstr ""

1528

1529

#: bzrlib/builtins.py:2542

1529

#: bzrlib/builtins.py:2449

1530

msgid ":Path filtering:"

1531

msgstr ""

1532

1533

#: bzrlib/builtins.py:2544

1533

#: bzrlib/builtins.py:2451

1534

msgid ""

1535

" If parameters are given and the first one is not a branch, the log\n"

1536

" will be filtered to show only those revisions that changed the\n"

1537

" nominated files or directories."

1538

msgstr ""

1539

1540

#: bzrlib/builtins.py:2548

1540

#: bzrlib/builtins.py:2455

1541

msgid ""

1542

" Filenames are interpreted within their historical context. To log a\n"

1543

" deleted file, specify a revision range so that the file existed at\n"

1544

" the end or start of the range."

1545

msgstr ""

1546

1547

#: bzrlib/builtins.py:2552

1547

#: bzrlib/builtins.py:2459

1548

msgid ""

1549

" Historical context is also important when interpreting pathnames of\n"

1550

" renamed files/directories. Consider the following example:"

1551

msgstr ""

1552

1553

#: bzrlib/builtins.py:2555

1553

#: bzrlib/builtins.py:2462

1554

msgid ""

1555

" * revision 1: add tutorial.txt\n"

1556

" * revision 2: modify tutorial.txt\n"

1557

" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"

1558

msgstr ""

1559

1560

#: bzrlib/builtins.py:2559

1560

#: bzrlib/builtins.py:2466

1561

msgid " In this case:"

1562

msgstr ""

1563

1564

#: bzrlib/builtins.py:2561

1564

#: bzrlib/builtins.py:2468

1565

msgid " * ``bzr log guide.txt`` will log the file added in revision 1"

1566

msgstr ""

1567

1568

#: bzrlib/builtins.py:2563

1568

#: bzrlib/builtins.py:2470

1569

msgid ""

1570

" * ``bzr log tutorial.txt`` will log the new file added in revision 3"

1571

msgstr ""

1572

1573

#: bzrlib/builtins.py:2565

1573

#: bzrlib/builtins.py:2472

1574

msgid ""

1575

" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"

1576

" the original file in revision 2."

1577

msgstr ""

1578

1579

#: bzrlib/builtins.py:2568

1579

#: bzrlib/builtins.py:2475

1580

msgid ""

1581

" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"

1582

" was no file called guide.txt in revision 2."

1583

msgstr ""

1584

1585

#: bzrlib/builtins.py:2571

1585

#: bzrlib/builtins.py:2478

1586

msgid ""

1587

" Renames are always followed by log. By design, there is no need to\n"

1588

" explicitly ask for this (and no way to stop logging a file back\n"

1589

" until it was last renamed)."

1590

msgstr ""

1591

1592

#: bzrlib/builtins.py:2575

1592

#: bzrlib/builtins.py:2482

1593

msgid ":Other filtering:"

1594

msgstr ""

1595

1596

#: bzrlib/builtins.py:2577

1596

#: bzrlib/builtins.py:2484

1597

msgid ""

1598

" The --match option can be used for finding revisions that match a\n"

1599

" regular expression in a commit message, committer, author or bug.\n"

1602

" --match-message can be used to only match a specific field."

1603

msgstr ""

1604

1605

#: bzrlib/builtins.py:2583

1605

#: bzrlib/builtins.py:2490

1606

msgid ":Tips & tricks:"

1607

msgstr ""

1608

1609

#: bzrlib/builtins.py:2585

1609

#: bzrlib/builtins.py:2492

1610

msgid ""

1611

" GUI tools and IDEs are often better at exploring history than command\n"

1612

" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"

1615

" <http://wiki.bazaar.canonical.com/IDEIntegration>. "

1616

msgstr ""

1617

1618

#: bzrlib/builtins.py:2591

1618

#: bzrlib/builtins.py:2498

1619

msgid ""

1620

" You may find it useful to add the aliases below to ``bazaar.conf``::"

1621

msgstr ""

1622

1623

#: bzrlib/builtins.py:2593

1623

#: bzrlib/builtins.py:2500

1624

msgid ""

1625

" [ALIASES]\n"

1626

" tip = log -r-1\n"

1628

" show = log -v -p"

1629

msgstr ""

1630

1631

#: bzrlib/builtins.py:2598

1631

#: bzrlib/builtins.py:2505

1632

msgid ""

1633

" ``bzr tip`` will then show the latest revision while ``bzr top``\n"

1634

" will show the last 10 mainline revisions. To see the details of a\n"

1635

" particular revision X, ``bzr show -rX``."

1636

msgstr ""

1637

1638

#: bzrlib/builtins.py:2602

1638

#: bzrlib/builtins.py:2509

1639

msgid ""

1640

" If you are interested in looking deeper into a particular merge X,\n"

1641

" use ``bzr log -n0 -rX``."

1642

msgstr ""

1643

1644

#: bzrlib/builtins.py:2605

1644

#: bzrlib/builtins.py:2512

1645

msgid ""

1646

" ``bzr log -v`` on a branch with lots of history is currently\n"

1647

" very slow. A fix for this issue is currently under development.\n"

1649

" be given when using the -v option."

1650

msgstr ""

1651

1652

#: bzrlib/builtins.py:2610

1652

#: bzrlib/builtins.py:2517

1653

msgid ""

1654

" bzr has a generic full-text matching plugin, bzr-search, that can be\n"

1655

" used to find revisions matching user names, commit messages, etc.\n"

1657

" a list of words but not others."

1658

msgstr ""

1659

1660

#: bzrlib/builtins.py:2615

1660

#: bzrlib/builtins.py:2522

1661

msgid ""

1662

" When exploring non-mainline history on large projects with deep\n"

1663

" history, the performance of log can be greatly improved by installing\n"

1665

" trading disk space for faster speed."

1666

msgstr ""

1667

1668

#: bzrlib/builtins.py:2624

1668

#: bzrlib/builtins.py:2531

1669

msgid "Show from oldest to newest."

1670

msgstr ""

1671

1672

#: bzrlib/builtins.py:2627

1672

#: bzrlib/builtins.py:2534

1673

msgid "Show files changed in each revision."

1674

msgstr ""

1675

1676

#: bzrlib/builtins.py:2633

1676

#: bzrlib/builtins.py:2540

1677

msgid "Show just the specified revision. See also \"help revisionspec\"."

1678

msgstr ""

1679

1680

#: bzrlib/builtins.py:2637

1680

#: bzrlib/builtins.py:2544

1681

msgid "What names to list as authors - first, all or committer."

1682

msgstr ""

1683

1684

#: bzrlib/builtins.py:2638

1684

#: bzrlib/builtins.py:2545

1685

msgid "Authors"

1686

msgstr ""

1687

1688

#: bzrlib/builtins.py:2643

1688

#: bzrlib/builtins.py:2550

1689

msgid "Number of levels to display - 0 for all, 1 for flat."

1690

msgstr ""

1691

1692

#: bzrlib/builtins.py:2653

1692

#: bzrlib/builtins.py:2560

1693

msgid "Limit the output to the first N revisions."

1694

msgstr ""

1695

1696

#: bzrlib/builtins.py:2658

1696

#: bzrlib/builtins.py:2565

1697

msgid "Show changes made in each revision as a patch."

1698

msgstr ""

1699

1700

#: bzrlib/builtins.py:2660

1700

#: bzrlib/builtins.py:2567

1701

msgid "Show merged revisions like --levels 0 does."

1702

msgstr ""

1703

1704

#: bzrlib/builtins.py:2664

1704

#: bzrlib/builtins.py:2571

1705

msgid "Do not report commits with more than one parent."

1706

msgstr ""

1707

1708

#: bzrlib/builtins.py:2666

1708

#: bzrlib/builtins.py:2573

1709

msgid ""

1710

"Display only the revisions that are not part of both ancestries (require -"

1711

"rX..Y)."

1712

msgstr ""

1713

1714

#: bzrlib/builtins.py:2670

1714

#: bzrlib/builtins.py:2577

1715

msgid "Show digital signature validity."

1716

msgstr ""

1717

1718

#: bzrlib/builtins.py:2673

1718

#: bzrlib/builtins.py:2580

1719

msgid "Show revisions whose properties match this expression."

1720

msgstr ""

1721

1722

#: bzrlib/builtins.py:2677

1722

#: bzrlib/builtins.py:2584

1723

msgid "Show revisions whose message matches this expression."

1724

msgstr ""

1725

1726

#: bzrlib/builtins.py:2681

1726

#: bzrlib/builtins.py:2588

1727

msgid "Show revisions whose committer matches this expression."

1728

msgstr ""

1729

1730

#: bzrlib/builtins.py:2685

1730

#: bzrlib/builtins.py:2592

1731

msgid "Show revisions whose authors match this expression."

1732

msgstr ""

1733

1734

#: bzrlib/builtins.py:2689

1734

#: bzrlib/builtins.py:2596

1735

msgid "Show revisions whose bugs match this expression."

1736

msgstr ""

1737

1738

#: bzrlib/builtins.py:2743

1738

#: bzrlib/builtins.py:2650

1739

msgid "--exclude-common-ancestry requires -r with two revisions"

1740

msgstr ""

1741

1742

#: bzrlib/builtins.py:2771

1742

#: bzrlib/builtins.py:2678

1743

#, python-format

1744

msgid "Path unknown at end or start of revision range: %s"

1745

msgstr ""

1746

1747

#: bzrlib/builtins.py:2888

1747

#: bzrlib/builtins.py:2795

1748

#, python-format

1749

msgid "bzr %s doesn't accept two revisions in different branches."

1750

msgstr ""

1751

1752

#: bzrlib/builtins.py:2904

1752

#: bzrlib/builtins.py:2811

1753

#, python-format

1754

msgid "bzr %s --revision takes one or two values."

1755

msgstr ""

1756

1757

#: bzrlib/builtins.py:2949

1757

#: bzrlib/builtins.py:2856

1758

msgid ""

1759

"List files in a tree.\n"

1760

" "

1761

msgstr ""

1762

1763

#: bzrlib/builtins.py:2958

1763

#: bzrlib/builtins.py:2865

1764

msgid "Recurse into subdirectories."

1765

msgstr ""

1766

1767

#: bzrlib/builtins.py:2960

1767

#: bzrlib/builtins.py:2867

1768

msgid "Print paths relative to the root of the branch."

1769

msgstr ""

1770

1771

#: bzrlib/builtins.py:2962

1771

#: bzrlib/builtins.py:2869

1772

msgid "Print unknown files."

1773

msgstr ""

1774

1775

#: bzrlib/builtins.py:2963

1775

#: bzrlib/builtins.py:2870

1776

msgid "Print versioned files."

1777

msgstr ""

1778

1779

#: bzrlib/builtins.py:2966

1779

#: bzrlib/builtins.py:2873

1780

msgid "Print ignored files."

1781

msgstr ""

1782

1783

#: bzrlib/builtins.py:2968

1783

#: bzrlib/builtins.py:2875

1784

msgid "List entries of a particular kind: file, directory, symlink."

1785

msgstr ""

1786

1787

#: bzrlib/builtins.py:2981

1787

#: bzrlib/builtins.py:2888

1788

msgid "invalid kind specified"

1789

msgstr ""

1790

1791

#: bzrlib/builtins.py:2984

1791

#: bzrlib/builtins.py:2891

1792

msgid "Cannot set both --verbose and --null"

1793

msgstr ""

1794

1795

#: bzrlib/builtins.py:2993

1795

#: bzrlib/builtins.py:2900

1796

msgid "cannot specify both --from-root and PATH"

1797

msgstr ""

1798

1799

#: bzrlib/builtins.py:3080

1799

#: bzrlib/builtins.py:2987

1800

msgid "Ignore specified files or patterns."

1801

msgstr ""

1802

1803

#: bzrlib/builtins.py:3082

1803

#: bzrlib/builtins.py:2989

1804

msgid "See ``bzr help patterns`` for details on the syntax of patterns."

1805

msgstr ""

1806

1807

#: bzrlib/builtins.py:3084

1807

#: bzrlib/builtins.py:2991

1808

msgid ""

1809

"If a .bzrignore file does not exist, the ignore command\n"

1810

"will create one and add the specified files or patterns to the newly\n"

1813

"the use of the ignore command will require an explicit add command."

1814

msgstr ""

1815

1816

#: bzrlib/builtins.py:3090

1816

#: bzrlib/builtins.py:2997

1817

msgid ""

1818

"To remove patterns from the ignore list, edit the .bzrignore file.\n"

1819

"After adding, editing or deleting that file either indirectly by\n"

1821

"it."

1822

msgstr ""

1823

1824

#: bzrlib/builtins.py:3095

1824

#: bzrlib/builtins.py:3002

1825

msgid ""

1826

"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"

1827

"the global ignore file can be found in the application data directory as\n"

1830

"can be edited directly using an editor."

1831

msgstr ""

1832

1833

#: bzrlib/builtins.py:3101

1833

#: bzrlib/builtins.py:3008

1834

msgid ""

1835

"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"

1836

"precedence over regular ignores. Such exceptions are used to specify\n"

1837

"files that should be versioned which would otherwise be ignored."

1838

msgstr ""

1839

1840

#: bzrlib/builtins.py:3105

1840

#: bzrlib/builtins.py:3012

1841

msgid ""

1842

"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"

1843

"precedence over the '!' exception patterns."

1844

msgstr ""

1845

1846

#: bzrlib/builtins.py:3108

1846

#: bzrlib/builtins.py:3015

1847

msgid ""

1848

":Notes: \n"

1849

" \n"

1851

" the shell on Unix."

1852

msgstr ""

1853

1854

#: bzrlib/builtins.py:3113

1854

#: bzrlib/builtins.py:3020

1855

msgid ""

1856

"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"

1857

" To ignore patterns that begin with that character, use the \"RE:\" prefix."

1858

msgstr ""

1859

1860

#: bzrlib/builtins.py:3116

1860

#: bzrlib/builtins.py:3023

1861

msgid ""

1862

":Examples:\n"

1863

" Ignore the top level Makefile::"

1864

msgstr ""

1865

1866

#: bzrlib/builtins.py:3119

1866

#: bzrlib/builtins.py:3026

1867

msgid " bzr ignore ./Makefile"

1868

msgstr ""

1869

1870

#: bzrlib/builtins.py:3121

1870

#: bzrlib/builtins.py:3028

1871

msgid " Ignore .class files in all directories...::"

1872

msgstr ""

1873

1874

#: bzrlib/builtins.py:3123

1874

#: bzrlib/builtins.py:3030

1875

msgid " bzr ignore \"*.class\""

1876

msgstr ""

1877

1878

#: bzrlib/builtins.py:3125

1878

#: bzrlib/builtins.py:3032

1879

msgid " ...but do not ignore \"special.class\"::"

1880

msgstr ""

1881

1882

#: bzrlib/builtins.py:3127

1882

#: bzrlib/builtins.py:3034

1883

msgid " bzr ignore \"!special.class\""

1884

msgstr ""

1885

1886

#: bzrlib/builtins.py:3129

1886

#: bzrlib/builtins.py:3036

1887

msgid " Ignore files whose name begins with the \"#\" character::"

1888

msgstr ""

1889

1890

#: bzrlib/builtins.py:3131

1890

#: bzrlib/builtins.py:3038

1891

msgid " bzr ignore \"RE:^#\""

1892

msgstr ""

1893

1894

#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137

1894

#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044

1895

msgid " Ignore .o files under the lib directory::"

1896

msgstr ""

1897

1898

#: bzrlib/builtins.py:3135

1898

#: bzrlib/builtins.py:3042

1899

msgid " bzr ignore \"lib/**/*.o\""

1900

msgstr ""

1901

1902

#: bzrlib/builtins.py:3139

1902

#: bzrlib/builtins.py:3046

1903

msgid " bzr ignore \"RE:lib/.*\\.o\""

1904

msgstr ""

1905

1906

#: bzrlib/builtins.py:3141

1906

#: bzrlib/builtins.py:3048

1907

msgid " Ignore everything but the \"debian\" toplevel directory::"

1908

msgstr ""

1909

1910

#: bzrlib/builtins.py:3143

1910

#: bzrlib/builtins.py:3050

1911

msgid ""

1912

" bzr ignore \"RE:(?!debian/).*\"\n"

1913

" \n"

1919

" bzr ignore \"!!*~\""

1920

msgstr ""

1921

1922

#: bzrlib/builtins.py:3157

1922

#: bzrlib/builtins.py:3064

1923

msgid "Display the default ignore rules that bzr uses."

1924

msgstr ""

1925

1926

#: bzrlib/builtins.py:3169

1926

#: bzrlib/builtins.py:3076

1927

msgid "ignore requires at least one NAME_PATTERN or --default-rules."

1928

msgstr ""

1929

1930

#: bzrlib/builtins.py:3180

1930

#: bzrlib/builtins.py:3087

1931

#, python-format

1932

msgid "Invalid ignore pattern found. %s"

1933

msgid_plural "Invalid ignore patterns found. %s"

1934

msgstr[0] ""

1935

msgstr[1] ""

1936

1937

#: bzrlib/builtins.py:3189

1937

#: bzrlib/builtins.py:3096

1938

msgid "NAME_PATTERN should not be an absolute path"

1939

msgstr ""

1940

1941

#: bzrlib/builtins.py:3202

1941

#: bzrlib/builtins.py:3109

1942

#, python-format

1943

msgid ""

1944

"Warning: the following files are version controlled and match your ignore "

1948

"them.\n"

1949

msgstr ""

1950

1951

#: bzrlib/builtins.py:3209

1951

#: bzrlib/builtins.py:3116

1952

msgid "List ignored files and the patterns that matched them."

1953

msgstr ""

1954

1955

#: bzrlib/builtins.py:3211

1955

#: bzrlib/builtins.py:3118

1956

msgid ""

1957

"List all the ignored files and the ignore pattern that caused the file to\n"

1958

"be ignored."

1959

msgstr ""

1960

1961

#: bzrlib/builtins.py:3214

1961

#: bzrlib/builtins.py:3121

1962

msgid "Alternatively, to list just the files::"

1963

msgstr ""

1964

1965

#: bzrlib/builtins.py:3216

1965

#: bzrlib/builtins.py:3123

1966

msgid " bzr ls --ignored"

1967

msgstr ""

1968

1969

#: bzrlib/builtins.py:3250

1969

#: bzrlib/builtins.py:3157

1970

#, python-format

1971

msgid "not a valid revision-number: %r"

1972

msgstr ""

1973

1974

#: bzrlib/builtins.py:3257

1974

#: bzrlib/builtins.py:3164

1975

msgid ""

1976

"Export current or past revision to a destination directory or archive."

1977

msgstr ""

1978

1979

#: bzrlib/builtins.py:3259

1979

#: bzrlib/builtins.py:3166

1980

msgid "If no revision is specified this exports the last committed revision."

1981

msgstr ""

1982

1983

#: bzrlib/builtins.py:3261

1983

#: bzrlib/builtins.py:3168

1984

msgid ""

1985

"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"

1986

"given, try to find the format with the extension. If no extension\n"

1987

"is found exports to a directory (equivalent to --format=dir)."

1988

msgstr ""

1989

1990

#: bzrlib/builtins.py:3265

1990

#: bzrlib/builtins.py:3172

1991

msgid ""

1992

"If root is supplied, it will be used as the root directory inside\n"

1993

"container formats (tar, zip, etc). If it is not supplied it will default\n"

1994

"to the exported filename. The root option has no effect for 'dir' format."

1995

msgstr ""

1996

1997

#: bzrlib/builtins.py:3269

1997

#: bzrlib/builtins.py:3176

1998

msgid ""

1999

"If branch is omitted then the branch containing the current working\n"

2000

"directory will be used."

2001

msgstr ""

2002

2003

#: bzrlib/builtins.py:3272

2003

#: bzrlib/builtins.py:3179

2004

msgid ""

2005

"Note: Export of tree with non-ASCII filenames to zip is not supported."

2006

msgstr ""

2007

2008

#: bzrlib/builtins.py:3274

2008

#: bzrlib/builtins.py:3181

2009

msgid ""

2010

" ================= =========================\n"

2011

" Supported formats Autodetected by extension\n"

2018

" ================= ========================="

2019

msgstr ""

2020

2021

#: bzrlib/builtins.py:3288

2021

#: bzrlib/builtins.py:3195

2022

msgid "Type of file to export to."

2023

msgstr ""

2024

2025

#: bzrlib/builtins.py:3291

2025

#: bzrlib/builtins.py:3198

2026

msgid "Apply content filters to export the convenient form."

2027

msgstr ""

2028

2029

#: bzrlib/builtins.py:3295

2029

#: bzrlib/builtins.py:3202

2030

msgid "Name of the root directory inside the exported file."

2031

msgstr ""

2032

2033

#: bzrlib/builtins.py:3297

2033

#: bzrlib/builtins.py:3204

2034

msgid ""

2035

"Set modification time of files to that of the last revision in which it was "

2036

"changed."

2037

msgstr ""

2038

2039

#: bzrlib/builtins.py:3300

2039

#: bzrlib/builtins.py:3207

2040

msgid ""

2041

"Export the working tree contents rather than that of the last revision."

2042

msgstr ""

2043

2044

#: bzrlib/builtins.py:3319

2044

#: bzrlib/builtins.py:3226

2045

msgid "--uncommitted requires a working tree"

2046

msgstr ""

2047

2048

#: bzrlib/builtins.py:3328

2048

#: bzrlib/builtins.py:3235

2049

#, python-format

2050

msgid "Unsupported export format: %s"

2051

msgstr ""

2052

2053

#: bzrlib/builtins.py:3332

2053

#: bzrlib/builtins.py:3239

2054

msgid ""

2055

"Write the contents of a file as of a given revision to standard output."

2056

msgstr ""

2057

2058

#: bzrlib/builtins.py:3334

2058

#: bzrlib/builtins.py:3241

2059

msgid "If no revision is nominated, the last revision is used."

2060

msgstr ""

2061

2062

#: bzrlib/builtins.py:3336

2062

#: bzrlib/builtins.py:3243

2063

msgid ""

2064

"Note: Take care to redirect standard output when using this command on a\n"

2065

"binary file."

2066

msgstr ""

2067

2068

#: bzrlib/builtins.py:3342

2068

#: bzrlib/builtins.py:3249

2069

msgid "The path name in the old tree."

2070

msgstr ""

2071

2072

#: bzrlib/builtins.py:3343

2072

#: bzrlib/builtins.py:3250

2073

msgid "Apply content filters to display the convenience form."

2074

msgstr ""

2075

2076

#: bzrlib/builtins.py:3354

2076

#: bzrlib/builtins.py:3261

2077

msgid "bzr cat --revision takes exactly one revision specifier"

2078

msgstr ""

2079

2080

#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391

2080

#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298

2081

msgid "{0!r} is not present in revision {1}"

2082

msgstr ""

2083

2084

#: bzrlib/builtins.py:3414

2084

#: bzrlib/builtins.py:3321

2085

msgid "Commit changes into a new revision."

2086

msgstr ""

2087

2088

#: bzrlib/builtins.py:3416

2088

#: bzrlib/builtins.py:3323

2089

msgid ""

2090

"An explanatory message needs to be given for each commit. This is\n"

2091

"often done by using the --message option (getting the message from the\n"

2095

"boilerplate text loaded into the editor, use the --show-diff option."

2096

msgstr ""

2097

2098

#: bzrlib/builtins.py:3423

2098

#: bzrlib/builtins.py:3330

2099

msgid ""

2100

"By default, the entire tree is committed and the person doing the\n"

2101

"commit is assumed to be the author. These defaults can be overridden\n"

2102

"as explained below."

2103

msgstr ""

2104

2105

#: bzrlib/builtins.py:3427

2105

#: bzrlib/builtins.py:3334

2106

msgid ":Selective commits:"

2107

msgstr ""

2108

2109

#: bzrlib/builtins.py:3429

2109

#: bzrlib/builtins.py:3336

2110

msgid ""

2111

" If selected files are specified, only changes to those files are\n"

2112

" committed. If a directory is specified then the directory and\n"

2113

" everything within it is committed."

2114

msgstr ""

2115

2116

#: bzrlib/builtins.py:3433

2116

#: bzrlib/builtins.py:3340

2117

msgid ""

2118

" When excludes are given, they take precedence over selected files.\n"

2119

" For example, to commit only changes within foo, but not changes\n"

2120

" within foo/bar::"

2121

msgstr ""

2122

2123

#: bzrlib/builtins.py:3437

2123

#: bzrlib/builtins.py:3344

2124

msgid " bzr commit foo -x foo/bar"

2125

msgstr ""

2126

2127

#: bzrlib/builtins.py:3439

2127

#: bzrlib/builtins.py:3346

2128

msgid " A selective commit after a merge is not yet supported."

2129

msgstr ""

2130

2131

#: bzrlib/builtins.py:3441

2131

#: bzrlib/builtins.py:3348

2132

msgid ":Custom authors:"

2133

msgstr ""

2134

2135

#: bzrlib/builtins.py:3443

2135

#: bzrlib/builtins.py:3350

2136

msgid ""

2137

" If the author of the change is not the same person as the committer,\n"

2138

" you can specify the author's name using the --author option. The\n"

2142

" author."

2143

msgstr ""

2144

2145

#: bzrlib/builtins.py:3450

2145

#: bzrlib/builtins.py:3357

2146

msgid ":Checks:"

2147

msgstr ""

2148

2149

#: bzrlib/builtins.py:3452

2149

#: bzrlib/builtins.py:3359

2150

msgid ""

2151

" A common mistake is to forget to add a new file or directory before\n"

2152

" running the commit command. The --strict option checks for unknown\n"

2155

" for details."

2156

msgstr ""

2157

2158

#: bzrlib/builtins.py:3458

2158

#: bzrlib/builtins.py:3365

2159

msgid ":Things to note:"

2160

msgstr ""

2161

2162

#: bzrlib/builtins.py:3460

2162

#: bzrlib/builtins.py:3367

2163

msgid ""

2164

" If you accidentially commit the wrong changes or make a spelling\n"

2165

" mistake in the commit message say, you can use the uncommit command\n"

2166

" to undo it. See ``bzr help uncommit`` for details."

2167

msgstr ""

2168

2169

#: bzrlib/builtins.py:3464

2169

#: bzrlib/builtins.py:3371

2170

msgid ""

2171

" Hooks can also be configured to run after a commit. This allows you\n"

2172

" to trigger updates to external systems like bug trackers. The --fixes\n"

2174

" one or more bugs. See ``bzr help bugs`` for details."

2175

msgstr ""

2176

2177

#: bzrlib/builtins.py:3474

2177

#: bzrlib/builtins.py:3381

2178

msgid "Do not consider changes made to a given path."

2179

msgstr ""

2180

2181

#: bzrlib/builtins.py:3477

2181

#: bzrlib/builtins.py:3384

2182

msgid "Description of the new revision."

2183

msgstr ""

2184

2185

#: bzrlib/builtins.py:3480

2185

#: bzrlib/builtins.py:3387

2186

msgid "Commit even if nothing has changed."

2187

msgstr ""

2188

2189

#: bzrlib/builtins.py:3484

2189

#: bzrlib/builtins.py:3391

2190

msgid "Take commit message from this file."

2191

msgstr ""

2192

2193

#: bzrlib/builtins.py:3486

2193

#: bzrlib/builtins.py:3393

2194

msgid "Refuse to commit if there are unknown files in the working tree."

2195

msgstr ""

2196

2197

#: bzrlib/builtins.py:3489

2197

#: bzrlib/builtins.py:3396

2198

msgid ""

2199

"Manually set a commit time using commit date format, e.g. '2009-10-10 "

2200

"08:00:00 +0100'."

2201

msgstr ""

2202

2203

#: bzrlib/builtins.py:3492

2203

#: bzrlib/builtins.py:3399

2204

msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."

2205

msgstr ""

2206

2207

#: bzrlib/builtins.py:3495

2207

#: bzrlib/builtins.py:3402

2208

msgid "Set the author's name, if it's different from the committer."

2209

msgstr ""

2210

2211

#: bzrlib/builtins.py:3498

2211

#: bzrlib/builtins.py:3405

2212

msgid ""

2213

"Perform a local commit in a bound branch. Local commits are not pushed to "

2214

"the master branch until a normal commit is performed."

2215

msgstr ""

2216

2217

#: bzrlib/builtins.py:3504

2217

#: bzrlib/builtins.py:3411

2218

msgid ""

2219

"When no message is supplied, show the diff along with the status summary in "

2220

"the message editor."

2221

msgstr ""

2222

2223

#: bzrlib/builtins.py:3507

2223

#: bzrlib/builtins.py:3414

2224

msgid ""

2225

"When committing to a foreign version control system do not push data that "

2226

"can not be natively represented."

2227

msgstr ""

2228

2229

#: bzrlib/builtins.py:3525

2229

#: bzrlib/builtins.py:3432

2230

#, python-format

2231

msgid ""

2232

"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "

2234

"See \"bzr help bugs\" for more information on this feature. Commit refused."

2235

msgstr ""

2236

2237

#: bzrlib/builtins.py:3534

2237

#: bzrlib/builtins.py:3441

2238

#, python-format

2239

msgid ""

2240

"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "

2242

"Commit refused."

2243

msgstr ""

2244

2245

#: bzrlib/builtins.py:3543

2245

#: bzrlib/builtins.py:3450

2246

#, python-format

2247

msgid "Unrecognized bug %s. Commit refused."

2248

msgstr ""

2249

2250

#: bzrlib/builtins.py:3546

2250

#: bzrlib/builtins.py:3453

2251

#, python-format

2252

msgid ""

2253

"%s\n"

2254

"Commit refused."

2255

msgstr ""

2256

2257

#: bzrlib/builtins.py:3570

2257

#: bzrlib/builtins.py:3477

2258

msgid "Could not parse --commit-time: "

2259

msgstr ""

2260

2261

#: bzrlib/builtins.py:3610

2261

#: bzrlib/builtins.py:3517

2262

msgid "please specify either --message or --file"

2263

msgstr ""

2264

2265

#: bzrlib/builtins.py:3639

2265

#: bzrlib/builtins.py:3546

2266

msgid "please specify a commit message with either --message or --file"

2267

msgstr ""

2268

2269

#: bzrlib/builtins.py:3642

2269

#: bzrlib/builtins.py:3549

2270

msgid ""

2271

"Empty commit message specified. Please specify a commit message with either -"

2272

"-message or --file or leave a blank message with --message \"\"."

2273

msgstr ""

2274

2275

#: bzrlib/builtins.py:3662

2275

#: bzrlib/builtins.py:3569

2276

msgid ""

2277

"No changes to commit. Please 'bzr add' the files you want to commit, or use -"

2278

"-unchanged to force an empty commit."

2279

msgstr ""

2280

2281

#: bzrlib/builtins.py:3666

2281

#: bzrlib/builtins.py:3573

2282

msgid ""

2283

"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "

2284

"resolve FILE\" to resolve."

2285

msgstr ""

2286

2287

#: bzrlib/builtins.py:3670

2287

#: bzrlib/builtins.py:3577

2288

msgid "Commit refused because there are unknown files in the working tree."

2289

msgstr ""

2290

2291

#: bzrlib/builtins.py:3673

2291

#: bzrlib/builtins.py:3580

2292

msgid ""

2293

"\n"

2294

"To commit to master branch, run update and then commit.\n"

2295

"You can also pass --local to commit to continue working disconnected."

2296

msgstr ""

2297

2298

#: bzrlib/builtins.py:3681

2298

#: bzrlib/builtins.py:3588

2299

msgid ""

2300

"Validate working tree structure, branch consistency and repository history."

2301

msgstr ""

2302

2303

#: bzrlib/builtins.py:3683

2303

#: bzrlib/builtins.py:3590

2304

msgid ""

2305

"This command checks various invariants about branch and repository storage\n"

2306

"to detect data corruption or bzr bugs."

2307

msgstr ""

2308

2309

#: bzrlib/builtins.py:3686

2309

#: bzrlib/builtins.py:3593

2310

msgid ""

2311

"The working tree and branch checks will only give output if a problem is\n"

2312

"detected. The output fields of the repository check are:"

2313

msgstr ""

2314

2315

#: bzrlib/builtins.py:3689

2315

#: bzrlib/builtins.py:3596

2316

msgid ""

2317

"revisions\n"

2318

" This is just the number of revisions checked. It doesn't\n"

2319

" indicate a problem."

2320

msgstr ""

2321

2322

#: bzrlib/builtins.py:3693

2322

#: bzrlib/builtins.py:3600

2323

msgid ""

2324

"versionedfiles\n"

2325

" This is just the number of versionedfiles checked. It\n"

2326

" doesn't indicate a problem."

2327

msgstr ""

2328

2329

#: bzrlib/builtins.py:3697

2329

#: bzrlib/builtins.py:3604

2330

msgid ""

2331

"unreferenced ancestors\n"

2332

" Texts that are ancestors of other texts, but\n"

2334

" subtle problem that Bazaar can work around."

2335

msgstr ""

2336

2337

#: bzrlib/builtins.py:3702

2337

#: bzrlib/builtins.py:3609

2338

msgid ""

2339

"unique file texts\n"

2340

" This is the total number of unique file contents\n"

2341

" seen in the checked revisions. It does not indicate a problem."

2342

msgstr ""

2343

2344

#: bzrlib/builtins.py:3706

2344

#: bzrlib/builtins.py:3613

2345

msgid ""

2346

"repeated file texts\n"

2347

" This is the total number of repeated texts seen\n"

2350

" indicate a problem."

2351

msgstr ""

2352

2353

#: bzrlib/builtins.py:3712

2353

#: bzrlib/builtins.py:3619

2354

msgid ""

2355

"If no restrictions are specified, all Bazaar data that is found at the "

2356

"given\n"

2357

"location will be checked."

2358

msgstr ""

2359

2360

#: bzrlib/builtins.py:3717

2360

#: bzrlib/builtins.py:3624

2361

msgid " Check the tree and branch at 'foo'::"

2362

msgstr ""

2363

2364

#: bzrlib/builtins.py:3719

2364

#: bzrlib/builtins.py:3626

2365

msgid " bzr check --tree --branch foo"

2366

msgstr ""

2367

2368

#: bzrlib/builtins.py:3721

2368

#: bzrlib/builtins.py:3628

2369

msgid " Check only the repository at 'bar'::"

2370

msgstr ""

2371

2372

#: bzrlib/builtins.py:3723

2372

#: bzrlib/builtins.py:3630

2373

msgid " bzr check --repo bar"

2374

msgstr ""

2375

2376

#: bzrlib/builtins.py:3725

2376

#: bzrlib/builtins.py:3632

2377

msgid " Check everything at 'baz'::"

2378

msgstr ""

2379

2380

#: bzrlib/builtins.py:3727

2380

#: bzrlib/builtins.py:3634

2381

msgid " bzr check baz"

2382

msgstr ""

2383

2384

#: bzrlib/builtins.py:3733

2384

#: bzrlib/builtins.py:3640

2385

msgid "Check the branch related to the current directory."

2386

msgstr ""

2387

2388

#: bzrlib/builtins.py:3735

2388

#: bzrlib/builtins.py:3642

2389

msgid "Check the repository related to the current directory."

2390

msgstr ""

2391

2392

#: bzrlib/builtins.py:3737

2392

#: bzrlib/builtins.py:3644

2393

msgid "Check the working tree related to the current directory."

2394

msgstr ""

2395

2396

#: bzrlib/builtins.py:3751

2396

#: bzrlib/builtins.py:3658

2397

msgid "Upgrade a repository, branch or working tree to a newer format."

2398

msgstr ""

2399

2400

#: bzrlib/builtins.py:3753

2400

#: bzrlib/builtins.py:3660

2401

msgid ""

2402

"When the default format has changed after a major new release of\n"

2403

"Bazaar, you may be informed during certain operations that you\n"

2406

"with older repositories or with older versions of Bazaar."

2407

msgstr ""

2408

2409

#: bzrlib/builtins.py:3759

2409

#: bzrlib/builtins.py:3666

2410

msgid ""

2411

"If you wish to upgrade to a particular format rather than the\n"

2412

"current default, that can be specified using the --format option.\n"

2416

"2.x default) so downgrading is not always possible."

2417

msgstr ""

2418

2419

#: bzrlib/builtins.py:3766

2419

#: bzrlib/builtins.py:3673

2420

msgid ""

2421

"A backup.bzr.~#~ directory is created at the start of the conversion\n"

2422

"process (where # is a number). By default, this is left there on\n"

2427

"afterwards."

2428

msgstr ""

2429

2430

#: bzrlib/builtins.py:3774

2430

#: bzrlib/builtins.py:3681

2431

msgid ""

2432

"If the location given is a shared repository, dependent branches\n"

2433

"are also converted provided the repository converts successfully.\n"

2435

"tried."

2436

msgstr ""

2437

2438

#: bzrlib/builtins.py:3779

2438

#: bzrlib/builtins.py:3686

2439

msgid ""

2440

"For more information on upgrades, see the Bazaar Upgrade Guide,\n"

2441

"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."

2442

msgstr ""

2443

2444

#: bzrlib/builtins.py:3787

2444

#: bzrlib/builtins.py:3694

2445

msgid "Upgrade to a specific format. See \"bzr help formats\" for details."

2446

msgstr ""

2447

2448

#: bzrlib/builtins.py:3791

2448

#: bzrlib/builtins.py:3698

2449

msgid "Branch format"

2450

msgstr ""

2451

2452

#: bzrlib/builtins.py:3793

2452

#: bzrlib/builtins.py:3700

2453

msgid "Remove the backup.bzr directory if successful."

2454

msgstr ""

2455

2456

#: bzrlib/builtins.py:3795

2456

#: bzrlib/builtins.py:3702

2457

msgid "Show what would be done, but don't actually do anything."

2458

msgstr ""

2459

2460

#: bzrlib/builtins.py:3810

2460

#: bzrlib/builtins.py:3717

2461

msgid "Show or set bzr user id."

2462

msgstr ""

2463

2464

#: bzrlib/builtins.py:3812

2464

#: bzrlib/builtins.py:3719

2465

msgid ""

2466

":Examples:\n"

2467

" Show the email of the current user::"

2468

msgstr ""

2469

2470

#: bzrlib/builtins.py:3815

2470

#: bzrlib/builtins.py:3722

2471

msgid " bzr whoami --email"

2472

msgstr ""

2473

2474

#: bzrlib/builtins.py:3817

2474

#: bzrlib/builtins.py:3724

2475

msgid " Set the current user::"

2476

msgstr ""

2477

2478

#: bzrlib/builtins.py:3819

2478

#: bzrlib/builtins.py:3726

2479

msgid " bzr whoami \"Frank Chu <fchu@example.com>\""

2480

msgstr ""

2481

2482

#: bzrlib/builtins.py:3823

2482

#: bzrlib/builtins.py:3730

2483

msgid "Display email address only."

2484

msgstr ""

2485

2486

#: bzrlib/builtins.py:3825

2486

#: bzrlib/builtins.py:3732

2487

msgid "Set identity for the current branch instead of globally."

2488

msgstr ""

2489

2490

#: bzrlib/builtins.py:3851

2490

#: bzrlib/builtins.py:3758

2491

msgid "--email can only be used to display existing identity"

2492

msgstr ""

2493

2494

#: bzrlib/builtins.py:3873

2494

#: bzrlib/builtins.py:3780

2495

msgid "Print or set the branch nickname."

2496

msgstr ""

2497

2498

#: bzrlib/builtins.py:3875

2498

#: bzrlib/builtins.py:3782

2499

msgid ""

2500

"If unset, the tree root directory name is used as the nickname.\n"

2501

"To print the current nickname, execute with no argument."

2502

msgstr ""

2503

2504

#: bzrlib/builtins.py:3878

2504

#: bzrlib/builtins.py:3785

2505

msgid ""

2506

"Bound branches use the nickname of its master branch unless it is set\n"

2507

"locally."

2508

msgstr ""

2509

2510

#: bzrlib/builtins.py:3898

2510

#: bzrlib/builtins.py:3805

2511

msgid "Set/unset and display aliases."

2512

msgstr ""

2513

2514

#: bzrlib/builtins.py:3900

2514

#: bzrlib/builtins.py:3807

2515

msgid ""

2516

":Examples:\n"

2517

" Show the current aliases::"

2518

msgstr ""

2519

2520

#: bzrlib/builtins.py:3903

2520

#: bzrlib/builtins.py:3810

2521

msgid " bzr alias"

2522

msgstr ""

2523

2524

#: bzrlib/builtins.py:3905

2524

#: bzrlib/builtins.py:3812

2525

msgid " Show the alias specified for 'll'::"

2526

msgstr ""

2527

2528

#: bzrlib/builtins.py:3907

2528

#: bzrlib/builtins.py:3814

2529

msgid " bzr alias ll"

2530

msgstr ""

2531

2532

#: bzrlib/builtins.py:3909

2532

#: bzrlib/builtins.py:3816

2533

msgid " Set an alias for 'll'::"

2534

msgstr ""

2535

2536

#: bzrlib/builtins.py:3911

2536

#: bzrlib/builtins.py:3818

2537

msgid " bzr alias ll=\"log --line -r-10..-1\""

2538

msgstr ""

2539

2540

#: bzrlib/builtins.py:3913

2540

#: bzrlib/builtins.py:3820

2541

msgid " To remove an alias for 'll'::"

2542

msgstr ""

2543

2544

#: bzrlib/builtins.py:3915

2544

#: bzrlib/builtins.py:3822

2545

msgid " bzr alias --remove ll"

2546

msgstr ""

2547

2548

#: bzrlib/builtins.py:3920

2548

#: bzrlib/builtins.py:3827

2549

msgid "Remove the alias."

2550

msgstr ""

2551

2552

#: bzrlib/builtins.py:3938

2552

#: bzrlib/builtins.py:3845

2553

msgid "bzr alias --remove expects an alias to remove."

2554

msgstr ""

2555

2556

#: bzrlib/builtins.py:4119

2556

#: bzrlib/builtins.py:4026

2557

msgid ""

2558

"subunit not available. subunit needs to be installed to use --subunit."

2559

msgstr ""

2560

2561

#: bzrlib/builtins.py:4136

2561

#: bzrlib/builtins.py:4043

2562

msgid ""

2563

"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"

2564

msgstr ""

2565

2566

#: bzrlib/builtins.py:4183

2566

#: bzrlib/builtins.py:4090

2567

msgid "Show version of bzr."

2568

msgstr ""

2569

2570

#: bzrlib/builtins.py:4187

2570

#: bzrlib/builtins.py:4094

2571

msgid "Print just the version number."

2572

msgstr ""

2573

2574

#: bzrlib/builtins.py:4206

2574

#: bzrlib/builtins.py:4113

2575

msgid "It sure does!\n"

2576

msgstr ""

2577

2578

#: bzrlib/builtins.py:4230

2578

#: bzrlib/builtins.py:4137

2579

#, python-format

2580

msgid "merge base is revision %s\n"

2581

msgstr ""

2582

2583

#: bzrlib/builtins.py:4234

2583

#: bzrlib/builtins.py:4141

2584

msgid "Perform a three-way merge."

2585

msgstr ""

2586

2587

#: bzrlib/builtins.py:4236

2587

#: bzrlib/builtins.py:4143

2588

msgid ""

2589

"The source of the merge can be specified either in the form of a branch,\n"

2590

"or in the form of a path to a file containing a merge directive generated\n"

2595

"the current working tree."

2596

msgstr ""

2597

2598

#: bzrlib/builtins.py:4244

2598

#: bzrlib/builtins.py:4151

2599

msgid ""

2600

"When merging from a branch, by default bzr will try to merge in all new\n"

2601

"work from the other branch, automatically determining an appropriate base\n"

2602

"revision. If this fails, you may need to give an explicit base."

2603

msgstr ""

2604

2605

#: bzrlib/builtins.py:4248

2605

#: bzrlib/builtins.py:4155

2606

msgid ""

2607

"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"

2608

"try to merge in all new work up to and including revision OTHER."

2609

msgstr ""

2610

2611

#: bzrlib/builtins.py:4251

2611

#: bzrlib/builtins.py:4158

2612

msgid ""

2613

"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"

2614

"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"

2619

"changes from the other branch is not stored in the commit."

2620

msgstr ""

2621

2622

#: bzrlib/builtins.py:4259

2622

#: bzrlib/builtins.py:4166

2623

msgid "Revision numbers are always relative to the source branch."

2624

msgstr ""

2625

2626

#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106

2626

#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106

2627

msgid ""

2628

"Merge will do its best to combine the changes in two branches, but there\n"

2629

"are some kinds of problems only a human can fix. When it encounters those,\n"

2630

"it will mark a conflict. A conflict means that you need to fix something,\n"

2631

"before you can commit."

2631

"before you should commit."

2632

msgstr ""

2633

2634

#: bzrlib/builtins.py:4266

2634

#: bzrlib/builtins.py:4173

2635

msgid ""

2636

"Use bzr resolve when you have fixed a problem. See also bzr conflicts."

2637

msgstr ""

2638

2639

#: bzrlib/builtins.py:4268

2639

#: bzrlib/builtins.py:4175

2640

msgid ""

2641

"If there is no default branch set, the first merge will set it (use\n"

2642

"--no-remember to avoid setting it). After that, you can omit the branch\n"

2644

"only be saved if the remote location can be accessed."

2645

msgstr ""

2646

2647

#: bzrlib/builtins.py:4273

2647

#: bzrlib/builtins.py:4180

2648

msgid ""

2649

"The results of the merge are placed into the destination working\n"

2650

"directory, where they can be reviewed (with bzr diff), tested, and then\n"

2651

"committed to record the result of the merge."

2652

msgstr ""

2653

2654

#: bzrlib/builtins.py:4277

2654

#: bzrlib/builtins.py:4184

2655

msgid ""

2656

"merge refuses to run if there are any uncommitted changes, unless\n"

2657

"--force is given. If --force is given, then the changes from the source \n"

2660

"merge revision which has more than two parents."

2661

msgstr ""

2662

2663

#: bzrlib/builtins.py:4283

2663

#: bzrlib/builtins.py:4190

2664

msgid ""

2665

"If one would like to merge changes from the working tree of the other\n"

2666

"branch without merging any committed revisions, the --uncommitted option\n"

2667

"can be given."

2668

msgstr ""

2669

2670

#: bzrlib/builtins.py:4287

2670

#: bzrlib/builtins.py:4194

2671

msgid ""

2672

"To select only some changes to merge, use \"merge -i\", which will prompt\n"

2673

"you to apply each diff hunk and file change, similar to \"shelve\"."

2674

msgstr ""

2675

2676

#: bzrlib/builtins.py:4290

2676

#: bzrlib/builtins.py:4197

2677

msgid ""

2678

":Examples:\n"

2679

" To merge all new revisions from bzr.dev::"

2680

msgstr ""

2681

2682

#: bzrlib/builtins.py:4293

2682

#: bzrlib/builtins.py:4200

2683

msgid " bzr merge ../bzr.dev"

2684

msgstr ""

2685

2686

#: bzrlib/builtins.py:4295

2686

#: bzrlib/builtins.py:4202

2687

msgid " To merge changes up to and including revision 82 from bzr.dev::"

2688

msgstr ""

2689

2690

#: bzrlib/builtins.py:4297

2690

#: bzrlib/builtins.py:4204

2691

msgid " bzr merge -r 82 ../bzr.dev"

2692

msgstr ""

2693

2694

#: bzrlib/builtins.py:4299

2694

#: bzrlib/builtins.py:4206

2695

msgid " To merge the changes introduced by 82, without previous changes::"

2696

msgstr ""

2697

2698

#: bzrlib/builtins.py:4301

2698

#: bzrlib/builtins.py:4208

2699

msgid " bzr merge -r 81..82 ../bzr.dev"

2700

msgstr ""

2701

2702

#: bzrlib/builtins.py:4303

2702

#: bzrlib/builtins.py:4210

2703

msgid " To apply a merge directive contained in /tmp/merge::"

2704

msgstr ""

2705

2706

#: bzrlib/builtins.py:4305

2706

#: bzrlib/builtins.py:4212

2707

msgid " bzr merge /tmp/merge"

2708

msgstr ""

2709

2710

#: bzrlib/builtins.py:4307

2710

#: bzrlib/builtins.py:4214

2711

msgid ""

2712

" To create a merge revision with three parents from two branches\n"

2713

" feature1a and feature1b:"

2714

msgstr ""

2715

2716

#: bzrlib/builtins.py:4310

2716

#: bzrlib/builtins.py:4217

2717

msgid ""

2718

" bzr merge ../feature1a\n"

2719

" bzr merge ../feature1b --force\n"

2720

" bzr commit -m 'revision with three parents'"

2721

msgstr ""

2722

2723

#: bzrlib/builtins.py:4322

2723

#: bzrlib/builtins.py:4229

2724

msgid "Merge even if the destination tree has uncommitted changes."

2725

msgstr ""

2726

2727

#: bzrlib/builtins.py:4328

2727

#: bzrlib/builtins.py:4235

2728

msgid ""

2729

"Apply uncommitted changes from a working copy, instead of branch changes."

2730

msgstr ""

2731

2732

#: bzrlib/builtins.py:4330

2732

#: bzrlib/builtins.py:4237

2733

msgid ""

2734

"If the destination is already completely merged into the source, pull from "

2735

"the source rather than merging. When this happens, you do not need to "

2736

"commit the result."

2737

msgstr ""

2738

2739

#: bzrlib/builtins.py:4335

2739

#: bzrlib/builtins.py:4242

2740

msgid ""

2741

"Branch to merge into, rather than the one containing the working directory."

2742

msgstr ""

2743

2744

#: bzrlib/builtins.py:4337

2744

#: bzrlib/builtins.py:4244

2745

msgid "Instead of merging, show a diff of the merge."

2746

msgstr ""

2747

2748

#: bzrlib/builtins.py:4339

2748

#: bzrlib/builtins.py:4246

2749

msgid "Select changes interactively."

2750

msgstr ""

2751

2752

#: bzrlib/builtins.py:4361

2752

#: bzrlib/builtins.py:4268

2753

msgid ""

2754

"Merging into empty branches not currently supported, "

2755

"https://bugs.launchpad.net/bzr/+bug/308562"

2756

msgstr ""

2757

2758

#: bzrlib/builtins.py:4388

2758

#: bzrlib/builtins.py:4295

2759

msgid "Cannot use --uncommitted with bundles or merge directives."

2760

msgstr ""

2761

2762

#: bzrlib/builtins.py:4399

2762

#: bzrlib/builtins.py:4306

2763

msgid "Cannot use --uncommitted and --revision at the same time."

2764

msgstr ""

2765

2766

#: bzrlib/builtins.py:4419

2766

#: bzrlib/builtins.py:4326

2767

msgid "merger: "

2768

msgstr ""

2769

2770

#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71

2770

#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71

2771

msgid "Nothing to do."

2772

msgstr ""

2773

2774

#: bzrlib/builtins.py:4425

2774

#: bzrlib/builtins.py:4332

2775

msgid "Cannot pull individual files"

2776

msgstr ""

2777

2778

#: bzrlib/builtins.py:4433

2778

#: bzrlib/builtins.py:4340

2779

msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"

2780

msgstr ""

2781

2782

#: bzrlib/builtins.py:4491

2782

#: bzrlib/builtins.py:4398

2783

#, python-format

2784

msgid "Show-base is not supported for this merge type. %s"

2785

msgstr ""

2786

2787

#: bzrlib/builtins.py:4500

2787

#: bzrlib/builtins.py:4407

2788

#, python-format

2789

msgid "Conflict reduction is not supported for merge type %s."

2790

msgstr ""

2791

2792

#: bzrlib/builtins.py:4504

2792

#: bzrlib/builtins.py:4411

2793

msgid "Cannot do conflict reduction and show base."

2794

msgstr ""

2795

2796

#: bzrlib/builtins.py:4615

2796

#: bzrlib/builtins.py:4522

2797

msgid "No location specified or remembered"

2798

msgstr ""

2799

2800

#: bzrlib/builtins.py:4617

2800

#: bzrlib/builtins.py:4524

2801

msgid "{0} remembered {1} location {2}"

2802

msgstr ""

2803

2804

#: bzrlib/builtins.py:4623

2804

#: bzrlib/builtins.py:4530

2805

msgid "Redo a merge."

2806

msgstr ""

2807

2808

#: bzrlib/builtins.py:4625

2808

#: bzrlib/builtins.py:4532

2809

msgid ""

2810

"Use this if you want to try a different merge technique while resolving\n"

2811

"conflicts. Some merge techniques are better than others, and remerge\n"

2812

"lets you try different ones on different files."

2813

msgstr ""

2814

2815

#: bzrlib/builtins.py:4629

2815

#: bzrlib/builtins.py:4536

2816

msgid ""

2817

"The options for remerge have the same meaning and defaults as the ones for\n"

2818

"merge. The difference is that remerge can (only) be run when there is a\n"

2819

"pending merge, and it lets you specify particular files."

2820

msgstr ""

2821

2822

#: bzrlib/builtins.py:4633

2822

#: bzrlib/builtins.py:4540

2823

msgid ""

2824

":Examples:\n"

2825

" Re-do the merge of all conflicted files, and show the base text in\n"

2826

" conflict regions, in addition to the usual THIS and OTHER texts::"

2827

msgstr ""

2828

2829

#: bzrlib/builtins.py:4637

2829

#: bzrlib/builtins.py:4544

2830

msgid " bzr remerge --show-base"

2831

msgstr ""

2832

2833

#: bzrlib/builtins.py:4639

2833

#: bzrlib/builtins.py:4546

2834

msgid ""

2835

" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"

2836

" additional processing to reduce the size of conflict regions::"

2837

msgstr ""

2838

2839

#: bzrlib/builtins.py:4642

2839

#: bzrlib/builtins.py:4549

2840

msgid " bzr remerge --merge-type weave --reprocess foobar"

2841

msgstr ""

2842

2843

#: bzrlib/builtins.py:4649

2843

#: bzrlib/builtins.py:4556

2844

msgid "Show base revision text in conflicts."

2845

msgstr ""

2846

2847

#: bzrlib/builtins.py:4661

2847

#: bzrlib/builtins.py:4568

2848

msgid ""

2849

"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"

2850

"merges."

2851

msgstr ""

2852

2853

#: bzrlib/builtins.py:4717

2853

#: bzrlib/builtins.py:4624

2854

msgid "Revert files to a previous revision."

2855

msgstr ""

2856

2857

#: bzrlib/builtins.py:4719

2857

#: bzrlib/builtins.py:4626

2858

msgid ""

2859

"Giving a list of files will revert only those files. Otherwise, all files\n"

2860

"will be reverted. If the revision is not specified with '--revision', the\n"

2861

"last committed revision is used."

2862

msgstr ""

2863

2864

#: bzrlib/builtins.py:4723

2864

#: bzrlib/builtins.py:4630

2865

msgid ""

2866

"To remove only some changes, without reverting to a prior version, use\n"

2867

"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"

2870

"certain changes on a hunk-by-hunk basis, see the shelve command."

2871

msgstr ""

2872

2873

#: bzrlib/builtins.py:4729

2873

#: bzrlib/builtins.py:4636

2874

msgid ""

2875

"By default, any files that have been manually changed will be backed up\n"

2876

"first. (Files changed only by merge are not backed up.) Backup files have\n"

2877

"'.~#~' appended to their name, where # is a number."

2878

msgstr ""

2879

2880

#: bzrlib/builtins.py:4733

2880

#: bzrlib/builtins.py:4640

2881

msgid ""

2882

"When you provide files, you can use their current pathname or the pathname\n"

2883

"from the target revision. So you can use revert to \"undelete\" a file by\n"

2885

"reverted."

2886

msgstr ""

2887

2888

#: bzrlib/builtins.py:4738

2888

#: bzrlib/builtins.py:4645

2889

msgid ""

2890

"If you have newly added files since the target revision, they will be\n"

2891

"removed. If the files to be removed have been changed, backups will be\n"

2893

"deleted."

2894

msgstr ""

2895

2896

#: bzrlib/builtins.py:4743

2896

#: bzrlib/builtins.py:4650

2897

msgid ""

2898

"The working tree contains a list of revisions that have been merged but\n"

2899

"not yet committed. These revisions will be included as additional parents\n"

2905

"reverting any files."

2906

msgstr ""

2907

2908

#: bzrlib/builtins.py:4752

2908

#: bzrlib/builtins.py:4659

2909

msgid ""

2910

"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"

2911

"changes from a branch in a single revision. To do this, perform the merge\n"

2919

"target branches."

2920

msgstr ""

2921

2922

#: bzrlib/builtins.py:4766

2922

#: bzrlib/builtins.py:4673

2923

msgid "Do not save backups of reverted files."

2924

msgstr ""

2925

2926

#: bzrlib/builtins.py:4768

2926

#: bzrlib/builtins.py:4675

2927

msgid "Remove pending merge marker, without changing any files."

2928

msgstr ""

2929

2930

#: bzrlib/builtins.py:4799

2930

#: bzrlib/builtins.py:4706

2931

msgid ""

2932

"Show help on a command or other topic.\n"

2933

" "

2934

msgstr ""

2935

2936

#: bzrlib/builtins.py:4804

2936

#: bzrlib/builtins.py:4711

2937

msgid "Show help on all commands."

2938

msgstr ""

2939

2940

#: bzrlib/builtins.py:4833

2940

#: bzrlib/builtins.py:4740

2941

msgid "Show unmerged/unpulled revisions between two branches."

2942

msgstr ""

2943

2944

#: bzrlib/builtins.py:4835

2944

#: bzrlib/builtins.py:4742

2945

msgid "OTHER_BRANCH may be local or remote."

2946

msgstr ""

2947

2948

#: bzrlib/builtins.py:4837

2948

#: bzrlib/builtins.py:4744

2949

msgid ""

2950

"To filter on a range of revisions, you can use the command -r begin..end\n"

2951

"-r revision requests a specific revision, -r ..end or -r begin.. are\n"

2956

" 0 - no missing revisions"

2957

msgstr ""

2958

2959

#: bzrlib/builtins.py:4847

2959

#: bzrlib/builtins.py:4754

2960

msgid ""

2961

" Determine the missing revisions between this and the branch at the\n"

2962

" remembered pull location::"

2963

msgstr ""

2964

2965

#: bzrlib/builtins.py:4850

2965

#: bzrlib/builtins.py:4757

2966

msgid " bzr missing"

2967

msgstr ""

2968

2969

#: bzrlib/builtins.py:4852

2969

#: bzrlib/builtins.py:4759

2970

msgid " Determine the missing revisions between this and another branch::"

2971

msgstr ""

2972

2973

#: bzrlib/builtins.py:4854

2973

#: bzrlib/builtins.py:4761

2974

msgid " bzr missing http://server/branch"

2975

msgstr ""

2976

2977

#: bzrlib/builtins.py:4856

2977

#: bzrlib/builtins.py:4763

2978

msgid ""

2979

" Determine the missing revisions up to a specific revision on the other\n"

2980

" branch::"

2981

msgstr ""

2982

2983

#: bzrlib/builtins.py:4859

2983

#: bzrlib/builtins.py:4766

2984

msgid " bzr missing -r ..-10"

2985

msgstr ""

2986

2987

#: bzrlib/builtins.py:4861

2987

#: bzrlib/builtins.py:4768

2988

msgid ""

2989

" Determine the missing revisions up to a specific revision on this\n"

2990

" branch::"

2991

msgstr ""

2992

2993

#: bzrlib/builtins.py:4864

2993

#: bzrlib/builtins.py:4771

2994

msgid " bzr missing --my-revision ..-10"

2995

msgstr ""

2996

2997

#: bzrlib/builtins.py:4871

2997

#: bzrlib/builtins.py:4778

2998

msgid "Reverse the order of revisions."

2999

msgstr ""

3000

3001

#: bzrlib/builtins.py:4873

3001

#: bzrlib/builtins.py:4780

3002

msgid "Display changes in the local branch only."

3003

msgstr ""

3004

3005

#: bzrlib/builtins.py:4874

3005

#: bzrlib/builtins.py:4781

3006

msgid "Same as --mine-only."

3007

msgstr ""

3008

3009

#: bzrlib/builtins.py:4876

3009

#: bzrlib/builtins.py:4783

3010

msgid "Display changes in the remote branch only."

3011

msgstr ""

3012

3013

#: bzrlib/builtins.py:4877

3013

#: bzrlib/builtins.py:4784

3014

msgid "Same as --theirs-only."

3015

msgstr ""

3016

3017

#: bzrlib/builtins.py:4882

3017

#: bzrlib/builtins.py:4789

3018

msgid ""

3019

"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "

3020

"details."

3021

msgstr ""

3022

3023

#: bzrlib/builtins.py:4886

3023

#: bzrlib/builtins.py:4793

3024

msgid ""

3025

"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "

3026

"details."

3027

msgstr ""

3028

3029

#: bzrlib/builtins.py:4889

3029

#: bzrlib/builtins.py:4796

3030

msgid "Show all revisions in addition to the mainline ones."

3031

msgstr ""

3032

3033

#: bzrlib/builtins.py:4943

3033

#: bzrlib/builtins.py:4850

3034

msgid "No peer location known or specified."

3035

msgstr ""

3036

3037

#: bzrlib/builtins.py:4947

3037

#: bzrlib/builtins.py:4854

3038

msgid "Using saved parent location: {0}\n"

3039

msgstr ""

3040

3041

#: bzrlib/builtins.py:4980

3041

#: bzrlib/builtins.py:4887

3042

#, python-format

3043

msgid "You have %d extra revision:\n"

3044

msgid_plural "You have %d extra revisions:\n"

3045

msgstr[0] ""

3046

msgstr[1] ""

3047

3048

#: bzrlib/builtins.py:4996

3048

#: bzrlib/builtins.py:4903

3049

#, python-format

3050

msgid "You are missing %d revision:\n"

3051

msgid_plural "You are missing %d revisions:\n"

3052

msgstr[0] ""

3053

msgstr[1] ""

3054

3055

#: bzrlib/builtins.py:5008

3055

#: bzrlib/builtins.py:4915

3056

msgid "This branch has no new revisions.\n"

3057

msgstr ""

3058

3059

#: bzrlib/builtins.py:5011

3059

#: bzrlib/builtins.py:4918

3060

msgid "Other branch has no new revisions.\n"

3061

msgstr ""

3062

3063

#: bzrlib/builtins.py:5016

3063

#: bzrlib/builtins.py:4923

3064

msgid "Branches are up to date.\n"

3065

msgstr ""

3066

3067

#: bzrlib/builtins.py:5027

3067

#: bzrlib/builtins.py:4934

3068

msgid "Compress the data within a repository."

3069

msgstr ""

3070

3071

#: bzrlib/builtins.py:5029

3071

#: bzrlib/builtins.py:4936

3072

msgid ""

3073

"This operation compresses the data within a bazaar repository. As\n"

3074

"bazaar supports automatic packing of repository, this operation is\n"

3075

"normally not required to be done manually."

3076

msgstr ""

3077

3078

#: bzrlib/builtins.py:5033

3078

#: bzrlib/builtins.py:4940

3079

msgid ""

3080

"During the pack operation, bazaar takes a backup of existing repository\n"

3081

"data, i.e. pack files. This backup is eventually removed by bazaar\n"

3084

"used."

3085

msgstr ""

3086

3087

#: bzrlib/builtins.py:5039

3087

#: bzrlib/builtins.py:4946

3088

msgid ""

3089

"Warning: If you use --clean-obsolete-packs and your machine crashes\n"

3090

"during or immediately after repacking, you may be left with a state\n"

3092

"been. In this case the repository may be unusable."

3093

msgstr ""

3094

3095

#: bzrlib/builtins.py:5048

3095

#: bzrlib/builtins.py:4955

3096

msgid "Delete obsolete packs to save disk space."

3097

msgstr ""

3098

3099

#: bzrlib/builtins.py:5062

3099

#: bzrlib/builtins.py:4969

3100

msgid "List the installed plugins."

3101

msgstr ""

3102

3103

#: bzrlib/builtins.py:5064

3103

#: bzrlib/builtins.py:4971

3104

msgid ""

3105

"This command displays the list of installed plugins including\n"

3106

"version of plugin and a short description of each."

3107

msgstr ""

3108

3109

#: bzrlib/builtins.py:5067

3109

#: bzrlib/builtins.py:4974

3110

msgid "--verbose shows the path where each plugin is located."

3111

msgstr ""

3112

3113

#: bzrlib/builtins.py:5069

3113

#: bzrlib/builtins.py:4976

3114

msgid ""

3115

"A plugin is an external component for Bazaar that extends the\n"

3116

"revision control system, by adding or replacing code in Bazaar.\n"

3119

"customizing log output."

3120

msgstr ""

3121

3122

#: bzrlib/builtins.py:5075

3122

#: bzrlib/builtins.py:4982

3123

msgid ""

3124

"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"

3125

"for further information on plugins including where to find them and how to\n"

3127

"plugins using the Python programming language."

3128

msgstr ""

3129

3130

#: bzrlib/builtins.py:5091

3130

#: bzrlib/builtins.py:4998

3131

msgid "Show testament (signing-form) of a revision."

3132

msgstr ""

3133

3134

#: bzrlib/builtins.py:5094

3134

#: bzrlib/builtins.py:5001

3135

msgid "Produce long-format testament."

3136

msgstr ""

3137

3138

#: bzrlib/builtins.py:5096

3138

#: bzrlib/builtins.py:5003

3139

msgid "Produce a strict-format testament."

3140

msgstr ""

3141

3142

#: bzrlib/builtins.py:5122

3142

#: bzrlib/builtins.py:5029

3143

msgid "Show the origin of each line in a file."

3144

msgstr ""

3145

3146

#: bzrlib/builtins.py:5124

3146

#: bzrlib/builtins.py:5031

3147

msgid ""

3148

"This prints out the given file with an annotation on the left side\n"

3149

"indicating which revision, author and date introduced the change."

3150

msgstr ""

3151

3152

#: bzrlib/builtins.py:5127

3152

#: bzrlib/builtins.py:5034

3153

msgid ""

3154

"If the origin is the same for a run of consecutive lines, it is\n"

3155

"shown only at the top, unless the --all option is given."

3156

msgstr ""

3157

3158

#: bzrlib/builtins.py:5135

3158

#: bzrlib/builtins.py:5042

3159

msgid "Show annotations on all lines."

3160

msgstr ""

3161

3162

#: bzrlib/builtins.py:5136

3162

#: bzrlib/builtins.py:5043

3163

msgid "Show commit date in annotations."

3164

msgstr ""

3165

3166

#: bzrlib/builtins.py:5223

3166

#: bzrlib/builtins.py:5130

3167

msgid "Cannot sign a range of non-revision-history revisions"

3168

msgstr ""

3169

3170

#: bzrlib/builtins.py:5235

3170

#: bzrlib/builtins.py:5142

3171

msgid "Please supply either one revision, or a range."

3172

msgstr ""

3173

3174

#: bzrlib/builtins.py:5239

3174

#: bzrlib/builtins.py:5146

3175

msgid ""

3176

"Convert the current branch into a checkout of the supplied branch.\n"

3177

"If no branch is supplied, rebind to the last bound location."

3178

msgstr ""

3179

3180

#: bzrlib/builtins.py:5242

3180

#: bzrlib/builtins.py:5149

3181

msgid ""

3182

"Once converted into a checkout, commits must succeed on the master branch\n"

3183

"before they will be applied to the local branch."

3184

msgstr ""

3185

3186

#: bzrlib/builtins.py:5245

3186

#: bzrlib/builtins.py:5152

3187

msgid ""

3188

"Bound branches use the nickname of its master branch unless it is set\n"

3189

"locally, in which case binding will update the local nickname to be\n"

3190

"that of the master."

3191

msgstr ""

3192

3193

#: bzrlib/builtins.py:5260

3193

#: bzrlib/builtins.py:5167

3194

msgid "No location supplied. This format does not remember old locations."

3195

msgstr ""

3196

3197

#: bzrlib/builtins.py:5265

3197

#: bzrlib/builtins.py:5172

3198

msgid "Branch is already bound"

3199

msgstr ""

3200

3201

#: bzrlib/builtins.py:5267

3201

#: bzrlib/builtins.py:5174

3202

msgid "No location supplied and no previous location known"

3203

msgstr ""

3204

3205

#: bzrlib/builtins.py:5273

3205

#: bzrlib/builtins.py:5180

3206

msgid "These branches have diverged. Try merging, and then bind again."

3207

msgstr ""

3208

3209

#: bzrlib/builtins.py:5280

3209

#: bzrlib/builtins.py:5187

3210

msgid "Convert the current checkout into a regular branch."

3211

msgstr ""

3212

3213

#: bzrlib/builtins.py:5282

3213

#: bzrlib/builtins.py:5189

3214

msgid ""

3215

"After unbinding, the local branch is considered independent and subsequent\n"

3216

"commits will be local only."

3217

msgstr ""

3218

3219

#: bzrlib/builtins.py:5293

3219

#: bzrlib/builtins.py:5200

3220

msgid "Local branch is not bound"

3221

msgstr ""

3222

3223

#: bzrlib/builtins.py:5297

3223

#: bzrlib/builtins.py:5204

3224

msgid "Remove the last committed revision."

3225

msgstr ""

3226

3227

#: bzrlib/builtins.py:5299

3227

#: bzrlib/builtins.py:5206

3228

msgid ""

3229

"--verbose will print out what is being removed.\n"

3230

"--dry-run will go through all the motions, but not actually\n"

3231

"remove anything."

3232

msgstr ""

3233

3234

#: bzrlib/builtins.py:5303

3234

#: bzrlib/builtins.py:5210

3235

msgid ""

3236

"If --revision is specified, uncommit revisions to leave the branch at the\n"

3237

"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"

3238

"branch at revision 15."

3239

msgstr ""

3240

3241

#: bzrlib/builtins.py:5307

3241

#: bzrlib/builtins.py:5214

3242

msgid ""

3243

"Uncommit leaves the working tree ready for a new commit. The only change\n"

3244

"it may make is to restore any pending merges that were present before\n"

3245

"the commit."

3246

msgstr ""

3247

3248

#: bzrlib/builtins.py:5318

3248

#: bzrlib/builtins.py:5225

3249

msgid "Don't actually make changes."

3250

msgstr ""

3251

3252

#: bzrlib/builtins.py:5319

3252

#: bzrlib/builtins.py:5226

3253

msgid "Say yes to all questions."

3254

msgstr ""

3255

3256

#: bzrlib/builtins.py:5321

3256

#: bzrlib/builtins.py:5228

3257

msgid "Keep tags that point to removed revisions."

3258

msgstr ""

3259

3260

#: bzrlib/builtins.py:5323

3260

#: bzrlib/builtins.py:5230

3261

msgid "Only remove the commits from the local branch when in a checkout."

3262

msgstr ""

3263

3264

#: bzrlib/builtins.py:5372

3264

#: bzrlib/builtins.py:5279

3265

msgid "No revisions to uncommit.\n"

3266

msgstr ""

3267

3268

#: bzrlib/builtins.py:5387

3268

#: bzrlib/builtins.py:5294

3269

msgid "Dry-run, pretending to remove the above revisions.\n"

3270

msgstr ""

3271

3272

#: bzrlib/builtins.py:5390

3272

#: bzrlib/builtins.py:5297

3273

msgid "The above revision(s) will be removed.\n"

3274

msgstr ""

3275

3276

#: bzrlib/builtins.py:5394

3276

#: bzrlib/builtins.py:5301

3277

msgid "Uncommit these revisions"

3278

msgstr ""

3279

3280

#: bzrlib/builtins.py:5397

3280

#: bzrlib/builtins.py:5304

3281

msgid "Canceled\n"

3282

msgstr ""

3283

3284

#: bzrlib/builtins.py:5404

3284

#: bzrlib/builtins.py:5311

3285

#, python-format

3286

msgid ""

3287

"You can restore the old tip by running:\n"

3288

" bzr pull . -r revid:%s\n"

3289

msgstr ""

3290

3291

#: bzrlib/builtins.py:5409

3291

#: bzrlib/builtins.py:5316

3292

msgid "Break a dead lock."

3293

msgstr ""

3294

3295

#: bzrlib/builtins.py:5411

3295

#: bzrlib/builtins.py:5318

3296

msgid ""

3297

"This command breaks a lock on a repository, branch, working directory or\n"

3298

"config file."

3299

msgstr ""

3300

3301

#: bzrlib/builtins.py:5414

3301

#: bzrlib/builtins.py:5321

3302

msgid ""

3303

"CAUTION: Locks should only be broken when you are sure that the process\n"

3304

"holding the lock has been stopped."

3305

msgstr ""

3306

3307

#: bzrlib/builtins.py:5417

3307

#: bzrlib/builtins.py:5324

3308

msgid ""

3309

"You can get information on what locks are open via the 'bzr info\n"

3310

"[location]' command."

3311

msgstr ""

3312

3313

#: bzrlib/builtins.py:5420

3313

#: bzrlib/builtins.py:5327

3314

msgid ""

3315

":Examples:\n"

3316

" bzr break-lock\n"

3318

" bzr break-lock --conf ~/.bazaar"

3319

msgstr ""

3320

3321

#: bzrlib/builtins.py:5429

3321

#: bzrlib/builtins.py:5336

3322

msgid "LOCATION is the directory where the config lock is."

3323

msgstr ""

3324

3325

#: bzrlib/builtins.py:5431

3325

#: bzrlib/builtins.py:5338

3326

msgid "Do not ask for confirmation before breaking the lock."

3327

msgstr ""

3328

3329

#: bzrlib/builtins.py:5466

3329

#: bzrlib/builtins.py:5373

3330

msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"

3331

msgstr ""

3332

3333

#: bzrlib/builtins.py:5467

3333

#: bzrlib/builtins.py:5374

3334

msgid "Run the bzr server."

3335

msgstr ""

3336

3337

#: bzrlib/builtins.py:5473

3337

#: bzrlib/builtins.py:5380

3338

msgid "Serve on stdin/out for use from inetd or sshd."

3339

msgstr ""

3340

3341

#: bzrlib/builtins.py:5474

3341

#: bzrlib/builtins.py:5381

3342

msgid "protocol"

3343

msgstr ""

3344

3345

#: bzrlib/builtins.py:5475

3345

#: bzrlib/builtins.py:5382

3346

msgid "Protocol to serve."

3347

msgstr ""

3348

3349

#: bzrlib/builtins.py:5479

3349

#: bzrlib/builtins.py:5386

3350

msgid ""

3351

"Listen for connections on nominated port of the form [hostname:]portnumber. "

3352

"Passing 0 as the port number will result in a dynamically allocated port. "

3353

"The default port depends on the protocol."

3354

msgstr ""

3355

3356

#: bzrlib/builtins.py:5485

3356

#: bzrlib/builtins.py:5392

3357

msgid "Serve contents of this directory."

3358

msgstr ""

3359

3360

#: bzrlib/builtins.py:5487

3360

#: bzrlib/builtins.py:5394

3361

msgid ""

3362

"By default the server is a readonly server. Supplying --allow-writes "

3363

"enables write access to the contents of the served directory and below. "

3366

"uncontrolled write access to your file system."

3367

msgstr ""

3368

3369

#: bzrlib/builtins.py:5496

3369

#: bzrlib/builtins.py:5403

3370

msgid "Override the default idle client timeout (5min)."

3371

msgstr ""

3372

3373

#: bzrlib/builtins.py:5546

3373

#: bzrlib/builtins.py:5453

3374

msgid "Combine a tree into its containing tree."

3375

msgstr ""

3376

3377

#: bzrlib/builtins.py:5548

3377

#: bzrlib/builtins.py:5455

3378

msgid "This command requires the target tree to be in a rich-root format."

3379

msgstr ""

3380

3381

#: bzrlib/builtins.py:5550

3381

#: bzrlib/builtins.py:5457

3382

msgid ""

3383

"The TREE argument should be an independent tree, inside another tree, but\n"

3384

"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"

3385

"running \"bzr branch\" with the target inside a tree.)"

3386

msgstr ""

3387

3388

#: bzrlib/builtins.py:5554

3388

#: bzrlib/builtins.py:5461

3389

msgid ""

3390

"The result is a combined tree, with the subtree no longer an independent\n"

3391

"part. This is marked as a merge of the subtree into the containing tree,\n"

3392

"and all history is preserved."

3393

msgstr ""

3394

3395

#: bzrlib/builtins.py:5572

3395

#: bzrlib/builtins.py:5479

3396

#, python-format

3397

msgid ""

3398

"Can't join trees because %s doesn't support rich root data.\n"

3399

"You can use bzr upgrade on the repository."

3400

msgstr ""

3401

3402

#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588

3402

#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495

3403

msgid "Cannot join {0}. {1}"

3404

msgstr ""

3405

3406

#: bzrlib/builtins.py:5592

3406

#: bzrlib/builtins.py:5499

3407

msgid "Split a subdirectory of a tree into a separate tree."

3408

msgstr ""

3409

3410

#: bzrlib/builtins.py:5594

3410

#: bzrlib/builtins.py:5501

3411

msgid ""

3412

"This command will produce a target tree in a format that supports\n"

3413

"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"

3414

"converted into earlier formats like 'dirstate-tags'."

3415

msgstr ""

3416

3417

#: bzrlib/builtins.py:5598

3417

#: bzrlib/builtins.py:5505

3418

msgid ""

3419

"The TREE argument should be a subdirectory of a working tree. That\n"

3420

"subdirectory will be converted into an independent tree, with its own\n"

3421

"branch. Commits in the top-level tree will not apply to the new subtree."

3422

msgstr ""

3423

3424

#: bzrlib/builtins.py:5678

3424

#: bzrlib/builtins.py:5585

3425

msgid "No submit branch specified or known"

3426

msgstr ""

3427

3428

#: bzrlib/builtins.py:5686 bzrlib/send.py:108

3428

#: bzrlib/builtins.py:5593 bzrlib/send.py:108

3429

msgid "No public branch specified or known"

3430

msgstr ""

3431

3432

#: bzrlib/builtins.py:5691

3432

#: bzrlib/builtins.py:5598

3433

msgid "bzr merge-directive takes at most two one revision identifiers"

3434

msgstr ""

3435

3436

#: bzrlib/builtins.py:5700

3436

#: bzrlib/builtins.py:5607

3437

msgid "No revisions to bundle."

3438

msgstr ""

3439

3440

#: bzrlib/builtins.py:5719

3440

#: bzrlib/builtins.py:5626

3441

msgid "Mail or create a merge-directive for submitting changes."

3442

msgstr ""

3443

3444

#: bzrlib/builtins.py:5721

3444

#: bzrlib/builtins.py:5628

3445

msgid "A merge directive provides many things needed for requesting merges:"

3446

msgstr ""

3447

3448

#: bzrlib/builtins.py:5723

3448

#: bzrlib/builtins.py:5630

3449

msgid "* A machine-readable description of the merge to perform"

3450

msgstr ""

3451

3452

#: bzrlib/builtins.py:5725

3452

#: bzrlib/builtins.py:5632

3453

msgid "* An optional patch that is a preview of the changes requested"

3454

msgstr ""

3455

3456

#: bzrlib/builtins.py:5727

3456

#: bzrlib/builtins.py:5634

3457

msgid ""

3458

"* An optional bundle of revision data, so that the changes can be applied\n"

3459

" directly from the merge directive, without retrieving data from a\n"

3460

" branch."

3461

msgstr ""

3462

3463

#: bzrlib/builtins.py:5731

3463

#: bzrlib/builtins.py:5638

3464

msgid ""

3465

"`bzr send` creates a compact data set that, when applied using bzr\n"

3466

"merge, has the same effect as merging from the source branch. "

3467

msgstr ""

3468

3469

#: bzrlib/builtins.py:5734

3469

#: bzrlib/builtins.py:5641

3470

msgid ""

3471

"By default the merge directive is self-contained and can be applied to any\n"

3472

"branch containing submit_branch in its ancestory without needing access to\n"

3473

"the source branch."

3474

msgstr ""

3475

3476

#: bzrlib/builtins.py:5738

3476

#: bzrlib/builtins.py:5645

3477

msgid ""

3478

"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"

3479

"revisions, but only a structured request to merge from the\n"

3482

"included if known, so that people can check it later."

3483

msgstr ""

3484

3485

#: bzrlib/builtins.py:5744

3485

#: bzrlib/builtins.py:5651

3486

msgid ""

3487

"The submit branch defaults to the parent of the source branch, but can be\n"

3488

"overridden. Both submit branch and public branch will be remembered in\n"

3491

"be changed using --from."

3492

msgstr ""

3493

3494

#: bzrlib/builtins.py:5750

3494

#: bzrlib/builtins.py:5657

3495

msgid ""

3496

"Both the submit branch and the public branch follow the usual behavior with\n"

3497

"respect to --remember: If there is no default location set, the first send\n"

3500

"--remember. The value will only be saved if the location can be accessed."

3501

msgstr ""

3502

3503

#: bzrlib/builtins.py:5756

3503

#: bzrlib/builtins.py:5663

3504

msgid ""

3505

"In order to calculate those changes, bzr must analyse the submit branch.\n"

3506

"Therefore it is most efficient for the submit branch to be a local mirror.\n"

3508

"in the merge directive."

3509

msgstr ""

3510

3511

#: bzrlib/builtins.py:5761

3511

#: bzrlib/builtins.py:5668

3512

msgid ""

3513

"The default behaviour is to send the merge directive by mail, unless -o is\n"

3514

"given, in which case it is sent to a file."

3515

msgstr ""

3516

3517

#: bzrlib/builtins.py:5764

3517

#: bzrlib/builtins.py:5671

3518

msgid ""

3519

"Mail is sent using your preferred mail program. This should be transparent\n"

3520

"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"

3521

"If the preferred client can't be found (or used), your editor will be used."

3522

msgstr ""

3523

3524

#: bzrlib/builtins.py:5768

3524

#: bzrlib/builtins.py:5675

3525

msgid ""

3526

"To use a specific mail program, set the mail_client configuration option.\n"

3527

"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"

3533

"supported clients."

3534

msgstr ""

3535

3536

#: bzrlib/builtins.py:5775

3536

#: bzrlib/builtins.py:5682

3537

msgid ""

3538

"If mail is being sent, a to address is required. This can be supplied\n"

3539

"either on the commandline, by setting the submit_to configuration\n"

3541

"in the submit branch."

3542

msgstr ""

3543

3544

#: bzrlib/builtins.py:5780

3544

#: bzrlib/builtins.py:5687

3545

msgid ""

3546

"Two formats are currently supported: \"4\" uses revision bundle format 4 "

3547

"and\n"

3551

"format 1. It is compatible with Bazaar 0.12 - 0.18."

3552

msgstr ""

3553

3554

#: bzrlib/builtins.py:5786

3554

#: bzrlib/builtins.py:5693

3555

msgid ""

3556

"The merge directives created by bzr send may be applied using bzr merge or\n"

3557

"bzr pull by specifying a file containing a merge directive as the location."

3558

msgstr ""

3559

3560

#: bzrlib/builtins.py:5789

3560

#: bzrlib/builtins.py:5696

3561

msgid ""

3562

"bzr send makes extensive use of public locations to map local locations "

3563

"into\n"

3565

"set them, and use `bzr info` to display them."

3566

msgstr ""

3567

3568

#: bzrlib/builtins.py:5813

3568

#: bzrlib/builtins.py:5720

3569

msgid "Write merge directive to this file or directory; use - for stdout."

3570

msgstr ""

3571

3572

#: bzrlib/builtins.py:5817

3572

#: bzrlib/builtins.py:5724

3573

msgid ""

3574

"Refuse to send if there are uncommitted changes in the working tree, --no-"

3575

"strict disables the check."

3576

msgstr ""

3577

3578

#: bzrlib/builtins.py:5819

3578

#: bzrlib/builtins.py:5726

3579

msgid "Mail the request to this address."

3580

msgstr ""

3581

3582

#: bzrlib/builtins.py:5823

3582

#: bzrlib/builtins.py:5730

3583

msgid "Body for the email."

3584

msgstr ""

3585

3586

#: bzrlib/builtins.py:5876

3586

#: bzrlib/builtins.py:5783

3587

msgid "Do not include a bundle in the merge directive."

3588

msgstr ""

3589

3590

#: bzrlib/builtins.py:5877

3590

#: bzrlib/builtins.py:5784

3591

msgid "Do not include a preview patch in the merge directive."

3592

msgstr ""

3593

3594

#: bzrlib/builtins.py:5880

3594

#: bzrlib/builtins.py:5787

3595

msgid "Remember submit and public branch."

3596

msgstr ""

3597

3598

#: bzrlib/builtins.py:5882

3598

#: bzrlib/builtins.py:5789

3599

msgid ""

3600

"Branch to generate the submission from, rather than the one containing the "

3601

"working directory."

3602

msgstr ""

3603

3604

#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76

3604

#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76

3605

msgid "format"

3606

msgstr ""

3607

3608

#: bzrlib/builtins.py:5893

3608

#: bzrlib/builtins.py:5800

3609

msgid "Use the specified output format."

3610

msgstr ""

3611

3612

#: bzrlib/builtins.py:5915

3612

#: bzrlib/builtins.py:5822

3613

msgid "Create, remove or modify a tag naming a revision."

3614

msgstr ""

3615

3616

#: bzrlib/builtins.py:5917

3616

#: bzrlib/builtins.py:5824

3617

msgid ""

3618

"Tags give human-meaningful names to revisions. Commands that take a -r\n"

3619

"(--revision) option can be given -rtag:X, where X is any previously\n"

3620

"created tag."

3621

msgstr ""

3622

3623

#: bzrlib/builtins.py:5921

3623

#: bzrlib/builtins.py:5828

3624

msgid ""

3625

"Tags are stored in the branch. Tags are copied from one branch to another\n"

3626

"along when you branch, push, pull or merge."

3627

msgstr ""

3628

3629

#: bzrlib/builtins.py:5924

3629

#: bzrlib/builtins.py:5831

3630

msgid ""

3631

"It is an error to give a tag name that already exists unless you pass\n"

3632

"--force, in which case the tag is moved to point to the new revision."

3633

msgstr ""

3634

3635

#: bzrlib/builtins.py:5927

3635

#: bzrlib/builtins.py:5834

3636

msgid ""

3637

"To rename a tag (change the name but keep it on the same revsion), run "

3638

"``bzr\n"

3639

"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."

3640

msgstr ""

3641

3642

#: bzrlib/builtins.py:5930

3642

#: bzrlib/builtins.py:5837

3643

msgid ""

3644

"If no tag name is specified it will be determined through the \n"

3645

"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"

3647

"details."

3648

msgstr ""

3649

3650

#: bzrlib/builtins.py:5940

3650

#: bzrlib/builtins.py:5847

3651

msgid "Delete this tag rather than placing it."

3652

msgstr ""

3653

3654

#: bzrlib/builtins.py:5943

3654

#: bzrlib/builtins.py:5850

3655

msgid "Branch in which to place the tag."

3656

msgstr ""

3657

3658

#: bzrlib/builtins.py:5945

3658

#: bzrlib/builtins.py:5852

3659

msgid "Replace existing tags."

3660

msgstr ""

3661

3662

#: bzrlib/builtins.py:5960

3662

#: bzrlib/builtins.py:5867

3663

msgid "No tag specified to delete."

3664

msgstr ""

3665

3666

#: bzrlib/builtins.py:5962

3666

#: bzrlib/builtins.py:5869

3667

#, python-format

3668

msgid "Deleted tag %s."

3669

msgstr ""

3670

3671

#: bzrlib/builtins.py:5976

3671

#: bzrlib/builtins.py:5883

3672

msgid "Please specify a tag name."

3673

msgstr ""

3674

3675

#: bzrlib/builtins.py:5984

3675

#: bzrlib/builtins.py:5891

3676

#, python-format

3677

msgid "Tag %s already exists for that revision."

3678

msgstr ""

3679

3680

#: bzrlib/builtins.py:5988

3680

#: bzrlib/builtins.py:5895

3681

#, python-format

3682

msgid "Created tag %s."

3683

msgstr ""

3684

3685

#: bzrlib/builtins.py:5990

3685

#: bzrlib/builtins.py:5897

3686

#, python-format

3687

msgid "Updated tag %s."

3688

msgstr ""

3689

3690

#: bzrlib/builtins.py:5994

3690

#: bzrlib/builtins.py:5901

3691

msgid "List tags."

3692

msgstr ""

3693

3694

#: bzrlib/builtins.py:5996

3694

#: bzrlib/builtins.py:5903

3695

msgid ""

3696

"This command shows a table of tag names and the revisions they reference."

3697

msgstr ""

3698

3699

#: bzrlib/builtins.py:6002

3699

#: bzrlib/builtins.py:5909

3700

msgid "Branch whose tags should be displayed."

3701

msgstr ""

3702

3703

#: bzrlib/builtins.py:6004

3703

#: bzrlib/builtins.py:5911

3704

msgid "Sort tags by different criteria."

3705

msgstr ""

3706

3707

#: bzrlib/builtins.py:6004

3707

#: bzrlib/builtins.py:5911

3708

msgid "Sorting"

3709

msgstr ""

3710

3711

#: bzrlib/builtins.py:6073

3711

#: bzrlib/builtins.py:5980

3712

msgid "Reconfigure the type of a bzr directory."

3713

msgstr ""

3714

3715

#: bzrlib/builtins.py:6075

3715

#: bzrlib/builtins.py:5982

3716

msgid "A target configuration must be specified."

3717

msgstr ""

3718

3719

#: bzrlib/builtins.py:6077

3719

#: bzrlib/builtins.py:5984

3720

msgid ""

3721

"For checkouts, the bind-to location will be auto-detected if not specified.\n"

3722

"The order of preference is\n"

3727

"If none of these is available, --bind-to must be specified."

3728

msgstr ""

3729

3730

#: bzrlib/builtins.py:6091

3730

#: bzrlib/builtins.py:5998

3731

msgid "Tree type"

3732

msgstr ""

3733

3734

#: bzrlib/builtins.py:6092

3734

#: bzrlib/builtins.py:5999

3735

msgid "The relation between branch and tree."

3736

msgstr ""

3737

3738

#: bzrlib/builtins.py:6094

3738

#: bzrlib/builtins.py:6001

3739

msgid "Reconfigure to be an unbound branch with no working tree."

3740

msgstr ""

3741

3742

#: bzrlib/builtins.py:6095

3742

#: bzrlib/builtins.py:6002

3743

msgid "Reconfigure to be an unbound branch with a working tree."

3744

msgstr ""

3745

3746

#: bzrlib/builtins.py:6096

3746

#: bzrlib/builtins.py:6003

3747

msgid "Reconfigure to be a bound branch with a working tree."

3748

msgstr ""

3749

3750

#: bzrlib/builtins.py:6097

3750

#: bzrlib/builtins.py:6004

3751

msgid "Reconfigure to be a lightweight checkout (with no local history)."

3752

msgstr ""

3753

3754

#: bzrlib/builtins.py:6102

3754

#: bzrlib/builtins.py:6009

3755

msgid "Repository type"

3756

msgstr ""

3757

3758

#: bzrlib/builtins.py:6103

3758

#: bzrlib/builtins.py:6010

3759

msgid "Location fo the repository."

3760

msgstr ""

3761

3762

#: bzrlib/builtins.py:6105

3762

#: bzrlib/builtins.py:6012

3763

msgid ""

3764

"Reconfigure to be a standalone branch (i.e. stop using shared repository)."

3765

msgstr ""

3766

3767

#: bzrlib/builtins.py:6107

3767

#: bzrlib/builtins.py:6014

3768

msgid "Reconfigure to use a shared repository."

3769

msgstr ""

3770

3771

#: bzrlib/builtins.py:6111

3771

#: bzrlib/builtins.py:6018

3772

msgid "Trees in Repository"

3773

msgstr ""

3774

3775

#: bzrlib/builtins.py:6112

3775

#: bzrlib/builtins.py:6019

3776

msgid "Whether new branches in the repository have trees."

3777

msgstr ""

3778

3779

#: bzrlib/builtins.py:6114

3779

#: bzrlib/builtins.py:6021

3780

msgid ""

3781

"Reconfigure repository to create working trees on branches by default."

3782

msgstr ""

3783

3784

#: bzrlib/builtins.py:6116

3784

#: bzrlib/builtins.py:6023

3785

msgid ""

3786

"Reconfigure repository to not create working trees on branches by default."

3787

msgstr ""

3788

3789

#: bzrlib/builtins.py:6119

3789

#: bzrlib/builtins.py:6026

3790

msgid "Branch to bind checkout to."

3791

msgstr ""

3792

3793

#: bzrlib/builtins.py:6121

3793

#: bzrlib/builtins.py:6028

3794

msgid "Perform reconfiguration even if local changes will be lost."

3795

msgstr ""

3796

3797

#: bzrlib/builtins.py:6124

3797

#: bzrlib/builtins.py:6031

3798

msgid "Reconfigure a branch to be stacked on another branch."

3799

msgstr ""

3800

3801

#: bzrlib/builtins.py:6128

3801

#: bzrlib/builtins.py:6035

3802

msgid ""

3803

"Reconfigure a branch to be unstacked. This may require copying substantial "

3804

"data into it."

3805

msgstr ""

3806

3807

#: bzrlib/builtins.py:6138

3807

#: bzrlib/builtins.py:6045

3808

msgid "Can't use both --stacked-on and --unstacked"

3809

msgstr ""

3810

3811

#: bzrlib/builtins.py:6152

3811

#: bzrlib/builtins.py:6059

3812

msgid "No target configuration specified"

3813

msgstr ""

3814

3815

#: bzrlib/builtins.py:6187

3815

#: bzrlib/builtins.py:6094

3816

msgid "Set the branch of a checkout and update."

3817

msgstr ""

3818

3819

#: bzrlib/builtins.py:6189

3819

#: bzrlib/builtins.py:6096

3820

msgid ""

3821

"For lightweight checkouts, this changes the branch being referenced.\n"

3822

"For heavyweight checkouts, this checks that there are no local commits\n"

3824

"of the new location and binds to it."

3825

msgstr ""

3826

3827

#: bzrlib/builtins.py:6194

3827

#: bzrlib/builtins.py:6101

3828

msgid ""

3829

"In both cases, the working tree is updated and uncommitted changes\n"

3830

"are merged. The user can commit or revert these as they desire."

3831

msgstr ""

3832

3833

#: bzrlib/builtins.py:6197

3833

#: bzrlib/builtins.py:6104

3834

msgid "Pending merges need to be committed or reverted before using switch."

3835

msgstr ""

3836

3837

#: bzrlib/builtins.py:6199

3837

#: bzrlib/builtins.py:6106

3838

msgid ""

3839

"The path to the branch to switch to can be specified relative to the parent\n"

3840

"directory of the current branch. For example, if you are currently in a\n"

3842

"/path/to/newbranch."

3843

msgstr ""

3844

3845

#: bzrlib/builtins.py:6204

3845

#: bzrlib/builtins.py:6111

3846

msgid ""

3847

"Bound branches use the nickname of its master branch unless it is set\n"

3848

"locally, in which case switching will update the local nickname to be\n"

3849

"that of the master."

3850

msgstr ""

3851

3852

#: bzrlib/builtins.py:6212

3852

#: bzrlib/builtins.py:6119

3853

msgid "Switch even if local commits will be lost."

3854

msgstr ""

3855

3856

#: bzrlib/builtins.py:6215

3856

#: bzrlib/builtins.py:6122

3857

msgid "Create the target branch from this one before switching to it."

3858

msgstr ""

3859

3860

#: bzrlib/builtins.py:6229

3860

#: bzrlib/builtins.py:6134

3861

msgid "You must supply either a revision or a location"

3862

msgstr ""

3863

3864

#: bzrlib/builtins.py:6242

3864

#: bzrlib/builtins.py:6145

3865

msgid "cannot create branch without source branch"

3866

msgstr ""

3867

3868

#: bzrlib/builtins.py:6262

3868

#: bzrlib/builtins.py:6209

3869

msgid "Manage filtered views."

3870

msgstr ""

3871

3872

#: bzrlib/builtins.py:6264

3872

#: bzrlib/builtins.py:6211

3873

msgid ""

3874

"Views provide a mask over the tree so that users can focus on\n"

3875

"a subset of a tree when doing their work. After creating a view,\n"

3879

"must be within the current view."

3880

msgstr ""

3881

3882

#: bzrlib/builtins.py:6271

3882

#: bzrlib/builtins.py:6218

3883

msgid ""

3884

"In most cases, a view has a short life-span: it is created to make\n"

3885

"a selected change and is deleted once that change is committed.\n"

3887

"and switch between them."

3888

msgstr ""

3889

3890

#: bzrlib/builtins.py:6276

3890

#: bzrlib/builtins.py:6223

3891

msgid ""

3892

"To disable the current view without deleting it, you can switch to\n"

3893

"the pseudo view called ``off``. This can be useful when you need\n"

3895

"want to switch back to your view after that."

3896

msgstr ""

3897

3898

#: bzrlib/builtins.py:6281

3898

#: bzrlib/builtins.py:6228

3899

msgid ""

3900

":Examples:\n"

3901

" To define the current view::"

3902

msgstr ""

3903

3904

#: bzrlib/builtins.py:6284

3904

#: bzrlib/builtins.py:6231

3905

msgid " bzr view file1 dir1 ..."

3906

msgstr ""

3907

3908

#: bzrlib/builtins.py:6286

3908

#: bzrlib/builtins.py:6233

3909

msgid " To list the current view::"

3910

msgstr ""

3911

3912

#: bzrlib/builtins.py:6288

3912

#: bzrlib/builtins.py:6235

3913

msgid " bzr view"

3914

msgstr ""

3915

3916

#: bzrlib/builtins.py:6290

3916

#: bzrlib/builtins.py:6237

3917

msgid " To delete the current view::"

3918

msgstr ""

3919

3920

#: bzrlib/builtins.py:6292

3920

#: bzrlib/builtins.py:6239

3921

msgid " bzr view --delete"

3922

msgstr ""

3923

3924

#: bzrlib/builtins.py:6294

3924

#: bzrlib/builtins.py:6241

3925

msgid " To disable the current view without deleting it::"

3926

msgstr ""

3927

3928

#: bzrlib/builtins.py:6296

3928

#: bzrlib/builtins.py:6243

3929

msgid " bzr view --switch off"

3930

msgstr ""

3931

3932

#: bzrlib/builtins.py:6298

3932

#: bzrlib/builtins.py:6245

3933

msgid " To define a named view and switch to it::"

3934

msgstr ""

3935

3936

#: bzrlib/builtins.py:6300

3936

#: bzrlib/builtins.py:6247

3937

msgid " bzr view --name view-name file1 dir1 ..."

3938

msgstr ""

3939

3940

#: bzrlib/builtins.py:6302

3940

#: bzrlib/builtins.py:6249

3941

msgid " To list a named view::"

3942

msgstr ""

3943

3944

#: bzrlib/builtins.py:6304

3944

#: bzrlib/builtins.py:6251

3945

msgid " bzr view --name view-name"

3946

msgstr ""

3947

3948

#: bzrlib/builtins.py:6306

3948

#: bzrlib/builtins.py:6253

3949

msgid " To delete a named view::"

3950

msgstr ""

3951

3952

#: bzrlib/builtins.py:6308

3952

#: bzrlib/builtins.py:6255

3953

msgid " bzr view --name view-name --delete"

3954

msgstr ""

3955

3956

#: bzrlib/builtins.py:6310

3956

#: bzrlib/builtins.py:6257

3957

msgid " To switch to a named view::"

3958

msgstr ""

3959

3960

#: bzrlib/builtins.py:6312

3960

#: bzrlib/builtins.py:6259

3961

msgid " bzr view --switch view-name"

3962

msgstr ""

3963

3964

#: bzrlib/builtins.py:6314

3964

#: bzrlib/builtins.py:6261

3965

msgid " To list all views defined::"

3966

msgstr ""

3967

3968

#: bzrlib/builtins.py:6316

3968

#: bzrlib/builtins.py:6263

3969

msgid " bzr view --all"

3970

msgstr ""

3971

3972

#: bzrlib/builtins.py:6318

3972

#: bzrlib/builtins.py:6265

3973

msgid " To delete all views::"

3974

msgstr ""

3975

3976

#: bzrlib/builtins.py:6320

3976

#: bzrlib/builtins.py:6267

3977

msgid " bzr view --delete --all"

3978

msgstr ""

3979

3980

#: bzrlib/builtins.py:6327

3980

#: bzrlib/builtins.py:6274

3981

msgid "Apply list or delete action to all views."

3982

msgstr ""

3983

3984

#: bzrlib/builtins.py:6330

3984

#: bzrlib/builtins.py:6277

3985

msgid "Delete the view."

3986

msgstr ""

3987

3988

#: bzrlib/builtins.py:6333

3988

#: bzrlib/builtins.py:6280

3989

msgid "Name of the view to define, list or delete."

3990

msgstr ""

3991

3992

#: bzrlib/builtins.py:6337

3992

#: bzrlib/builtins.py:6284

3993

msgid "Name of the view to switch to."

3994

msgstr ""

3995

3996

#: bzrlib/builtins.py:6356

3996

#: bzrlib/builtins.py:6303

3997

msgid "Both --delete and a file list specified"

3998

msgstr ""

3999

4000

#: bzrlib/builtins.py:6359

4000

#: bzrlib/builtins.py:6306

4001

msgid "Both --delete and --switch specified"

4002

msgstr ""

4003

4004

#: bzrlib/builtins.py:6362

4004

#: bzrlib/builtins.py:6309

4005

msgid "Deleted all views.\n"

4006

msgstr ""

4007

4008

#: bzrlib/builtins.py:6364

4008

#: bzrlib/builtins.py:6311

4009

msgid "No current view to delete"

4010

msgstr ""

4011

4012

#: bzrlib/builtins.py:6367

4012

#: bzrlib/builtins.py:6314

4013

#, python-format

4014

msgid "Deleted '%s' view.\n"

4015

msgstr ""

4016

4017

#: bzrlib/builtins.py:6371

4017

#: bzrlib/builtins.py:6318

4018

msgid "Both --switch and a file list specified"

4019

msgstr ""

4020

4021

#: bzrlib/builtins.py:6374

4021

#: bzrlib/builtins.py:6321

4022

msgid "Both --switch and --all specified"

4023

msgstr ""

4024

4025

#: bzrlib/builtins.py:6377

4025

#: bzrlib/builtins.py:6324

4026

msgid "No current view to disable"

4027

msgstr ""

4028

4029

#: bzrlib/builtins.py:6379

4029

#: bzrlib/builtins.py:6326

4030

#, python-format

4031

msgid "Disabled '%s' view.\n"

4032

msgstr ""

4033

4034

#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405

4034

#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352

4035

msgid "Using '{0}' view: {1}\n"

4036

msgstr ""

4037

4038

#: bzrlib/builtins.py:6386

4038

#: bzrlib/builtins.py:6333

4039

msgid "Views defined:\n"

4040

msgstr ""

4041

4042

#: bzrlib/builtins.py:6395

4042

#: bzrlib/builtins.py:6342

4043

msgid "No views defined.\n"

4044

msgstr ""

4045

4046

#: bzrlib/builtins.py:6402

4046

#: bzrlib/builtins.py:6349

4047

msgid "Cannot change the 'off' pseudo view"

4048

msgstr ""

4049

4050

#: bzrlib/builtins.py:6410

4050

#: bzrlib/builtins.py:6357

4051

msgid "No current view.\n"

4052

msgstr ""

4053

4054

#: bzrlib/builtins.py:6413

4054

#: bzrlib/builtins.py:6360

4055

msgid "'{0}' view is: {1}\n"

4056

msgstr ""

4057

4058

#: bzrlib/builtins.py:6433

4058

#: bzrlib/builtins.py:6380

4059

msgid " <no hooks installed>\n"

4060

msgstr ""

4061

4062

#: bzrlib/builtins.py:6437

4062

#: bzrlib/builtins.py:6384

4063

msgid "Remove a branch."

4064

msgstr ""

4065

4066

#: bzrlib/builtins.py:6439

4066

#: bzrlib/builtins.py:6386

4067

msgid ""

4068

"This will remove the branch from the specified location but \n"

4069

"will keep any working tree or repository in place."

4070

msgstr ""

4071

4072

#: bzrlib/builtins.py:6444

4072

#: bzrlib/builtins.py:6391

4073

msgid " Remove the branch at repo/trunk::"

4074

msgstr ""

4075

4076

#: bzrlib/builtins.py:6446

4076

#: bzrlib/builtins.py:6393

4077

msgid " bzr remove-branch repo/trunk"

4078

msgstr ""

4079

4080

#: bzrlib/builtins.py:6461

4080

#: bzrlib/builtins.py:6408

4081

msgid "Plaintext diff output."

4082

msgstr ""

4083

4084

#: bzrlib/builtins.py:6462

4084

#: bzrlib/builtins.py:6409

4085

msgid "Temporarily set aside some changes from the current tree."

4086

msgstr ""

4087

4088

#: bzrlib/builtins.py:6464

4088

#: bzrlib/builtins.py:6411

4089

msgid ""

4090

"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"

4091

"ie. out of the way, until a later time when you can bring them back from\n"

4094

"will they survive its deletion."

4095

msgstr ""

4096

4097

#: bzrlib/builtins.py:6470

4097

#: bzrlib/builtins.py:6417

4098

msgid "If shelve --list is specified, previously-shelved changes are listed."

4099

msgstr ""

4100

4101

#: bzrlib/builtins.py:6472

4101

#: bzrlib/builtins.py:6419

4102

msgid ""

4103

"Shelve is intended to help separate several sets of changes that have\n"

4104

"been inappropriately mingled. If you just want to get rid of all changes\n"

4106

"shelve all text changes at once, use shelve --all."

4107

msgstr ""

4108

4109

#: bzrlib/builtins.py:6477

4109

#: bzrlib/builtins.py:6424

4110

msgid ""

4111

"If filenames are specified, only the changes to those files will be\n"

4112

"shelved. Other files will be left untouched."

4113

msgstr ""

4114

4115

#: bzrlib/builtins.py:6480

4115

#: bzrlib/builtins.py:6427

4116

msgid ""

4117

"If a revision is specified, changes since that revision will be shelved."

4118

msgstr ""

4119

4120

#: bzrlib/builtins.py:6482

4120

#: bzrlib/builtins.py:6429

4121

msgid ""

4122

"You can put multiple items on the shelf, and by default, 'unshelve' will\n"

4123

"restore the most recently shelved changes."

4124

msgstr ""

4125

4126

#: bzrlib/builtins.py:6485

4126

#: bzrlib/builtins.py:6432

4127

msgid ""

4128

"For complicated changes, it is possible to edit the changes in a separate\n"

4129

"editor program to decide what the file remaining in the working copy\n"

4130

"should look like. To do this, add the configuration option"

4131

msgstr ""

4132

4133

#: bzrlib/builtins.py:6489

4133

#: bzrlib/builtins.py:6436

4134

msgid " change_editor = PROGRAM @new_path @old_path"

4135

msgstr ""

4136

4137

#: bzrlib/builtins.py:6491

4137

#: bzrlib/builtins.py:6438

4138

msgid ""

4139

"where @new_path is replaced with the path of the new version of the \n"

4140

"file and @old_path is replaced with the path of the old version of \n"

4143

" "

4144

msgstr ""

4145

4146

#: bzrlib/builtins.py:6503

4146

#: bzrlib/builtins.py:6450

4147

msgid "Shelve all changes."

4148

msgstr ""

4149

4150

#: bzrlib/builtins.py:6505

4150

#: bzrlib/builtins.py:6452

4151

msgid "Method to use for writing diffs."

4152

msgstr ""

4153

4154

#: bzrlib/builtins.py:6505

4154

#: bzrlib/builtins.py:6452

4155

msgid "writer"

4156

msgstr ""

4157

4158

#: bzrlib/builtins.py:6509

4158

#: bzrlib/builtins.py:6456

4159

msgid "List shelved changes."

4160

msgstr ""

4161

4162

#: bzrlib/builtins.py:6511

4162

#: bzrlib/builtins.py:6458

4163

msgid "Destroy removed changes instead of shelving them."

4164

msgstr ""

4165

4166

#: bzrlib/builtins.py:6540

4166

#: bzrlib/builtins.py:6487

4167

msgid "No shelved changes."

4168

msgstr ""

4169

4170

#: bzrlib/builtins.py:6551

4170

#: bzrlib/builtins.py:6498

4171

msgid "Restore shelved changes."

4172

msgstr ""

4173

4174

#: bzrlib/builtins.py:6553

4174

#: bzrlib/builtins.py:6500

4175

msgid ""

4176

"By default, the most recently shelved changes are restored. However if you\n"

4177

"specify a shelf by id those changes will be restored instead. This works\n"

4178

"best when the changes don't depend on each other."

4179

msgstr ""

4180

4181

#: bzrlib/builtins.py:6562

4181

#: bzrlib/builtins.py:6509

4182

msgid "The action to perform."

4183

msgstr ""

4184

4185

#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694

4185

#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694

4186

msgid "action"

4187

msgstr ""

4188

4189

#: bzrlib/builtins.py:6564

4189

#: bzrlib/builtins.py:6511

4190

msgid "Apply changes and remove from the shelf."

4191

msgstr ""

4192

4193

#: bzrlib/builtins.py:6565

4193

#: bzrlib/builtins.py:6512

4194

msgid "Show changes, but do not apply or remove them."

4195

msgstr ""

4196

4197

#: bzrlib/builtins.py:6566

4197

#: bzrlib/builtins.py:6513

4198

msgid ""

4199

"Instead of unshelving the changes, show the diff that would result from "

4200

"unshelving."

4201

msgstr ""

4202

4203

#: bzrlib/builtins.py:6568

4203

#: bzrlib/builtins.py:6515

4204

msgid "Delete changes without applying them."

4205

msgstr ""

4206

4207

#: bzrlib/builtins.py:6569

4207

#: bzrlib/builtins.py:6516

4208

msgid "Apply changes but don't delete them."

4209

msgstr ""

4210

4211

#: bzrlib/builtins.py:6584

4211

#: bzrlib/builtins.py:6531

4212

msgid "Remove unwanted files from working tree."

4213

msgstr ""

4214

4215

#: bzrlib/builtins.py:6586

4215

#: bzrlib/builtins.py:6533

4216

msgid ""

4217

"By default, only unknown files, not ignored files, are deleted. Versioned\n"

4218

"files are never deleted."

4219

msgstr ""

4220

4221

#: bzrlib/builtins.py:6589

4221

#: bzrlib/builtins.py:6536

4222

msgid ""

4223

"Another class is 'detritus', which includes files emitted by bzr during\n"

4224

"normal operations and selftests. (The value of these files decreases with\n"

4225

"time.)"

4226

msgstr ""

4227

4228

#: bzrlib/builtins.py:6593

4228

#: bzrlib/builtins.py:6540

4229

msgid ""

4230

"If no options are specified, unknown files are deleted. Otherwise, option\n"

4231

"flags are respected, and may be combined."

4232

msgstr ""

4233

4234

#: bzrlib/builtins.py:6596

4234

#: bzrlib/builtins.py:6543

4235

msgid "To check what clean-tree will do, use --dry-run."

4236

msgstr ""

4237

4238

#: bzrlib/builtins.py:6599

4238

#: bzrlib/builtins.py:6546

4239

msgid "Delete all ignored files."

4240

msgstr ""

4241

4242

#: bzrlib/builtins.py:6600

4242

#: bzrlib/builtins.py:6547

4243

msgid ""

4244

"Delete conflict files, merge and revert backups, and failed selftest dirs."

4245

msgstr ""

4246

4247

#: bzrlib/builtins.py:6603

4247

#: bzrlib/builtins.py:6550

4248

msgid "Delete files unknown to bzr (default)."

4249

msgstr ""

4250

4251

#: bzrlib/builtins.py:6604

4251

#: bzrlib/builtins.py:6551

4252

msgid "Show files to delete instead of deleting them."

4253

msgstr ""

4254

4255

#: bzrlib/builtins.py:6606

4255

#: bzrlib/builtins.py:6553

4256

msgid "Do not prompt before deleting."

4257

msgstr ""

4258

4312

msgstr[0] ""

4313

msgstr[1] ""

4314

4315

#: bzrlib/bzrdir.py:490

4315

#: bzrlib/bzrdir.py:489

4316

msgid ""

4317

"making backup of {0}\n"

4318

" to {1}"

4319

msgstr ""

4320

4321

#: bzrlib/bzrdir.py:513

4321

#: bzrlib/bzrdir.py:512

4322

msgid "renamed {0} to {1}"

4323

msgstr ""

4324

4325

#: bzrlib/bzrdir.py:1652

4325

#: bzrlib/bzrdir.py:1663

4326

#, python-format

4327

msgid ""

4328

"Source repository format does not support stacking, using format:\n"

4329

" %s"

4330

msgstr ""

4331

4332

#: bzrlib/bzrdir.py:1672

4332

#: bzrlib/bzrdir.py:1683

4333

#, python-format

4334

msgid ""

4335

"Source branch format does not support stacking, using format:\n"

4336

" %s"

4337

msgstr ""

4338

4339

#: bzrlib/bzrdir.py:1818

4339

#: bzrlib/bzrdir.py:1829

4340

msgid "starting repository conversion"

4341

msgstr ""

4342

4343

#: bzrlib/bzrdir.py:2039

4343

#: bzrlib/bzrdir.py:2058

4344

msgid "Using default stacking branch {0} at {1}"

4345

msgstr ""

4346

4579

msgid "bzr version-info --revision takes exactly one revision specifier"

4580

msgstr ""

4581

4582

#: bzrlib/commands.py:229

4582

#: bzrlib/commands.py:228

4583

#, python-format

4584

msgid "unknown command \"%s\""

4585

msgstr ""

4586

4587

#: bzrlib/commands.py:476

4587

#: bzrlib/commands.py:475

4588

msgid "No help for this command."

4589

msgstr ""

4590

4591

#: bzrlib/commands.py:489

4591

#: bzrlib/commands.py:488

4592

#, python-format

4593

msgid ":Purpose: %s\n"

4594

msgstr ""

4595

4596

#: bzrlib/commands.py:491

4596

#: bzrlib/commands.py:490

4597

#, python-format

4598

msgid ""

4599

":Usage:\n"

4600

"%s\n"

4601

msgstr ""

4602

4603

#: bzrlib/commands.py:493

4603

#: bzrlib/commands.py:492

4604

#, python-format

4605

msgid ":Usage: %s\n"

4606

msgstr ""

4607

4608

#: bzrlib/commands.py:512

4608

#: bzrlib/commands.py:511

4609

#, python-format

4610

msgid ":Options:%s"

4611

msgstr ""

4612

4613

#: bzrlib/commands.py:523

4613

#: bzrlib/commands.py:522

4614

#, python-format

4615

msgid ""

4616

":Description:\n"

4618

"\n"

4619

msgstr ""

4620

4621

#: bzrlib/commands.py:533

4621

#: bzrlib/commands.py:532

4622

#, python-format

4623

msgid ""

4624

"See bzr help %s for more details and examples.\n"

4625

"\n"

4626

msgstr ""

4627

4628

#: bzrlib/commands.py:538

4628

#: bzrlib/commands.py:537

4629

msgid ":Aliases: "

4630

msgstr ""

4631

4632

#: bzrlib/commands.py:542

4632

#: bzrlib/commands.py:541

4633

#, python-format

4634

msgid ":From: plugin \"%s\"\n"

4635

msgstr ""

4636

4637

#: bzrlib/commands.py:554

4637

#: bzrlib/commands.py:553

4638

msgid ":doc:`{0} <{1}-help>`"

4639

msgstr ""

4640

4641

#: bzrlib/commands.py:558

4641

#: bzrlib/commands.py:557

4642

#, python-format

4643

msgid ":See also: %s"

4644

msgstr ""

4645

4646

#: bzrlib/commands.py:816 bzrlib/gpg.py:324

4646

#: bzrlib/commands.py:815 bzrlib/gpg.py:324

4647

msgid "Only ASCII permitted in option names"

4648

msgstr ""

4649

4650

#: bzrlib/commands.py:841 bzrlib/commands.py:849

4650

#: bzrlib/commands.py:840 bzrlib/commands.py:848

4651

msgid "command {0!r} needs one or more {1}"

4652

msgstr ""

4653

4654

#: bzrlib/commands.py:858

4654

#: bzrlib/commands.py:857

4655

msgid "command {0!r} requires argument {1}"

4656

msgstr ""

4657

4658

#: bzrlib/commands.py:865

4658

#: bzrlib/commands.py:864

4659

msgid "extra argument to command {0}: {1}"

4660

msgstr ""

4661

4662

#: bzrlib/commands.py:962

4662

#: bzrlib/commands.py:961

4663

#, python-format

4664

msgid "Profile data written to \"%s\"."

4665

msgstr ""

4761

msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."

4762

msgstr ""

4763

4764

#: bzrlib/config.py:2485

4764

#: bzrlib/config.py:2499

4765

msgid "{0} is not an SI unit."

4766

msgstr ""

4767

4768

#: bzrlib/config.py:2949

4768

#: bzrlib/config.py:2956

4769

msgid ""

4770

"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "

4771

"will be saved."

4772

msgstr ""

4773

4774

#: bzrlib/config.py:3093

4774

#: bzrlib/config.py:3100

4775

#, python-format

4776

msgid "Invalid '%s', should be of the form 'name=value'"

4777

msgstr ""

4778

4779

#: bzrlib/config.py:3962

4779

#: bzrlib/config.py:3969

4780

msgid "Display, set or remove a configuration option."

4781

msgstr ""

4782

4783

#: bzrlib/config.py:3964

4783

#: bzrlib/config.py:3971

4784

msgid "Display the active value for a given option."

4785

msgstr ""

4786

4787

#: bzrlib/config.py:3966

4787

#: bzrlib/config.py:3973

4788

msgid ""

4789

"If --all is specified, NAME is interpreted as a regular expression and all\n"

4790

"matching options are displayed mentioning their scope. The active value\n"

4791

"that bzr will take into account is the first one displayed for each option."

4792

msgstr ""

4793

4794

#: bzrlib/config.py:3970

4794

#: bzrlib/config.py:3977

4795

msgid "If no NAME is given, --all .* is implied."

4796

msgstr ""

4797

4798

#: bzrlib/config.py:3972

4798

#: bzrlib/config.py:3979

4799

msgid ""

4800

"Setting a value is achieved by using name=value without spaces. The value\n"

4801

"is set in the most relevant scope and can be checked by displaying the\n"

4802

"option again."

4803

msgstr ""

4804

4805

#: bzrlib/config.py:3984

4805

#: bzrlib/config.py:3991

4806

msgid "Reduce the scope to the specified configuration file."

4807

msgstr ""

4808

4809

#: bzrlib/config.py:3988

4809

#: bzrlib/config.py:3995

4810

msgid "Display all the defined values for the matching options."

4811

msgstr ""

4812

4813

#: bzrlib/config.py:3990

4813

#: bzrlib/config.py:3997

4814

msgid "Remove the option from the configuration file."

4815

msgstr ""

4816

4890

msgstr[0] ""

4891

msgstr[1] ""

4892

4893

#: bzrlib/controldir.py:710

4893

#: bzrlib/controldir.py:698

4894

msgid "{0} is{1} redirected to {2}"

4895

msgstr ""

4896

4996

msgid "The value '%(value)s' is not a valid value."

4997

msgstr ""

4998

4999

#: bzrlib/errors.py:424

5000

msgid "Bad value \"%(value)s\" for option \"%(name)s\"."

5001

msgstr ""

5002

5003

4999

#: bzrlib/errors.py:443

5004

5000

msgid "Generic path error: %(path)r%(extra)s)"

5005

5001

msgstr ""

5099

5095

msgstr ""

5100

5096

5101

5097

#: bzrlib/errors.py:705

5102

msgid "A control directory already exists: \"%(path)s\"."

5103

msgstr ""

5104

5105

#: bzrlib/errors.py:710

5106

5098

msgid "Already a branch: \"%(path)s\"."

5107

5099

msgstr ""

5108

5100

5109

#: bzrlib/errors.py:715

5110

msgid "Parent branch already exists: \"%(path)s\"."

5111

msgstr ""

5112

5113

#: bzrlib/errors.py:721

5101

#: bzrlib/errors.py:711

5114

5102

msgid ""

5115

5103

"Directory contains a branch, but no working tree (use bzr checkout if you "

5116

5104

"wish to build a working tree): \"%(path)s\""

5117

5105

msgstr ""

5118

5106

5107

#: bzrlib/errors.py:716

5108

msgid ""

5109

"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""

5110

msgstr ""

5111

5119

5112

#: bzrlib/errors.py:726

5120

5113

msgid ""

5121

"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""

5114

"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""

5122

5115

msgstr ""

5123

5116

5124

5117

#: bzrlib/errors.py:736

5125

msgid ""

5126

"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""

5127

msgstr ""

5128

5129

#: bzrlib/errors.py:746

5130

5118

msgid "No repository present: \"%(path)s\""

5131

5119

msgstr ""

5132

5120

5133

#: bzrlib/errors.py:753

5121

#: bzrlib/errors.py:743

5134

5122

msgid ""

5135

5123

"Unsupported branch format: %(format)s\n"

5136

5124

"Please run 'bzr upgrade'"

5137

5125

msgstr ""

5138

5126

5139

#: bzrlib/errors.py:759

5127

#: bzrlib/errors.py:749

5140

5128

msgid "Unknown %(kind)s format: %(format)r"

5141

5129

msgstr ""

5142

5130

5131

#: bzrlib/errors.py:758

5132

msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."

5133

msgstr ""

5134

5143

5135

#: bzrlib/errors.py:768

5144

msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."

5145

msgstr ""

5146

5147

#: bzrlib/errors.py:778

5148

5136

msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"

5149

5137

msgstr ""

5150

5138

5151

#: bzrlib/errors.py:793

5139

#: bzrlib/errors.py:783

5152

5140

msgid ""

5153

5141

"%(target)s\n"

5154

5142

"is not compatible with\n"

5156

5144

"%(details)s"

5157

5145

msgstr ""

5158

5146

5147

#: bzrlib/errors.py:799

5148

msgid "Revision is not compatible with %(repo_format)s"

5149

msgstr ""

5150

5159

5151

#: bzrlib/errors.py:809

5160

msgid "Revision is not compatible with %(repo_format)s"

5161

msgstr ""

5162

5163

#: bzrlib/errors.py:819

5164

5152

msgid "%(context_info)s%(path)s is already versioned."

5165

5153

msgstr ""

5166

5154

5167

#: bzrlib/errors.py:840

5155

#: bzrlib/errors.py:830

5168

5156

msgid "%(context_info)s%(path)s is not versioned."

5169

5157

msgstr ""

5170

5158

5171

#: bzrlib/errors.py:861

5159

#: bzrlib/errors.py:851

5172

5160

msgid "Path(s) are not versioned: %(paths_as_string)s"

5173

5161

msgstr ""

5174

5162

5175

#: bzrlib/errors.py:872

5163

#: bzrlib/errors.py:862

5176

5164

msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"

5177

5165

msgstr ""

5178

5166

5179

#: bzrlib/errors.py:891

5167

#: bzrlib/errors.py:881

5180

5168

msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""

5181

5169

msgstr ""

5182

5170

5183

#: bzrlib/errors.py:899

5171

#: bzrlib/errors.py:889

5184

5172

msgid ""

5185

5173

"Filename %(filename)r is not valid in your current filesystem encoding "

5186

5174

"%(fs_encoding)s"

5187

5175

msgstr ""

5188

5176

5189

#: bzrlib/errors.py:910

5177

#: bzrlib/errors.py:900

5190

5178

msgid "Cannot operate on \"%(filename)s\" because it is a control file"

5191

5179

msgstr ""

5192

5180

5193

#: bzrlib/errors.py:928

5181

#: bzrlib/errors.py:918

5194

5182

msgid "The lock for '%(lock_description)s' is in use and cannot be broken."

5195

5183

msgstr ""

5196

5184

5185

#: bzrlib/errors.py:957

5186

msgid "Cannot lock %(lock)s: %(why)s"

5187

msgstr ""

5188

5197

5189

#: bzrlib/errors.py:967

5198

msgid "Cannot lock %(lock)s: %(why)s"

5199

msgstr ""

5200

5201

#: bzrlib/errors.py:977

5202

5190

msgid ""

5203

5191

"A transaction related operation was attempted after the transaction finished."

5204

5192

msgstr ""

5205

5193

5206

#: bzrlib/errors.py:1004

5194

#: bzrlib/errors.py:994

5207

5195

msgid "Cannot lock: transport is read only: %(transport)s"

5208

5196

msgstr ""

5209

5197

5210

#: bzrlib/errors.py:1012

5198

#: bzrlib/errors.py:1002

5211

5199

msgid "Could not acquire lock \"%(lock)s\": %(msg)s"

5212

5200

msgstr ""

5213

5201

5214

#: bzrlib/errors.py:1023

5202

#: bzrlib/errors.py:1013

5215

5203

msgid ""

5216

5204

"Lock was broken while still open: %(lock)s - check storage consistency!"

5217

5205

msgstr ""

5218

5206

5219

#: bzrlib/errors.py:1034

5207

#: bzrlib/errors.py:1024

5220

5208

msgid ""

5221

5209

"Lock was released and re-acquired before being broken: %(lock)s: held by "

5222

5210

"%(holder)r, wanted to break %(target)r"

5223

5211

msgstr ""

5224

5212

5225

#: bzrlib/errors.py:1046

5213

#: bzrlib/errors.py:1036

5226

5214

msgid ""

5227

5215

"Lock is apparently held, but corrupted: %(corruption_info)s\n"

5228

5216

"Use 'bzr break-lock' to clear it"

5229

5217

msgstr ""

5230

5218

5231

#: bzrlib/errors.py:1059

5219

#: bzrlib/errors.py:1049

5232

5220

msgid "Lock not held: %(lock)s"

5233

5221

msgstr ""

5234

5222

5235

#: bzrlib/errors.py:1088

5223

#: bzrlib/errors.py:1078

5236

5224

msgid "No changes to commit"

5237

5225

msgstr ""

5238

5226

5227

#: bzrlib/errors.py:1083

5228

msgid ""

5229

"Selected-file commit of merges is not supported yet: files %(files_str)s"

5230

msgstr ""

5231

5239

5232

#: bzrlib/errors.py:1093

5240

5233

msgid ""

5241

"Selected-file commit of merges is not supported yet: files %(files_str)s"

5242

msgstr ""

5243

5244

#: bzrlib/errors.py:1103

5245

msgid ""

5246

5234

"Excluding paths during commit is not supported by repository at "

5247

5235

"%(repository)r."

5248

5236

msgstr ""

5249

5237

5250

#: bzrlib/errors.py:1112

5238

#: bzrlib/errors.py:1102

5251

5239

msgid ""

5252

5240

"The specified commit message contains characters unsupported by the current "

5253

5241

"encoding."

5254

5242

msgstr ""

5255

5243

5256

#: bzrlib/errors.py:1118

5244

#: bzrlib/errors.py:1108

5257

5245

msgid "Upgrade URL cannot work with readonly URLs."

5258

5246

msgstr ""

5259

5247

5260

#: bzrlib/errors.py:1123

5248

#: bzrlib/errors.py:1113

5261

5249

msgid "The branch format %(format)s is already at the most recent format."

5262

5250

msgstr ""

5263

5251

5264

#: bzrlib/errors.py:1146

5252

#: bzrlib/errors.py:1136

5265

5253

msgid "Option --change does not accept revision ranges"

5266

5254

msgstr ""

5267

5255

5268

#: bzrlib/errors.py:1151

5256

#: bzrlib/errors.py:1141

5269

5257

msgid "No namespace registered for string: %(spec)r"

5270

5258

msgstr ""

5271

5259

5272

#: bzrlib/errors.py:1170

5260

#: bzrlib/errors.py:1160

5273

5261

msgid ""

5274

5262

"Requested revision: '%(spec)s' does not exist in branch: "

5275

5263

"%(branch_url)s%(extra)s"

5276

5264

msgstr ""

5277

5265

5278

#: bzrlib/errors.py:1184

5266

#: bzrlib/errors.py:1174

5279

5267

msgid ""

5280

5268

"Operation denied because it would change the main history, which is not "

5281

5269

"permitted by the append_revisions_only setting on branch \"%(location)s\"."

5282

5270

msgstr ""

5283

5271

5284

#: bzrlib/errors.py:1195

5272

#: bzrlib/errors.py:1185

5285

5273

msgid ""

5286

5274

"These branches have diverged. Use the missing command to see how.\n"

5287

5275

"Use the merge command to reconcile them."

5288

5276

msgstr ""

5289

5277

5290

#: bzrlib/errors.py:1215

5278

#: bzrlib/errors.py:1205

5291

5279

msgid ""

5292

5280

"Branches have no common ancestor, and no merge base revision was specified."

5293

5281

msgstr ""

5294

5282

5295

#: bzrlib/errors.py:1221

5283

#: bzrlib/errors.py:1211

5296

5284

msgid ""

5297

5285

"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."

5298

5286

msgstr ""

5299

5287

5300

#: bzrlib/errors.py:1227

5288

#: bzrlib/errors.py:1217

5301

5289

msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"

5302

5290

msgstr ""

5303

5291

5304

#: bzrlib/errors.py:1236

5292

#: bzrlib/errors.py:1226

5305

5293

msgid ""

5306

5294

"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."

5307

5295

msgstr ""

5308

5296

5309

#: bzrlib/errors.py:1245

5297

#: bzrlib/errors.py:1235

5310

5298

msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"

5311

5299

msgstr ""

5312

5300

5313

#: bzrlib/errors.py:1254

5301

#: bzrlib/errors.py:1244

5314

5302

msgid "Branch %(branch)s has no commits."

5315

5303

msgstr ""

5316

5304

5317

#: bzrlib/errors.py:1272

5305

#: bzrlib/errors.py:1262

5318

5306

msgid ""

5319

5307

"Bound branch %(branch)s is out of date with master branch "

5320

5308

"%(master)s.%(extra_help)s"

5321

5309

msgstr ""

5322

5310

5323

#: bzrlib/errors.py:1284

5311

#: bzrlib/errors.py:1274

5324

5312

msgid ""

5325

5313

"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "

5326

5314

"bound to %(remote)s."

5327

5315

msgstr ""

5328

5316

5329

#: bzrlib/errors.py:1296

5317

#: bzrlib/errors.py:1286

5330

5318

msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"

5331

5319

msgstr ""

5332

5320

5333

#: bzrlib/errors.py:1305

5321

#: bzrlib/errors.py:1295

5334

5322

msgid ""

5335

5323

"Unable to connect to target of bound branch %(branch)s => %(target)s: "

5336

5324

"%(error)s"

5337

5325

msgstr ""

5338

5326

5339

#: bzrlib/errors.py:1317

5327

#: bzrlib/errors.py:1307

5340

5328

msgid "Error in processing weave: %(msg)s"

5341

5329

msgstr ""

5342

5330

5343

#: bzrlib/errors.py:1326

5331

#: bzrlib/errors.py:1316

5344

5332

msgid "Revision {%(revision_id)s} already present in %(weave)s"

5345

5333

msgstr ""

5346

5334

5335

#: bzrlib/errors.py:1327

5336

msgid "Revision {%(revision_id)s} not present in %(weave)s"

5337

msgstr ""

5338

5347

5339

#: bzrlib/errors.py:1337

5348

msgid "Revision {%(revision_id)s} not present in %(weave)s"

5349

msgstr ""

5350

5351

#: bzrlib/errors.py:1347

5352

5340

msgid "Weave invariant violated: %(what)s"

5353

5341

msgstr ""

5354

5342

5355

#: bzrlib/errors.py:1356

5343

#: bzrlib/errors.py:1346

5356

5344

msgid "Parents are mismatched between two revisions. %(msg)s"

5357

5345

msgstr ""

5358

5346

5359

#: bzrlib/errors.py:1378

5347

#: bzrlib/errors.py:1368

5360

5348

msgid ""

5361

5349

"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "

5362

5350

"%(weave_b)s"

5363

5351

msgstr ""

5364

5352

5365

#: bzrlib/errors.py:1390

5353

#: bzrlib/errors.py:1380

5366

5354

msgid "Versioned file error"

5367

5355

msgstr ""

5368

5356

5357

#: bzrlib/errors.py:1385

5358

msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."

5359

msgstr ""

5360

5369

5361

#: bzrlib/errors.py:1395

5370

msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."

5362

msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."

5371

5363

msgstr ""

5372

5364

5373

5365

#: bzrlib/errors.py:1405

5374

msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."

5375

msgstr ""

5376

5377

#: bzrlib/errors.py:1415

5378

5366

msgid "Text did not match its checksum: %(msg)s"

5379

5367

msgstr ""

5380

5368

5381

#: bzrlib/errors.py:1541

5369

#: bzrlib/errors.py:1531

5382

5370

msgid "Export format %(format)r not supported"

5383

5371

msgstr ""

5384

5372

5385

#: bzrlib/errors.py:1550

5373

#: bzrlib/errors.py:1540

5386

5374

msgid "Transport error: %(msg)s %(orig_error)s"

5387

5375

msgstr ""

5388

5376

5389

#: bzrlib/errors.py:1576

5377

#: bzrlib/errors.py:1566

5390

5378

msgid "Generic bzr smart protocol error: %(details)s"

5391

5379

msgstr ""

5392

5380

5393

#: bzrlib/errors.py:1584

5381

#: bzrlib/errors.py:1574

5394

5382

msgid "Received bad protocol version marker: %(marker)r"

5395

5383

msgstr ""

5396

5384

5397

#: bzrlib/errors.py:1616

5385

#: bzrlib/errors.py:1606

5398

5386

msgid "Transport operation not possible: %(msg)s %(orig_error)s"

5399

5387

msgstr ""

5400

5388

5401

#: bzrlib/errors.py:1621

5389

#: bzrlib/errors.py:1611

5402

5390

msgid "Connection error: %(msg)s %(orig_error)s"

5403

5391

msgstr ""

5404

5392

5405

#: bzrlib/errors.py:1626

5393

#: bzrlib/errors.py:1616

5406

5394

msgid "%(msg)s %(host)s%(port)s%(orig_error)s"

5407

5395

msgstr ""

5408

5396

5409

#: bzrlib/errors.py:1647

5397

#: bzrlib/errors.py:1637

5410

5398

msgid "Connection closed: %(msg)s %(orig_error)s"

5411

5399

msgstr ""

5412

5400

5413

#: bzrlib/errors.py:1652

5401

#: bzrlib/errors.py:1642

5414

5402

msgid "Connection Timeout: %(msg)s%(orig_error)s"

5415

5403

msgstr ""

5416

5404

5405

#: bzrlib/errors.py:1647

5406

msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"

5407

msgstr ""

5408

5417

5409

#: bzrlib/errors.py:1657

5418

msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"

5419

msgstr ""

5420

5421

#: bzrlib/errors.py:1667

5422

5410

msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"

5423

5411

msgstr ""

5424

5412

5425

#: bzrlib/errors.py:1682

5426

msgid "Certificate error: %(error)s"

5427

msgstr ""

5428

5429

#: bzrlib/errors.py:1690

5413

#: bzrlib/errors.py:1672

5430

5414

msgid "Invalid http range %(range)r for %(path)s: %(msg)s"

5431

5415

msgstr ""

5432

5416

5433

#: bzrlib/errors.py:1704

5417

#: bzrlib/errors.py:1686

5434

5418

msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"

5435

5419

msgstr ""

5436

5420

5437

#: bzrlib/errors.py:1712

5421

#: bzrlib/errors.py:1694

5438

5422

msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"

5439

5423

msgstr ""

5440

5424

5441

#: bzrlib/errors.py:1721

5425

#: bzrlib/errors.py:1703

5442

5426

msgid "%(source)s is%(permanently)s redirected to %(target)s"

5443

5427

msgstr ""

5444

5428

5445

#: bzrlib/errors.py:1735

5429

#: bzrlib/errors.py:1717

5446

5430

msgid "Too many redirections"

5447

5431

msgstr ""

5448

5432

5449

#: bzrlib/errors.py:1740

5433

#: bzrlib/errors.py:1722

5450

5434

msgid "Working tree has conflicts."

5451

5435

msgstr ""

5452

5436

5453

#: bzrlib/errors.py:1744

5437

#: bzrlib/errors.py:1726

5454

5438

msgid "Config file %(filename)s is not UTF-8 encoded\n"

5455

5439

msgstr ""

5456

5440

5457

#: bzrlib/errors.py:1753

5441

#: bzrlib/errors.py:1735

5458

5442

msgid ""

5459

5443

"Error(s) parsing config file %(filename)s:\n"

5460

5444

"%(errors)s"

5461

5445

msgstr ""

5462

5446

5447

#: bzrlib/errors.py:1746

5448

msgid "Bad value \"%(value)s\" for option \"%(name)s\"."

5449

msgstr ""

5450

5451

#: bzrlib/errors.py:1754

5452

msgid "%(username)r does not seem to contain a reasonable email address"

5453

msgstr ""

5454

5463

5455

#: bzrlib/errors.py:1763

5464

msgid ""

5465

"Bad value \"%(value)s\" for option \"%(name)s\".\n"

5466

"See ``bzr help %(name)s``"

5467

msgstr ""

5468

5469

#: bzrlib/errors.py:1773

5470

msgid "%(username)r does not seem to contain a reasonable email address"

5471

msgstr ""

5472

5473

#: bzrlib/errors.py:1782

5474

5456

msgid "Failed to GPG sign data with command \"%(command_line)s\""

5475

5457

msgstr ""

5476

5458

5477

#: bzrlib/errors.py:1790

5459

#: bzrlib/errors.py:1771

5478

5460

msgid "Failed to verify GPG signature data with error \"%(error)s\""

5479

5461

msgstr ""

5480

5462

5481

#: bzrlib/errors.py:1798

5463

#: bzrlib/errors.py:1779

5482

5464

msgid "Unable to import library \"%(library)s\": %(error)s"

5483

5465

msgstr ""

5484

5466

5485

#: bzrlib/errors.py:1806

5467

#: bzrlib/errors.py:1787

5486

5468

msgid "python-gpgme is not installed, it is needed to verify signatures"

5487

5469

msgstr ""

5488

5470

5489

#: bzrlib/errors.py:1814

5471

#: bzrlib/errors.py:1795

5490

5472

msgid ""

5491

5473

"The working tree for %(basedir)s has changed since the last commit, but "

5492

5474

"weave merge requires that it be unchanged"

5493

5475

msgstr ""

5494

5476

5495

#: bzrlib/errors.py:1824

5477

#: bzrlib/errors.py:1805

5496

5478

msgid ""

5497

5479

"Can't reprocess and show base, because reprocessing obscures the "

5498

5480

"relationship of conflicting lines to the base"

5499

5481

msgstr ""

5500

5482

5501

#: bzrlib/errors.py:1830

5483

#: bzrlib/errors.py:1811

5502

5484

msgid "Cycle in graph %(graph)r"

5503

5485

msgstr ""

5504

5486

5505

#: bzrlib/errors.py:1858

5487

#: bzrlib/errors.py:1839

5506

5488

msgid "File %(filename)s is not conflicted."

5507

5489

msgstr ""

5508

5490

5509

#: bzrlib/errors.py:1880

5491

#: bzrlib/errors.py:1861

5510

5492

msgid "No bundle was found in \"%(filename)s\"."

5511

5493

msgstr ""

5512

5494

5513

#: bzrlib/errors.py:1889

5495

#: bzrlib/errors.py:1870

5514

5496

msgid "Unable to handle bundle version %(version)s: %(msg)s"

5515

5497

msgstr ""

5516

5498

5517

#: bzrlib/errors.py:1899

5499

#: bzrlib/errors.py:1880

5518

5500

msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"

5519

5501

msgstr ""

5520

5502

5521

#: bzrlib/errors.py:1912

5503

#: bzrlib/errors.py:1893

5522

5504

msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"

5523

5505

msgstr ""

5524

5506

5525

#: bzrlib/errors.py:1922

5507

#: bzrlib/errors.py:1903

5526

5508

msgid "Key %(key)s is already present in map"

5527

5509

msgstr ""

5528

5510

5529

#: bzrlib/errors.py:1927

5511

#: bzrlib/errors.py:1908

5530

5512

msgid "The prefix %(prefix)s is in the help search path twice."

5531

5513

msgstr ""

5532

5514

5533

#: bzrlib/errors.py:1937

5515

#: bzrlib/errors.py:1918

5534

5516

msgid ""

5535

5517

"No final name for trans_id %(trans_id)r\n"

5536

5518

"file-id: %(file_id)r\n"

5537

5519

"root trans-id: %(root_trans_id)r\n"

5538

5520

msgstr ""

5539

5521

5540

#: bzrlib/errors.py:1969

5522

#: bzrlib/errors.py:1950

5541

5523

msgid "Attempt to reuse a transform that has already been applied."

5542

5524

msgstr ""

5543

5525

5544

#: bzrlib/errors.py:1974

5526

#: bzrlib/errors.py:1955

5545

5527

msgid "Moving the root directory is not supported at this time"

5546

5528

msgstr ""

5547

5529

5548

#: bzrlib/errors.py:1979

5530

#: bzrlib/errors.py:1960

5549

5531

msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"

5550

5532

msgstr ""

5551

5533

5552

#: bzrlib/errors.py:1990

5534

#: bzrlib/errors.py:1971

5553

5535

msgid ""

5554

5536

"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5555

5537

msgstr ""

5556

5538

5557

#: bzrlib/errors.py:2026

5539

#: bzrlib/errors.py:2007

5558

5540

msgid ""

5559

5541

"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5560

5542

msgstr ""

5561

5543

5562

#: bzrlib/errors.py:2056

5544

#: bzrlib/errors.py:2037

5563

5545

msgid "Unable to import paramiko (required for sftp support): %(error)s"

5564

5546

msgstr ""

5565

5547

5566

#: bzrlib/errors.py:2064

5548

#: bzrlib/errors.py:2045

5567

5549

msgid "Nothing to merge."

5568

5550

msgstr ""

5569

5551

5570

#: bzrlib/errors.py:2069

5552

#: bzrlib/errors.py:2050

5571

5553

msgid "Format %(format)s cannot be initialised by this version of bzr."

5572

5554

msgstr ""

5573

5555

5574

#: bzrlib/errors.py:2078

5556

#: bzrlib/errors.py:2059

5575

5557

msgid ""

5576

5558

"Cannot convert from format %(from_format)s to format %(format)s. "

5577

5559

"%(problem)s"

5578

5560

msgstr ""

5579

5561

5580

#: bzrlib/errors.py:2090

5562

#: bzrlib/errors.py:2071

5581

5563

msgid "Could not find an appropriate Differ for file \"%(path)s\""

5582

5564

msgstr ""

5583

5565

5584

#: bzrlib/errors.py:2098

5566

#: bzrlib/errors.py:2079

5585

5567

msgid "%(exe_name)s could not be found on this machine"

5586

5568

msgstr ""

5587

5569

5588

#: bzrlib/errors.py:2106

5570

#: bzrlib/errors.py:2087

5589

5571

msgid "Diff is not installed on this machine: %(msg)s"

5590

5572

msgstr ""

5591

5573

5592

#: bzrlib/errors.py:2114

5574

#: bzrlib/errors.py:2095

5593

5575

msgid "Diff3 is not installed on this machine."

5594

5576

msgstr ""

5595

5577

5596

#: bzrlib/errors.py:2120

5578

#: bzrlib/errors.py:2101

5597

5579

msgid "The content being inserted is already present."

5598

5580

msgstr ""

5599

5581

5600

#: bzrlib/errors.py:2125

5582

#: bzrlib/errors.py:2106

5601

5583

msgid ""

5602

5584

"This tree contains left-over files from a failed operation.\n"

5603

5585

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5605

5587

" keep, and delete it when you are done."

5606

5588

msgstr ""

5607

5589

5608

#: bzrlib/errors.py:2136

5590

#: bzrlib/errors.py:2117

5609

5591

msgid ""

5610

5592

"This tree contains left-over files from a failed operation.\n"

5611

5593

" Please examine %(pending_deletion)s to see if it contains any files you\n"

5612

5594

" wish to keep, and delete it when you are done."

5613

5595

msgstr ""

5614

5596

5615

#: bzrlib/errors.py:2146

5597

#: bzrlib/errors.py:2127

5616

5598

msgid ""

5617

5599

"Unable to delete transform temporary directory %(limbo_dir)s.\n"

5618

5600

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5620

5602

" keep, and delete it when you are done."

5621

5603

msgstr ""

5622

5604

5623

#: bzrlib/errors.py:2157

5605

#: bzrlib/errors.py:2138

5624

5606

msgid ""

5625

5607

"Unable to delete transform temporary directory %(pending_deletion)s. Please "

5626

5608

"examine %(pending_deletion)s to see if it contains any files you wish to "

5627

5609

"keep, and delete it when you are done."

5628

5610

msgstr ""

5629

5611

5630

#: bzrlib/errors.py:2167

5612

#: bzrlib/errors.py:2148

5631

5613

msgid "Working tree is out of date, please run 'bzr update'.%(more)s"

5632

5614

msgstr ""

5633

5615

5634

#: bzrlib/errors.py:2181

5616

#: bzrlib/errors.py:2162

5635

5617

msgid ""

5636

5618

"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."

5637

5619

msgstr ""

5638

5620

5639

#: bzrlib/errors.py:2194

5621

#: bzrlib/errors.py:2175

5640

5622

msgid "Error in merge modified format"

5641

5623

msgstr ""

5642

5624

5643

#: bzrlib/errors.py:2199

5625

#: bzrlib/errors.py:2180

5644

5626

msgid "Format error in conflict listings"

5645

5627

msgstr ""

5646

5628

5647

#: bzrlib/errors.py:2203

5629

#: bzrlib/errors.py:2184

5648

5630

msgid ""

5649

5631

"Inconsistency in dirstate file %(dirstate_path)s.\n"

5650

5632

"Error: %(description)s"

5651

5633

msgstr ""

5652

5634

5653

#: bzrlib/errors.py:2214

5635

#: bzrlib/errors.py:2195

5654

5636

msgid ""

5655

5637

"An error has been detected in the repository %(repo_path)s.\n"

5656

5638

"Please run bzr reconcile on this repository."

5657

5639

msgstr ""

5658

5640

5659

#: bzrlib/errors.py:2225

5641

#: bzrlib/errors.py:2206

5660

5642

msgid ""

5661

5643

"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"

5662

5644

"reason: %(reason)s"

5663

5645

msgstr ""

5664

5646

5665

#: bzrlib/errors.py:2238

5647

#: bzrlib/errors.py:2219

5666

5648

msgid ""

5667

5649

"An inconsistent delta was supplied: %(delta)r\n"

5668

5650

"reason: %(reason)s"

5669

5651

msgstr ""

5670

5652

5671

#: bzrlib/errors.py:2250

5653

#: bzrlib/errors.py:2231

5672

5654

msgid "To use this feature you must upgrade your branch at %(path)s."

5673

5655

msgstr ""

5674

5656

5675

#: bzrlib/errors.py:2259

5657

#: bzrlib/errors.py:2240

5676

5658

msgid "To use this feature you must upgrade your repository at %(path)s."

5677

5659

msgstr ""

5678

5660

5679

#: bzrlib/errors.py:2264

5661

#: bzrlib/errors.py:2245

5680

5662

msgid ""

5681

5663

"To use this feature you must upgrade your branch at %(path)s to a format "

5682

5664

"which supports rich roots."

5683

5665

msgstr ""

5684

5666

5685

#: bzrlib/errors.py:2270

5667

#: bzrlib/errors.py:2251

5686

5668

msgid "Cannot perform local-only commits on unbound branches."

5687

5669

msgstr ""

5688

5670

5689

#: bzrlib/errors.py:2275

5671

#: bzrlib/errors.py:2256

5690

5672

msgid "The method %(mname)s is not supported on objects of type %(tname)s."

5691

5673

msgstr ""

5692

5674

5693

#: bzrlib/errors.py:2296

5675

#: bzrlib/errors.py:2277

5694

5676

msgid "Ghost tags not supported by format %(format)r."

5695

5677

msgstr ""

5696

5678

5697

#: bzrlib/errors.py:2304

5679

#: bzrlib/errors.py:2285

5698

5680

msgid "File is binary but should be text."

5699

5681

msgstr ""

5700

5682

5701

#: bzrlib/errors.py:2309

5683

#: bzrlib/errors.py:2290

5702

5684

msgid "The path %(path)s is not permitted on this platform"

5703

5685

msgstr ""

5704

5686

5705

#: bzrlib/errors.py:2318

5687

#: bzrlib/errors.py:2299

5706

5688

msgid ""

5707

5689

"Testament did not match expected value.\n"

5708

5690

" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"

5709

5691

" {%(measured)s}"

5710

5692

msgstr ""

5711

5693

5712

#: bzrlib/errors.py:2330

5694

#: bzrlib/errors.py:2311

5713

5695

msgid "Not a bzr revision-bundle: %(text)r"

5714

5696

msgstr ""

5715

5697

5716

#: bzrlib/errors.py:2339

5698

#: bzrlib/errors.py:2320

5717

5699

msgid "Bad bzr revision-bundle: %(text)r"

5718

5700

msgstr ""

5719

5701

5720

#: bzrlib/errors.py:2348

5702

#: bzrlib/errors.py:2329

5721

5703

msgid "Malformed bzr revision-bundle header: %(text)r"

5722

5704

msgstr ""

5723

5705

5724

#: bzrlib/errors.py:2353

5706

#: bzrlib/errors.py:2334

5725

5707

msgid "Malformed patches in bzr revision-bundle: %(text)r"

5726

5708

msgstr ""

5727

5709

5728

#: bzrlib/errors.py:2358

5710

#: bzrlib/errors.py:2339

5729

5711

msgid "Malformed footer in bzr revision-bundle: %(text)r"

5730

5712

msgstr ""

5731

5713

5732

#: bzrlib/errors.py:2363

5714

#: bzrlib/errors.py:2344

5733

5715

msgid "End of line marker was not \\n in bzr revision-bundle"

5734

5716

msgstr ""

5735

5717

5736

#: bzrlib/errors.py:2373

5718

#: bzrlib/errors.py:2354

5737

5719

msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"

5738

5720

msgstr ""

5739

5721

5740

#: bzrlib/errors.py:2383

5722

#: bzrlib/errors.py:2364

5741

5723

msgid "Root class for inventory serialization errors"

5742

5724

msgstr ""

5743

5725

5744

#: bzrlib/errors.py:2387

5726

#: bzrlib/errors.py:2368

5745

5727

msgid ""

5746

5728

"The inventory was not in the expected format:\n"

5747

5729

" %(msg)s"

5748

5730

msgstr ""

5749

5731

5750

#: bzrlib/errors.py:2396

5732

#: bzrlib/errors.py:2377

5751

5733

msgid "This operation requires rich root data storage"

5752

5734

msgstr ""

5753

5735

5754

#: bzrlib/errors.py:2409

5736

#: bzrlib/errors.py:2390

5755

5737

msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"

5756

5738

msgstr ""

5757

5739

5758

#: bzrlib/errors.py:2418

5740

#: bzrlib/errors.py:2399

5759

5741

msgid ""

5760

5742

"Don't know how to handle SSH connections. Please set BZR_SSH environment "

5761

5743

"variable."

5762

5744

msgstr ""

5763

5745

5764

#: bzrlib/errors.py:2425

5746

#: bzrlib/errors.py:2406

5765

5747

msgid ""

5766

5748

"Could not determine revno for {%(revision_id)s} because its ancestry shows a "

5767

5749

"ghost at {%(ghost_revision_id)s}"

5768

5750

msgstr ""

5769

5751

5770

#: bzrlib/errors.py:2435

5752

#: bzrlib/errors.py:2416

5771

5753

msgid "Ghost revision {%(revision_id)s} cannot be used here."

5772

5754

msgstr ""

5773

5755

5774

#: bzrlib/errors.py:2486

5756

#: bzrlib/errors.py:2467

5775

5757

msgid ""

5776

5758

"A merge directive must provide either a bundle or a public branch location."

5777

5759

msgstr ""

5778

5760

5779

#: bzrlib/errors.py:2493

5761

#: bzrlib/errors.py:2474

5780

5762

msgid "Bad merge directive payload %(start)r"

5781

5763

msgstr ""

5782

5764

5783

#: bzrlib/errors.py:2503

5765

#: bzrlib/errors.py:2484

5784

5766

msgid "Preview patch does not match requested changes."

5785

5767

msgstr ""

5786

5768

5787

#: bzrlib/errors.py:2509

5769

#: bzrlib/errors.py:2490

5788

5770

msgid "Patch_type was %(patch_type)s, but no patch was supplied."

5789

5771

msgstr ""

5790

5772

5791

#: bzrlib/errors.py:2519

5773

#: bzrlib/errors.py:2500

5792

5774

msgid ""

5793

5775

"Your branch does not have all of the revisions required in order to merge "

5794

5776

"this merge directive and the target location specified in the merge "

5795

5777

"directive is not a branch: %(location)s."

5796

5778

msgstr ""

5797

5779

5798

#: bzrlib/errors.py:2531

5780

#: bzrlib/errors.py:2512

5799

5781

msgid "Unsupported entry kind %(kind)s"

5800

5782

msgstr ""

5801

5783

5802

#: bzrlib/errors.py:2539

5784

#: bzrlib/errors.py:2520

5803

5785

msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"

5804

5786

msgstr ""

5805

5787

5788

#: bzrlib/errors.py:2530

5789

msgid "Subsume target %(other_tree)s needs to be upgraded."

5790

msgstr ""

5791

5806

5792

#: bzrlib/errors.py:2549

5807

msgid "Subsume target %(other_tree)s needs to be upgraded."

5808

msgstr ""

5809

5810

#: bzrlib/errors.py:2568

5811

5793

msgid "No such tag: %(tag_name)s"

5812

5794

msgstr ""

5813

5795

5814

#: bzrlib/errors.py:2576

5796

#: bzrlib/errors.py:2557

5815

5797

msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."

5816

5798

msgstr ""

5817

5799

5818

#: bzrlib/errors.py:2585

5800

#: bzrlib/errors.py:2566

5819

5801

msgid "Tag %(tag_name)s already exists."

5820

5802

msgstr ""

5821

5803

5822

#: bzrlib/errors.py:2593

5804

#: bzrlib/errors.py:2574

5823

5805

msgid ""

5824

5806

"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "

5825

5807

"bugs\" for more information on this feature."

5826

5808

msgstr ""

5827

5809

5828

#: bzrlib/errors.py:2603

5810

#: bzrlib/errors.py:2584

5829

5811

msgid ""

5830

5812

"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"

5831

5813

msgstr ""

5832

5814

5833

#: bzrlib/errors.py:2613

5815

#: bzrlib/errors.py:2594

5834

5816

msgid ""

5835

5817

"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"

5836

5818

msgstr ""

5837

5819

5838

#: bzrlib/errors.py:2623

5820

#: bzrlib/errors.py:2604

5839

5821

msgid "Invalid line in bugs property: '%(line)s'"

5840

5822

msgstr ""

5841

5823

5842

#: bzrlib/errors.py:2631

5824

#: bzrlib/errors.py:2612

5843

5825

msgid "Invalid bug status: '%(status)s'"

5844

5826

msgstr ""

5845

5827

5846

#: bzrlib/errors.py:2639

5828

#: bzrlib/errors.py:2620

5847

5829

msgid "Could not understand response from smart server: %(response_tuple)r"

5848

5830

msgstr ""

5849

5831

5832

#: bzrlib/errors.py:2659

5833

msgid "Server sent an unexpected error: %(error_tuple)r"

5834

msgstr ""

5835

5850

5836

#: bzrlib/errors.py:2678

5851

msgid "Server sent an unexpected error: %(error_tuple)r"

5852

msgstr ""

5853

5854

#: bzrlib/errors.py:2697

5855

5837

msgid "Unrecognised container format: %(container_format)r"

5856

5838

msgstr ""

5857

5839

5858

#: bzrlib/errors.py:2705

5840

#: bzrlib/errors.py:2686

5859

5841

msgid "Unexpected end of container stream"

5860

5842

msgstr ""

5861

5843

5862

#: bzrlib/errors.py:2710

5844

#: bzrlib/errors.py:2691

5863

5845

msgid "Unknown record type: %(record_type)r"

5864

5846

msgstr ""

5865

5847

5866

#: bzrlib/errors.py:2718

5848

#: bzrlib/errors.py:2699

5867

5849

msgid "Invalid record: %(reason)s"

5868

5850

msgstr ""

5869

5851

5870

#: bzrlib/errors.py:2726

5852

#: bzrlib/errors.py:2707

5871

5853

msgid "Container has data after end marker: %(excess)r"

5872

5854

msgstr ""

5873

5855

5874

#: bzrlib/errors.py:2734

5856

#: bzrlib/errors.py:2715

5875

5857

msgid "Container has multiple records with the same name: %(name)s"

5876

5858

msgstr ""

5877

5859

5878

#: bzrlib/errors.py:2747

5860

#: bzrlib/errors.py:2728

5879

5861

msgid "Corrupt or incompatible data stream: %(reason)s"

5880

5862

msgstr ""

5881

5863

5882

#: bzrlib/errors.py:2755

5864

#: bzrlib/errors.py:2736

5883

5865

msgid "SMTP error: %(error)s"

5884

5866

msgstr ""

5885

5867

5886

#: bzrlib/errors.py:2763

5868

#: bzrlib/errors.py:2744

5887

5869

msgid "No message supplied."

5888

5870

msgstr ""

5889

5871

5890

#: bzrlib/errors.py:2768

5872

#: bzrlib/errors.py:2749

5891

5873

msgid "No mail-to address (--mail-to) or output (-o) specified."

5892

5874

msgstr ""

5893

5875

5894

#: bzrlib/errors.py:2773

5876

#: bzrlib/errors.py:2754

5895

5877

msgid "Unknown mail client: %(mail_client)s"

5896

5878

msgstr ""

5897

5879

5898

#: bzrlib/errors.py:2781

5880

#: bzrlib/errors.py:2762

5899

5881

msgid ""

5900

5882

"Unable to find mail client with the following names: "

5901

5883

"%(mail_command_list_string)s"

5902

5884

msgstr ""

5903

5885

5904

#: bzrlib/errors.py:2791

5886

#: bzrlib/errors.py:2772

5905

5887

msgid "SMTP connection to %(host)s refused"

5906

5888

msgstr ""

5907

5889

5908

#: bzrlib/errors.py:2800

5890

#: bzrlib/errors.py:2781

5909

5891

msgid "Please specify smtp_server. No server at default %(host)s."

5910

5892

msgstr ""

5911

5893

5912

#: bzrlib/errors.py:2814

5894

#: bzrlib/errors.py:2795

5913

5895

msgid ""

5914

5896

"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"

5915

5897

"reconfigure."

5916

5898

msgstr ""

5917

5899

5918

#: bzrlib/errors.py:2826

5900

#: bzrlib/errors.py:2807

5919

5901

msgid "'%(display_url)s' is already a branch."

5920

5902

msgstr ""

5921

5903

5922

#: bzrlib/errors.py:2831

5904

#: bzrlib/errors.py:2812

5923

5905

msgid "'%(display_url)s' is already a tree."

5924

5906

msgstr ""

5925

5907

5926

#: bzrlib/errors.py:2836

5908

#: bzrlib/errors.py:2817

5927

5909

msgid "'%(display_url)s' is already a checkout."

5928

5910

msgstr ""

5929

5911

5930

#: bzrlib/errors.py:2841

5912

#: bzrlib/errors.py:2822

5931

5913

msgid "'%(display_url)s' is already a lightweight checkout."

5932

5914

msgstr ""

5933

5915

5934

#: bzrlib/errors.py:2846

5916

#: bzrlib/errors.py:2827

5935

5917

msgid "'%(display_url)s' is already using a shared repository."

5936

5918

msgstr ""

5937

5919

5938

#: bzrlib/errors.py:2851

5920

#: bzrlib/errors.py:2832

5939

5921

msgid "'%(display_url)s' is already standalone."

5940

5922

msgstr ""

5941

5923

5942

#: bzrlib/errors.py:2856

5924

#: bzrlib/errors.py:2837

5943

5925

msgid "Shared repository '%(display_url)s' already creates working trees."

5944

5926

msgstr ""

5945

5927

5946

#: bzrlib/errors.py:2862

5928

#: bzrlib/errors.py:2843

5947

5929

msgid ""

5948

5930

"Shared repository '%(display_url)s' already doesn't create working trees."

5949

5931

msgstr ""

5950

5932

5951

#: bzrlib/errors.py:2868

5933

#: bzrlib/errors.py:2849

5952

5934

msgid "Requested reconfiguration of '%(display_url)s' is not supported."

5953

5935

msgstr ""

5954

5936

5955

#: bzrlib/errors.py:2873

5937

#: bzrlib/errors.py:2854

5956

5938

msgid "No location could be found to bind to at %(display_url)s."

5957

5939

msgstr ""

5958

5940

5959

#: bzrlib/errors.py:2878

5941

#: bzrlib/errors.py:2859

5960

5942

msgid ""

5961

5943

"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "

5962

5944

"status).%(more)s"

5963

5945

msgstr ""

5964

5946

5965

#: bzrlib/errors.py:2897

5947

#: bzrlib/errors.py:2878

5966

5948

msgid ""

5967

5949

"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"

5968

5950

"list).%(more)s"

5969

5951

msgstr ""

5970

5952

5971

#: bzrlib/errors.py:2903

5953

#: bzrlib/errors.py:2884

5972

5954

msgid "Variable {%(name)s} is not available."

5973

5955

msgstr ""

5974

5956

5975

#: bzrlib/errors.py:2911

5957

#: bzrlib/errors.py:2892

5976

5958

msgid "No template specified."

5977

5959

msgstr ""

5978

5960

5979

#: bzrlib/errors.py:2916

5961

#: bzrlib/errors.py:2897

5980

5962

msgid "Unable to create symlink %(path_str)son this platform"

5981

5963

msgstr ""

5982

5964

5983

#: bzrlib/errors.py:2931

5965

#: bzrlib/errors.py:2912

5984

5966

msgid ""

5985

5967

"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "

5986

5968

"\"original\", \"local\"."

5987

5969

msgstr ""

5988

5970

5989

#: bzrlib/errors.py:2965

5971

#: bzrlib/errors.py:2946

5990

5972

msgid ""

5991

5973

"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"

5992

5974

msgstr ""

5993

5975

5994

#: bzrlib/errors.py:2977

5976

#: bzrlib/errors.py:2958

5995

5977

msgid "The \"%(config_id)s\" configuration does not exist."

5996

5978

msgstr ""

5997

5979

5998

#: bzrlib/errors.py:2985

5980

#: bzrlib/errors.py:2966

5999

5981

msgid "The \"%(option_name)s\" configuration option does not exist."

6000

5982

msgstr ""

6001

5983

6002

#: bzrlib/errors.py:2993

5984

#: bzrlib/errors.py:2974

6003

5985

msgid "The alias \"%(alias_name)s\" does not exist."

6004

5986

msgstr ""

6005

5987

6006

#: bzrlib/errors.py:3007

5988

#: bzrlib/errors.py:2988

6007

5989

msgid "\"%(alias_name)s\" is not a valid location alias."

6008

5990

msgstr ""

6009

5991

6010

#: bzrlib/errors.py:3015

5992

#: bzrlib/errors.py:2996

6011

5993

msgid "No %(alias_name)s location assigned."

6012

5994

msgstr ""

6013

5995

6014

#: bzrlib/errors.py:3023

5996

#: bzrlib/errors.py:3004

6015

5997

msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."

6016

5998

msgstr ""

6017

5999

6018

#: bzrlib/errors.py:3033

6000

#: bzrlib/errors.py:3014

6019

6001

msgid "Unknown rules detected: %(unknowns_str)s."

6020

6002

msgstr ""

6021

6003

6022

#: bzrlib/errors.py:3044

6004

#: bzrlib/errors.py:3025

6023

6005

msgid "Tip change rejected: %(msg)s"

6024

6006

msgstr ""

6025

6007

6026

#: bzrlib/errors.py:3052

6008

#: bzrlib/errors.py:3033

6027

6009

msgid "Shelf corrupt."

6028

6010

msgstr ""

6029

6011

6030

#: bzrlib/errors.py:3057

6012

#: bzrlib/errors.py:3038

6031

6013

msgid "Corruption while decompressing repository file%(orig_error)s"

6032

6014

msgstr ""

6033

6015

6034

#: bzrlib/errors.py:3069

6016

#: bzrlib/errors.py:3050

6035

6017

msgid "No changes are shelved with id \"%(shelf_id)d\"."

6036

6018

msgstr ""

6037

6019

6038

#: bzrlib/errors.py:3077

6020

#: bzrlib/errors.py:3058

6039

6021

msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."

6040

6022

msgstr ""

6041

6023

6042

#: bzrlib/errors.py:3085

6024

#: bzrlib/errors.py:3066

6043

6025

msgid ""

6044

6026

"An attempt to access a url outside the server jail was made: '%(url)s'."

6045

6027

msgstr ""

6046

6028

6047

#: bzrlib/errors.py:3093

6029

#: bzrlib/errors.py:3074

6048

6030

msgid "The user aborted the operation."

6049

6031

msgstr ""

6050

6032

6051

#: bzrlib/errors.py:3098

6033

#: bzrlib/errors.py:3079

6052

6034

msgid "Branching '%(url)s'(%(format)s) must create a working tree."

6053

6035

msgstr ""

6054

6036

6055

#: bzrlib/errors.py:3108

6037

#: bzrlib/errors.py:3089

6056

6038

msgid "No such view: %(view_name)s."

6057

6039

msgstr ""

6058

6040

6059

#: bzrlib/errors.py:3118

6041

#: bzrlib/errors.py:3099

6060

6042

msgid ""

6061

6043

"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "

6062

6044

"to a later format."

6063

6045

msgstr ""

6064

6046

6065

#: bzrlib/errors.py:3127

6047

#: bzrlib/errors.py:3108

6066

6048

msgid ""

6067

6049

"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"

6068

6050

msgstr ""

6069

6051

6070

#: bzrlib/errors.py:3194

6052

#: bzrlib/errors.py:3175

6071

6053

msgid "%(bzrdir)r does not support co-located branches."

6072

6054

msgstr ""

6073

6055

6074

#: bzrlib/errors.py:3200

6056

#: bzrlib/errors.py:3181

6075

6057

msgid ""

6076

6058

"Unable to determine your name.\n"

6077

6059

"Please, set your name with the 'whoami' command.\n"

6078

6060

"E.g. bzr whoami \"Your Name <name@example.com>\""

6079

6061

msgstr ""

6080

6062

6081

#: bzrlib/errors.py:3209

6063

#: bzrlib/errors.py:3190

6082

6064

msgid "Invalid pattern(s) found. %(msg)s"

6083

6065

msgstr ""

6084

6066

6085

#: bzrlib/errors.py:3217

6067

#: bzrlib/errors.py:3198

6086

6068

msgid ""

6087

6069

"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "

6088

6070

"unbind` to fix."

6089

6071

msgstr ""

6090

6072

6091

#: bzrlib/errors.py:3228

6073

#: bzrlib/errors.py:3209

6092

6074

msgid "Loop involving %(refs)r while expanding \"%(string)s\"."

6093

6075

msgstr ""

6094

6076

6095

#: bzrlib/errors.py:3237

6077

#: bzrlib/errors.py:3218

6096

6078

msgid "Option %(name)s is not defined while expanding \"%(string)s\"."

6097

6079

msgstr ""

6098

6080

6099

#: bzrlib/errors.py:3246

6081

#: bzrlib/errors.py:3227

6100

6082

msgid ""

6101

6083

"No compatible object available for operations from %(source)r to %(target)r."

6102

6084

msgstr ""

6103

6085

6104

#: bzrlib/errors.py:3256

6086

#: bzrlib/errors.py:3237

6105

6087

msgid ""

6106

6088

"VFS requests over the smart server are not allowed. Encountered: %(method)s, "

6107

6089

"%(arguments)s."

6108

6090

msgstr ""

6109

6091

6110

#: bzrlib/errors.py:3266

6092

#: bzrlib/errors.py:3247

6111

6093

msgid ""

6112

6094

"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "

6113

6095

"format %(format)r"

6114

6096

msgstr ""

6115

6097

6116

#: bzrlib/errors.py:3278

6098

#: bzrlib/errors.py:3259

6117

6099

msgid ""

6118

6100

"Missing feature %(feature)s not provided by this version of Bazaar or any "

6119

6101

"plugin."

6120

6102

msgstr ""

6121

6103

6122

#: bzrlib/errors.py:3291

6104

#: bzrlib/errors.py:3272

6123

6105

msgid "Binary files section encountered."

6124

6106

msgstr ""

6125

6107

6126

#: bzrlib/errors.py:3299

6108

#: bzrlib/errors.py:3280

6127

6109

msgid ""

6128

6110

"Malformed patch header. %(desc)s\n"

6129

6111

"%(line)r"

6130

6112

msgstr ""

6131

6113

6132

#: bzrlib/errors.py:3308

6114

#: bzrlib/errors.py:3289

6133

6115

msgid ""

6134

6116

"Malformed hunk header. %(desc)s\n"

6135

6117

"%(line)r"

6136

6118

msgstr ""

6137

6119

6138

#: bzrlib/errors.py:3317

6120

#: bzrlib/errors.py:3298

6139

6121

msgid ""

6140

6122

"Malformed line. %(desc)s\n"

6141

6123

"%(line)r"

6142

6124

msgstr ""

6143

6125

6144

#: bzrlib/errors.py:3327

6126

#: bzrlib/errors.py:3308

6145

6127

msgid ""

6146

6128

"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "

6147

6129

"but patch says it should be \"%(patch_line)s\""

6148

6130

msgstr ""

6149

6131

6150

#: bzrlib/errors.py:3338

6132

#: bzrlib/errors.py:3319

6151

6133

msgid "The feature %(feature)s has already been registered."

6152

6134

msgstr ""

6153

6135

6477

6459

msgid "lstat/stat of ({0!r}): {1!r}"

6478

6460

msgstr ""

6479

6461

6480

#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019

6462

#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008

6481

6463

#, python-format

6482

6464

msgid "sorry, %r not allowed in path"

6483

6465

msgstr ""

6484

6466

6485

#: bzrlib/osutils.py:1237

6467

#: bzrlib/osutils.py:1226

6486

6468

#, python-format

6487

6469

msgid "%r is too short to calculate a relative path"

6488

6470

msgstr ""

6926

6908

msgid "Created new branch."

6927

6909

msgstr ""

6928

6910

6929

#: bzrlib/push.py:97

6911

#: bzrlib/push.py:98

6930

6912

#, python-format

6931

6913

msgid ""

6932

6914

"Target directory %s already contains a .bzr directory, but it is not valid."

7053

7035

msgid "%s is now not stacked\n"

7054

7036

msgstr ""

7055

7037

7056

#: bzrlib/remote.py:1228 bzrlib/repository.py:289

7038

#: bzrlib/remote.py:1180 bzrlib/repository.py:289

7057

7039

#, python-format

7058

7040

msgid "bzr: ERROR (ignored): %s"

7059

7041

msgstr ""

7060

7042

7061

#: bzrlib/remote.py:2541

7043

#: bzrlib/remote.py:2493

7062

7044

msgid "Copying repository content as tarball..."

7063

7045

msgstr ""

7064

7046

7273

7255

msgid "listening on port: %s"

7274

7256

msgstr ""

7275

7257

7276

#: bzrlib/switch.py:73

7258

#: bzrlib/switch.py:69

7277

7259

msgid "Pending merges must be committed or reverted before using switch."

7278

7260

msgstr ""

7279

7261

7280

#: bzrlib/switch.py:100

7262

#: bzrlib/switch.py:96

7281

7263

msgid ""

7282

7264

"Cannot switch as local commits found in the checkout. Commit these to the "

7283

7265

"bound branch or use --force to throw them away."

7284

7266

msgstr ""

7285

7267

7286

#: bzrlib/switch.py:105

7268

#: bzrlib/switch.py:101

7287

7269

#, python-format

7288

7270

msgid ""

7289

7271

"Unable to connect to current master branch %(target)s: %(error)s To switch "

7290

7272

"anyway, use --force."

7291

7273

msgstr ""

7292

7274

7293

#: bzrlib/switch.py:125

7275

#: bzrlib/switch.py:110

7294

7276

msgid "Cannot switch a branch, only a checkout."

7295

7277

msgstr ""

7296

7278

7297

#: bzrlib/switch.py:163

7279

#: bzrlib/switch.py:146

7298

7280

#, python-format

7299

7281

msgid "Tree is up to date at revision %d."

7300

7282

msgstr ""

7301

7283

7302

#: bzrlib/switch.py:169

7284

#: bzrlib/switch.py:152

7303

7285

#, python-format

7304

7286

msgid "Updated to revision %d."

7305

7287

msgstr ""

7306

7288

7307

#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747

7289

#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743

7308

7290

msgid "Apply phase"

7309

7291

msgstr ""

7310

7292

7311

#: bzrlib/transform.py:1773 bzrlib/transform.py:1841

7293

#: bzrlib/transform.py:1769 bzrlib/transform.py:1837

7312

7294

msgid "removing file"

7313

7295

msgstr ""

7314

7296

7315

#: bzrlib/transform.py:1791 bzrlib/transform.py:1876

7297

#: bzrlib/transform.py:1787 bzrlib/transform.py:1872

7316

7298

msgid "adding file"

7317

7299

msgstr ""

7318

7300

7319

#: bzrlib/transform.py:2591

7301

#: bzrlib/transform.py:2587

7320

7302

msgid "Building tree"

7321

7303

msgstr ""

7322

7304

7323

#: bzrlib/transform.py:2681 bzrlib/transform.py:2708

7305

#: bzrlib/transform.py:2677 bzrlib/transform.py:2704

7324

7306

msgid "Adding file contents"

7325

7307

msgstr ""

7326

7308

7327

#: bzrlib/transform.py:3028

7309

#: bzrlib/transform.py:3024

7328

7310

msgid "Resolution pass"

7329

7311

msgstr ""

7330

7312

7473

7455

7474

7456

#: dummy/help_topics/basic/detail.txt:1

7475

7457

msgid ""

7476

"Bazaar 2.5b6 -- a free distributed version-control tool\n"

7458

"Bazaar 2.5b5 -- a free distributed version-control tool\n"

7477

7459

"http://bazaar.canonical.com/"

7478

7460

msgstr ""

7479

7461

11739

11721

"~~~~~~~~~~~~~~~~~~~~~~"

11740

11722

msgstr ""

11741

11723

11742

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418

11724

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402

11743

11725

msgid "Introduced in: 1.4"

11744

11726

msgstr ""

11745

11727

11931

11913

msgstr ""

11932

11914

11933

11915

#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196

11934

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464

11916

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448

11935

11917

msgid "Introduced in: 1.17"

11936

11918

msgstr ""

11937

11919

11987

11969

#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226

11988

11970

#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241

11989

11971

#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370

11990

#: en/help_topics/hooks.txt:443

11972

#: en/help_topics/hooks.txt:427

11991

11973

msgid "Introduced in: 2.4"

11992

11974

msgstr ""

11993

11975

12088

12070

msgstr ""

12089

12071

12090

12072

#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297

12091

#: en/help_topics/hooks.txt:521

12073

#: en/help_topics/hooks.txt:505

12092

12074

msgid "Introduced in: 1.15"

12093

12075

msgstr ""

12094

12076

12170

12152

msgstr ""

12171

12153

12172

12154

#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334

12173

#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402

12174

#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509

12155

#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493

12175

12156

msgid "Introduced in: 2.5"

12176

12157

msgstr ""

12177

12158

12290

12271

12291

12272

#: en/help_topics/hooks.txt:399

12292

12273

msgid ""

12293

"post_transform\n"

12294

"~~~~~~~~~~~~~~"

12274

"start_commit\n"

12275

"~~~~~~~~~~~~"

12295

12276

msgstr ""

12296

12277

12297

12278

#: en/help_topics/hooks.txt:404

12298

12279

msgid ""

12299

"Called after a tree transform has been performed on a tree. The hook\n"

12300

"is called with the tree that is being transformed and the transform."

12301

msgstr ""

12302

12303

#: en/help_topics/hooks.txt:407

12304

msgid ""

12305

"pre_transform\n"

12306

"~~~~~~~~~~~~~"

12307

msgstr ""

12308

12309

#: en/help_topics/hooks.txt:412

12310

msgid ""

12311

"Called before a tree transform on this tree. The hook is called with\n"

12312

"the tree that is being transformed and the transform."

12313

msgstr ""

12314

12315

#: en/help_topics/hooks.txt:415

12316

msgid ""

12317

"start_commit\n"

12318

"~~~~~~~~~~~~"

12319

msgstr ""

12320

12321

#: en/help_topics/hooks.txt:420

12322

msgid ""

12323

12280

"Called before a commit is performed on a tree. The start commit hook\n"

12324

12281

"is able to change the tree before the commit takes place. start_commit\n"

12325

12282

"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"

12326

12283

"being performed on."

12327

12284

msgstr ""

12328

12285

12329

#: en/help_topics/hooks.txt:425

12286

#: en/help_topics/hooks.txt:409

12330

12287

msgid ""

12331

12288

"SmartClientHooks\n"

12332

12289

"----------------"

12333

12290

msgstr ""

12334

12291

12335

#: en/help_topics/hooks.txt:428

12292

#: en/help_topics/hooks.txt:412

12336

12293

msgid ""

12337

12294

"call\n"

12338

12295

"~~~~"

12339

12296

msgstr ""

12340

12297

12341

#: en/help_topics/hooks.txt:431

12298

#: en/help_topics/hooks.txt:415

12342

12299

msgid "Introduced in: unknown"

12343

12300

msgstr ""

12344

12301

12345

#: en/help_topics/hooks.txt:433

12302

#: en/help_topics/hooks.txt:417

12346

12303

msgid ""

12347

12304

"Called when the smart client is submitting a request to the smart\n"

12348

12305

"server. Called with a bzrlib.smart.client.CallHookParams object.\n"

12349

12306

"Streaming request bodies, and responses, are not accessible."

12350

12307

msgstr ""

12351

12308

12352

#: en/help_topics/hooks.txt:437

12309

#: en/help_topics/hooks.txt:421

12353

12310

msgid ""

12354

12311

"SmartServerHooks\n"

12355

12312

"----------------"

12356

12313

msgstr ""

12357

12314

12358

#: en/help_topics/hooks.txt:440

12315

#: en/help_topics/hooks.txt:424

12359

12316

msgid ""

12360

12317

"server_exception\n"

12361

12318

"~~~~~~~~~~~~~~~~"

12362

12319

msgstr ""

12363

12320

12364

#: en/help_topics/hooks.txt:445

12321

#: en/help_topics/hooks.txt:429

12365

12322

msgid ""

12366

12323

"Called by the bzr server when an exception occurs. server_exception is\n"

12367

12324

"called with the sys.exc_info() tuple return true for the hook if the\n"

12369

12326

"normally."

12370

12327

msgstr ""

12371

12328

12372

#: en/help_topics/hooks.txt:450

12329

#: en/help_topics/hooks.txt:434

12373

12330

msgid ""

12374

12331

"server_started\n"

12375

12332

"~~~~~~~~~~~~~~"

12376

12333

msgstr ""

12377

12334

12378

#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472

12335

#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456

12379

12336

msgid "Introduced in: 0.16"

12380

12337

msgstr ""

12381

12338

12382

#: en/help_topics/hooks.txt:455

12339

#: en/help_topics/hooks.txt:439

12383

12340

msgid ""

12384

12341

"Called by the bzr server when it starts serving a directory.\n"

12385

12342

"server_started is called with (backing urls, public url), where\n"

12388

12345

"served."

12389

12346

msgstr ""

12390

12347

12391

#: en/help_topics/hooks.txt:461

12348

#: en/help_topics/hooks.txt:445

12392

12349

msgid ""

12393

12350

"server_started_ex\n"

12394

12351

"~~~~~~~~~~~~~~~~~"

12395

12352

msgstr ""

12396

12353

12397

#: en/help_topics/hooks.txt:466

12354

#: en/help_topics/hooks.txt:450

12398

12355

msgid ""

12399

12356

"Called by the bzr server when it starts serving a directory.\n"

12400

12357

"server_started is called with (backing_urls, server_obj)."

12401

12358

msgstr ""

12402

12359

12403

#: en/help_topics/hooks.txt:469

12360

#: en/help_topics/hooks.txt:453

12404

12361

msgid ""

12405

12362

"server_stopped\n"

12406

12363

"~~~~~~~~~~~~~~"

12407

12364

msgstr ""

12408

12365

12409

#: en/help_topics/hooks.txt:474

12366

#: en/help_topics/hooks.txt:458

12410

12367

msgid ""

12411

12368

"Called by the bzr server when it stops serving a directory.\n"

12412

12369

"server_stopped is called with the same parameters as the\n"

12413

12370

"server_started hook: (backing_urls, public_url)."

12414

12371

msgstr ""

12415

12372

12416

#: en/help_topics/hooks.txt:478

12373

#: en/help_topics/hooks.txt:462

12417

12374

msgid ""

12418

12375

"StatusHooks\n"

12419

12376

"-----------"

12420

12377

msgstr ""

12421

12378

12422

#: en/help_topics/hooks.txt:481

12379

#: en/help_topics/hooks.txt:465

12423

12380

msgid ""

12424

12381

"post_status\n"

12425

12382

"~~~~~~~~~~~"

12426

12383

msgstr ""

12427

12384

12428

#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495

12385

#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479

12429

12386

msgid "Introduced in: 2.3"

12430

12387

msgstr ""

12431

12388

12432

#: en/help_topics/hooks.txt:486

12389

#: en/help_topics/hooks.txt:470

12433

12390

msgid ""

12434

12391

"Called with argument StatusHookParams after Bazaar has displayed the\n"

12435

12392

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12438

12395

"status command. to_file is the output stream for writing."

12439

12396

msgstr ""

12440

12397

12441

#: en/help_topics/hooks.txt:492

12398

#: en/help_topics/hooks.txt:476

12442

12399

msgid ""

12443

12400

"pre_status\n"

12444

12401

"~~~~~~~~~~"

12445

12402

msgstr ""

12446

12403

12447

#: en/help_topics/hooks.txt:497

12404

#: en/help_topics/hooks.txt:481

12448

12405

msgid ""

12449

12406

"Called with argument StatusHookParams before Bazaar displays the\n"

12450

12407

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12453

12410

"status command. to_file is the output stream for writing."

12454

12411

msgstr ""

12455

12412

12456

#: en/help_topics/hooks.txt:503

12413

#: en/help_topics/hooks.txt:487

12457

12414

msgid ""

12458

12415

"TransportHooks\n"

12459

12416

"--------------"

12460

12417

msgstr ""

12461

12418

12462

#: en/help_topics/hooks.txt:506

12419

#: en/help_topics/hooks.txt:490

12463

12420

msgid ""

12464

12421

"post_connect\n"

12465

12422

"~~~~~~~~~~~~"

12466

12423

msgstr ""

12467

12424

12468

#: en/help_topics/hooks.txt:511

12425

#: en/help_topics/hooks.txt:495

12469

12426

msgid ""

12470

12427

"Called after a new connection is established or a reconnect occurs.\n"

12471

12428

"The sole argument passed is either the connected transport or smart\n"

12472

12429

"medium instance."

12473

12430

msgstr ""

12474

12431

12475

#: en/help_topics/hooks.txt:515

12432

#: en/help_topics/hooks.txt:499

12476

12433

msgid ""

12477

12434

"RioVersionInfoBuilderHooks\n"

12478

12435

"--------------------------"

12479

12436

msgstr ""

12480

12437

12481

#: en/help_topics/hooks.txt:518

12438

#: en/help_topics/hooks.txt:502

12482

12439

msgid ""

12483

12440

"revision\n"

12484

12441

"~~~~~~~~"

12485

12442

msgstr ""

12486

12443

12487

#: en/help_topics/hooks.txt:523

12444

#: en/help_topics/hooks.txt:507

12488

12445

msgid ""

12489

12446

"Invoked when adding information about a revision to the RIO stanza\n"

12490

12447

"that is printed. revision is called with a revision object and a RIO\n"