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

7

msgstr ""

8

"Project-Id-Version: bzr\n"

9

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

10

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

10

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

11

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

12

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

13

"Language-Team: French <fr@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-01-17 05:16+0000\n"

19

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

18

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

19

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

20

21

#: bzrlib/add.py:95

22

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

26

msgid "Unstacking"

27

msgstr "Dépilement"

28

29

#: bzrlib/branch.py:3183

29

#: bzrlib/branch.py:3205

30

#, python-format

31

msgid "Pushed up to revision %d."

32

msgstr "Publication jusqu'à la révision %d."

33

34

#: bzrlib/branch.py:3185

34

#: bzrlib/branch.py:3207

35

#, python-format

36

msgid "%d tag updated."

37

msgid_plural "%d tags updated."

38

msgstr[0] "%d étiquette mise à jour."

39

msgstr[1] "%d étiquettes mises à jour."

40

41

#: bzrlib/branch.py:3188

41

#: bzrlib/branch.py:3210

42

msgid "No new revisions or tags to push."

43

msgstr "Pas de nouvelles révisions ou étiquettes à publier."

44

45

#: bzrlib/branch.py:3190

45

#: bzrlib/branch.py:3212

46

msgid "No new revisions to push."

47

msgstr "Aucune nouvelle révision à envoyer."

48

49

#: bzrlib/branch.py:3210

49

#: bzrlib/branch.py:3232

50

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

51

msgstr ""

52

53

#: bzrlib/branch.py:3213

53

#: bzrlib/branch.py:3235

54

#, python-format

55

msgid "found error:%s"

56

msgstr "erreur trouvée : %s"

57

58

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

58

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

59

#, python-format

60

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

61

msgstr ""

62

63

#: bzrlib/builtins.py:130

63

#: bzrlib/builtins.py:218

64

#, python-format

65

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

66

msgstr ""

67

68

#: bzrlib/builtins.py:215

68

#: bzrlib/builtins.py:303

69

msgid "Display status summary."

70

msgstr ""

71

72

#: bzrlib/builtins.py:217

72

#: bzrlib/builtins.py:305

73

msgid ""

74

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

75

"grouped by state. Possible states are:"

77

"Ceci informe sur les fichiers versionnés et inconnus, regroupés\n"

78

"selon leur état. Les différents états sont :"

79

80

#: bzrlib/builtins.py:220

80

#: bzrlib/builtins.py:308

81

msgid ""

82

"added\n"

83

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

85

"ajouté\n"

86

" Versionné dans la copie de travail mais pas dans la révision précédente."

87

88

#: bzrlib/builtins.py:223

88

#: bzrlib/builtins.py:311

89

msgid ""

90

"removed\n"

91

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

95

" Versionné dans la révision précédente mais enlevé ou supprimé\n"

96

" de la copie de travail."

97

98

#: bzrlib/builtins.py:227

98

#: bzrlib/builtins.py:315

99

msgid ""

100

"renamed\n"

101

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

108

"dont\n"

109

" le répertoire parent a été renommé."

110

111

#: bzrlib/builtins.py:232

111

#: bzrlib/builtins.py:320

112

msgid ""

113

"modified\n"

114

" Text has changed since the previous revision."

116

"modifié\n"

117

" Le texte a été modifié depuis la révision précédente."

118

119

#: bzrlib/builtins.py:235

119

#: bzrlib/builtins.py:323

120

msgid ""

121

"kind changed\n"

122

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

124

"type modifié\n"

125

" le type du fichier a été modifiée (ex. de fichier à répertoire)."

126

127

#: bzrlib/builtins.py:238

127

#: bzrlib/builtins.py:326

128

msgid ""

129

"unknown\n"

130

" Not versioned and not matching an ignore pattern."

132

"inconnu\n"

133

" Non versionné et ne correspond pas à une règle d'exclusion."

134

135

#: bzrlib/builtins.py:241

135

#: bzrlib/builtins.py:329

136

msgid ""

137

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

138

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

140

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

141

msgstr ""

142

143

#: bzrlib/builtins.py:246

143

#: bzrlib/builtins.py:334

144

msgid ""

145

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

146

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

149

"Pour le détail des modifications sur les fichiers textes,\n"

150

"utilisez « bzr diff »."

151

152

#: bzrlib/builtins.py:249

152

#: bzrlib/builtins.py:337

153

msgid ""

154

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

155

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

156

"use bzr status -SV."

157

msgstr ""

158

159

#: bzrlib/builtins.py:253

159

#: bzrlib/builtins.py:341

160

msgid ""

161

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

162

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

164

"is reported for everything inside that directory."

165

msgstr ""

166

167

#: bzrlib/builtins.py:258

167

#: bzrlib/builtins.py:346

168

msgid ""

169

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

170

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

172

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

173

msgstr ""

174

175

#: bzrlib/builtins.py:263

175

#: bzrlib/builtins.py:351

176

msgid ""

177

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

178

"single revision to the revision argument."

179

msgstr ""

180

181

#: bzrlib/builtins.py:266

181

#: bzrlib/builtins.py:354

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:275

188

#: bzrlib/builtins.py:363

189

msgid "Use short status indicators."

190

msgstr ""

191

192

#: bzrlib/builtins.py:277

192

#: bzrlib/builtins.py:365

193

msgid "Only show versioned files."

194

msgstr ""

195

196

#: bzrlib/builtins.py:279

196

#: bzrlib/builtins.py:367

197

msgid "Don't show pending merges."

198

msgstr ""

199

200

#: bzrlib/builtins.py:282

200

#: bzrlib/builtins.py:370

201

msgid "Do not mark object type using indicator."

202

msgstr ""

203

204

#: bzrlib/builtins.py:297

204

#: bzrlib/builtins.py:385

205

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

206

msgstr ""

207

"bzr status --revision prend exactement un ou deux numéros de révision"

208

209

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

209

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

210

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

211

msgstr ""

212

213

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

213

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

214

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

215

msgstr ""

216

217

#: bzrlib/builtins.py:351

217

#: bzrlib/builtins.py:439

218

#, python-format

219

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

220

msgstr ""

221

222

#: bzrlib/builtins.py:362

222

#: bzrlib/builtins.py:450

223

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

224

msgstr "Le répertoire {0} ne contient aucune révision {1}."

225

226

#: bzrlib/builtins.py:369

226

#: bzrlib/builtins.py:457

227

msgid "You cannot specify a NULL revision."

228

msgstr ""

229

230

#: bzrlib/builtins.py:461

230

#: bzrlib/builtins.py:549

231

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

232

msgstr ""

233

234

#: bzrlib/builtins.py:463

234

#: bzrlib/builtins.py:551

235

msgid ""

236

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

237

"this will refuse to run against one."

238

msgstr ""

239

240

#: bzrlib/builtins.py:466

240

#: bzrlib/builtins.py:554

241

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

242

msgstr ""

243

244

#: bzrlib/builtins.py:472

244

#: bzrlib/builtins.py:560

245

msgid ""

246

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

247

msgstr ""

248

249

#: bzrlib/builtins.py:486

249

#: bzrlib/builtins.py:574

250

msgid "No working tree to remove"

251

msgstr ""

252

253

#: bzrlib/builtins.py:488

253

#: bzrlib/builtins.py:576

254

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

255

msgstr ""

256

257

#: bzrlib/builtins.py:497

257

#: bzrlib/builtins.py:585

258

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

259

msgstr ""

260

261

#: bzrlib/builtins.py:537

261

#: bzrlib/builtins.py:625

262

msgid ""

263

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

264

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

265

msgstr ""

266

267

#: bzrlib/builtins.py:548

267

#: bzrlib/builtins.py:636

268

msgid ""

269

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

270

"commit"

271

msgstr ""

272

273

#: bzrlib/builtins.py:552

273

#: bzrlib/builtins.py:640

274

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

275

msgstr ""

276

277

#: bzrlib/builtins.py:556

277

#: bzrlib/builtins.py:644

278

msgid "Show current revision number."

279

msgstr "Afficher le numéro de la révision actuelle."

280

281

#: bzrlib/builtins.py:558

281

#: bzrlib/builtins.py:646

282

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

283

msgstr ""

284

285

#: bzrlib/builtins.py:571

285

#: bzrlib/builtins.py:659

286

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

287

msgstr ""

288

289

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

289

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

290

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

291

msgstr ""

292

293

#: bzrlib/builtins.py:612

293

#: bzrlib/builtins.py:700

294

msgid "Show revno of working tree."

295

msgstr ""

296

297

#: bzrlib/builtins.py:660

297

#: bzrlib/builtins.py:748

298

msgid "Add specified files or directories."

299

msgstr ""

300

301

#: bzrlib/builtins.py:662

301

#: bzrlib/builtins.py:750

302

msgid ""

303

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

304

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

305

"any of the named files are already versioned."

306

msgstr ""

307

308

#: bzrlib/builtins.py:666

308

#: bzrlib/builtins.py:754

309

msgid ""

310

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

311

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

316

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

317

msgstr ""

318

319

#: bzrlib/builtins.py:674

319

#: bzrlib/builtins.py:762

320

msgid ""

321

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

322

"unless they are explicitly ignored."

323

msgstr ""

324

325

#: bzrlib/builtins.py:677

325

#: bzrlib/builtins.py:765

326

msgid ""

327

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

328

"are currently unknown."

329

msgstr ""

330

331

#: bzrlib/builtins.py:680

331

#: bzrlib/builtins.py:768

332

msgid ""

333

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

334

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

336

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

337

msgstr ""

338

339

#: bzrlib/builtins.py:685

339

#: bzrlib/builtins.py:773

340

msgid ""

341

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

342

"add them."

343

msgstr ""

344

345

#: bzrlib/builtins.py:688

345

#: bzrlib/builtins.py:776

346

msgid ""

347

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

348

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

353

"into a subdirectory of this one."

354

msgstr ""

355

356

#: bzrlib/builtins.py:696

356

#: bzrlib/builtins.py:784

357

msgid ""

358

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

359

"unless they are explicitly mentioned."

360

msgstr ""

361

362

#: bzrlib/builtins.py:699

362

#: bzrlib/builtins.py:787

363

msgid ""

364

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

365

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

366

"to file size."

367

msgstr ""

368

369

#: bzrlib/builtins.py:706

369

#: bzrlib/builtins.py:794

370

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

371

msgstr ""

372

373

#: bzrlib/builtins.py:712

373

#: bzrlib/builtins.py:800

374

msgid "Lookup file ids from this tree."

375

msgstr ""

376

377

#: bzrlib/builtins.py:748

377

#: bzrlib/builtins.py:836

378

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

379

msgstr ""

380

381

#: bzrlib/builtins.py:753

381

#: bzrlib/builtins.py:841

382

msgid "Create a new versioned directory."

383

msgstr ""

384

385

#: bzrlib/builtins.py:755

385

#: bzrlib/builtins.py:843

386

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

387

msgstr ""

388

389

#: bzrlib/builtins.py:762

389

#: bzrlib/builtins.py:850

390

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

391

msgstr ""

392

393

#: bzrlib/builtins.py:796

393

#: bzrlib/builtins.py:884

394

#, python-format

395

msgid "added %s\n"

396

msgstr "ajouté %s\n"

397

398

#: bzrlib/builtins.py:838

398

#: bzrlib/builtins.py:926

399

#, python-format

400

msgid "invalid kind %r specified"

401

msgstr ""

402

403

#: bzrlib/builtins.py:875

403

#: bzrlib/builtins.py:963

404

msgid "Move or rename a file."

405

msgstr "Déplacer ou renommer un fichier."

406

407

#: bzrlib/builtins.py:877

407

#: bzrlib/builtins.py:965

408

msgid " bzr mv SOURCE... DESTINATION"

409

msgstr ""

410

411

#: bzrlib/builtins.py:879

411

#: bzrlib/builtins.py:967

412

msgid ""

413

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

414

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

415

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

416

msgstr ""

417

418

#: bzrlib/builtins.py:883

418

#: bzrlib/builtins.py:971

419

msgid ""

420

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

421

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

424

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

425

msgstr ""

426

427

#: bzrlib/builtins.py:889

427

#: bzrlib/builtins.py:977

428

msgid "Files cannot be moved between branches."

429

msgstr ""

430

431

#: bzrlib/builtins.py:896

431

#: bzrlib/builtins.py:984

432

msgid ""

433

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

434

"moved."

435

msgstr ""

436

437

#: bzrlib/builtins.py:898

437

#: bzrlib/builtins.py:986

438

msgid "Automatically guess renames."

439

msgstr ""

440

441

#: bzrlib/builtins.py:899

441

#: bzrlib/builtins.py:987

442

msgid "Avoid making changes when guessing renames."

443

msgstr ""

444

445

#: bzrlib/builtins.py:908

445

#: bzrlib/builtins.py:996

446

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

447

msgstr ""

448

449

#: bzrlib/builtins.py:912

449

#: bzrlib/builtins.py:1000

450

msgid "missing file argument"

451

msgstr ""

452

453

#: bzrlib/builtins.py:916

453

#: bzrlib/builtins.py:1004

454

msgid "can not move root of branch"

455

msgstr ""

456

457

#: bzrlib/builtins.py:922

457

#: bzrlib/builtins.py:1010

458

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

459

msgstr ""

460

461

#: bzrlib/builtins.py:925

461

#: bzrlib/builtins.py:1013

462

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

463

msgstr ""

464

465

#: bzrlib/builtins.py:962

465

#: bzrlib/builtins.py:1050

466

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

467

msgstr ""

468

469

#: bzrlib/builtins.py:1014

469

#: bzrlib/builtins.py:1102

470

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

471

msgstr ""

472

473

#: bzrlib/builtins.py:1016

473

#: bzrlib/builtins.py:1104

474

msgid ""

475

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

476

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

478

"parent."

479

msgstr ""

480

481

#: bzrlib/builtins.py:1021

481

#: bzrlib/builtins.py:1109

482

msgid ""

483

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

484

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

485

"be able to pull it again."

486

msgstr ""

487

488

#: bzrlib/builtins.py:1025

488

#: bzrlib/builtins.py:1113

489

msgid ""

490

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

491

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

492

"branches have diverged."

493

msgstr ""

494

495

#: bzrlib/builtins.py:1029

495

#: bzrlib/builtins.py:1117

496

msgid ""

497

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

498

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

500

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

501

msgstr ""

502

503

#: bzrlib/builtins.py:1034

503

#: bzrlib/builtins.py:1122

504

msgid ""

505

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

506

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

507

"-Olog_format=<other_format>."

508

msgstr ""

509

510

#: bzrlib/builtins.py:1038

510

#: bzrlib/builtins.py:1126

511

msgid ""

512

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

513

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

514

"with bzr send."

515

msgstr ""

516

517

#: bzrlib/builtins.py:1046

517

#: bzrlib/builtins.py:1134

518

msgid "Show logs of pulled revisions."

519

msgstr ""

520

521

#: bzrlib/builtins.py:1048

521

#: bzrlib/builtins.py:1136

522

msgid ""

523

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

524

msgstr ""

525

526

#: bzrlib/builtins.py:1051

526

#: bzrlib/builtins.py:1139

527

msgid ""

528

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

529

"master branch."

530

msgstr ""

531

532

#: bzrlib/builtins.py:1080

532

#: bzrlib/builtins.py:1168

533

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

534

msgstr ""

535

536

#: bzrlib/builtins.py:1096

536

#: bzrlib/builtins.py:1184

537

msgid "No pull location known or specified."

538

msgstr ""

539

540

#: bzrlib/builtins.py:1102

540

#: bzrlib/builtins.py:1190

541

#, python-format

542

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

543

msgstr ""

544

545

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

545

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

546

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

547

msgstr ""

548

549

#: bzrlib/builtins.py:1150

549

#: bzrlib/builtins.py:1238

550

msgid "Update a mirror of this branch."

551

msgstr ""

552

553

#: bzrlib/builtins.py:1152

553

#: bzrlib/builtins.py:1240

554

msgid ""

555

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

556

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

557

msgstr ""

558

559

#: bzrlib/builtins.py:1155

559

#: bzrlib/builtins.py:1243

560

msgid ""

561

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

562

"the future."

563

msgstr ""

564

565

#: bzrlib/builtins.py:1158

565

#: bzrlib/builtins.py:1246

566

msgid ""

567

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

568

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

569

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

570

msgstr ""

571

572

#: bzrlib/builtins.py:1162

572

#: bzrlib/builtins.py:1250

573

msgid ""

574

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

575

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

576

msgstr ""

577

578

#: bzrlib/builtins.py:1165

578

#: bzrlib/builtins.py:1253

579

msgid ""

580

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

581

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

582

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

583

msgstr ""

584

585

#: bzrlib/builtins.py:1169

585

#: bzrlib/builtins.py:1257

586

msgid ""

587

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

588

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

590

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

591

msgstr ""

592

593

#: bzrlib/builtins.py:1174

593

#: bzrlib/builtins.py:1262

594

msgid ""

595

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

596

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

597

"-Olog_format=<other_format>."

598

msgstr ""

599

600

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

600

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

601

msgid ""

602

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

603

msgstr ""

604

605

#: bzrlib/builtins.py:1188

605

#: bzrlib/builtins.py:1276

606

msgid ""

607

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

608

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

609

msgstr ""

610

611

#: bzrlib/builtins.py:1193

611

#: bzrlib/builtins.py:1281

612

msgid ""

613

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

614

"branch."

615

msgstr ""

616

617

#: bzrlib/builtins.py:1196

617

#: bzrlib/builtins.py:1284

618

msgid ""

619

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

620

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

621

"the branch created."

622

msgstr ""

623

624

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

624

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

625

msgid ""

626

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

627

"strict disables the check."

628

msgstr ""

629

630

#: bzrlib/builtins.py:1204

630

#: bzrlib/builtins.py:1292

631

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

632

msgstr ""

633

634

#: bzrlib/builtins.py:1248

634

#: bzrlib/builtins.py:1336

635

msgid "Could not determine branch to refer to."

636

msgstr ""

637

638

#: bzrlib/builtins.py:1257

638

#: bzrlib/builtins.py:1345

639

#, python-format

640

msgid ""

641

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

642

"use 'bzr push :parent'."

643

msgstr ""

644

645

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

645

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

646

msgid "No push location known or specified."

647

msgstr ""

648

649

#: bzrlib/builtins.py:1267

649

#: bzrlib/builtins.py:1355

650

#, python-format

651

msgid "Using saved push location: %s"

652

msgstr ""

653

654

#: bzrlib/builtins.py:1277

654

#: bzrlib/builtins.py:1365

655

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

656

msgstr ""

657

658

#: bzrlib/builtins.py:1279

658

#: bzrlib/builtins.py:1367

659

msgid ""

660

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

661

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

666

"create ./foo-bar."

667

msgstr ""

668

669

#: bzrlib/builtins.py:1286

669

#: bzrlib/builtins.py:1374

670

msgid ""

671

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

672

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

673

msgstr ""

674

675

#: bzrlib/builtins.py:1289

675

#: bzrlib/builtins.py:1377

676

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

677

msgstr ""

678

679

#: bzrlib/builtins.py:1299

679

#: bzrlib/builtins.py:1387

680

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

681

msgstr ""

682

683

#: bzrlib/builtins.py:1301

683

#: bzrlib/builtins.py:1389

684

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

685

msgstr ""

686

687

#: bzrlib/builtins.py:1304

687

#: bzrlib/builtins.py:1392

688

msgid ""

689

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

690

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

691

msgstr ""

692

693

#: bzrlib/builtins.py:1308

693

#: bzrlib/builtins.py:1396

694

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

695

msgstr ""

696

697

#: bzrlib/builtins.py:1310

697

#: bzrlib/builtins.py:1398

698

msgid ""

699

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

700

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

701

msgstr ""

702

703

#: bzrlib/builtins.py:1315

703

#: bzrlib/builtins.py:1403

704

msgid "Bind new branch to from location."

705

msgstr ""

706

707

#: bzrlib/builtins.py:1362

707

#: bzrlib/builtins.py:1450

708

#, python-format

709

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

710

msgstr ""

711

712

#: bzrlib/builtins.py:1374

712

#: bzrlib/builtins.py:1462

713

#, python-format

714

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

715

msgstr ""

716

717

#: bzrlib/builtins.py:1393

717

#: bzrlib/builtins.py:1481

718

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

719

msgstr ""

720

721

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

721

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

722

#, python-format

723

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

724

msgstr ""

725

726

#: bzrlib/builtins.py:1407

726

#: bzrlib/builtins.py:1500

727

#, python-format

728

msgid "Branched %d revision."

729

msgid_plural "Branched %d revisions."

730

msgstr[0] ""

731

msgstr[1] ""

732

733

#: bzrlib/builtins.py:1412

733

#: bzrlib/builtins.py:1505

734

#, python-format

735

msgid "New branch bound to %s"

736

msgstr ""

737

738

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

738

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

739

#, python-format

740

msgid "Switched to branch: %s"

741

msgstr ""

742

743

#: bzrlib/builtins.py:1422

743

#: bzrlib/builtins.py:1515

744

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

745

msgstr ""

746

747

#: bzrlib/builtins.py:1424

747

#: bzrlib/builtins.py:1517

748

msgid ""

749

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

750

"location."

751

msgstr ""

752

753

#: bzrlib/builtins.py:1431

753

#: bzrlib/builtins.py:1524

754

msgid ""

755

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

756

"location."

757

msgstr ""

758

759

#: bzrlib/builtins.py:1461

759

#: bzrlib/builtins.py:1554

760

msgid "(default)"

761

msgstr ""

762

763

#: bzrlib/builtins.py:1473

763

#: bzrlib/builtins.py:1566

764

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

765

msgstr ""

766

767

#: bzrlib/builtins.py:1475

767

#: bzrlib/builtins.py:1568

768

msgid ""

769

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

770

"for\n"

774

"location using SFTP."

775

msgstr ""

776

777

#: bzrlib/builtins.py:1480

777

#: bzrlib/builtins.py:1573

778

msgid ""

779

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

780

"will\n"

786

"create ./foo-bar."

787

msgstr ""

788

789

#: bzrlib/builtins.py:1487

789

#: bzrlib/builtins.py:1580

790

msgid ""

791

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

792

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

796

"code.)"

797

msgstr ""

798

799

#: bzrlib/builtins.py:1497

799

#: bzrlib/builtins.py:1590

800

msgid ""

801

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

802

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

804

"commits."

805

msgstr ""

806

807

#: bzrlib/builtins.py:1504

807

#: bzrlib/builtins.py:1597

808

msgid "Get file contents from this tree."

809

msgstr ""

810

811

#: bzrlib/builtins.py:1506

811

#: bzrlib/builtins.py:1599

812

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

813

msgstr ""

814

815

#: bzrlib/builtins.py:1547

815

#: bzrlib/builtins.py:1640

816

msgid ""

817

"Show list of renamed files.\n"

818

" "

819

msgstr ""

820

821

#: bzrlib/builtins.py:1577

821

#: bzrlib/builtins.py:1670

822

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

823

msgstr ""

824

825

#: bzrlib/builtins.py:1579

825

#: bzrlib/builtins.py:1672

826

msgid ""

827

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

828

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

829

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

830

msgstr ""

831

832

#: bzrlib/builtins.py:1583

832

#: bzrlib/builtins.py:1676

833

msgid ""

834

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

835

"that is out of date from its branch."

836

msgstr ""

837

838

#: bzrlib/builtins.py:1586

838

#: bzrlib/builtins.py:1679

839

msgid ""

840

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

841

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

843

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

844

msgstr ""

845

846

#: bzrlib/builtins.py:1591

846

#: bzrlib/builtins.py:1684

847

msgid ""

848

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

849

"the branch from the master."

850

msgstr ""

851

852

#: bzrlib/builtins.py:1594

852

#: bzrlib/builtins.py:1687

853

msgid ""

854

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

855

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

859

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

860

msgstr ""

861

862

#: bzrlib/builtins.py:1601

862

#: bzrlib/builtins.py:1694

863

msgid ""

864

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

865

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

866

"current working directory is used."

867

msgstr ""

868

869

#: bzrlib/builtins.py:1617

869

#: bzrlib/builtins.py:1710

870

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

871

msgstr ""

872

873

#: bzrlib/builtins.py:1625

873

#: bzrlib/builtins.py:1718

874

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

875

msgstr ""

876

877

#: bzrlib/builtins.py:1656

877

#: bzrlib/builtins.py:1749

878

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

879

msgstr ""

880

881

#: bzrlib/builtins.py:1672

881

#: bzrlib/builtins.py:1765

882

#, python-format

883

msgid ""

884

"branch has no revision %s\n"

885

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

886

msgstr ""

887

888

#: bzrlib/builtins.py:1678

888

#: bzrlib/builtins.py:1771

889

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

890

msgstr ""

891

892

#: bzrlib/builtins.py:1682

892

#: bzrlib/builtins.py:1775

893

msgid ""

894

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

895

"can be committed with 'bzr commit'."

896

msgstr ""

897

898

#: bzrlib/builtins.py:1691

898

#: bzrlib/builtins.py:1784

899

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

900

msgstr ""

901

902

#: bzrlib/builtins.py:1693

902

#: bzrlib/builtins.py:1786

903

msgid ""

904

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

905

"tree, branch or repository."

906

msgstr ""

907

908

#: bzrlib/builtins.py:1696

908

#: bzrlib/builtins.py:1789

909

msgid ""

910

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

911

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

912

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

913

msgstr ""

914

915

#: bzrlib/builtins.py:1700

915

#: bzrlib/builtins.py:1793

916

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

917

msgstr ""

918

919

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

920

#: bzrlib/builtins.py:6389

919

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

920

#: bzrlib/builtins.py:6442

921

msgid ":Examples:"

922

msgstr ""

923

924

#: bzrlib/builtins.py:1704

924

#: bzrlib/builtins.py:1797

925

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

926

msgstr ""

927

928

#: bzrlib/builtins.py:1706

928

#: bzrlib/builtins.py:1799

929

msgid " bzr info"

930

msgstr ""

931

932

#: bzrlib/builtins.py:1708

932

#: bzrlib/builtins.py:1801

933

msgid ""

934

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

935

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

936

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

937

msgstr ""

938

939

#: bzrlib/builtins.py:1712

939

#: bzrlib/builtins.py:1805

940

msgid " bzr info -v"

941

msgstr ""

942

943

#: bzrlib/builtins.py:1714

943

#: bzrlib/builtins.py:1807

944

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

945

msgstr ""

946

947

#: bzrlib/builtins.py:1716

947

#: bzrlib/builtins.py:1809

948

msgid " bzr info -vv"

949

msgstr ""

950

951

#: bzrlib/builtins.py:1735

951

#: bzrlib/builtins.py:1828

952

msgid "Remove files or directories."

953

msgstr ""

954

955

#: bzrlib/builtins.py:1737

955

#: bzrlib/builtins.py:1830

956

msgid ""

957

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

958

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

961

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

962

msgstr ""

963

964

#: bzrlib/builtins.py:1745

964

#: bzrlib/builtins.py:1838

965

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

966

msgstr ""

967

968

#: bzrlib/builtins.py:1747

968

#: bzrlib/builtins.py:1840

969

msgid "The file deletion mode to be used."

970

msgstr ""

971

972

#: bzrlib/builtins.py:1748

972

#: bzrlib/builtins.py:1841

973

msgid "Deletion Strategy"

974

msgstr ""

975

976

#: bzrlib/builtins.py:1749

976

#: bzrlib/builtins.py:1842

977

msgid "Backup changed files (default)."

978

msgstr ""

979

980

#: bzrlib/builtins.py:1750

980

#: bzrlib/builtins.py:1843

981

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

982

msgstr ""

983

984

#: bzrlib/builtins.py:1751

984

#: bzrlib/builtins.py:1844

985

msgid "Don't backup changed files."

986

msgstr ""

987

988

#: bzrlib/builtins.py:1752

988

#: bzrlib/builtins.py:1845

989

msgid ""

990

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

991

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

992

msgstr ""

993

994

#: bzrlib/builtins.py:1761

994

#: bzrlib/builtins.py:1854

995

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

996

msgstr ""

997

998

#: bzrlib/builtins.py:1778

998

#: bzrlib/builtins.py:1871

999

msgid "No matching files."

1000

msgstr ""

1001

1002

#: bzrlib/builtins.py:1839

1002

#: bzrlib/builtins.py:1932

1003

msgid "Reconcile bzr metadata in a branch."

1004

msgstr ""

1005

1006

#: bzrlib/builtins.py:1841

1006

#: bzrlib/builtins.py:1934

1007

msgid ""

1008

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

1009

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

1011

"advises you to run it."

1012

msgstr ""

1013

1014

#: bzrlib/builtins.py:1846

1014

#: bzrlib/builtins.py:1939

1015

msgid ""

1016

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

1017

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

1019

"correctly in both branches."

1020

msgstr ""

1021

1022

#: bzrlib/builtins.py:1851

1022

#: bzrlib/builtins.py:1944

1023

msgid ""

1024

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

1025

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

1026

msgstr ""

1027

1028

#: bzrlib/builtins.py:1854

1028

#: bzrlib/builtins.py:1947

1029

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

1030

msgstr ""

1031

1032

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

1032

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

1033

msgid ""

1034

"Format for the bzr 2.0 series.\n"

1035

"Uses group-compress storage.\n"

1036

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

1037

msgstr ""

1038

1039

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

1039

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

1040

msgid ""

1041

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

1042

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

1043

msgstr ""

1044

1045

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

1045

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

1046

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

1047

msgstr ""

1048

1049

#: bzrlib/builtins.py:1922

1049

#: bzrlib/builtins.py:2015

1050

msgid "Make a directory into a versioned branch."

1051

msgstr ""

1052

1053

#: bzrlib/builtins.py:1924

1053

#: bzrlib/builtins.py:2017

1054

msgid ""

1055

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

1056

"existing project."

1057

msgstr ""

1058

1059

#: bzrlib/builtins.py:1927

1059

#: bzrlib/builtins.py:2020

1060

msgid ""

1061

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

1062

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

1064

"in the .bzr directory."

1065

msgstr ""

1066

1067

#: bzrlib/builtins.py:1932

1067

#: bzrlib/builtins.py:2025

1068

msgid ""

1069

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

1070

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

1071

msgstr ""

1072

1073

#: bzrlib/builtins.py:1935

1073

#: bzrlib/builtins.py:2028

1074

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

1075

msgstr ""

1076

1077

#: bzrlib/builtins.py:1937

1077

#: bzrlib/builtins.py:2030

1078

msgid ""

1079

" cd ~/project\n"

1080

" bzr init\n"

1083

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

1084

msgstr ""

1085

1086

#: bzrlib/builtins.py:1948

1086

#: bzrlib/builtins.py:2041

1087

msgid ""

1088

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

1089

msgstr ""

1090

1091

#: bzrlib/builtins.py:1951

1091

#: bzrlib/builtins.py:2044

1092

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

1093

msgstr ""

1094

1095

#: bzrlib/builtins.py:1959

1095

#: bzrlib/builtins.py:2052

1096

msgid ""

1097

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

1098

msgstr ""

1099

1100

#: bzrlib/builtins.py:1962

1100

#: bzrlib/builtins.py:2055

1101

msgid "Create a branch without a working tree."

1102

msgstr ""

1103

1104

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

1104

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

1105

#, python-format

1106

msgid ""

1107

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

1108

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

1109

msgstr ""

1110

1111

#: bzrlib/builtins.py:2016

1111

#: bzrlib/builtins.py:2109

1112

msgid ""

1113

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

1114

msgstr ""

1115

1116

#: bzrlib/builtins.py:2027

1116

#: bzrlib/builtins.py:2120

1117

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

1118

msgstr ""

1119

1120

#: bzrlib/builtins.py:2036

1120

#: bzrlib/builtins.py:2129

1121

#, python-format

1122

msgid "Using shared repository: %s\n"

1123

msgstr ""

1124

1125

#: bzrlib/builtins.py:2040

1125

#: bzrlib/builtins.py:2133

1126

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

1127

msgstr ""

1128

1129

#: bzrlib/builtins.py:2042

1129

#: bzrlib/builtins.py:2135

1130

msgid ""

1131

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

1132

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

1134

"speeds up the creation of new branches."

1135

msgstr ""

1136

1137

#: bzrlib/builtins.py:2047

1137

#: bzrlib/builtins.py:2140

1138

msgid ""

1139

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

1140

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

1144

"branches, such as on a server."

1145

msgstr ""

1146

1147

#: bzrlib/builtins.py:2054

1147

#: bzrlib/builtins.py:2147

1148

msgid ""

1149

":Examples:\n"

1150

" Create a shared repository holding just branches::"

1151

msgstr ""

1152

1153

#: bzrlib/builtins.py:2057

1153

#: bzrlib/builtins.py:2150

1154

msgid ""

1155

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

1156

" bzr init repo/trunk"

1157

msgstr ""

1158

1159

#: bzrlib/builtins.py:2060

1159

#: bzrlib/builtins.py:2153

1160

msgid " Make a lightweight checkout elsewhere::"

1161

msgstr ""

1162

1163

#: bzrlib/builtins.py:2062

1163

#: bzrlib/builtins.py:2155

1164

msgid ""

1165

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

1166

" cd trunk-checkout\n"

1167

" (add files here)"

1168

msgstr ""

1169

1170

#: bzrlib/builtins.py:2070

1170

#: bzrlib/builtins.py:2163

1171

msgid ""

1172

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

1173

msgstr ""

1174

1175

#: bzrlib/builtins.py:2074

1175

#: bzrlib/builtins.py:2167

1176

msgid "Repository format"

1177

msgstr ""

1178

1179

#: bzrlib/builtins.py:2076

1179

#: bzrlib/builtins.py:2169

1180

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

1181

msgstr ""

1182

1183

#: bzrlib/builtins.py:2102

1183

#: bzrlib/builtins.py:2195

1184

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

1185

msgstr ""

1186

1187

#: bzrlib/builtins.py:2104

1187

#: bzrlib/builtins.py:2197

1188

msgid ""

1189

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

1190

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

1194

"given."

1195

msgstr ""

1196

1197

#: bzrlib/builtins.py:2111

1197

#: bzrlib/builtins.py:2204

1198

msgid ""

1199

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

1200

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

1201

msgstr ""

1202

1203

#: bzrlib/builtins.py:2114

1203

#: bzrlib/builtins.py:2207

1204

msgid ""

1205

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

1206

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

1210

"in the range."

1211

msgstr ""

1212

1213

#: bzrlib/builtins.py:2121

1213

#: bzrlib/builtins.py:2214

1214

msgid ""

1215

":Exit values:\n"

1216

" 1 - changed\n"

1219

" 0 - no change"

1220

msgstr ""

1221

1222

#: bzrlib/builtins.py:2127

1222

#: bzrlib/builtins.py:2220

1223

msgid ""

1224

":Examples:\n"

1225

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

1226

msgstr ""

1227

1228

#: bzrlib/builtins.py:2130

1228

#: bzrlib/builtins.py:2223

1229

msgid " bzr diff"

1230

msgstr ""

1231

1232

#: bzrlib/builtins.py:2132

1232

#: bzrlib/builtins.py:2225

1233

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

1234

msgstr ""

1235

1236

#: bzrlib/builtins.py:2134

1236

#: bzrlib/builtins.py:2227

1237

msgid " bzr diff -r1"

1238

msgstr ""

1239

1240

#: bzrlib/builtins.py:2136

1240

#: bzrlib/builtins.py:2229

1241

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

1242

msgstr ""

1243

1244

#: bzrlib/builtins.py:2138

1244

#: bzrlib/builtins.py:2231

1245

msgid " bzr diff -r1..3"

1246

msgstr ""

1247

1248

#: bzrlib/builtins.py:2140

1248

#: bzrlib/builtins.py:2233

1249

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

1250

msgstr ""

1251

1252

#: bzrlib/builtins.py:2142

1252

#: bzrlib/builtins.py:2235

1253

msgid " bzr diff -r1..3 xxx"

1254

msgstr ""

1255

1256

#: bzrlib/builtins.py:2144

1256

#: bzrlib/builtins.py:2237

1257

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

1258

msgstr ""

1259

1260

#: bzrlib/builtins.py:2146

1260

#: bzrlib/builtins.py:2239

1261

msgid " bzr diff -c2"

1262

msgstr ""

1263

1264

#: bzrlib/builtins.py:2148

1264

#: bzrlib/builtins.py:2241

1265

msgid ""

1266

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

1267

" \n"

1268

" bzr diff -cX"

1269

msgstr ""

1270

1271

#: bzrlib/builtins.py:2152

1271

#: bzrlib/builtins.py:2245

1272

msgid ""

1273

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

1274

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

1275

" another parent, use::"

1276

msgstr ""

1277

1278

#: bzrlib/builtins.py:2156

1278

#: bzrlib/builtins.py:2249

1279

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

1280

msgstr ""

1281

1282

#: bzrlib/builtins.py:2158

1282

#: bzrlib/builtins.py:2251

1283

msgid ""

1284

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

1285

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

1286

msgstr ""

1287

1288

#: bzrlib/builtins.py:2161

1288

#: bzrlib/builtins.py:2254

1289

msgid " bzr diff -r-2.."

1290

msgstr ""

1291

1292

#: bzrlib/builtins.py:2163

1292

#: bzrlib/builtins.py:2256

1293

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

1294

msgstr ""

1295

1296

#: bzrlib/builtins.py:2165

1296

#: bzrlib/builtins.py:2258

1297

msgid " bzr diff NEWS"

1298

msgstr ""

1299

1300

#: bzrlib/builtins.py:2167

1300

#: bzrlib/builtins.py:2260

1301

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

1302

msgstr ""

1303

1304

#: bzrlib/builtins.py:2169

1304

#: bzrlib/builtins.py:2262

1305

msgid " bzr diff xxx/NEWS"

1306

msgstr ""

1307

1308

#: bzrlib/builtins.py:2171

1308

#: bzrlib/builtins.py:2264

1309

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

1310

msgstr ""

1311

1312

#: bzrlib/builtins.py:2173

1312

#: bzrlib/builtins.py:2266

1313

msgid " bzr diff --old xxx"

1314

msgstr ""

1315

1316

#: bzrlib/builtins.py:2175

1316

#: bzrlib/builtins.py:2268

1317

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

1318

msgstr ""

1319

1320

#: bzrlib/builtins.py:2177

1320

#: bzrlib/builtins.py:2270

1321

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

1322

msgstr ""

1323

1324

#: bzrlib/builtins.py:2179

1324

#: bzrlib/builtins.py:2272

1325

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

1326

msgstr ""

1327

1328

#: bzrlib/builtins.py:2181

1328

#: bzrlib/builtins.py:2274

1329

msgid ""

1330

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

1331

" \n"

1334

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

1335

msgstr ""

1336

1337

#: bzrlib/builtins.py:2191

1337

#: bzrlib/builtins.py:2284

1338

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

1339

msgstr ""

1340

1341

#: bzrlib/builtins.py:2194

1341

#: bzrlib/builtins.py:2287

1342

msgid ""

1343

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

1344

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

1345

msgstr ""

1346

1347

#: bzrlib/builtins.py:2197

1347

#: bzrlib/builtins.py:2290

1348

msgid "Branch/tree to compare from."

1349

msgstr ""

1350

1351

#: bzrlib/builtins.py:2201

1351

#: bzrlib/builtins.py:2294

1352

msgid "Branch/tree to compare to."

1353

msgstr ""

1354

1355

#: bzrlib/builtins.py:2207

1355

#: bzrlib/builtins.py:2300

1356

msgid "Use this command to compare files."

1357

msgstr ""

1358

1359

#: bzrlib/builtins.py:2212

1359

#: bzrlib/builtins.py:2305

1360

msgid "Diff format to use."

1361

msgstr ""

1362

1363

#: bzrlib/builtins.py:2214

1363

#: bzrlib/builtins.py:2307

1364

msgid "Diff format"

1365

msgstr ""

1366

1367

#: bzrlib/builtins.py:2236

1367

#: bzrlib/builtins.py:2329

1368

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

1369

msgstr ""

1370

1371

#: bzrlib/builtins.py:2240

1371

#: bzrlib/builtins.py:2333

1372

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

1373

msgstr ""

1374

1375

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

1376

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

1375

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

1376

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

1377

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

1378

msgstr ""

1379

1380

#: bzrlib/builtins.py:2265

1380

#: bzrlib/builtins.py:2358

1381

msgid ""

1382

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

1383

" "

1384

msgstr ""

1385

1386

#: bzrlib/builtins.py:2343

1386

#: bzrlib/builtins.py:2436

1387

msgid "Show the tree root directory."

1388

msgstr ""

1389

1390

#: bzrlib/builtins.py:2345

1390

#: bzrlib/builtins.py:2438

1391

msgid ""

1392

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

1393

"directory."

1394

msgstr ""

1395

1396

#: bzrlib/builtins.py:2360

1396

#: bzrlib/builtins.py:2453

1397

msgid "The limit argument must be an integer."

1398

msgstr ""

1399

1400

#: bzrlib/builtins.py:2368

1400

#: bzrlib/builtins.py:2461

1401

msgid "The levels argument must be an integer."

1402

msgstr ""

1403

1404

#: bzrlib/builtins.py:2373

1404

#: bzrlib/builtins.py:2466

1405

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

1406

msgstr ""

1407

1408

#: bzrlib/builtins.py:2375

1408

#: bzrlib/builtins.py:2468

1409

msgid ""

1410

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

1411

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

1413

"Here are some simple examples::"

1414

msgstr ""

1415

1416

#: bzrlib/builtins.py:2380

1416

#: bzrlib/builtins.py:2473

1417

msgid ""

1418

" bzr log log the current branch\n"

1419

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

1420

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

1421

msgstr ""

1422

1423

#: bzrlib/builtins.py:2384

1423

#: bzrlib/builtins.py:2477

1424

msgid ""

1425

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

1426

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

1430

"were merged."

1431

msgstr ""

1432

1433

#: bzrlib/builtins.py:2391

1433

#: bzrlib/builtins.py:2484

1434

msgid ":Output control:"

1435

msgstr ""

1436

1437

#: bzrlib/builtins.py:2393

1437

#: bzrlib/builtins.py:2486

1438

msgid ""

1439

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

1440

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

1442

" for more details on log formats."

1443

msgstr ""

1444

1445

#: bzrlib/builtins.py:2398

1445

#: bzrlib/builtins.py:2491

1446

msgid ""

1447

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

1448

" displayed::"

1449

msgstr ""

1450

1451

#: bzrlib/builtins.py:2401

1451

#: bzrlib/builtins.py:2494

1452

msgid ""

1453

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

1454

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

1457

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

1458

msgstr ""

1459

1460

#: bzrlib/builtins.py:2407

1460

#: bzrlib/builtins.py:2500

1461

msgid ""

1462

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

1463

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

1464

" just the top level (mainline)."

1465

msgstr ""

1466

1467

#: bzrlib/builtins.py:2411

1467

#: bzrlib/builtins.py:2504

1468

msgid ""

1469

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

1470

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

1471

" instead, use the -vv option."

1472

msgstr ""

1473

1474

#: bzrlib/builtins.py:2415

1474

#: bzrlib/builtins.py:2508

1475

msgid ":Ordering control:"

1476

msgstr ""

1477

1478

#: bzrlib/builtins.py:2417

1478

#: bzrlib/builtins.py:2510

1479

msgid ""

1480

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

1481

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

1483

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

1484

msgstr ""

1485

1486

#: bzrlib/builtins.py:2422

1486

#: bzrlib/builtins.py:2515

1487

msgid ":Revision filtering:"

1488

msgstr ""

1489

1490

#: bzrlib/builtins.py:2424

1490

#: bzrlib/builtins.py:2517

1491

msgid ""

1492

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

1493

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

1494

msgstr ""

1495

1496

#: bzrlib/builtins.py:2427

1496

#: bzrlib/builtins.py:2520

1497

msgid ""

1498

" -rX display revision X\n"

1499

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

1501

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

1502

msgstr ""

1503

1504

#: bzrlib/builtins.py:2432

1504

#: bzrlib/builtins.py:2525

1505

msgid ""

1506

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

1507

" Some common examples are given below::"

1508

msgstr ""

1509

1510

#: bzrlib/builtins.py:2435

1510

#: bzrlib/builtins.py:2528

1511

msgid ""

1512

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

1513

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

1517

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

1518

msgstr ""

1519

1520

#: bzrlib/builtins.py:2442

1520

#: bzrlib/builtins.py:2535

1521

msgid ""

1522

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

1523

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

1527

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

1528

msgstr ""

1529

1530

#: bzrlib/builtins.py:2449

1530

#: bzrlib/builtins.py:2542

1531

msgid ":Path filtering:"

1532

msgstr ""

1533

1534

#: bzrlib/builtins.py:2451

1534

#: bzrlib/builtins.py:2544

1535

msgid ""

1536

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

1537

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

1538

" nominated files or directories."

1539

msgstr ""

1540

1541

#: bzrlib/builtins.py:2455

1541

#: bzrlib/builtins.py:2548

1542

msgid ""

1543

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

1544

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

1545

" the end or start of the range."

1546

msgstr ""

1547

1548

#: bzrlib/builtins.py:2459

1548

#: bzrlib/builtins.py:2552

1549

msgid ""

1550

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

1551

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

1552

msgstr ""

1553

1554

#: bzrlib/builtins.py:2462

1554

#: bzrlib/builtins.py:2555

1555

msgid ""

1556

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

1557

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

1558

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

1559

msgstr ""

1560

1561

#: bzrlib/builtins.py:2466

1561

#: bzrlib/builtins.py:2559

1562

msgid " In this case:"

1563

msgstr ""

1564

1565

#: bzrlib/builtins.py:2468

1565

#: bzrlib/builtins.py:2561

1566

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

1567

msgstr ""

1568

1569

#: bzrlib/builtins.py:2470

1569

#: bzrlib/builtins.py:2563

1570

msgid ""

1571

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

1572

msgstr ""

1573

1574

#: bzrlib/builtins.py:2472

1574

#: bzrlib/builtins.py:2565

1575

msgid ""

1576

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

1577

" the original file in revision 2."

1578

msgstr ""

1579

1580

#: bzrlib/builtins.py:2475

1580

#: bzrlib/builtins.py:2568

1581

msgid ""

1582

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

1583

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

1584

msgstr ""

1585

1586

#: bzrlib/builtins.py:2478

1586

#: bzrlib/builtins.py:2571

1587

msgid ""

1588

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

1589

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

1590

" until it was last renamed)."

1591

msgstr ""

1592

1593

#: bzrlib/builtins.py:2482

1593

#: bzrlib/builtins.py:2575

1594

msgid ":Other filtering:"

1595

msgstr ""

1596

1597

#: bzrlib/builtins.py:2484

1597

#: bzrlib/builtins.py:2577

1598

msgid ""

1599

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

1600

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

1603

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

1604

msgstr ""

1605

1606

#: bzrlib/builtins.py:2490

1606

#: bzrlib/builtins.py:2583

1607

msgid ":Tips & tricks:"

1608

msgstr ""

1609

1610

#: bzrlib/builtins.py:2492

1610

#: bzrlib/builtins.py:2585

1611

msgid ""

1612

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

1613

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

1616

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

1617

msgstr ""

1618

1619

#: bzrlib/builtins.py:2498

1619

#: bzrlib/builtins.py:2591

1620

msgid ""

1621

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

1622

msgstr ""

1623

1624

#: bzrlib/builtins.py:2500

1624

#: bzrlib/builtins.py:2593

1625

msgid ""

1626

" [ALIASES]\n"

1627

" tip = log -r-1\n"

1629

" show = log -v -p"

1630

msgstr ""

1631

1632

#: bzrlib/builtins.py:2505

1632

#: bzrlib/builtins.py:2598

1633

msgid ""

1634

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

1635

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

1636

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

1637

msgstr ""

1638

1639

#: bzrlib/builtins.py:2509

1639

#: bzrlib/builtins.py:2602

1640

msgid ""

1641

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

1642

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

1643

msgstr ""

1644

1645

#: bzrlib/builtins.py:2512

1645

#: bzrlib/builtins.py:2605

1646

msgid ""

1647

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

1648

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

1650

" be given when using the -v option."

1651

msgstr ""

1652

1653

#: bzrlib/builtins.py:2517

1653

#: bzrlib/builtins.py:2610

1654

msgid ""

1655

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

1656

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

1658

" a list of words but not others."

1659

msgstr ""

1660

1661

#: bzrlib/builtins.py:2522

1661

#: bzrlib/builtins.py:2615

1662

msgid ""

1663

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

1664

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

1666

" trading disk space for faster speed."

1667

msgstr ""

1668

1669

#: bzrlib/builtins.py:2531

1669

#: bzrlib/builtins.py:2624

1670

msgid "Show from oldest to newest."

1671

msgstr ""

1672

1673

#: bzrlib/builtins.py:2534

1673

#: bzrlib/builtins.py:2627

1674

msgid "Show files changed in each revision."

1675

msgstr ""

1676

1677

#: bzrlib/builtins.py:2540

1677

#: bzrlib/builtins.py:2633

1678

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

1679

msgstr ""

1680

1681

#: bzrlib/builtins.py:2544

1681

#: bzrlib/builtins.py:2637

1682

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

1683

msgstr ""

1684

1685

#: bzrlib/builtins.py:2545

1685

#: bzrlib/builtins.py:2638

1686

msgid "Authors"

1687

msgstr ""

1688

1689

#: bzrlib/builtins.py:2550

1689

#: bzrlib/builtins.py:2643

1690

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

1691

msgstr ""

1692

1693

#: bzrlib/builtins.py:2560

1693

#: bzrlib/builtins.py:2653

1694

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

1695

msgstr ""

1696

1697

#: bzrlib/builtins.py:2565

1697

#: bzrlib/builtins.py:2658

1698

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

1699

msgstr ""

1700

1701

#: bzrlib/builtins.py:2567

1701

#: bzrlib/builtins.py:2660

1702

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

1703

msgstr ""

1704

1705

#: bzrlib/builtins.py:2571

1705

#: bzrlib/builtins.py:2664

1706

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

1707

msgstr ""

1708

1709

#: bzrlib/builtins.py:2573

1709

#: bzrlib/builtins.py:2666

1710

msgid ""

1711

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

1712

"rX..Y)."

1713

msgstr ""

1714

1715

#: bzrlib/builtins.py:2577

1715

#: bzrlib/builtins.py:2670

1716

msgid "Show digital signature validity."

1717

msgstr ""

1718

1719

#: bzrlib/builtins.py:2580

1719

#: bzrlib/builtins.py:2673

1720

msgid "Show revisions whose properties match this expression."

1721

msgstr ""

1722

1723

#: bzrlib/builtins.py:2584

1723

#: bzrlib/builtins.py:2677

1724

msgid "Show revisions whose message matches this expression."

1725

msgstr ""

1726

1727

#: bzrlib/builtins.py:2588

1727

#: bzrlib/builtins.py:2681

1728

msgid "Show revisions whose committer matches this expression."

1729

msgstr ""

1730

1731

#: bzrlib/builtins.py:2592

1731

#: bzrlib/builtins.py:2685

1732

msgid "Show revisions whose authors match this expression."

1733

msgstr ""

1734

1735

#: bzrlib/builtins.py:2596

1735

#: bzrlib/builtins.py:2689

1736

msgid "Show revisions whose bugs match this expression."

1737

msgstr ""

1738

1739

#: bzrlib/builtins.py:2650

1739

#: bzrlib/builtins.py:2743

1740

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

1741

msgstr ""

1742

1743

#: bzrlib/builtins.py:2678

1743

#: bzrlib/builtins.py:2771

1744

#, python-format

1745

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

1746

msgstr ""

1747

1748

#: bzrlib/builtins.py:2795

1748

#: bzrlib/builtins.py:2888

1749

#, python-format

1750

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

1751

msgstr ""

1752

1753

#: bzrlib/builtins.py:2811

1753

#: bzrlib/builtins.py:2904

1754

#, python-format

1755

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

1756

msgstr ""

1757

1758

#: bzrlib/builtins.py:2856

1758

#: bzrlib/builtins.py:2949

1759

msgid ""

1760

"List files in a tree.\n"

1761

" "

1762

msgstr ""

1763

1764

#: bzrlib/builtins.py:2865

1764

#: bzrlib/builtins.py:2958

1765

msgid "Recurse into subdirectories."

1766

msgstr ""

1767

1768

#: bzrlib/builtins.py:2867

1768

#: bzrlib/builtins.py:2960

1769

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

1770

msgstr ""

1771

1772

#: bzrlib/builtins.py:2869

1772

#: bzrlib/builtins.py:2962

1773

msgid "Print unknown files."

1774

msgstr ""

1775

1776

#: bzrlib/builtins.py:2870

1776

#: bzrlib/builtins.py:2963

1777

msgid "Print versioned files."

1778

msgstr ""

1779

1780

#: bzrlib/builtins.py:2873

1780

#: bzrlib/builtins.py:2966

1781

msgid "Print ignored files."

1782

msgstr ""

1783

1784

#: bzrlib/builtins.py:2875

1784

#: bzrlib/builtins.py:2968

1785

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

1786

msgstr ""

1787

1788

#: bzrlib/builtins.py:2888

1788

#: bzrlib/builtins.py:2981

1789

msgid "invalid kind specified"

1790

msgstr ""

1791

1792

#: bzrlib/builtins.py:2891

1792

#: bzrlib/builtins.py:2984

1793

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

1794

msgstr ""

1795

1796

#: bzrlib/builtins.py:2900

1796

#: bzrlib/builtins.py:2993

1797

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

1798

msgstr ""

1799

1800

#: bzrlib/builtins.py:2987

1800

#: bzrlib/builtins.py:3080

1801

msgid "Ignore specified files or patterns."

1802

msgstr ""

1803

1804

#: bzrlib/builtins.py:2989

1804

#: bzrlib/builtins.py:3082

1805

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

1806

msgstr ""

1807

1808

#: bzrlib/builtins.py:2991

1808

#: bzrlib/builtins.py:3084

1809

msgid ""

1810

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

1811

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

1814

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

1815

msgstr ""

1816

1817

#: bzrlib/builtins.py:2997

1817

#: bzrlib/builtins.py:3090

1818

msgid ""

1819

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

1820

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

1822

"it."

1823

msgstr ""

1824

1825

#: bzrlib/builtins.py:3002

1825

#: bzrlib/builtins.py:3095

1826

msgid ""

1827

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

1828

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

1831

"can be edited directly using an editor."

1832

msgstr ""

1833

1834

#: bzrlib/builtins.py:3008

1834

#: bzrlib/builtins.py:3101

1835

msgid ""

1836

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

1837

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

1838

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

1839

msgstr ""

1840

1841

#: bzrlib/builtins.py:3012

1841

#: bzrlib/builtins.py:3105

1842

msgid ""

1843

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

1844

"precedence over the '!' exception patterns."

1845

msgstr ""

1846

1847

#: bzrlib/builtins.py:3015

1847

#: bzrlib/builtins.py:3108

1848

msgid ""

1849

":Notes: \n"

1850

" \n"

1852

" the shell on Unix."

1853

msgstr ""

1854

1855

#: bzrlib/builtins.py:3020

1855

#: bzrlib/builtins.py:3113

1856

msgid ""

1857

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

1858

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

1859

msgstr ""

1860

1861

#: bzrlib/builtins.py:3023

1861

#: bzrlib/builtins.py:3116

1862

msgid ""

1863

":Examples:\n"

1864

" Ignore the top level Makefile::"

1865

msgstr ""

1866

1867

#: bzrlib/builtins.py:3026

1867

#: bzrlib/builtins.py:3119

1868

msgid " bzr ignore ./Makefile"

1869

msgstr ""

1870

1871

#: bzrlib/builtins.py:3028

1871

#: bzrlib/builtins.py:3121

1872

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

1873

msgstr ""

1874

1875

#: bzrlib/builtins.py:3030

1875

#: bzrlib/builtins.py:3123

1876

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

1877

msgstr ""

1878

1879

#: bzrlib/builtins.py:3032

1879

#: bzrlib/builtins.py:3125

1880

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

1881

msgstr ""

1882

1883

#: bzrlib/builtins.py:3034

1883

#: bzrlib/builtins.py:3127

1884

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

1885

msgstr ""

1886

1887

#: bzrlib/builtins.py:3036

1887

#: bzrlib/builtins.py:3129

1888

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

1889

msgstr ""

1890

1891

#: bzrlib/builtins.py:3038

1891

#: bzrlib/builtins.py:3131

1892

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

1893

msgstr ""

1894

1895

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

1895

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

1896

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

1897

msgstr ""

1898

1899

#: bzrlib/builtins.py:3042

1899

#: bzrlib/builtins.py:3135

1900

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

1901

msgstr ""

1902

1903

#: bzrlib/builtins.py:3046

1903

#: bzrlib/builtins.py:3139

1904

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

1905

msgstr ""

1906

1907

#: bzrlib/builtins.py:3048

1907

#: bzrlib/builtins.py:3141

1908

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

1909

msgstr ""

1910

1911

#: bzrlib/builtins.py:3050

1911

#: bzrlib/builtins.py:3143

1912

msgid ""

1913

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

1914

" \n"

1920

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

1921

msgstr ""

1922

1923

#: bzrlib/builtins.py:3064

1923

#: bzrlib/builtins.py:3157

1924

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

1925

msgstr ""

1926

1927

#: bzrlib/builtins.py:3076

1927

#: bzrlib/builtins.py:3169

1928

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

1929

msgstr ""

1930

1931

#: bzrlib/builtins.py:3087

1931

#: bzrlib/builtins.py:3180

1932

#, python-format

1933

msgid "Invalid ignore pattern found. %s"

1934

msgid_plural "Invalid ignore patterns found. %s"

1935

msgstr[0] ""

1936

msgstr[1] ""

1937

1938

#: bzrlib/builtins.py:3096

1938

#: bzrlib/builtins.py:3189

1939

msgid "NAME_PATTERN should not be an absolute path"

1940

msgstr ""

1941

1942

#: bzrlib/builtins.py:3109

1942

#: bzrlib/builtins.py:3202

1943

#, python-format

1944

msgid ""

1945

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

1949

"them.\n"

1950

msgstr ""

1951

1952

#: bzrlib/builtins.py:3116

1952

#: bzrlib/builtins.py:3209

1953

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

1954

msgstr ""

1955

1956

#: bzrlib/builtins.py:3118

1956

#: bzrlib/builtins.py:3211

1957

msgid ""

1958

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

1959

"be ignored."

1960

msgstr ""

1961

1962

#: bzrlib/builtins.py:3121

1962

#: bzrlib/builtins.py:3214

1963

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

1964

msgstr ""

1965

1966

#: bzrlib/builtins.py:3123

1966

#: bzrlib/builtins.py:3216

1967

msgid " bzr ls --ignored"

1968

msgstr ""

1969

1970

#: bzrlib/builtins.py:3157

1970

#: bzrlib/builtins.py:3250

1971

#, python-format

1972

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

1973

msgstr ""

1974

1975

#: bzrlib/builtins.py:3164

1975

#: bzrlib/builtins.py:3257

1976

msgid ""

1977

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

1978

msgstr ""

1979

1980

#: bzrlib/builtins.py:3166

1980

#: bzrlib/builtins.py:3259

1981

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

1982

msgstr ""

1983

1984

#: bzrlib/builtins.py:3168

1984

#: bzrlib/builtins.py:3261

1985

msgid ""

1986

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

1987

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

1988

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

1989

msgstr ""

1990

1991

#: bzrlib/builtins.py:3172

1991

#: bzrlib/builtins.py:3265

1992

msgid ""

1993

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

1994

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

1995

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

1996

msgstr ""

1997

1998

#: bzrlib/builtins.py:3176

1998

#: bzrlib/builtins.py:3269

1999

msgid ""

2000

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

2001

"directory will be used."

2002

msgstr ""

2003

2004

#: bzrlib/builtins.py:3179

2004

#: bzrlib/builtins.py:3272

2005

msgid ""

2006

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

2007

msgstr ""

2008

2009

#: bzrlib/builtins.py:3181

2009

#: bzrlib/builtins.py:3274

2010

msgid ""

2011

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

2012

" Supported formats Autodetected by extension\n"

2019

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

2020

msgstr ""

2021

2022

#: bzrlib/builtins.py:3195

2022

#: bzrlib/builtins.py:3288

2023

msgid "Type of file to export to."

2024

msgstr ""

2025

2026

#: bzrlib/builtins.py:3198

2026

#: bzrlib/builtins.py:3291

2027

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

2028

msgstr ""

2029

2030

#: bzrlib/builtins.py:3202

2030

#: bzrlib/builtins.py:3295

2031

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

2032

msgstr ""

2033

2034

#: bzrlib/builtins.py:3204

2034

#: bzrlib/builtins.py:3297

2035

msgid ""

2036

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

2037

"changed."

2038

msgstr ""

2039

2040

#: bzrlib/builtins.py:3207

2040

#: bzrlib/builtins.py:3300

2041

msgid ""

2042

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

2043

msgstr ""

2044

2045

#: bzrlib/builtins.py:3226

2045

#: bzrlib/builtins.py:3319

2046

msgid "--uncommitted requires a working tree"

2047

msgstr ""

2048

2049

#: bzrlib/builtins.py:3235

2049

#: bzrlib/builtins.py:3328

2050

#, python-format

2051

msgid "Unsupported export format: %s"

2052

msgstr ""

2053

2054

#: bzrlib/builtins.py:3239

2054

#: bzrlib/builtins.py:3332

2055

msgid ""

2056

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

2057

msgstr ""

2058

2059

#: bzrlib/builtins.py:3241

2059

#: bzrlib/builtins.py:3334

2060

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

2061

msgstr ""

2062

2063

#: bzrlib/builtins.py:3243

2063

#: bzrlib/builtins.py:3336

2064

msgid ""

2065

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

2066

"binary file."

2067

msgstr ""

2068

2069

#: bzrlib/builtins.py:3249

2069

#: bzrlib/builtins.py:3342

2070

msgid "The path name in the old tree."

2071

msgstr ""

2072

2073

#: bzrlib/builtins.py:3250

2073

#: bzrlib/builtins.py:3343

2074

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

2075

msgstr ""

2076

2077

#: bzrlib/builtins.py:3261

2077

#: bzrlib/builtins.py:3354

2078

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

2079

msgstr ""

2080

2081

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

2081

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

2082

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

2083

msgstr ""

2084

2085

#: bzrlib/builtins.py:3321

2085

#: bzrlib/builtins.py:3414

2086

msgid "Commit changes into a new revision."

2087

msgstr ""

2088

2089

#: bzrlib/builtins.py:3323

2089

#: bzrlib/builtins.py:3416

2090

msgid ""

2091

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

2092

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

2096

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

2097

msgstr ""

2098

2099

#: bzrlib/builtins.py:3330

2099

#: bzrlib/builtins.py:3423

2100

msgid ""

2101

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

2102

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

2103

"as explained below."

2104

msgstr ""

2105

2106

#: bzrlib/builtins.py:3334

2106

#: bzrlib/builtins.py:3427

2107

msgid ":Selective commits:"

2108

msgstr ""

2109

2110

#: bzrlib/builtins.py:3336

2110

#: bzrlib/builtins.py:3429

2111

msgid ""

2112

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

2113

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

2114

" everything within it is committed."

2115

msgstr ""

2116

2117

#: bzrlib/builtins.py:3340

2117

#: bzrlib/builtins.py:3433

2118

msgid ""

2119

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

2120

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

2121

" within foo/bar::"

2122

msgstr ""

2123

2124

#: bzrlib/builtins.py:3344

2124

#: bzrlib/builtins.py:3437

2125

msgid " bzr commit foo -x foo/bar"

2126

msgstr ""

2127

2128

#: bzrlib/builtins.py:3346

2128

#: bzrlib/builtins.py:3439

2129

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

2130

msgstr ""

2131

2132

#: bzrlib/builtins.py:3348

2132

#: bzrlib/builtins.py:3441

2133

msgid ":Custom authors:"

2134

msgstr ""

2135

2136

#: bzrlib/builtins.py:3350

2136

#: bzrlib/builtins.py:3443

2137

msgid ""

2138

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

2139

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

2143

" author."

2144

msgstr ""

2145

2146

#: bzrlib/builtins.py:3357

2146

#: bzrlib/builtins.py:3450

2147

msgid ":Checks:"

2148

msgstr ""

2149

2150

#: bzrlib/builtins.py:3359

2150

#: bzrlib/builtins.py:3452

2151

msgid ""

2152

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

2153

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

2156

" for details."

2157

msgstr ""

2158

2159

#: bzrlib/builtins.py:3365

2159

#: bzrlib/builtins.py:3458

2160

msgid ":Things to note:"

2161

msgstr ""

2162

2163

#: bzrlib/builtins.py:3367

2163

#: bzrlib/builtins.py:3460

2164

msgid ""

2165

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

2166

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

2167

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

2168

msgstr ""

2169

2170

#: bzrlib/builtins.py:3371

2170

#: bzrlib/builtins.py:3464

2171

msgid ""

2172

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

2173

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

2175

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

2176

msgstr ""

2177

2178

#: bzrlib/builtins.py:3381

2178

#: bzrlib/builtins.py:3474

2179

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

2180

msgstr ""

2181

2182

#: bzrlib/builtins.py:3384

2182

#: bzrlib/builtins.py:3477

2183

msgid "Description of the new revision."

2184

msgstr ""

2185

2186

#: bzrlib/builtins.py:3387

2186

#: bzrlib/builtins.py:3480

2187

msgid "Commit even if nothing has changed."

2188

msgstr ""

2189

2190

#: bzrlib/builtins.py:3391

2190

#: bzrlib/builtins.py:3484

2191

msgid "Take commit message from this file."

2192

msgstr ""

2193

2194

#: bzrlib/builtins.py:3393

2194

#: bzrlib/builtins.py:3486

2195

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

2196

msgstr ""

2197

2198

#: bzrlib/builtins.py:3396

2198

#: bzrlib/builtins.py:3489

2199

msgid ""

2200

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

2201

"08:00:00 +0100'."

2202

msgstr ""

2203

2204

#: bzrlib/builtins.py:3399

2204

#: bzrlib/builtins.py:3492

2205

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

2206

msgstr ""

2207

2208

#: bzrlib/builtins.py:3402

2208

#: bzrlib/builtins.py:3495

2209

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

2210

msgstr ""

2211

2212

#: bzrlib/builtins.py:3405

2212

#: bzrlib/builtins.py:3498

2213

msgid ""

2214

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

2215

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

2216

msgstr ""

2217

2218

#: bzrlib/builtins.py:3411

2218

#: bzrlib/builtins.py:3504

2219

msgid ""

2220

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

2221

"the message editor."

2222

msgstr ""

2223

2224

#: bzrlib/builtins.py:3414

2224

#: bzrlib/builtins.py:3507

2225

msgid ""

2226

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

2227

"can not be natively represented."

2228

msgstr ""

2229

2230

#: bzrlib/builtins.py:3432

2230

#: bzrlib/builtins.py:3525

2231

#, python-format

2232

msgid ""

2233

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

2235

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

2236

msgstr ""

2237

2238

#: bzrlib/builtins.py:3441

2238

#: bzrlib/builtins.py:3534

2239

#, python-format

2240

msgid ""

2241

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

2243

"Commit refused."

2244

msgstr ""

2245

2246

#: bzrlib/builtins.py:3450

2246

#: bzrlib/builtins.py:3543

2247

#, python-format

2248

msgid "Unrecognized bug %s. Commit refused."

2249

msgstr ""

2250

2251

#: bzrlib/builtins.py:3453

2251

#: bzrlib/builtins.py:3546

2252

#, python-format

2253

msgid ""

2254

"%s\n"

2255

"Commit refused."

2256

msgstr ""

2257

2258

#: bzrlib/builtins.py:3477

2258

#: bzrlib/builtins.py:3570

2259

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

2260

msgstr ""

2261

2262

#: bzrlib/builtins.py:3517

2262

#: bzrlib/builtins.py:3610

2263

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

2264

msgstr ""

2265

2266

#: bzrlib/builtins.py:3546

2266

#: bzrlib/builtins.py:3639

2267

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

2268

msgstr ""

2269

2270

#: bzrlib/builtins.py:3549

2270

#: bzrlib/builtins.py:3642

2271

msgid ""

2272

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

2273

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

2274

msgstr ""

2275

2276

#: bzrlib/builtins.py:3569

2276

#: bzrlib/builtins.py:3662

2277

msgid ""

2278

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

2279

"-unchanged to force an empty commit."

2280

msgstr ""

2281

2282

#: bzrlib/builtins.py:3573

2282

#: bzrlib/builtins.py:3666

2283

msgid ""

2284

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

2285

"resolve FILE\" to resolve."

2286

msgstr ""

2287

2288

#: bzrlib/builtins.py:3577

2288

#: bzrlib/builtins.py:3670

2289

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

2290

msgstr ""

2291

2292

#: bzrlib/builtins.py:3580

2292

#: bzrlib/builtins.py:3673

2293

msgid ""

2294

"\n"

2295

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

2296

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

2297

msgstr ""

2298

2299

#: bzrlib/builtins.py:3588

2299

#: bzrlib/builtins.py:3681

2300

msgid ""

2301

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

2302

msgstr ""

2303

2304

#: bzrlib/builtins.py:3590

2304

#: bzrlib/builtins.py:3683

2305

msgid ""

2306

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

2307

"to detect data corruption or bzr bugs."

2308

msgstr ""

2309

2310

#: bzrlib/builtins.py:3593

2310

#: bzrlib/builtins.py:3686

2311

msgid ""

2312

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

2313

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

2314

msgstr ""

2315

2316

#: bzrlib/builtins.py:3596

2316

#: bzrlib/builtins.py:3689

2317

msgid ""

2318

"revisions\n"

2319

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

2320

" indicate a problem."

2321

msgstr ""

2322

2323

#: bzrlib/builtins.py:3600

2323

#: bzrlib/builtins.py:3693

2324

msgid ""

2325

"versionedfiles\n"

2326

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

2327

" doesn't indicate a problem."

2328

msgstr ""

2329

2330

#: bzrlib/builtins.py:3604

2330

#: bzrlib/builtins.py:3697

2331

msgid ""

2332

"unreferenced ancestors\n"

2333

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

2335

" subtle problem that Bazaar can work around."

2336

msgstr ""

2337

2338

#: bzrlib/builtins.py:3609

2338

#: bzrlib/builtins.py:3702

2339

msgid ""

2340

"unique file texts\n"

2341

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

2342

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

2343

msgstr ""

2344

2345

#: bzrlib/builtins.py:3613

2345

#: bzrlib/builtins.py:3706

2346

msgid ""

2347

"repeated file texts\n"

2348

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

2351

" indicate a problem."

2352

msgstr ""

2353

2354

#: bzrlib/builtins.py:3619

2354

#: bzrlib/builtins.py:3712

2355

msgid ""

2356

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

2357

"given\n"

2358

"location will be checked."

2359

msgstr ""

2360

2361

#: bzrlib/builtins.py:3624

2361

#: bzrlib/builtins.py:3717

2362

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

2363

msgstr ""

2364

2365

#: bzrlib/builtins.py:3626

2365

#: bzrlib/builtins.py:3719

2366

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

2367

msgstr ""

2368

2369

#: bzrlib/builtins.py:3628

2369

#: bzrlib/builtins.py:3721

2370

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

2371

msgstr ""

2372

2373

#: bzrlib/builtins.py:3630

2373

#: bzrlib/builtins.py:3723

2374

msgid " bzr check --repo bar"

2375

msgstr ""

2376

2377

#: bzrlib/builtins.py:3632

2377

#: bzrlib/builtins.py:3725

2378

msgid " Check everything at 'baz'::"

2379

msgstr ""

2380

2381

#: bzrlib/builtins.py:3634

2381

#: bzrlib/builtins.py:3727

2382

msgid " bzr check baz"

2383

msgstr ""

2384

2385

#: bzrlib/builtins.py:3640

2385

#: bzrlib/builtins.py:3733

2386

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

2387

msgstr ""

2388

2389

#: bzrlib/builtins.py:3642

2389

#: bzrlib/builtins.py:3735

2390

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

2391

msgstr ""

2392

2393

#: bzrlib/builtins.py:3644

2393

#: bzrlib/builtins.py:3737

2394

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

2395

msgstr ""

2396

2397

#: bzrlib/builtins.py:3658

2397

#: bzrlib/builtins.py:3751

2398

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

2399

msgstr ""

2400

2401

#: bzrlib/builtins.py:3660

2401

#: bzrlib/builtins.py:3753

2402

msgid ""

2403

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

2404

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

2407

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

2408

msgstr ""

2409

2410

#: bzrlib/builtins.py:3666

2410

#: bzrlib/builtins.py:3759

2411

msgid ""

2412

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

2413

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

2417

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

2418

msgstr ""

2419

2420

#: bzrlib/builtins.py:3673

2420

#: bzrlib/builtins.py:3766

2421

msgid ""

2422

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

2423

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

2428

"afterwards."

2429

msgstr ""

2430

2431

#: bzrlib/builtins.py:3681

2431

#: bzrlib/builtins.py:3774

2432

msgid ""

2433

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

2434

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

2436

"tried."

2437

msgstr ""

2438

2439

#: bzrlib/builtins.py:3686

2439

#: bzrlib/builtins.py:3779

2440

msgid ""

2441

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

2442

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

2443

msgstr ""

2444

2445

#: bzrlib/builtins.py:3694

2445

#: bzrlib/builtins.py:3787

2446

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

2447

msgstr ""

2448

2449

#: bzrlib/builtins.py:3698

2449

#: bzrlib/builtins.py:3791

2450

msgid "Branch format"

2451

msgstr ""

2452

2453

#: bzrlib/builtins.py:3700

2453

#: bzrlib/builtins.py:3793

2454

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

2455

msgstr ""

2456

2457

#: bzrlib/builtins.py:3702

2457

#: bzrlib/builtins.py:3795

2458

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

2459

msgstr ""

2460

2461

#: bzrlib/builtins.py:3717

2461

#: bzrlib/builtins.py:3810

2462

msgid "Show or set bzr user id."

2463

msgstr ""

2464

2465

#: bzrlib/builtins.py:3719

2465

#: bzrlib/builtins.py:3812

2466

msgid ""

2467

":Examples:\n"

2468

" Show the email of the current user::"

2469

msgstr ""

2470

2471

#: bzrlib/builtins.py:3722

2471

#: bzrlib/builtins.py:3815

2472

msgid " bzr whoami --email"

2473

msgstr ""

2474

2475

#: bzrlib/builtins.py:3724

2475

#: bzrlib/builtins.py:3817

2476

msgid " Set the current user::"

2477

msgstr ""

2478

2479

#: bzrlib/builtins.py:3726

2479

#: bzrlib/builtins.py:3819

2480

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

2481

msgstr ""

2482

2483

#: bzrlib/builtins.py:3730

2483

#: bzrlib/builtins.py:3823

2484

msgid "Display email address only."

2485

msgstr ""

2486

2487

#: bzrlib/builtins.py:3732

2487

#: bzrlib/builtins.py:3825

2488

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

2489

msgstr ""

2490

2491

#: bzrlib/builtins.py:3758

2491

#: bzrlib/builtins.py:3851

2492

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

2493

msgstr ""

2494

2495

#: bzrlib/builtins.py:3780

2495

#: bzrlib/builtins.py:3873

2496

msgid "Print or set the branch nickname."

2497

msgstr ""

2498

2499

#: bzrlib/builtins.py:3782

2499

#: bzrlib/builtins.py:3875

2500

msgid ""

2501

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

2502

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

2503

msgstr ""

2504

2505

#: bzrlib/builtins.py:3785

2505

#: bzrlib/builtins.py:3878

2506

msgid ""

2507

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

2508

"locally."

2509

msgstr ""

2510

2511

#: bzrlib/builtins.py:3805

2511

#: bzrlib/builtins.py:3898

2512

msgid "Set/unset and display aliases."

2513

msgstr ""

2514

2515

#: bzrlib/builtins.py:3807

2515

#: bzrlib/builtins.py:3900

2516

msgid ""

2517

":Examples:\n"

2518

" Show the current aliases::"

2519

msgstr ""

2520

2521

#: bzrlib/builtins.py:3810

2521

#: bzrlib/builtins.py:3903

2522

msgid " bzr alias"

2523

msgstr ""

2524

2525

#: bzrlib/builtins.py:3812

2525

#: bzrlib/builtins.py:3905

2526

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

2527

msgstr ""

2528

2529

#: bzrlib/builtins.py:3814

2529

#: bzrlib/builtins.py:3907

2530

msgid " bzr alias ll"

2531

msgstr ""

2532

2533

#: bzrlib/builtins.py:3816

2533

#: bzrlib/builtins.py:3909

2534

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

2535

msgstr ""

2536

2537

#: bzrlib/builtins.py:3818

2537

#: bzrlib/builtins.py:3911

2538

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

2539

msgstr ""

2540

2541

#: bzrlib/builtins.py:3820

2541

#: bzrlib/builtins.py:3913

2542

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

2543

msgstr ""

2544

2545

#: bzrlib/builtins.py:3822

2545

#: bzrlib/builtins.py:3915

2546

msgid " bzr alias --remove ll"

2547

msgstr ""

2548

2549

#: bzrlib/builtins.py:3827

2549

#: bzrlib/builtins.py:3920

2550

msgid "Remove the alias."

2551

msgstr ""

2552

2553

#: bzrlib/builtins.py:3845

2553

#: bzrlib/builtins.py:3938

2554

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

2555

msgstr ""

2556

2557

#: bzrlib/builtins.py:4026

2557

#: bzrlib/builtins.py:4119

2558

msgid ""

2559

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

2560

msgstr ""

2561

2562

#: bzrlib/builtins.py:4043

2562

#: bzrlib/builtins.py:4136

2563

msgid ""

2564

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

2565

msgstr ""

2566

2567

#: bzrlib/builtins.py:4090

2567

#: bzrlib/builtins.py:4183

2568

msgid "Show version of bzr."

2569

msgstr ""

2570

2571

#: bzrlib/builtins.py:4094

2571

#: bzrlib/builtins.py:4187

2572

msgid "Print just the version number."

2573

msgstr ""

2574

2575

#: bzrlib/builtins.py:4113

2575

#: bzrlib/builtins.py:4206

2576

msgid "It sure does!\n"

2577

msgstr ""

2578

2579

#: bzrlib/builtins.py:4137

2579

#: bzrlib/builtins.py:4230

2580

#, python-format

2581

msgid "merge base is revision %s\n"

2582

msgstr ""

2583

2584

#: bzrlib/builtins.py:4141

2584

#: bzrlib/builtins.py:4234

2585

msgid "Perform a three-way merge."

2586

msgstr ""

2587

2588

#: bzrlib/builtins.py:4143

2588

#: bzrlib/builtins.py:4236

2589

msgid ""

2590

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

2591

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

2596

"the current working tree."

2597

msgstr ""

2598

2599

#: bzrlib/builtins.py:4151

2599

#: bzrlib/builtins.py:4244

2600

msgid ""

2601

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

2602

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

2603

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

2604

msgstr ""

2605

2606

#: bzrlib/builtins.py:4155

2606

#: bzrlib/builtins.py:4248

2607

msgid ""

2608

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

2609

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

2610

msgstr ""

2611

2612

#: bzrlib/builtins.py:4158

2612

#: bzrlib/builtins.py:4251

2613

msgid ""

2614

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

2615

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

2620

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

2621

msgstr ""

2622

2623

#: bzrlib/builtins.py:4166

2623

#: bzrlib/builtins.py:4259

2624

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

2625

msgstr ""

2626

2627

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

2627

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

2628

msgid ""

2629

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

2630

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

2631

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

2632

"before you should commit."

2632

"before you can commit."

2633

msgstr ""

2634

2635

#: bzrlib/builtins.py:4173

2635

#: bzrlib/builtins.py:4266

2636

msgid ""

2637

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

2638

msgstr ""

2639

2640

#: bzrlib/builtins.py:4175

2640

#: bzrlib/builtins.py:4268

2641

msgid ""

2642

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

2643

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

2645

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

2646

msgstr ""

2647

2648

#: bzrlib/builtins.py:4180

2648

#: bzrlib/builtins.py:4273

2649

msgid ""

2650

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

2651

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

2652

"committed to record the result of the merge."

2653

msgstr ""

2654

2655

#: bzrlib/builtins.py:4184

2655

#: bzrlib/builtins.py:4277

2656

msgid ""

2657

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

2658

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

2661

"merge revision which has more than two parents."

2662

msgstr ""

2663

2664

#: bzrlib/builtins.py:4190

2664

#: bzrlib/builtins.py:4283

2665

msgid ""

2666

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

2667

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

2668

"can be given."

2669

msgstr ""

2670

2671

#: bzrlib/builtins.py:4194

2671

#: bzrlib/builtins.py:4287

2672

msgid ""

2673

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

2674

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

2675

msgstr ""

2676

2677

#: bzrlib/builtins.py:4197

2677

#: bzrlib/builtins.py:4290

2678

msgid ""

2679

":Examples:\n"

2680

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

2681

msgstr ""

2682

2683

#: bzrlib/builtins.py:4200

2683

#: bzrlib/builtins.py:4293

2684

msgid " bzr merge ../bzr.dev"

2685

msgstr ""

2686

2687

#: bzrlib/builtins.py:4202

2687

#: bzrlib/builtins.py:4295

2688

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

2689

msgstr ""

2690

2691

#: bzrlib/builtins.py:4204

2691

#: bzrlib/builtins.py:4297

2692

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

2693

msgstr ""

2694

2695

#: bzrlib/builtins.py:4206

2695

#: bzrlib/builtins.py:4299

2696

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

2697

msgstr ""

2698

2699

#: bzrlib/builtins.py:4208

2699

#: bzrlib/builtins.py:4301

2700

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

2701

msgstr ""

2702

2703

#: bzrlib/builtins.py:4210

2703

#: bzrlib/builtins.py:4303

2704

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

2705

msgstr ""

2706

2707

#: bzrlib/builtins.py:4212

2707

#: bzrlib/builtins.py:4305

2708

msgid " bzr merge /tmp/merge"

2709

msgstr ""

2710

2711

#: bzrlib/builtins.py:4214

2711

#: bzrlib/builtins.py:4307

2712

msgid ""

2713

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

2714

" feature1a and feature1b:"

2715

msgstr ""

2716

2717

#: bzrlib/builtins.py:4217

2717

#: bzrlib/builtins.py:4310

2718

msgid ""

2719

" bzr merge ../feature1a\n"

2720

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

2721

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

2722

msgstr ""

2723

2724

#: bzrlib/builtins.py:4229

2724

#: bzrlib/builtins.py:4322

2725

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

2726

msgstr ""

2727

2728

#: bzrlib/builtins.py:4235

2728

#: bzrlib/builtins.py:4328

2729

msgid ""

2730

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

2731

msgstr ""

2732

2733

#: bzrlib/builtins.py:4237

2733

#: bzrlib/builtins.py:4330

2734

msgid ""

2735

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

2736

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

2737

"commit the result."

2738

msgstr ""

2739

2740

#: bzrlib/builtins.py:4242

2740

#: bzrlib/builtins.py:4335

2741

msgid ""

2742

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

2743

msgstr ""

2744

2745

#: bzrlib/builtins.py:4244

2745

#: bzrlib/builtins.py:4337

2746

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

2747

msgstr ""

2748

2749

#: bzrlib/builtins.py:4246

2749

#: bzrlib/builtins.py:4339

2750

msgid "Select changes interactively."

2751

msgstr ""

2752

2753

#: bzrlib/builtins.py:4268

2753

#: bzrlib/builtins.py:4361

2754

msgid ""

2755

"Merging into empty branches not currently supported, "

2756

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

2757

msgstr ""

2758

2759

#: bzrlib/builtins.py:4295

2759

#: bzrlib/builtins.py:4388

2760

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

2761

msgstr ""

2762

2763

#: bzrlib/builtins.py:4306

2763

#: bzrlib/builtins.py:4399

2764

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

2765

msgstr ""

2766

2767

#: bzrlib/builtins.py:4326

2767

#: bzrlib/builtins.py:4419

2768

msgid "merger: "

2769

msgstr ""

2770

2771

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

2771

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

2772

msgid "Nothing to do."

2773

msgstr ""

2774

2775

#: bzrlib/builtins.py:4332

2775

#: bzrlib/builtins.py:4425

2776

msgid "Cannot pull individual files"

2777

msgstr ""

2778

2779

#: bzrlib/builtins.py:4340

2779

#: bzrlib/builtins.py:4433

2780

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

2781

msgstr ""

2782

2783

#: bzrlib/builtins.py:4398

2783

#: bzrlib/builtins.py:4491

2784

#, python-format

2785

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

2786

msgstr ""

2787

2788

#: bzrlib/builtins.py:4407

2788

#: bzrlib/builtins.py:4500

2789

#, python-format

2790

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

2791

msgstr ""

2792

2793

#: bzrlib/builtins.py:4411

2793

#: bzrlib/builtins.py:4504

2794

msgid "Cannot do conflict reduction and show base."

2795

msgstr ""

2796

2797

#: bzrlib/builtins.py:4522

2797

#: bzrlib/builtins.py:4615

2798

msgid "No location specified or remembered"

2799

msgstr ""

2800

2801

#: bzrlib/builtins.py:4524

2801

#: bzrlib/builtins.py:4617

2802

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

2803

msgstr ""

2804

2805

#: bzrlib/builtins.py:4530

2805

#: bzrlib/builtins.py:4623

2806

msgid "Redo a merge."

2807

msgstr ""

2808

2809

#: bzrlib/builtins.py:4532

2809

#: bzrlib/builtins.py:4625

2810

msgid ""

2811

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

2812

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

2813

"lets you try different ones on different files."

2814

msgstr ""

2815

2816

#: bzrlib/builtins.py:4536

2816

#: bzrlib/builtins.py:4629

2817

msgid ""

2818

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

2819

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

2820

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

2821

msgstr ""

2822

2823

#: bzrlib/builtins.py:4540

2823

#: bzrlib/builtins.py:4633

2824

msgid ""

2825

":Examples:\n"

2826

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

2827

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

2828

msgstr ""

2829

2830

#: bzrlib/builtins.py:4544

2830

#: bzrlib/builtins.py:4637

2831

msgid " bzr remerge --show-base"

2832

msgstr ""

2833

2834

#: bzrlib/builtins.py:4546

2834

#: bzrlib/builtins.py:4639

2835

msgid ""

2836

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

2837

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

2838

msgstr ""

2839

2840

#: bzrlib/builtins.py:4549

2840

#: bzrlib/builtins.py:4642

2841

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

2842

msgstr ""

2843

2844

#: bzrlib/builtins.py:4556

2844

#: bzrlib/builtins.py:4649

2845

msgid "Show base revision text in conflicts."

2846

msgstr ""

2847

2848

#: bzrlib/builtins.py:4568

2848

#: bzrlib/builtins.py:4661

2849

msgid ""

2850

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

2851

"merges."

2852

msgstr ""

2853

2854

#: bzrlib/builtins.py:4624

2854

#: bzrlib/builtins.py:4717

2855

msgid "Revert files to a previous revision."

2856

msgstr ""

2857

2858

#: bzrlib/builtins.py:4626

2858

#: bzrlib/builtins.py:4719

2859

msgid ""

2860

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

2861

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

2862

"last committed revision is used."

2863

msgstr ""

2864

2865

#: bzrlib/builtins.py:4630

2865

#: bzrlib/builtins.py:4723

2866

msgid ""

2867

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

2868

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

2871

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

2872

msgstr ""

2873

2874

#: bzrlib/builtins.py:4636

2874

#: bzrlib/builtins.py:4729

2875

msgid ""

2876

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

2877

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

2878

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

2879

msgstr ""

2880

2881

#: bzrlib/builtins.py:4640

2881

#: bzrlib/builtins.py:4733

2882

msgid ""

2883

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

2884

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

2886

"reverted."

2887

msgstr ""

2888

2889

#: bzrlib/builtins.py:4645

2889

#: bzrlib/builtins.py:4738

2890

msgid ""

2891

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

2892

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

2894

"deleted."

2895

msgstr ""

2896

2897

#: bzrlib/builtins.py:4650

2897

#: bzrlib/builtins.py:4743

2898

msgid ""

2899

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

2900

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

2906

"reverting any files."

2907

msgstr ""

2908

2909

#: bzrlib/builtins.py:4659

2909

#: bzrlib/builtins.py:4752

2910

msgid ""

2911

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

2912

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

2920

"target branches."

2921

msgstr ""

2922

2923

#: bzrlib/builtins.py:4673

2923

#: bzrlib/builtins.py:4766

2924

msgid "Do not save backups of reverted files."

2925

msgstr ""

2926

2927

#: bzrlib/builtins.py:4675

2927

#: bzrlib/builtins.py:4768

2928

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

2929

msgstr ""

2930

2931

#: bzrlib/builtins.py:4706

2931

#: bzrlib/builtins.py:4799

2932

msgid ""

2933

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

2934

" "

2935

msgstr ""

2936

2937

#: bzrlib/builtins.py:4711

2937

#: bzrlib/builtins.py:4804

2938

msgid "Show help on all commands."

2939

msgstr ""

2940

2941

#: bzrlib/builtins.py:4740

2941

#: bzrlib/builtins.py:4833

2942

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

2943

msgstr ""

2944

2945

#: bzrlib/builtins.py:4742

2945

#: bzrlib/builtins.py:4835

2946

msgid "OTHER_BRANCH may be local or remote."

2947

msgstr ""

2948

2949

#: bzrlib/builtins.py:4744

2949

#: bzrlib/builtins.py:4837

2950

msgid ""

2951

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

2952

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

2957

" 0 - no missing revisions"

2958

msgstr ""

2959

2960

#: bzrlib/builtins.py:4754

2960

#: bzrlib/builtins.py:4847

2961

msgid ""

2962

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

2963

" remembered pull location::"

2964

msgstr ""

2965

2966

#: bzrlib/builtins.py:4757

2966

#: bzrlib/builtins.py:4850

2967

msgid " bzr missing"

2968

msgstr ""

2969

2970

#: bzrlib/builtins.py:4759

2970

#: bzrlib/builtins.py:4852

2971

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

2972

msgstr ""

2973

2974

#: bzrlib/builtins.py:4761

2974

#: bzrlib/builtins.py:4854

2975

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

2976

msgstr ""

2977

2978

#: bzrlib/builtins.py:4763

2978

#: bzrlib/builtins.py:4856

2979

msgid ""

2980

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

2981

" branch::"

2982

msgstr ""

2983

2984

#: bzrlib/builtins.py:4766

2984

#: bzrlib/builtins.py:4859

2985

msgid " bzr missing -r ..-10"

2986

msgstr ""

2987

2988

#: bzrlib/builtins.py:4768

2988

#: bzrlib/builtins.py:4861

2989

msgid ""

2990

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

2991

" branch::"

2992

msgstr ""

2993

2994

#: bzrlib/builtins.py:4771

2994

#: bzrlib/builtins.py:4864

2995

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

2996

msgstr ""

2997

2998

#: bzrlib/builtins.py:4778

2998

#: bzrlib/builtins.py:4871

2999

msgid "Reverse the order of revisions."

3000

msgstr ""

3001

3002

#: bzrlib/builtins.py:4780

3002

#: bzrlib/builtins.py:4873

3003

msgid "Display changes in the local branch only."

3004

msgstr ""

3005

3006

#: bzrlib/builtins.py:4781

3006

#: bzrlib/builtins.py:4874

3007

msgid "Same as --mine-only."

3008

msgstr ""

3009

3010

#: bzrlib/builtins.py:4783

3010

#: bzrlib/builtins.py:4876

3011

msgid "Display changes in the remote branch only."

3012

msgstr ""

3013

3014

#: bzrlib/builtins.py:4784

3014

#: bzrlib/builtins.py:4877

3015

msgid "Same as --theirs-only."

3016

msgstr ""

3017

3018

#: bzrlib/builtins.py:4789

3018

#: bzrlib/builtins.py:4882

3019

msgid ""

3020

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

3021

"details."

3022

msgstr ""

3023

3024

#: bzrlib/builtins.py:4793

3024

#: bzrlib/builtins.py:4886

3025

msgid ""

3026

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

3027

"details."

3028

msgstr ""

3029

3030

#: bzrlib/builtins.py:4796

3030

#: bzrlib/builtins.py:4889

3031

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

3032

msgstr ""

3033

3034

#: bzrlib/builtins.py:4850

3034

#: bzrlib/builtins.py:4943

3035

msgid "No peer location known or specified."

3036

msgstr ""

3037

3038

#: bzrlib/builtins.py:4854

3038

#: bzrlib/builtins.py:4947

3039

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

3040

msgstr ""

3041

3042

#: bzrlib/builtins.py:4887

3042

#: bzrlib/builtins.py:4980

3043

#, python-format

3044

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

3045

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

3046

msgstr[0] ""

3047

msgstr[1] ""

3048

3049

#: bzrlib/builtins.py:4903

3049

#: bzrlib/builtins.py:4996

3050

#, python-format

3051

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

3052

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

3053

msgstr[0] ""

3054

msgstr[1] ""

3055

3056

#: bzrlib/builtins.py:4915

3056

#: bzrlib/builtins.py:5008

3057

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

3058

msgstr ""

3059

3060

#: bzrlib/builtins.py:4918

3060

#: bzrlib/builtins.py:5011

3061

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

3062

msgstr ""

3063

3064

#: bzrlib/builtins.py:4923

3064

#: bzrlib/builtins.py:5016

3065

msgid "Branches are up to date.\n"

3066

msgstr ""

3067

3068

#: bzrlib/builtins.py:4934

3068

#: bzrlib/builtins.py:5027

3069

msgid "Compress the data within a repository."

3070

msgstr ""

3071

3072

#: bzrlib/builtins.py:4936

3072

#: bzrlib/builtins.py:5029

3073

msgid ""

3074

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

3075

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

3076

"normally not required to be done manually."

3077

msgstr ""

3078

3079

#: bzrlib/builtins.py:4940

3079

#: bzrlib/builtins.py:5033

3080

msgid ""

3081

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

3082

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

3085

"used."

3086

msgstr ""

3087

3088

#: bzrlib/builtins.py:4946

3088

#: bzrlib/builtins.py:5039

3089

msgid ""

3090

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

3091

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

3093

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

3094

msgstr ""

3095

3096

#: bzrlib/builtins.py:4955

3096

#: bzrlib/builtins.py:5048

3097

msgid "Delete obsolete packs to save disk space."

3098

msgstr ""

3099

3100

#: bzrlib/builtins.py:4969

3100

#: bzrlib/builtins.py:5062

3101

msgid "List the installed plugins."

3102

msgstr ""

3103

3104

#: bzrlib/builtins.py:4971

3104

#: bzrlib/builtins.py:5064

3105

msgid ""

3106

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

3107

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

3108

msgstr ""

3109

3110

#: bzrlib/builtins.py:4974

3110

#: bzrlib/builtins.py:5067

3111

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

3112

msgstr ""

3113

3114

#: bzrlib/builtins.py:4976

3114

#: bzrlib/builtins.py:5069

3115

msgid ""

3116

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

3117

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

3120

"customizing log output."

3121

msgstr ""

3122

3123

#: bzrlib/builtins.py:4982

3123

#: bzrlib/builtins.py:5075

3124

msgid ""

3125

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

3126

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

3128

"plugins using the Python programming language."

3129

msgstr ""

3130

3131

#: bzrlib/builtins.py:4998

3131

#: bzrlib/builtins.py:5091

3132

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

3133

msgstr ""

3134

3135

#: bzrlib/builtins.py:5001

3135

#: bzrlib/builtins.py:5094

3136

msgid "Produce long-format testament."

3137

msgstr ""

3138

3139

#: bzrlib/builtins.py:5003

3139

#: bzrlib/builtins.py:5096

3140

msgid "Produce a strict-format testament."

3141

msgstr ""

3142

3143

#: bzrlib/builtins.py:5029

3143

#: bzrlib/builtins.py:5122

3144

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

3145

msgstr ""

3146

3147

#: bzrlib/builtins.py:5031

3147

#: bzrlib/builtins.py:5124

3148

msgid ""

3149

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

3150

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

3151

msgstr ""

3152

3153

#: bzrlib/builtins.py:5034

3153

#: bzrlib/builtins.py:5127

3154

msgid ""

3155

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

3156

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

3157

msgstr ""

3158

3159

#: bzrlib/builtins.py:5042

3159

#: bzrlib/builtins.py:5135

3160

msgid "Show annotations on all lines."

3161

msgstr ""

3162

3163

#: bzrlib/builtins.py:5043

3163

#: bzrlib/builtins.py:5136

3164

msgid "Show commit date in annotations."

3165

msgstr ""

3166

3167

#: bzrlib/builtins.py:5130

3167

#: bzrlib/builtins.py:5223

3168

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

3169

msgstr ""

3170

3171

#: bzrlib/builtins.py:5142

3171

#: bzrlib/builtins.py:5235

3172

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

3173

msgstr ""

3174

3175

#: bzrlib/builtins.py:5146

3175

#: bzrlib/builtins.py:5239

3176

msgid ""

3177

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

3178

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

3179

msgstr ""

3180

3181

#: bzrlib/builtins.py:5149

3181

#: bzrlib/builtins.py:5242

3182

msgid ""

3183

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

3184

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

3185

msgstr ""

3186

3187

#: bzrlib/builtins.py:5152

3187

#: bzrlib/builtins.py:5245

3188

msgid ""

3189

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

3190

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

3191

"that of the master."

3192

msgstr ""

3193

3194

#: bzrlib/builtins.py:5167

3194

#: bzrlib/builtins.py:5260

3195

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

3196

msgstr ""

3197

3198

#: bzrlib/builtins.py:5172

3198

#: bzrlib/builtins.py:5265

3199

msgid "Branch is already bound"

3200

msgstr ""

3201

3202

#: bzrlib/builtins.py:5174

3202

#: bzrlib/builtins.py:5267

3203

msgid "No location supplied and no previous location known"

3204

msgstr ""

3205

3206

#: bzrlib/builtins.py:5180

3206

#: bzrlib/builtins.py:5273

3207

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

3208

msgstr ""

3209

3210

#: bzrlib/builtins.py:5187

3210

#: bzrlib/builtins.py:5280

3211

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

3212

msgstr ""

3213

3214

#: bzrlib/builtins.py:5189

3214

#: bzrlib/builtins.py:5282

3215

msgid ""

3216

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

3217

"commits will be local only."

3218

msgstr ""

3219

3220

#: bzrlib/builtins.py:5200

3220

#: bzrlib/builtins.py:5293

3221

msgid "Local branch is not bound"

3222

msgstr ""

3223

3224

#: bzrlib/builtins.py:5204

3224

#: bzrlib/builtins.py:5297

3225

msgid "Remove the last committed revision."

3226

msgstr ""

3227

3228

#: bzrlib/builtins.py:5206

3228

#: bzrlib/builtins.py:5299

3229

msgid ""

3230

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

3231

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

3232

"remove anything."

3233

msgstr ""

3234

3235

#: bzrlib/builtins.py:5210

3235

#: bzrlib/builtins.py:5303

3236

msgid ""

3237

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

3238

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

3239

"branch at revision 15."

3240

msgstr ""

3241

3242

#: bzrlib/builtins.py:5214

3242

#: bzrlib/builtins.py:5307

3243

msgid ""

3244

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

3245

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

3246

"the commit."

3247

msgstr ""

3248

3249

#: bzrlib/builtins.py:5225

3249

#: bzrlib/builtins.py:5318

3250

msgid "Don't actually make changes."

3251

msgstr ""

3252

3253

#: bzrlib/builtins.py:5226

3253

#: bzrlib/builtins.py:5319

3254

msgid "Say yes to all questions."

3255

msgstr ""

3256

3257

#: bzrlib/builtins.py:5228

3257

#: bzrlib/builtins.py:5321

3258

msgid "Keep tags that point to removed revisions."

3259

msgstr ""

3260

3261

#: bzrlib/builtins.py:5230

3261

#: bzrlib/builtins.py:5323

3262

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

3263

msgstr ""

3264

3265

#: bzrlib/builtins.py:5279

3265

#: bzrlib/builtins.py:5372

3266

msgid "No revisions to uncommit.\n"

3267

msgstr ""

3268

3269

#: bzrlib/builtins.py:5294

3269

#: bzrlib/builtins.py:5387

3270

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

3271

msgstr ""

3272

3273

#: bzrlib/builtins.py:5297

3273

#: bzrlib/builtins.py:5390

3274

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

3275

msgstr ""

3276

3277

#: bzrlib/builtins.py:5301

3277

#: bzrlib/builtins.py:5394

3278

msgid "Uncommit these revisions"

3279

msgstr ""

3280

3281

#: bzrlib/builtins.py:5304

3281

#: bzrlib/builtins.py:5397

3282

msgid "Canceled\n"

3283

msgstr ""

3284

3285

#: bzrlib/builtins.py:5311

3285

#: bzrlib/builtins.py:5404

3286

#, python-format

3287

msgid ""

3288

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

3289

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

3290

msgstr ""

3291

3292

#: bzrlib/builtins.py:5316

3292

#: bzrlib/builtins.py:5409

3293

msgid "Break a dead lock."

3294

msgstr ""

3295

3296

#: bzrlib/builtins.py:5318

3296

#: bzrlib/builtins.py:5411

3297

msgid ""

3298

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

3299

"config file."

3300

msgstr ""

3301

3302

#: bzrlib/builtins.py:5321

3302

#: bzrlib/builtins.py:5414

3303

msgid ""

3304

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

3305

"holding the lock has been stopped."

3306

msgstr ""

3307

3308

#: bzrlib/builtins.py:5324

3308

#: bzrlib/builtins.py:5417

3309

msgid ""

3310

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

3311

"[location]' command."

3312

msgstr ""

3313

3314

#: bzrlib/builtins.py:5327

3314

#: bzrlib/builtins.py:5420

3315

msgid ""

3316

":Examples:\n"

3317

" bzr break-lock\n"

3319

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

3320

msgstr ""

3321

3322

#: bzrlib/builtins.py:5336

3322

#: bzrlib/builtins.py:5429

3323

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

3324

msgstr ""

3325

3326

#: bzrlib/builtins.py:5338

3326

#: bzrlib/builtins.py:5431

3327

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

3328

msgstr ""

3329

3330

#: bzrlib/builtins.py:5373

3330

#: bzrlib/builtins.py:5466

3331

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

3332

msgstr ""

3333

3334

#: bzrlib/builtins.py:5374

3334

#: bzrlib/builtins.py:5467

3335

msgid "Run the bzr server."

3336

msgstr ""

3337

3338

#: bzrlib/builtins.py:5380

3338

#: bzrlib/builtins.py:5473

3339

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

3340

msgstr ""

3341

3342

#: bzrlib/builtins.py:5381

3342

#: bzrlib/builtins.py:5474

3343

msgid "protocol"

3344

msgstr ""

3345

3346

#: bzrlib/builtins.py:5382

3346

#: bzrlib/builtins.py:5475

3347

msgid "Protocol to serve."

3348

msgstr ""

3349

3350

#: bzrlib/builtins.py:5386

3350

#: bzrlib/builtins.py:5479

3351

msgid ""

3352

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

3353

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

3354

"The default port depends on the protocol."

3355

msgstr ""

3356

3357

#: bzrlib/builtins.py:5392

3357

#: bzrlib/builtins.py:5485

3358

msgid "Serve contents of this directory."

3359

msgstr ""

3360

3361

#: bzrlib/builtins.py:5394

3361

#: bzrlib/builtins.py:5487

3362

msgid ""

3363

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

3364

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

3367

"uncontrolled write access to your file system."

3368

msgstr ""

3369

3370

#: bzrlib/builtins.py:5403

3370

#: bzrlib/builtins.py:5496

3371

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

3372

msgstr ""

3373

3374

#: bzrlib/builtins.py:5453

3374

#: bzrlib/builtins.py:5546

3375

msgid "Combine a tree into its containing tree."

3376

msgstr ""

3377

3378

#: bzrlib/builtins.py:5455

3378

#: bzrlib/builtins.py:5548

3379

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

3380

msgstr ""

3381

3382

#: bzrlib/builtins.py:5457

3382

#: bzrlib/builtins.py:5550

3383

msgid ""

3384

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

3385

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

3386

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

3387

msgstr ""

3388

3389

#: bzrlib/builtins.py:5461

3389

#: bzrlib/builtins.py:5554

3390

msgid ""

3391

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

3392

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

3393

"and all history is preserved."

3394

msgstr ""

3395

3396

#: bzrlib/builtins.py:5479

3396

#: bzrlib/builtins.py:5572

3397

#, python-format

3398

msgid ""

3399

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

3400

"You can use bzr upgrade on the repository."

3401

msgstr ""

3402

3403

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

3403

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

3404

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

3405

msgstr ""

3406

3407

#: bzrlib/builtins.py:5499

3407

#: bzrlib/builtins.py:5592

3408

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

3409

msgstr ""

3410

3411

#: bzrlib/builtins.py:5501

3411

#: bzrlib/builtins.py:5594

3412

msgid ""

3413

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

3414

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

3415

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

3416

msgstr ""

3417

3418

#: bzrlib/builtins.py:5505

3418

#: bzrlib/builtins.py:5598

3419

msgid ""

3420

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

3421

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

3422

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

3423

msgstr ""

3424

3425

#: bzrlib/builtins.py:5585

3425

#: bzrlib/builtins.py:5678

3426

msgid "No submit branch specified or known"

3427

msgstr ""

3428

3429

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

3429

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

3430

msgid "No public branch specified or known"

3431

msgstr ""

3432

3433

#: bzrlib/builtins.py:5598

3433

#: bzrlib/builtins.py:5691

3434

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

3435

msgstr ""

3436

3437

#: bzrlib/builtins.py:5607

3437

#: bzrlib/builtins.py:5700

3438

msgid "No revisions to bundle."

3439

msgstr ""

3440

3441

#: bzrlib/builtins.py:5626

3441

#: bzrlib/builtins.py:5719

3442

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

3443

msgstr ""

3444

3445

#: bzrlib/builtins.py:5628

3445

#: bzrlib/builtins.py:5721

3446

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

3447

msgstr ""

3448

3449

#: bzrlib/builtins.py:5630

3449

#: bzrlib/builtins.py:5723

3450

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

3451

msgstr ""

3452

3453

#: bzrlib/builtins.py:5632

3453

#: bzrlib/builtins.py:5725

3454

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

3455

msgstr ""

3456

3457

#: bzrlib/builtins.py:5634

3457

#: bzrlib/builtins.py:5727

3458

msgid ""

3459

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

3460

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

3461

" branch."

3462

msgstr ""

3463

3464

#: bzrlib/builtins.py:5638

3464

#: bzrlib/builtins.py:5731

3465

msgid ""

3466

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

3467

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

3468

msgstr ""

3469

3470

#: bzrlib/builtins.py:5641

3470

#: bzrlib/builtins.py:5734

3471

msgid ""

3472

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

3473

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

3474

"the source branch."

3475

msgstr ""

3476

3477

#: bzrlib/builtins.py:5645

3477

#: bzrlib/builtins.py:5738

3478

msgid ""

3479

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

3480

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

3483

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

3484

msgstr ""

3485

3486

#: bzrlib/builtins.py:5651

3486

#: bzrlib/builtins.py:5744

3487

msgid ""

3488

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

3489

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

3492

"be changed using --from."

3493

msgstr ""

3494

3495

#: bzrlib/builtins.py:5657

3495

#: bzrlib/builtins.py:5750

3496

msgid ""

3497

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

3498

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

3501

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

3502

msgstr ""

3503

3504

#: bzrlib/builtins.py:5663

3504

#: bzrlib/builtins.py:5756

3505

msgid ""

3506

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

3507

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

3509

"in the merge directive."

3510

msgstr ""

3511

3512

#: bzrlib/builtins.py:5668

3512

#: bzrlib/builtins.py:5761

3513

msgid ""

3514

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

3515

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

3516

msgstr ""

3517

3518

#: bzrlib/builtins.py:5671

3518

#: bzrlib/builtins.py:5764

3519

msgid ""

3520

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

3521

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

3522

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

3523

msgstr ""

3524

3525

#: bzrlib/builtins.py:5675

3525

#: bzrlib/builtins.py:5768

3526

msgid ""

3527

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

3528

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

3534

"supported clients."

3535

msgstr ""

3536

3537

#: bzrlib/builtins.py:5682

3537

#: bzrlib/builtins.py:5775

3538

msgid ""

3539

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

3540

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

3542

"in the submit branch."

3543

msgstr ""

3544

3545

#: bzrlib/builtins.py:5687

3545

#: bzrlib/builtins.py:5780

3546

msgid ""

3547

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

3548

"and\n"

3552

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

3553

msgstr ""

3554

3555

#: bzrlib/builtins.py:5693

3555

#: bzrlib/builtins.py:5786

3556

msgid ""

3557

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

3558

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

3559

msgstr ""

3560

3561

#: bzrlib/builtins.py:5696

3561

#: bzrlib/builtins.py:5789

3562

msgid ""

3563

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

3564

"into\n"

3566

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

3567

msgstr ""

3568

3569

#: bzrlib/builtins.py:5720

3569

#: bzrlib/builtins.py:5813

3570

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

3571

msgstr ""

3572

3573

#: bzrlib/builtins.py:5724

3573

#: bzrlib/builtins.py:5817

3574

msgid ""

3575

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

3576

"strict disables the check."

3577

msgstr ""

3578

3579

#: bzrlib/builtins.py:5726

3579

#: bzrlib/builtins.py:5819

3580

msgid "Mail the request to this address."

3581

msgstr ""

3582

3583

#: bzrlib/builtins.py:5730

3583

#: bzrlib/builtins.py:5823

3584

msgid "Body for the email."

3585

msgstr ""

3586

3587

#: bzrlib/builtins.py:5783

3587

#: bzrlib/builtins.py:5876

3588

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

3589

msgstr ""

3590

3591

#: bzrlib/builtins.py:5784

3591

#: bzrlib/builtins.py:5877

3592

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

3593

msgstr ""

3594

3595

#: bzrlib/builtins.py:5787

3595

#: bzrlib/builtins.py:5880

3596

msgid "Remember submit and public branch."

3597

msgstr ""

3598

3599

#: bzrlib/builtins.py:5789

3599

#: bzrlib/builtins.py:5882

3600

msgid ""

3601

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

3602

"working directory."

3603

msgstr ""

3604

3605

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

3605

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

3606

msgid "format"

3607

msgstr ""

3608

3609

#: bzrlib/builtins.py:5800

3609

#: bzrlib/builtins.py:5893

3610

msgid "Use the specified output format."

3611

msgstr ""

3612

3613

#: bzrlib/builtins.py:5822

3613

#: bzrlib/builtins.py:5915

3614

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

3615

msgstr ""

3616

3617

#: bzrlib/builtins.py:5824

3617

#: bzrlib/builtins.py:5917

3618

msgid ""

3619

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

3620

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

3621

"created tag."

3622

msgstr ""

3623

3624

#: bzrlib/builtins.py:5828

3624

#: bzrlib/builtins.py:5921

3625

msgid ""

3626

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

3627

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

3628

msgstr ""

3629

3630

#: bzrlib/builtins.py:5831

3630

#: bzrlib/builtins.py:5924

3631

msgid ""

3632

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

3633

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

3634

msgstr ""

3635

3636

#: bzrlib/builtins.py:5834

3636

#: bzrlib/builtins.py:5927

3637

msgid ""

3638

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

3639

"``bzr\n"

3640

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

3641

msgstr ""

3642

3643

#: bzrlib/builtins.py:5837

3643

#: bzrlib/builtins.py:5930

3644

msgid ""

3645

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

3646

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

3648

"details."

3649

msgstr ""

3650

3651

#: bzrlib/builtins.py:5847

3651

#: bzrlib/builtins.py:5940

3652

msgid "Delete this tag rather than placing it."

3653

msgstr ""

3654

3655

#: bzrlib/builtins.py:5850

3655

#: bzrlib/builtins.py:5943

3656

msgid "Branch in which to place the tag."

3657

msgstr ""

3658

3659

#: bzrlib/builtins.py:5852

3659

#: bzrlib/builtins.py:5945

3660

msgid "Replace existing tags."

3661

msgstr ""

3662

3663

#: bzrlib/builtins.py:5867

3663

#: bzrlib/builtins.py:5960

3664

msgid "No tag specified to delete."

3665

msgstr ""

3666

3667

#: bzrlib/builtins.py:5869

3667

#: bzrlib/builtins.py:5962

3668

#, python-format

3669

msgid "Deleted tag %s."

3670

msgstr ""

3671

3672

#: bzrlib/builtins.py:5883

3672

#: bzrlib/builtins.py:5976

3673

msgid "Please specify a tag name."

3674

msgstr ""

3675

3676

#: bzrlib/builtins.py:5891

3676

#: bzrlib/builtins.py:5984

3677

#, python-format

3678

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

3679

msgstr ""

3680

3681

#: bzrlib/builtins.py:5895

3681

#: bzrlib/builtins.py:5988

3682

#, python-format

3683

msgid "Created tag %s."

3684

msgstr ""

3685

3686

#: bzrlib/builtins.py:5897

3686

#: bzrlib/builtins.py:5990

3687

#, python-format

3688

msgid "Updated tag %s."

3689

msgstr ""

3690

3691

#: bzrlib/builtins.py:5901

3691

#: bzrlib/builtins.py:5994

3692

msgid "List tags."

3693

msgstr ""

3694

3695

#: bzrlib/builtins.py:5903

3695

#: bzrlib/builtins.py:5996

3696

msgid ""

3697

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

3698

msgstr ""

3699

3700

#: bzrlib/builtins.py:5909

3700

#: bzrlib/builtins.py:6002

3701

msgid "Branch whose tags should be displayed."

3702

msgstr ""

3703

3704

#: bzrlib/builtins.py:5911

3704

#: bzrlib/builtins.py:6004

3705

msgid "Sort tags by different criteria."

3706

msgstr ""

3707

3708

#: bzrlib/builtins.py:5911

3708

#: bzrlib/builtins.py:6004

3709

msgid "Sorting"

3710

msgstr ""

3711

3712

#: bzrlib/builtins.py:5980

3712

#: bzrlib/builtins.py:6073

3713

msgid "Reconfigure the type of a bzr directory."

3714

msgstr ""

3715

3716

#: bzrlib/builtins.py:5982

3716

#: bzrlib/builtins.py:6075

3717

msgid "A target configuration must be specified."

3718

msgstr ""

3719

3720

#: bzrlib/builtins.py:5984

3720

#: bzrlib/builtins.py:6077

3721

msgid ""

3722

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

3723

"The order of preference is\n"

3728

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

3729

msgstr ""

3730

3731

#: bzrlib/builtins.py:5998

3731

#: bzrlib/builtins.py:6091

3732

msgid "Tree type"

3733

msgstr ""

3734

3735

#: bzrlib/builtins.py:5999

3735

#: bzrlib/builtins.py:6092

3736

msgid "The relation between branch and tree."

3737

msgstr ""

3738

3739

#: bzrlib/builtins.py:6001

3739

#: bzrlib/builtins.py:6094

3740

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

3741

msgstr ""

3742

3743

#: bzrlib/builtins.py:6002

3743

#: bzrlib/builtins.py:6095

3744

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

3745

msgstr ""

3746

3747

#: bzrlib/builtins.py:6003

3747

#: bzrlib/builtins.py:6096

3748

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

3749

msgstr ""

3750

3751

#: bzrlib/builtins.py:6004

3751

#: bzrlib/builtins.py:6097

3752

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

3753

msgstr ""

3754

3755

#: bzrlib/builtins.py:6009

3755

#: bzrlib/builtins.py:6102

3756

msgid "Repository type"

3757

msgstr ""

3758

3759

#: bzrlib/builtins.py:6010

3759

#: bzrlib/builtins.py:6103

3760

msgid "Location fo the repository."

3761

msgstr ""

3762

3763

#: bzrlib/builtins.py:6012

3763

#: bzrlib/builtins.py:6105

3764

msgid ""

3765

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

3766

msgstr ""

3767

3768

#: bzrlib/builtins.py:6014

3768

#: bzrlib/builtins.py:6107

3769

msgid "Reconfigure to use a shared repository."

3770

msgstr ""

3771

3772

#: bzrlib/builtins.py:6018

3772

#: bzrlib/builtins.py:6111

3773

msgid "Trees in Repository"

3774

msgstr ""

3775

3776

#: bzrlib/builtins.py:6019

3776

#: bzrlib/builtins.py:6112

3777

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

3778

msgstr ""

3779

3780

#: bzrlib/builtins.py:6021

3780

#: bzrlib/builtins.py:6114

3781

msgid ""

3782

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

3783

msgstr ""

3784

3785

#: bzrlib/builtins.py:6023

3785

#: bzrlib/builtins.py:6116

3786

msgid ""

3787

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

3788

msgstr ""

3789

3790

#: bzrlib/builtins.py:6026

3790

#: bzrlib/builtins.py:6119

3791

msgid "Branch to bind checkout to."

3792

msgstr ""

3793

3794

#: bzrlib/builtins.py:6028

3794

#: bzrlib/builtins.py:6121

3795

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

3796

msgstr ""

3797

3798

#: bzrlib/builtins.py:6031

3798

#: bzrlib/builtins.py:6124

3799

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

3800

msgstr ""

3801

3802

#: bzrlib/builtins.py:6035

3802

#: bzrlib/builtins.py:6128

3803

msgid ""

3804

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

3805

"data into it."

3806

msgstr ""

3807

3808

#: bzrlib/builtins.py:6045

3808

#: bzrlib/builtins.py:6138

3809

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

3810

msgstr ""

3811

3812

#: bzrlib/builtins.py:6059

3812

#: bzrlib/builtins.py:6152

3813

msgid "No target configuration specified"

3814

msgstr ""

3815

3816

#: bzrlib/builtins.py:6094

3816

#: bzrlib/builtins.py:6187

3817

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

3818

msgstr ""

3819

3820

#: bzrlib/builtins.py:6096

3820

#: bzrlib/builtins.py:6189

3821

msgid ""

3822

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

3823

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

3825

"of the new location and binds to it."

3826

msgstr ""

3827

3828

#: bzrlib/builtins.py:6101

3828

#: bzrlib/builtins.py:6194

3829

msgid ""

3830

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

3831

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

3832

msgstr ""

3833

3834

#: bzrlib/builtins.py:6104

3834

#: bzrlib/builtins.py:6197

3835

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

3836

msgstr ""

3837

3838

#: bzrlib/builtins.py:6106

3838

#: bzrlib/builtins.py:6199

3839

msgid ""

3840

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

3841

"directory of the current branch. For example, if you are currently in a\n"

3843

"/path/to/newbranch."

3844

msgstr ""

3845

3846

#: bzrlib/builtins.py:6111

3846

#: bzrlib/builtins.py:6204

3847

msgid ""

3848

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

3849

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

3850

"that of the master."

3851

msgstr ""

3852

3853

#: bzrlib/builtins.py:6119

3853

#: bzrlib/builtins.py:6212

3854

msgid "Switch even if local commits will be lost."

3855

msgstr ""

3856

3857

#: bzrlib/builtins.py:6122

3857

#: bzrlib/builtins.py:6215

3858

msgid "Create the target branch from this one before switching to it."

3859

msgstr ""

3860

3861

#: bzrlib/builtins.py:6134

3861

#: bzrlib/builtins.py:6229

3862

msgid "You must supply either a revision or a location"

3863

msgstr ""

3864

3865

#: bzrlib/builtins.py:6145

3865

#: bzrlib/builtins.py:6242

3866

msgid "cannot create branch without source branch"

3867

msgstr ""

3868

3869

#: bzrlib/builtins.py:6209

3869

#: bzrlib/builtins.py:6262

3870

msgid "Manage filtered views."

3871

msgstr ""

3872

3873

#: bzrlib/builtins.py:6211

3873

#: bzrlib/builtins.py:6264

3874

msgid ""

3875

"Views provide a mask over the tree so that users can focus on\n"

3876

"a subset of a tree when doing their work. After creating a view,\n"

3880

"must be within the current view."

3881

msgstr ""

3882

3883

#: bzrlib/builtins.py:6218

3883

#: bzrlib/builtins.py:6271

3884

msgid ""

3885

"In most cases, a view has a short life-span: it is created to make\n"

3886

"a selected change and is deleted once that change is committed.\n"

3888

"and switch between them."

3889

msgstr ""

3890

3891

#: bzrlib/builtins.py:6223

3891

#: bzrlib/builtins.py:6276

3892

msgid ""

3893

"To disable the current view without deleting it, you can switch to\n"

3894

"the pseudo view called ``off``. This can be useful when you need\n"

3896

"want to switch back to your view after that."

3897

msgstr ""

3898

3899

#: bzrlib/builtins.py:6228

3899

#: bzrlib/builtins.py:6281

3900

msgid ""

3901

":Examples:\n"

3902

" To define the current view::"

3903

msgstr ""

3904

3905

#: bzrlib/builtins.py:6231

3905

#: bzrlib/builtins.py:6284

3906

msgid " bzr view file1 dir1 ..."

3907

msgstr ""

3908

3909

#: bzrlib/builtins.py:6233

3909

#: bzrlib/builtins.py:6286

3910

msgid " To list the current view::"

3911

msgstr ""

3912

3913

#: bzrlib/builtins.py:6235

3913

#: bzrlib/builtins.py:6288

3914

msgid " bzr view"

3915

msgstr ""

3916

3917

#: bzrlib/builtins.py:6237

3917

#: bzrlib/builtins.py:6290

3918

msgid " To delete the current view::"

3919

msgstr ""

3920

3921

#: bzrlib/builtins.py:6239

3921

#: bzrlib/builtins.py:6292

3922

msgid " bzr view --delete"

3923

msgstr ""

3924

3925

#: bzrlib/builtins.py:6241

3925

#: bzrlib/builtins.py:6294

3926

msgid " To disable the current view without deleting it::"

3927

msgstr ""

3928

3929

#: bzrlib/builtins.py:6243

3929

#: bzrlib/builtins.py:6296

3930

msgid " bzr view --switch off"

3931

msgstr ""

3932

3933

#: bzrlib/builtins.py:6245

3933

#: bzrlib/builtins.py:6298

3934

msgid " To define a named view and switch to it::"

3935

msgstr ""

3936

3937

#: bzrlib/builtins.py:6247

3937

#: bzrlib/builtins.py:6300

3938

msgid " bzr view --name view-name file1 dir1 ..."

3939

msgstr ""

3940

3941

#: bzrlib/builtins.py:6249

3941

#: bzrlib/builtins.py:6302

3942

msgid " To list a named view::"

3943

msgstr ""

3944

3945

#: bzrlib/builtins.py:6251

3945

#: bzrlib/builtins.py:6304

3946

msgid " bzr view --name view-name"

3947

msgstr ""

3948

3949

#: bzrlib/builtins.py:6253

3949

#: bzrlib/builtins.py:6306

3950

msgid " To delete a named view::"

3951

msgstr ""

3952

3953

#: bzrlib/builtins.py:6255

3953

#: bzrlib/builtins.py:6308

3954

msgid " bzr view --name view-name --delete"

3955

msgstr ""

3956

3957

#: bzrlib/builtins.py:6257

3957

#: bzrlib/builtins.py:6310

3958

msgid " To switch to a named view::"

3959

msgstr ""

3960

3961

#: bzrlib/builtins.py:6259

3961

#: bzrlib/builtins.py:6312

3962

msgid " bzr view --switch view-name"

3963

msgstr ""

3964

3965

#: bzrlib/builtins.py:6261

3965

#: bzrlib/builtins.py:6314

3966

msgid " To list all views defined::"

3967

msgstr ""

3968

3969

#: bzrlib/builtins.py:6263

3969

#: bzrlib/builtins.py:6316

3970

msgid " bzr view --all"

3971

msgstr ""

3972

3973

#: bzrlib/builtins.py:6265

3973

#: bzrlib/builtins.py:6318

3974

msgid " To delete all views::"

3975

msgstr ""

3976

3977

#: bzrlib/builtins.py:6267

3977

#: bzrlib/builtins.py:6320

3978

msgid " bzr view --delete --all"

3979

msgstr ""

3980

3981

#: bzrlib/builtins.py:6274

3981

#: bzrlib/builtins.py:6327

3982

msgid "Apply list or delete action to all views."

3983

msgstr ""

3984

3985

#: bzrlib/builtins.py:6277

3985

#: bzrlib/builtins.py:6330

3986

msgid "Delete the view."

3987

msgstr ""

3988

3989

#: bzrlib/builtins.py:6280

3989

#: bzrlib/builtins.py:6333

3990

msgid "Name of the view to define, list or delete."

3991

msgstr ""

3992

3993

#: bzrlib/builtins.py:6284

3993

#: bzrlib/builtins.py:6337

3994

msgid "Name of the view to switch to."

3995

msgstr ""

3996

3997

#: bzrlib/builtins.py:6303

3997

#: bzrlib/builtins.py:6356

3998

msgid "Both --delete and a file list specified"

3999

msgstr ""

4000

4001

#: bzrlib/builtins.py:6306

4001

#: bzrlib/builtins.py:6359

4002

msgid "Both --delete and --switch specified"

4003

msgstr ""

4004

4005

#: bzrlib/builtins.py:6309

4005

#: bzrlib/builtins.py:6362

4006

msgid "Deleted all views.\n"

4007

msgstr ""

4008

4009

#: bzrlib/builtins.py:6311

4009

#: bzrlib/builtins.py:6364

4010

msgid "No current view to delete"

4011

msgstr ""

4012

4013

#: bzrlib/builtins.py:6314

4013

#: bzrlib/builtins.py:6367

4014

#, python-format

4015

msgid "Deleted '%s' view.\n"

4016

msgstr ""

4017

4018

#: bzrlib/builtins.py:6318

4018

#: bzrlib/builtins.py:6371

4019

msgid "Both --switch and a file list specified"

4020

msgstr ""

4021

4022

#: bzrlib/builtins.py:6321

4022

#: bzrlib/builtins.py:6374

4023

msgid "Both --switch and --all specified"

4024

msgstr ""

4025

4026

#: bzrlib/builtins.py:6324

4026

#: bzrlib/builtins.py:6377

4027

msgid "No current view to disable"

4028

msgstr ""

4029

4030

#: bzrlib/builtins.py:6326

4030

#: bzrlib/builtins.py:6379

4031

#, python-format

4032

msgid "Disabled '%s' view.\n"

4033

msgstr ""

4034

4035

#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352

4035

#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405

4036

msgid "Using '{0}' view: {1}\n"

4037

msgstr ""

4038

4039

#: bzrlib/builtins.py:6333

4039

#: bzrlib/builtins.py:6386

4040

msgid "Views defined:\n"

4041

msgstr ""

4042

4043

#: bzrlib/builtins.py:6342

4043

#: bzrlib/builtins.py:6395

4044

msgid "No views defined.\n"

4045

msgstr ""

4046

4047

#: bzrlib/builtins.py:6349

4047

#: bzrlib/builtins.py:6402

4048

msgid "Cannot change the 'off' pseudo view"

4049

msgstr ""

4050

4051

#: bzrlib/builtins.py:6357

4051

#: bzrlib/builtins.py:6410

4052

msgid "No current view.\n"

4053

msgstr ""

4054

4055

#: bzrlib/builtins.py:6360

4055

#: bzrlib/builtins.py:6413

4056

msgid "'{0}' view is: {1}\n"

4057

msgstr ""

4058

4059

#: bzrlib/builtins.py:6380

4059

#: bzrlib/builtins.py:6433

4060

msgid " <no hooks installed>\n"

4061

msgstr ""

4062

4063

#: bzrlib/builtins.py:6384

4063

#: bzrlib/builtins.py:6437

4064

msgid "Remove a branch."

4065

msgstr ""

4066

4067

#: bzrlib/builtins.py:6386

4067

#: bzrlib/builtins.py:6439

4068

msgid ""

4069

"This will remove the branch from the specified location but \n"

4070

"will keep any working tree or repository in place."

4071

msgstr ""

4072

4073

#: bzrlib/builtins.py:6391

4073

#: bzrlib/builtins.py:6444

4074

msgid " Remove the branch at repo/trunk::"

4075

msgstr ""

4076

4077

#: bzrlib/builtins.py:6393

4077

#: bzrlib/builtins.py:6446

4078

msgid " bzr remove-branch repo/trunk"

4079

msgstr ""

4080

4081

#: bzrlib/builtins.py:6408

4081

#: bzrlib/builtins.py:6461

4082

msgid "Plaintext diff output."

4083

msgstr ""

4084

4085

#: bzrlib/builtins.py:6409

4085

#: bzrlib/builtins.py:6462

4086

msgid "Temporarily set aside some changes from the current tree."

4087

msgstr ""

4088

4089

#: bzrlib/builtins.py:6411

4089

#: bzrlib/builtins.py:6464

4090

msgid ""

4091

"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"

4092

"ie. out of the way, until a later time when you can bring them back from\n"

4095

"will they survive its deletion."

4096

msgstr ""

4097

4098

#: bzrlib/builtins.py:6417

4098

#: bzrlib/builtins.py:6470

4099

msgid "If shelve --list is specified, previously-shelved changes are listed."

4100

msgstr ""

4101

4102

#: bzrlib/builtins.py:6419

4102

#: bzrlib/builtins.py:6472

4103

msgid ""

4104

"Shelve is intended to help separate several sets of changes that have\n"

4105

"been inappropriately mingled. If you just want to get rid of all changes\n"

4107

"shelve all text changes at once, use shelve --all."

4108

msgstr ""

4109

4110

#: bzrlib/builtins.py:6424

4110

#: bzrlib/builtins.py:6477

4111

msgid ""

4112

"If filenames are specified, only the changes to those files will be\n"

4113

"shelved. Other files will be left untouched."

4114

msgstr ""

4115

4116

#: bzrlib/builtins.py:6427

4116

#: bzrlib/builtins.py:6480

4117

msgid ""

4118

"If a revision is specified, changes since that revision will be shelved."

4119

msgstr ""

4120

4121

#: bzrlib/builtins.py:6429

4121

#: bzrlib/builtins.py:6482

4122

msgid ""

4123

"You can put multiple items on the shelf, and by default, 'unshelve' will\n"

4124

"restore the most recently shelved changes."

4125

msgstr ""

4126

4127

#: bzrlib/builtins.py:6432

4127

#: bzrlib/builtins.py:6485

4128

msgid ""

4129

"For complicated changes, it is possible to edit the changes in a separate\n"

4130

"editor program to decide what the file remaining in the working copy\n"

4131

"should look like. To do this, add the configuration option"

4132

msgstr ""

4133

4134

#: bzrlib/builtins.py:6436

4134

#: bzrlib/builtins.py:6489

4135

msgid " change_editor = PROGRAM @new_path @old_path"

4136

msgstr ""

4137

4138

#: bzrlib/builtins.py:6438

4138

#: bzrlib/builtins.py:6491

4139

msgid ""

4140

"where @new_path is replaced with the path of the new version of the \n"

4141

"file and @old_path is replaced with the path of the old version of \n"

4144

" "

4145

msgstr ""

4146

4147

#: bzrlib/builtins.py:6450

4147

#: bzrlib/builtins.py:6503

4148

msgid "Shelve all changes."

4149

msgstr ""

4150

4151

#: bzrlib/builtins.py:6452

4151

#: bzrlib/builtins.py:6505

4152

msgid "Method to use for writing diffs."

4153

msgstr ""

4154

4155

#: bzrlib/builtins.py:6452

4155

#: bzrlib/builtins.py:6505

4156

msgid "writer"

4157

msgstr ""

4158

4159

#: bzrlib/builtins.py:6456

4159

#: bzrlib/builtins.py:6509

4160

msgid "List shelved changes."

4161

msgstr ""

4162

4163

#: bzrlib/builtins.py:6458

4163

#: bzrlib/builtins.py:6511

4164

msgid "Destroy removed changes instead of shelving them."

4165

msgstr ""

4166

4167

#: bzrlib/builtins.py:6487

4167

#: bzrlib/builtins.py:6540

4168

msgid "No shelved changes."

4169

msgstr ""

4170

4171

#: bzrlib/builtins.py:6498

4171

#: bzrlib/builtins.py:6551

4172

msgid "Restore shelved changes."

4173

msgstr ""

4174

4175

#: bzrlib/builtins.py:6500

4175

#: bzrlib/builtins.py:6553

4176

msgid ""

4177

"By default, the most recently shelved changes are restored. However if you\n"

4178

"specify a shelf by id those changes will be restored instead. This works\n"

4179

"best when the changes don't depend on each other."

4180

msgstr ""

4181

4182

#: bzrlib/builtins.py:6509

4182

#: bzrlib/builtins.py:6562

4183

msgid "The action to perform."

4184

msgstr ""

4185

4186

#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694

4186

#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694

4187

msgid "action"

4188

msgstr ""

4189

4190

#: bzrlib/builtins.py:6511

4190

#: bzrlib/builtins.py:6564

4191

msgid "Apply changes and remove from the shelf."

4192

msgstr ""

4193

4194

#: bzrlib/builtins.py:6512

4194

#: bzrlib/builtins.py:6565

4195

msgid "Show changes, but do not apply or remove them."

4196

msgstr ""

4197

4198

#: bzrlib/builtins.py:6513

4198

#: bzrlib/builtins.py:6566

4199

msgid ""

4200

"Instead of unshelving the changes, show the diff that would result from "

4201

"unshelving."

4202

msgstr ""

4203

4204

#: bzrlib/builtins.py:6515

4204

#: bzrlib/builtins.py:6568

4205

msgid "Delete changes without applying them."

4206

msgstr ""

4207

4208

#: bzrlib/builtins.py:6516

4208

#: bzrlib/builtins.py:6569

4209

msgid "Apply changes but don't delete them."

4210

msgstr ""

4211

4212

#: bzrlib/builtins.py:6531

4212

#: bzrlib/builtins.py:6584

4213

msgid "Remove unwanted files from working tree."

4214

msgstr ""

4215

4216

#: bzrlib/builtins.py:6533

4216

#: bzrlib/builtins.py:6586

4217

msgid ""

4218

"By default, only unknown files, not ignored files, are deleted. Versioned\n"

4219

"files are never deleted."

4220

msgstr ""

4221

4222

#: bzrlib/builtins.py:6536

4222

#: bzrlib/builtins.py:6589

4223

msgid ""

4224

"Another class is 'detritus', which includes files emitted by bzr during\n"

4225

"normal operations and selftests. (The value of these files decreases with\n"

4226

"time.)"

4227

msgstr ""

4228

4229

#: bzrlib/builtins.py:6540

4229

#: bzrlib/builtins.py:6593

4230

msgid ""

4231

"If no options are specified, unknown files are deleted. Otherwise, option\n"

4232

"flags are respected, and may be combined."

4233

msgstr ""

4234

4235

#: bzrlib/builtins.py:6543

4235

#: bzrlib/builtins.py:6596

4236

msgid "To check what clean-tree will do, use --dry-run."

4237

msgstr ""

4238

4239

#: bzrlib/builtins.py:6546

4239

#: bzrlib/builtins.py:6599

4240

msgid "Delete all ignored files."

4241

msgstr ""

4242

4243

#: bzrlib/builtins.py:6547

4243

#: bzrlib/builtins.py:6600

4244

msgid ""

4245

"Delete conflict files, merge and revert backups, and failed selftest dirs."

4246

msgstr ""

4247

4248

#: bzrlib/builtins.py:6550

4248

#: bzrlib/builtins.py:6603

4249

msgid "Delete files unknown to bzr (default)."

4250

msgstr ""

4251

4252

#: bzrlib/builtins.py:6551

4252

#: bzrlib/builtins.py:6604

4253

msgid "Show files to delete instead of deleting them."

4254

msgstr ""

4255

4256

#: bzrlib/builtins.py:6553

4256

#: bzrlib/builtins.py:6606

4257

msgid "Do not prompt before deleting."

4258

msgstr ""

4259

4313

msgstr[0] ""

4314

msgstr[1] ""

4315

4316

#: bzrlib/bzrdir.py:489

4316

#: bzrlib/bzrdir.py:490

4317

msgid ""

4318

"making backup of {0}\n"

4319

" to {1}"

4320

msgstr ""

4321

4322

#: bzrlib/bzrdir.py:512

4322

#: bzrlib/bzrdir.py:513

4323

msgid "renamed {0} to {1}"

4324

msgstr ""

4325

4326

#: bzrlib/bzrdir.py:1663

4326

#: bzrlib/bzrdir.py:1652

4327

#, python-format

4328

msgid ""

4329

"Source repository format does not support stacking, using format:\n"

4330

" %s"

4331

msgstr ""

4332

4333

#: bzrlib/bzrdir.py:1683

4333

#: bzrlib/bzrdir.py:1672

4334

#, python-format

4335

msgid ""

4336

"Source branch format does not support stacking, using format:\n"

4337

" %s"

4338

msgstr ""

4339

4340

#: bzrlib/bzrdir.py:1829

4340

#: bzrlib/bzrdir.py:1818

4341

msgid "starting repository conversion"

4342

msgstr ""

4343

4344

#: bzrlib/bzrdir.py:2058

4344

#: bzrlib/bzrdir.py:2039

4345

msgid "Using default stacking branch {0} at {1}"

4346

msgstr ""

4347

4580

msgid "bzr version-info --revision takes exactly one revision specifier"

4581

msgstr ""

4582

4583

#: bzrlib/commands.py:228

4583

#: bzrlib/commands.py:229

4584

#, python-format

4585

msgid "unknown command \"%s\""

4586

msgstr ""

4587

4588

#: bzrlib/commands.py:475

4588

#: bzrlib/commands.py:476

4589

msgid "No help for this command."

4590

msgstr ""

4591

4592

#: bzrlib/commands.py:488

4592

#: bzrlib/commands.py:489

4593

#, python-format

4594

msgid ":Purpose: %s\n"

4595

msgstr ""

4596

4597

#: bzrlib/commands.py:490

4597

#: bzrlib/commands.py:491

4598

#, python-format

4599

msgid ""

4600

":Usage:\n"

4601

"%s\n"

4602

msgstr ""

4603

4604

#: bzrlib/commands.py:492

4604

#: bzrlib/commands.py:493

4605

#, python-format

4606

msgid ":Usage: %s\n"

4607

msgstr ""

4608

4609

#: bzrlib/commands.py:511

4609

#: bzrlib/commands.py:512

4610

#, python-format

4611

msgid ":Options:%s"

4612

msgstr ""

4613

4614

#: bzrlib/commands.py:522

4614

#: bzrlib/commands.py:523

4615

#, python-format

4616

msgid ""

4617

":Description:\n"

4619

"\n"

4620

msgstr ""

4621

4622

#: bzrlib/commands.py:532

4622

#: bzrlib/commands.py:533

4623

#, python-format

4624

msgid ""

4625

"See bzr help %s for more details and examples.\n"

4626

"\n"

4627

msgstr ""

4628

4629

#: bzrlib/commands.py:537

4629

#: bzrlib/commands.py:538

4630

msgid ":Aliases: "

4631

msgstr ""

4632

4633

#: bzrlib/commands.py:541

4633

#: bzrlib/commands.py:542

4634

#, python-format

4635

msgid ":From: plugin \"%s\"\n"

4636

msgstr ""

4637

4638

#: bzrlib/commands.py:553

4638

#: bzrlib/commands.py:554

4639

msgid ":doc:`{0} <{1}-help>`"

4640

msgstr ""

4641

4642

#: bzrlib/commands.py:557

4642

#: bzrlib/commands.py:558

4643

#, python-format

4644

msgid ":See also: %s"

4645

msgstr ""

4646

4647

#: bzrlib/commands.py:815 bzrlib/gpg.py:324

4647

#: bzrlib/commands.py:816 bzrlib/gpg.py:324

4648

msgid "Only ASCII permitted in option names"

4649

msgstr ""

4650

4651

#: bzrlib/commands.py:840 bzrlib/commands.py:848

4651

#: bzrlib/commands.py:841 bzrlib/commands.py:849

4652

msgid "command {0!r} needs one or more {1}"

4653

msgstr ""

4654

4655

#: bzrlib/commands.py:857

4655

#: bzrlib/commands.py:858

4656

msgid "command {0!r} requires argument {1}"

4657

msgstr ""

4658

4659

#: bzrlib/commands.py:864

4659

#: bzrlib/commands.py:865

4660

msgid "extra argument to command {0}: {1}"

4661

msgstr ""

4662

4663

#: bzrlib/commands.py:961

4663

#: bzrlib/commands.py:962

4664

#, python-format

4665

msgid "Profile data written to \"%s\"."

4666

msgstr ""

4762

msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."

4763

msgstr ""

4764

4765

#: bzrlib/config.py:2499

4765

#: bzrlib/config.py:2485

4766

msgid "{0} is not an SI unit."

4767

msgstr ""

4768

4769

#: bzrlib/config.py:2956

4769

#: bzrlib/config.py:2949

4770

msgid ""

4771

"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "

4772

"will be saved."

4773

msgstr ""

4774

4775

#: bzrlib/config.py:3100

4775

#: bzrlib/config.py:3093

4776

#, python-format

4777

msgid "Invalid '%s', should be of the form 'name=value'"

4778

msgstr ""

4779

4780

#: bzrlib/config.py:3969

4780

#: bzrlib/config.py:3962

4781

msgid "Display, set or remove a configuration option."

4782

msgstr ""

4783

4784

#: bzrlib/config.py:3971

4784

#: bzrlib/config.py:3964

4785

msgid "Display the active value for a given option."

4786

msgstr ""

4787

4788

#: bzrlib/config.py:3973

4788

#: bzrlib/config.py:3966

4789

msgid ""

4790

"If --all is specified, NAME is interpreted as a regular expression and all\n"

4791

"matching options are displayed mentioning their scope. The active value\n"

4792

"that bzr will take into account is the first one displayed for each option."

4793

msgstr ""

4794

4795

#: bzrlib/config.py:3977

4795

#: bzrlib/config.py:3970

4796

msgid "If no NAME is given, --all .* is implied."

4797

msgstr ""

4798

4799

#: bzrlib/config.py:3979

4799

#: bzrlib/config.py:3972

4800

msgid ""

4801

"Setting a value is achieved by using name=value without spaces. The value\n"

4802

"is set in the most relevant scope and can be checked by displaying the\n"

4803

"option again."

4804

msgstr ""

4805

4806

#: bzrlib/config.py:3991

4806

#: bzrlib/config.py:3984

4807

msgid "Reduce the scope to the specified configuration file."

4808

msgstr ""

4809

4810

#: bzrlib/config.py:3995

4810

#: bzrlib/config.py:3988

4811

msgid "Display all the defined values for the matching options."

4812

msgstr ""

4813

4814

#: bzrlib/config.py:3997

4814

#: bzrlib/config.py:3990

4815

msgid "Remove the option from the configuration file."

4816

msgstr ""

4817

4891

msgstr[0] ""

4892

msgstr[1] ""

4893

4894

#: bzrlib/controldir.py:698

4894

#: bzrlib/controldir.py:710

4895

msgid "{0} is{1} redirected to {2}"

4896

msgstr ""

4897

4997

msgid "The value '%(value)s' is not a valid value."

4998

msgstr ""

4999

5000

#: bzrlib/errors.py:424

5001

msgid "Bad value \"%(value)s\" for option \"%(name)s\"."

5002

msgstr ""

5003

5000

5004

#: bzrlib/errors.py:443

5001

5005

msgid "Generic path error: %(path)r%(extra)s)"

5002

5006

msgstr ""

5096

5100

msgstr ""

5097

5101

5098

5102

#: bzrlib/errors.py:705

5103

msgid "A control directory already exists: \"%(path)s\"."

5104

msgstr ""

5105

5106

#: bzrlib/errors.py:710

5099

5107

msgid "Already a branch: \"%(path)s\"."

5100

5108

msgstr ""

5101

5109

5102

#: bzrlib/errors.py:711

5110

#: bzrlib/errors.py:715

5111

msgid "Parent branch already exists: \"%(path)s\"."

5112

msgstr ""

5113

5114

#: bzrlib/errors.py:721

5103

5115

msgid ""

5104

5116

"Directory contains a branch, but no working tree (use bzr checkout if you "

5105

5117

"wish to build a working tree): \"%(path)s\""

5106

5118

msgstr ""

5107

5119

5108

#: bzrlib/errors.py:716

5120

#: bzrlib/errors.py:726

5109

5121

msgid ""

5110

5122

"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""

5111

5123

msgstr ""

5112

5124

5113

#: bzrlib/errors.py:726

5125

#: bzrlib/errors.py:736

5114

5126

msgid ""

5115

5127

"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""

5116

5128

msgstr ""

5117

5129

5118

#: bzrlib/errors.py:736

5130

#: bzrlib/errors.py:746

5119

5131

msgid "No repository present: \"%(path)s\""

5120

5132

msgstr ""

5121

5133

5122

#: bzrlib/errors.py:743

5134

#: bzrlib/errors.py:753

5123

5135

msgid ""

5124

5136

"Unsupported branch format: %(format)s\n"

5125

5137

"Please run 'bzr upgrade'"

5126

5138

msgstr ""

5127

5139

5128

#: bzrlib/errors.py:749

5140

#: bzrlib/errors.py:759

5129

5141

msgid "Unknown %(kind)s format: %(format)r"

5130

5142

msgstr ""

5131

5143

5132

#: bzrlib/errors.py:758

5144

#: bzrlib/errors.py:768

5133

5145

msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."

5134

5146

msgstr ""

5135

5147

5136

#: bzrlib/errors.py:768

5148

#: bzrlib/errors.py:778

5137

5149

msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"

5138

5150

msgstr ""

5139

5151

5140

#: bzrlib/errors.py:783

5152

#: bzrlib/errors.py:793

5141

5153

msgid ""

5142

5154

"%(target)s\n"

5143

5155

"is not compatible with\n"

5145

5157

"%(details)s"

5146

5158

msgstr ""

5147

5159

5148

#: bzrlib/errors.py:799

5160

#: bzrlib/errors.py:809

5149

5161

msgid "Revision is not compatible with %(repo_format)s"

5150

5162

msgstr ""

5151

5163

5152

#: bzrlib/errors.py:809

5164

#: bzrlib/errors.py:819

5153

5165

msgid "%(context_info)s%(path)s is already versioned."

5154

5166

msgstr ""

5155

5167

5156

#: bzrlib/errors.py:830

5168

#: bzrlib/errors.py:840

5157

5169

msgid "%(context_info)s%(path)s is not versioned."

5158

5170

msgstr ""

5159

5171

5160

#: bzrlib/errors.py:851

5172

#: bzrlib/errors.py:861

5161

5173

msgid "Path(s) are not versioned: %(paths_as_string)s"

5162

5174

msgstr ""

5163

5175

5164

#: bzrlib/errors.py:862

5176

#: bzrlib/errors.py:872

5165

5177

msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"

5166

5178

msgstr ""

5167

5179

5168

#: bzrlib/errors.py:881

5180

#: bzrlib/errors.py:891

5169

5181

msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""

5170

5182

msgstr ""

5171

5183

5172

#: bzrlib/errors.py:889

5184

#: bzrlib/errors.py:899

5173

5185

msgid ""

5174

5186

"Filename %(filename)r is not valid in your current filesystem encoding "

5175

5187

"%(fs_encoding)s"

5176

5188

msgstr ""

5177

5189

5178

#: bzrlib/errors.py:900

5190

#: bzrlib/errors.py:910

5179

5191

msgid "Cannot operate on \"%(filename)s\" because it is a control file"

5180

5192

msgstr ""

5181

5193

5182

#: bzrlib/errors.py:918

5194

#: bzrlib/errors.py:928

5183

5195

msgid "The lock for '%(lock_description)s' is in use and cannot be broken."

5184

5196

msgstr ""

5185

5197

5186

#: bzrlib/errors.py:957

5198

#: bzrlib/errors.py:967

5187

5199

msgid "Cannot lock %(lock)s: %(why)s"

5188

5200

msgstr ""

5189

5201

5190

#: bzrlib/errors.py:967

5202

#: bzrlib/errors.py:977

5191

5203

msgid ""

5192

5204

"A transaction related operation was attempted after the transaction finished."

5193

5205

msgstr ""

5194

5206

5195

#: bzrlib/errors.py:994

5207

#: bzrlib/errors.py:1004

5196

5208

msgid "Cannot lock: transport is read only: %(transport)s"

5197

5209

msgstr ""

5198

5210

5199

#: bzrlib/errors.py:1002

5211

#: bzrlib/errors.py:1012

5200

5212

msgid "Could not acquire lock \"%(lock)s\": %(msg)s"

5201

5213

msgstr ""

5202

5214

5203

#: bzrlib/errors.py:1013

5215

#: bzrlib/errors.py:1023

5204

5216

msgid ""

5205

5217

"Lock was broken while still open: %(lock)s - check storage consistency!"

5206

5218

msgstr ""

5207

5219

5208

#: bzrlib/errors.py:1024

5220

#: bzrlib/errors.py:1034

5209

5221

msgid ""

5210

5222

"Lock was released and re-acquired before being broken: %(lock)s: held by "

5211

5223

"%(holder)r, wanted to break %(target)r"

5212

5224

msgstr ""

5213

5225

5214

#: bzrlib/errors.py:1036

5226

#: bzrlib/errors.py:1046

5215

5227

msgid ""

5216

5228

"Lock is apparently held, but corrupted: %(corruption_info)s\n"

5217

5229

"Use 'bzr break-lock' to clear it"

5218

5230

msgstr ""

5219

5231

5220

#: bzrlib/errors.py:1049

5232

#: bzrlib/errors.py:1059

5221

5233

msgid "Lock not held: %(lock)s"

5222

5234

msgstr ""

5223

5235

5224

#: bzrlib/errors.py:1078

5236

#: bzrlib/errors.py:1088

5225

5237

msgid "No changes to commit"

5226

5238

msgstr ""

5227

5239

5228

#: bzrlib/errors.py:1083

5240

#: bzrlib/errors.py:1093

5229

5241

msgid ""

5230

5242

"Selected-file commit of merges is not supported yet: files %(files_str)s"

5231

5243

msgstr ""

5232

5244

5233

#: bzrlib/errors.py:1093

5245

#: bzrlib/errors.py:1103

5234

5246

msgid ""

5235

5247

"Excluding paths during commit is not supported by repository at "

5236

5248

"%(repository)r."

5237

5249

msgstr ""

5238

5250

5239

#: bzrlib/errors.py:1102

5251

#: bzrlib/errors.py:1112

5240

5252

msgid ""

5241

5253

"The specified commit message contains characters unsupported by the current "

5242

5254

"encoding."

5243

5255

msgstr ""

5244

5256

5245

#: bzrlib/errors.py:1108

5257

#: bzrlib/errors.py:1118

5246

5258

msgid "Upgrade URL cannot work with readonly URLs."

5247

5259

msgstr ""

5248

5260

5249

#: bzrlib/errors.py:1113

5261

#: bzrlib/errors.py:1123

5250

5262

msgid "The branch format %(format)s is already at the most recent format."

5251

5263

msgstr ""

5252

5264

5253

#: bzrlib/errors.py:1136

5265

#: bzrlib/errors.py:1146

5254

5266

msgid "Option --change does not accept revision ranges"

5255

5267

msgstr ""

5256

5268

5257

#: bzrlib/errors.py:1141

5269

#: bzrlib/errors.py:1151

5258

5270

msgid "No namespace registered for string: %(spec)r"

5259

5271

msgstr ""

5260

5272

5261

#: bzrlib/errors.py:1160

5273

#: bzrlib/errors.py:1170

5262

5274

msgid ""

5263

5275

"Requested revision: '%(spec)s' does not exist in branch: "

5264

5276

"%(branch_url)s%(extra)s"

5265

5277

msgstr ""

5266

5278

5267

#: bzrlib/errors.py:1174

5279

#: bzrlib/errors.py:1184

5268

5280

msgid ""

5269

5281

"Operation denied because it would change the main history, which is not "

5270

5282

"permitted by the append_revisions_only setting on branch \"%(location)s\"."

5271

5283

msgstr ""

5272

5284

5273

#: bzrlib/errors.py:1185

5285

#: bzrlib/errors.py:1195

5274

5286

msgid ""

5275

5287

"These branches have diverged. Use the missing command to see how.\n"

5276

5288

"Use the merge command to reconcile them."

5277

5289

msgstr ""

5278

5290

5279

#: bzrlib/errors.py:1205

5291

#: bzrlib/errors.py:1215

5280

5292

msgid ""

5281

5293

"Branches have no common ancestor, and no merge base revision was specified."

5282

5294

msgstr ""

5283

5295

5284

#: bzrlib/errors.py:1211

5296

#: bzrlib/errors.py:1221

5285

5297

msgid ""

5286

5298

"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."

5287

5299

msgstr ""

5288

5300

5289

#: bzrlib/errors.py:1217

5301

#: bzrlib/errors.py:1227

5290

5302

msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"

5291

5303

msgstr ""

5292

5304

5293

#: bzrlib/errors.py:1226

5305

#: bzrlib/errors.py:1236

5294

5306

msgid ""

5295

5307

"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."

5296

5308

msgstr ""

5297

5309

5298

#: bzrlib/errors.py:1235

5310

#: bzrlib/errors.py:1245

5299

5311

msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"

5300

5312

msgstr ""

5301

5313

5302

#: bzrlib/errors.py:1244

5314

#: bzrlib/errors.py:1254

5303

5315

msgid "Branch %(branch)s has no commits."

5304

5316

msgstr ""

5305

5317

5306

#: bzrlib/errors.py:1262

5318

#: bzrlib/errors.py:1272

5307

5319

msgid ""

5308

5320

"Bound branch %(branch)s is out of date with master branch "

5309

5321

"%(master)s.%(extra_help)s"

5310

5322

msgstr ""

5311

5323

5312

#: bzrlib/errors.py:1274

5324

#: bzrlib/errors.py:1284

5313

5325

msgid ""

5314

5326

"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "

5315

5327

"bound to %(remote)s."

5316

5328

msgstr ""

5317

5329

5318

#: bzrlib/errors.py:1286

5330

#: bzrlib/errors.py:1296

5319

5331

msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"

5320

5332

msgstr ""

5321

5333

5322

#: bzrlib/errors.py:1295

5334

#: bzrlib/errors.py:1305

5323

5335

msgid ""

5324

5336

"Unable to connect to target of bound branch %(branch)s => %(target)s: "

5325

5337

"%(error)s"

5326

5338

msgstr ""

5327

5339

5328

#: bzrlib/errors.py:1307

5340

#: bzrlib/errors.py:1317

5329

5341

msgid "Error in processing weave: %(msg)s"

5330

5342

msgstr ""

5331

5343

5332

#: bzrlib/errors.py:1316

5344

#: bzrlib/errors.py:1326

5333

5345

msgid "Revision {%(revision_id)s} already present in %(weave)s"

5334

5346

msgstr ""

5335

5347

5336

#: bzrlib/errors.py:1327

5348

#: bzrlib/errors.py:1337

5337

5349

msgid "Revision {%(revision_id)s} not present in %(weave)s"

5338

5350

msgstr ""

5339

5351

5340

#: bzrlib/errors.py:1337

5352

#: bzrlib/errors.py:1347

5341

5353

msgid "Weave invariant violated: %(what)s"

5342

5354

msgstr ""

5343

5355

5344

#: bzrlib/errors.py:1346

5356

#: bzrlib/errors.py:1356

5345

5357

msgid "Parents are mismatched between two revisions. %(msg)s"

5346

5358

msgstr ""

5347

5359

5348

#: bzrlib/errors.py:1368

5360

#: bzrlib/errors.py:1378

5349

5361

msgid ""

5350

5362

"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "

5351

5363

"%(weave_b)s"

5352

5364

msgstr ""

5353

5365

5354

#: bzrlib/errors.py:1380

5366

#: bzrlib/errors.py:1390

5355

5367

msgid "Versioned file error"

5356

5368

msgstr ""

5357

5369

5358

#: bzrlib/errors.py:1385

5370

#: bzrlib/errors.py:1395

5359

5371

msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."

5360

5372

msgstr ""

5361

5373

5362

#: bzrlib/errors.py:1395

5374

#: bzrlib/errors.py:1405

5363

5375

msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."

5364

5376

msgstr ""

5365

5377

5366

#: bzrlib/errors.py:1405

5378

#: bzrlib/errors.py:1415

5367

5379

msgid "Text did not match its checksum: %(msg)s"

5368

5380

msgstr ""

5369

5381

5370

#: bzrlib/errors.py:1531

5382

#: bzrlib/errors.py:1541

5371

5383

msgid "Export format %(format)r not supported"

5372

5384

msgstr ""

5373

5385

5374

#: bzrlib/errors.py:1540

5386

#: bzrlib/errors.py:1550

5375

5387

msgid "Transport error: %(msg)s %(orig_error)s"

5376

5388

msgstr ""

5377

5389

5378

#: bzrlib/errors.py:1566

5390

#: bzrlib/errors.py:1576

5379

5391

msgid "Generic bzr smart protocol error: %(details)s"

5380

5392

msgstr ""

5381

5393

5382

#: bzrlib/errors.py:1574

5394

#: bzrlib/errors.py:1584

5383

5395

msgid "Received bad protocol version marker: %(marker)r"

5384

5396

msgstr ""

5385

5397

5386

#: bzrlib/errors.py:1606

5398

#: bzrlib/errors.py:1616

5387

5399

msgid "Transport operation not possible: %(msg)s %(orig_error)s"

5388

5400

msgstr ""

5389

5401

5390

#: bzrlib/errors.py:1611

5402

#: bzrlib/errors.py:1621

5391

5403

msgid "Connection error: %(msg)s %(orig_error)s"

5392

5404

msgstr ""

5393

5405

5394

#: bzrlib/errors.py:1616

5406

#: bzrlib/errors.py:1626

5395

5407

msgid "%(msg)s %(host)s%(port)s%(orig_error)s"

5396

5408

msgstr ""

5397

5409

5398

#: bzrlib/errors.py:1637

5410

#: bzrlib/errors.py:1647

5399

5411

msgid "Connection closed: %(msg)s %(orig_error)s"

5400

5412

msgstr ""

5401

5413

5402

#: bzrlib/errors.py:1642

5414

#: bzrlib/errors.py:1652

5403

5415

msgid "Connection Timeout: %(msg)s%(orig_error)s"

5404

5416

msgstr ""

5405

5417

5406

#: bzrlib/errors.py:1647

5418

#: bzrlib/errors.py:1657

5407

5419

msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"

5408

5420

msgstr ""

5409

5421

5410

#: bzrlib/errors.py:1657

5422

#: bzrlib/errors.py:1667

5411

5423

msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"

5412

5424

msgstr ""

5413

5425

5414

#: bzrlib/errors.py:1672

5426

#: bzrlib/errors.py:1682

5427

msgid "Certificate error: %(error)s"

5428

msgstr ""

5429

5430

#: bzrlib/errors.py:1690

5415

5431

msgid "Invalid http range %(range)r for %(path)s: %(msg)s"

5416

5432

msgstr ""

5417

5433

5418

#: bzrlib/errors.py:1686

5434

#: bzrlib/errors.py:1704

5419

5435

msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"

5420

5436

msgstr ""

5421

5437

5422

#: bzrlib/errors.py:1694

5438

#: bzrlib/errors.py:1712

5423

5439

msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"

5424

5440

msgstr ""

5425

5441

5426

#: bzrlib/errors.py:1703

5442

#: bzrlib/errors.py:1721

5427

5443

msgid "%(source)s is%(permanently)s redirected to %(target)s"

5428

5444

msgstr ""

5429

5445

5430

#: bzrlib/errors.py:1717

5446

#: bzrlib/errors.py:1735

5431

5447

msgid "Too many redirections"

5432

5448

msgstr ""

5433

5449

5434

#: bzrlib/errors.py:1722

5450

#: bzrlib/errors.py:1740

5435

5451

msgid "Working tree has conflicts."

5436

5452

msgstr ""

5437

5453

5438

#: bzrlib/errors.py:1726

5454

#: bzrlib/errors.py:1744

5439

5455

msgid "Config file %(filename)s is not UTF-8 encoded\n"

5440

5456

msgstr ""

5441

5457

5442

#: bzrlib/errors.py:1735

5458

#: bzrlib/errors.py:1753

5443

5459

msgid ""

5444

5460

"Error(s) parsing config file %(filename)s:\n"

5445

5461

"%(errors)s"

5446

5462

msgstr ""

5447

5463

5448

#: bzrlib/errors.py:1746

5449

msgid "Bad value \"%(value)s\" for option \"%(name)s\"."

5464

#: bzrlib/errors.py:1763

5465

msgid ""

5466

"Bad value \"%(value)s\" for option \"%(name)s\".\n"

5467

"See ``bzr help %(name)s``"

5450

5468

msgstr ""

5451

5469

5452

#: bzrlib/errors.py:1754

5470

#: bzrlib/errors.py:1773

5453

5471

msgid "%(username)r does not seem to contain a reasonable email address"

5454

5472

msgstr ""

5455

5473

5456

#: bzrlib/errors.py:1763

5474

#: bzrlib/errors.py:1782

5457

5475

msgid "Failed to GPG sign data with command \"%(command_line)s\""

5458

5476

msgstr ""

5459

5477

5460

#: bzrlib/errors.py:1771

5478

#: bzrlib/errors.py:1790

5461

5479

msgid "Failed to verify GPG signature data with error \"%(error)s\""

5462

5480

msgstr ""

5463

5481

5464

#: bzrlib/errors.py:1779

5482

#: bzrlib/errors.py:1798

5465

5483

msgid "Unable to import library \"%(library)s\": %(error)s"

5466

5484

msgstr ""

5467

5485

5468

#: bzrlib/errors.py:1787

5486

#: bzrlib/errors.py:1806

5469

5487

msgid "python-gpgme is not installed, it is needed to verify signatures"

5470

5488

msgstr ""

5471

5489

5472

#: bzrlib/errors.py:1795

5490

#: bzrlib/errors.py:1814

5473

5491

msgid ""

5474

5492

"The working tree for %(basedir)s has changed since the last commit, but "

5475

5493

"weave merge requires that it be unchanged"

5476

5494

msgstr ""

5477

5495

5478

#: bzrlib/errors.py:1805

5496

#: bzrlib/errors.py:1824

5479

5497

msgid ""

5480

5498

"Can't reprocess and show base, because reprocessing obscures the "

5481

5499

"relationship of conflicting lines to the base"

5482

5500

msgstr ""

5483

5501

5484

#: bzrlib/errors.py:1811

5502

#: bzrlib/errors.py:1830

5485

5503

msgid "Cycle in graph %(graph)r"

5486

5504

msgstr ""

5487

5505

5488

#: bzrlib/errors.py:1839

5506

#: bzrlib/errors.py:1858

5489

5507

msgid "File %(filename)s is not conflicted."

5490

5508

msgstr ""

5491

5509

5492

#: bzrlib/errors.py:1861

5510

#: bzrlib/errors.py:1880

5493

5511

msgid "No bundle was found in \"%(filename)s\"."

5494

5512

msgstr ""

5495

5513

5496

#: bzrlib/errors.py:1870

5514

#: bzrlib/errors.py:1889

5497

5515

msgid "Unable to handle bundle version %(version)s: %(msg)s"

5498

5516

msgstr ""

5499

5517

5500

#: bzrlib/errors.py:1880

5518

#: bzrlib/errors.py:1899

5501

5519

msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"

5502

5520

msgstr ""

5503

5521

5504

#: bzrlib/errors.py:1893

5522

#: bzrlib/errors.py:1912

5505

5523

msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"

5506

5524

msgstr ""

5507

5525

5508

#: bzrlib/errors.py:1903

5526

#: bzrlib/errors.py:1922

5509

5527

msgid "Key %(key)s is already present in map"

5510

5528

msgstr ""

5511

5529

5512

#: bzrlib/errors.py:1908

5530

#: bzrlib/errors.py:1927

5513

5531

msgid "The prefix %(prefix)s is in the help search path twice."

5514

5532

msgstr ""

5515

5533

5516

#: bzrlib/errors.py:1918

5534

#: bzrlib/errors.py:1937

5517

5535

msgid ""

5518

5536

"No final name for trans_id %(trans_id)r\n"

5519

5537

"file-id: %(file_id)r\n"

5520

5538

"root trans-id: %(root_trans_id)r\n"

5521

5539

msgstr ""

5522

5540

5523

#: bzrlib/errors.py:1950

5541

#: bzrlib/errors.py:1969

5524

5542

msgid "Attempt to reuse a transform that has already been applied."

5525

5543

msgstr ""

5526

5544

5527

#: bzrlib/errors.py:1955

5545

#: bzrlib/errors.py:1974

5528

5546

msgid "Moving the root directory is not supported at this time"

5529

5547

msgstr ""

5530

5548

5531

#: bzrlib/errors.py:1960

5549

#: bzrlib/errors.py:1979

5532

5550

msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"

5533

5551

msgstr ""

5534

5552

5535

#: bzrlib/errors.py:1971

5553

#: bzrlib/errors.py:1990

5536

5554

msgid ""

5537

5555

"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5538

5556

msgstr ""

5539

5557

5540

#: bzrlib/errors.py:2007

5558

#: bzrlib/errors.py:2026

5541

5559

msgid ""

5542

5560

"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5543

5561

msgstr ""

5544

5562

5545

#: bzrlib/errors.py:2037

5563

#: bzrlib/errors.py:2056

5546

5564

msgid "Unable to import paramiko (required for sftp support): %(error)s"

5547

5565

msgstr ""

5548

5566

5549

#: bzrlib/errors.py:2045

5567

#: bzrlib/errors.py:2064

5550

5568

msgid "Nothing to merge."

5551

5569

msgstr ""

5552

5570

5553

#: bzrlib/errors.py:2050

5571

#: bzrlib/errors.py:2069

5554

5572

msgid "Format %(format)s cannot be initialised by this version of bzr."

5555

5573

msgstr ""

5556

5574

5557

#: bzrlib/errors.py:2059

5575

#: bzrlib/errors.py:2078

5558

5576

msgid ""

5559

5577

"Cannot convert from format %(from_format)s to format %(format)s. "

5560

5578

"%(problem)s"

5561

5579

msgstr ""

5562

5580

5563

#: bzrlib/errors.py:2071

5581

#: bzrlib/errors.py:2090

5564

5582

msgid "Could not find an appropriate Differ for file \"%(path)s\""

5565

5583

msgstr ""

5566

5584

5567

#: bzrlib/errors.py:2079

5585

#: bzrlib/errors.py:2098

5568

5586

msgid "%(exe_name)s could not be found on this machine"

5569

5587

msgstr ""

5570

5588

5571

#: bzrlib/errors.py:2087

5589

#: bzrlib/errors.py:2106

5572

5590

msgid "Diff is not installed on this machine: %(msg)s"

5573

5591

msgstr ""

5574

5592

5575

#: bzrlib/errors.py:2095

5593

#: bzrlib/errors.py:2114

5576

5594

msgid "Diff3 is not installed on this machine."

5577

5595

msgstr ""

5578

5596

5579

#: bzrlib/errors.py:2101

5597

#: bzrlib/errors.py:2120

5580

5598

msgid "The content being inserted is already present."

5581

5599

msgstr ""

5582

5600

5583

#: bzrlib/errors.py:2106

5601

#: bzrlib/errors.py:2125

5584

5602

msgid ""

5585

5603

"This tree contains left-over files from a failed operation.\n"

5586

5604

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5588

5606

" keep, and delete it when you are done."

5589

5607

msgstr ""

5590

5608

5591

#: bzrlib/errors.py:2117

5609

#: bzrlib/errors.py:2136

5592

5610

msgid ""

5593

5611

"This tree contains left-over files from a failed operation.\n"

5594

5612

" Please examine %(pending_deletion)s to see if it contains any files you\n"

5595

5613

" wish to keep, and delete it when you are done."

5596

5614

msgstr ""

5597

5615

5598

#: bzrlib/errors.py:2127

5616

#: bzrlib/errors.py:2146

5599

5617

msgid ""

5600

5618

"Unable to delete transform temporary directory %(limbo_dir)s.\n"

5601

5619

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5603

5621

" keep, and delete it when you are done."

5604

5622

msgstr ""

5605

5623

5606

#: bzrlib/errors.py:2138

5624

#: bzrlib/errors.py:2157

5607

5625

msgid ""

5608

5626

"Unable to delete transform temporary directory %(pending_deletion)s. Please "

5609

5627

"examine %(pending_deletion)s to see if it contains any files you wish to "

5610

5628

"keep, and delete it when you are done."

5611

5629

msgstr ""

5612

5630

5613

#: bzrlib/errors.py:2148

5631

#: bzrlib/errors.py:2167

5614

5632

msgid "Working tree is out of date, please run 'bzr update'.%(more)s"

5615

5633

msgstr ""

5616

5634

5617

#: bzrlib/errors.py:2162

5635

#: bzrlib/errors.py:2181

5618

5636

msgid ""

5619

5637

"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."

5620

5638

msgstr ""

5621

5639

5622

#: bzrlib/errors.py:2175

5640

#: bzrlib/errors.py:2194

5623

5641

msgid "Error in merge modified format"

5624

5642

msgstr ""

5625

5643

5626

#: bzrlib/errors.py:2180

5644

#: bzrlib/errors.py:2199

5627

5645

msgid "Format error in conflict listings"

5628

5646

msgstr ""

5629

5647

5630

#: bzrlib/errors.py:2184

5648

#: bzrlib/errors.py:2203

5631

5649

msgid ""

5632

5650

"Inconsistency in dirstate file %(dirstate_path)s.\n"

5633

5651

"Error: %(description)s"

5634

5652

msgstr ""

5635

5653

5636

#: bzrlib/errors.py:2195

5654

#: bzrlib/errors.py:2214

5637

5655

msgid ""

5638

5656

"An error has been detected in the repository %(repo_path)s.\n"

5639

5657

"Please run bzr reconcile on this repository."

5640

5658

msgstr ""

5641

5659

5642

#: bzrlib/errors.py:2206

5660

#: bzrlib/errors.py:2225

5643

5661

msgid ""

5644

5662

"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"

5645

5663

"reason: %(reason)s"

5646

5664

msgstr ""

5647

5665

5648

#: bzrlib/errors.py:2219

5666

#: bzrlib/errors.py:2238

5649

5667

msgid ""

5650

5668

"An inconsistent delta was supplied: %(delta)r\n"

5651

5669

"reason: %(reason)s"

5652

5670

msgstr ""

5653

5671

5654

#: bzrlib/errors.py:2231

5672

#: bzrlib/errors.py:2250

5655

5673

msgid "To use this feature you must upgrade your branch at %(path)s."

5656

5674

msgstr ""

5657

5675

5658

#: bzrlib/errors.py:2240

5676

#: bzrlib/errors.py:2259

5659

5677

msgid "To use this feature you must upgrade your repository at %(path)s."

5660

5678

msgstr ""

5661

5679

5662

#: bzrlib/errors.py:2245

5680

#: bzrlib/errors.py:2264

5663

5681

msgid ""

5664

5682

"To use this feature you must upgrade your branch at %(path)s to a format "

5665

5683

"which supports rich roots."

5666

5684

msgstr ""

5667

5685

5668

#: bzrlib/errors.py:2251

5686

#: bzrlib/errors.py:2270

5669

5687

msgid "Cannot perform local-only commits on unbound branches."

5670

5688

msgstr ""

5671

5689

5672

#: bzrlib/errors.py:2256

5690

#: bzrlib/errors.py:2275

5673

5691

msgid "The method %(mname)s is not supported on objects of type %(tname)s."

5674

5692

msgstr ""

5675

5693

5676

#: bzrlib/errors.py:2277

5694

#: bzrlib/errors.py:2296

5677

5695

msgid "Ghost tags not supported by format %(format)r."

5678

5696

msgstr ""

5679

5697

5680

#: bzrlib/errors.py:2285

5698

#: bzrlib/errors.py:2304

5681

5699

msgid "File is binary but should be text."

5682

5700

msgstr ""

5683

5701

5684

#: bzrlib/errors.py:2290

5702

#: bzrlib/errors.py:2309

5685

5703

msgid "The path %(path)s is not permitted on this platform"

5686

5704

msgstr ""

5687

5705

5688

#: bzrlib/errors.py:2299

5706

#: bzrlib/errors.py:2318

5689

5707

msgid ""

5690

5708

"Testament did not match expected value.\n"

5691

5709

" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"

5692

5710

" {%(measured)s}"

5693

5711

msgstr ""

5694

5712

5695

#: bzrlib/errors.py:2311

5713

#: bzrlib/errors.py:2330

5696

5714

msgid "Not a bzr revision-bundle: %(text)r"

5697

5715

msgstr ""

5698

5716

5699

#: bzrlib/errors.py:2320

5717

#: bzrlib/errors.py:2339

5700

5718

msgid "Bad bzr revision-bundle: %(text)r"

5701

5719

msgstr ""

5702

5720

5703

#: bzrlib/errors.py:2329

5721

#: bzrlib/errors.py:2348

5704

5722

msgid "Malformed bzr revision-bundle header: %(text)r"

5705

5723

msgstr ""

5706

5724

5707

#: bzrlib/errors.py:2334

5725

#: bzrlib/errors.py:2353

5708

5726

msgid "Malformed patches in bzr revision-bundle: %(text)r"

5709

5727

msgstr ""

5710

5728

5711

#: bzrlib/errors.py:2339

5729

#: bzrlib/errors.py:2358

5712

5730

msgid "Malformed footer in bzr revision-bundle: %(text)r"

5713

5731

msgstr ""

5714

5732

5715

#: bzrlib/errors.py:2344

5733

#: bzrlib/errors.py:2363

5716

5734

msgid "End of line marker was not \\n in bzr revision-bundle"

5717

5735

msgstr ""

5718

5736

5719

#: bzrlib/errors.py:2354

5737

#: bzrlib/errors.py:2373

5720

5738

msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"

5721

5739

msgstr ""

5722

5740

5723

#: bzrlib/errors.py:2364

5741

#: bzrlib/errors.py:2383

5724

5742

msgid "Root class for inventory serialization errors"

5725

5743

msgstr ""

5726

5744

5727

#: bzrlib/errors.py:2368

5745

#: bzrlib/errors.py:2387

5728

5746

msgid ""

5729

5747

"The inventory was not in the expected format:\n"

5730

5748

" %(msg)s"

5731

5749

msgstr ""

5732

5750

5733

#: bzrlib/errors.py:2377

5751

#: bzrlib/errors.py:2396

5734

5752

msgid "This operation requires rich root data storage"

5735

5753

msgstr ""

5736

5754

5737

#: bzrlib/errors.py:2390

5755

#: bzrlib/errors.py:2409

5738

5756

msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"

5739

5757

msgstr ""

5740

5758

5741

#: bzrlib/errors.py:2399

5759

#: bzrlib/errors.py:2418

5742

5760

msgid ""

5743

5761

"Don't know how to handle SSH connections. Please set BZR_SSH environment "

5744

5762

"variable."

5745

5763

msgstr ""

5746

5764

5747

#: bzrlib/errors.py:2406

5765

#: bzrlib/errors.py:2425

5748

5766

msgid ""

5749

5767

"Could not determine revno for {%(revision_id)s} because its ancestry shows a "

5750

5768

"ghost at {%(ghost_revision_id)s}"

5751

5769

msgstr ""

5752

5770

5753

#: bzrlib/errors.py:2416

5771

#: bzrlib/errors.py:2435

5754

5772

msgid "Ghost revision {%(revision_id)s} cannot be used here."

5755

5773

msgstr ""

5756

5774

5757

#: bzrlib/errors.py:2467

5775

#: bzrlib/errors.py:2486

5758

5776

msgid ""

5759

5777

"A merge directive must provide either a bundle or a public branch location."

5760

5778

msgstr ""

5761

5779

5762

#: bzrlib/errors.py:2474

5780

#: bzrlib/errors.py:2493

5763

5781

msgid "Bad merge directive payload %(start)r"

5764

5782

msgstr ""

5765

5783

5766

#: bzrlib/errors.py:2484

5784

#: bzrlib/errors.py:2503

5767

5785

msgid "Preview patch does not match requested changes."

5768

5786

msgstr ""

5769

5787

5770

#: bzrlib/errors.py:2490

5788

#: bzrlib/errors.py:2509

5771

5789

msgid "Patch_type was %(patch_type)s, but no patch was supplied."

5772

5790

msgstr ""

5773

5791

5774

#: bzrlib/errors.py:2500

5792

#: bzrlib/errors.py:2519

5775

5793

msgid ""

5776

5794

"Your branch does not have all of the revisions required in order to merge "

5777

5795

"this merge directive and the target location specified in the merge "

5778

5796

"directive is not a branch: %(location)s."

5779

5797

msgstr ""

5780

5798

5781

#: bzrlib/errors.py:2512

5799

#: bzrlib/errors.py:2531

5782

5800

msgid "Unsupported entry kind %(kind)s"

5783

5801

msgstr ""

5784

5802

5785

#: bzrlib/errors.py:2520

5803

#: bzrlib/errors.py:2539

5786

5804

msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"

5787

5805

msgstr ""

5788

5806

5789

#: bzrlib/errors.py:2530

5807

#: bzrlib/errors.py:2549

5790

5808

msgid "Subsume target %(other_tree)s needs to be upgraded."

5791

5809

msgstr ""

5792

5810

5793

#: bzrlib/errors.py:2549

5811

#: bzrlib/errors.py:2568

5794

5812

msgid "No such tag: %(tag_name)s"

5795

5813

msgstr ""

5796

5814

5797

#: bzrlib/errors.py:2557

5815

#: bzrlib/errors.py:2576

5798

5816

msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."

5799

5817

msgstr ""

5800

5818

5801

#: bzrlib/errors.py:2566

5819

#: bzrlib/errors.py:2585

5802

5820

msgid "Tag %(tag_name)s already exists."

5803

5821

msgstr ""

5804

5822

5805

#: bzrlib/errors.py:2574

5823

#: bzrlib/errors.py:2593

5806

5824

msgid ""

5807

5825

"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "

5808

5826

"bugs\" for more information on this feature."

5809

5827

msgstr ""

5810

5828

5811

#: bzrlib/errors.py:2584

5829

#: bzrlib/errors.py:2603

5812

5830

msgid ""

5813

5831

"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"

5814

5832

msgstr ""

5815

5833

5816

#: bzrlib/errors.py:2594

5834

#: bzrlib/errors.py:2613

5817

5835

msgid ""

5818

5836

"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"

5819

5837

msgstr ""

5820

5838

5821

#: bzrlib/errors.py:2604

5839

#: bzrlib/errors.py:2623

5822

5840

msgid "Invalid line in bugs property: '%(line)s'"

5823

5841

msgstr ""

5824

5842

5825

#: bzrlib/errors.py:2612

5843

#: bzrlib/errors.py:2631

5826

5844

msgid "Invalid bug status: '%(status)s'"

5827

5845

msgstr ""

5828

5846

5829

#: bzrlib/errors.py:2620

5847

#: bzrlib/errors.py:2639

5830

5848

msgid "Could not understand response from smart server: %(response_tuple)r"

5831

5849

msgstr ""

5832

5850

5833

#: bzrlib/errors.py:2659

5851

#: bzrlib/errors.py:2678

5834

5852

msgid "Server sent an unexpected error: %(error_tuple)r"

5835

5853

msgstr ""

5836

5854

5837

#: bzrlib/errors.py:2678

5855

#: bzrlib/errors.py:2697

5838

5856

msgid "Unrecognised container format: %(container_format)r"

5839

5857

msgstr ""

5840

5858

5841

#: bzrlib/errors.py:2686

5859

#: bzrlib/errors.py:2705

5842

5860

msgid "Unexpected end of container stream"

5843

5861

msgstr ""

5844

5862

5845

#: bzrlib/errors.py:2691

5863

#: bzrlib/errors.py:2710

5846

5864

msgid "Unknown record type: %(record_type)r"

5847

5865

msgstr ""

5848

5866

5849

#: bzrlib/errors.py:2699

5867

#: bzrlib/errors.py:2718

5850

5868

msgid "Invalid record: %(reason)s"

5851

5869

msgstr ""

5852

5870

5853

#: bzrlib/errors.py:2707

5871

#: bzrlib/errors.py:2726

5854

5872

msgid "Container has data after end marker: %(excess)r"

5855

5873

msgstr ""

5856

5874

5857

#: bzrlib/errors.py:2715

5875

#: bzrlib/errors.py:2734

5858

5876

msgid "Container has multiple records with the same name: %(name)s"

5859

5877

msgstr ""

5860

5878

5861

#: bzrlib/errors.py:2728

5879

#: bzrlib/errors.py:2747

5862

5880

msgid "Corrupt or incompatible data stream: %(reason)s"

5863

5881

msgstr ""

5864

5882

5865

#: bzrlib/errors.py:2736

5883

#: bzrlib/errors.py:2755

5866

5884

msgid "SMTP error: %(error)s"

5867

5885

msgstr ""

5868

5886

5869

#: bzrlib/errors.py:2744

5887

#: bzrlib/errors.py:2763

5870

5888

msgid "No message supplied."

5871

5889

msgstr ""

5872

5890

5873

#: bzrlib/errors.py:2749

5891

#: bzrlib/errors.py:2768

5874

5892

msgid "No mail-to address (--mail-to) or output (-o) specified."

5875

5893

msgstr ""

5876

5894

5877

#: bzrlib/errors.py:2754

5895

#: bzrlib/errors.py:2773

5878

5896

msgid "Unknown mail client: %(mail_client)s"

5879

5897

msgstr ""

5880

5898

5881

#: bzrlib/errors.py:2762

5899

#: bzrlib/errors.py:2781

5882

5900

msgid ""

5883

5901

"Unable to find mail client with the following names: "

5884

5902

"%(mail_command_list_string)s"

5885

5903

msgstr ""

5886

5904

5887

#: bzrlib/errors.py:2772

5905

#: bzrlib/errors.py:2791

5888

5906

msgid "SMTP connection to %(host)s refused"

5889

5907

msgstr ""

5890

5908

5891

#: bzrlib/errors.py:2781

5909

#: bzrlib/errors.py:2800

5892

5910

msgid "Please specify smtp_server. No server at default %(host)s."

5893

5911

msgstr ""

5894

5912

5895

#: bzrlib/errors.py:2795

5913

#: bzrlib/errors.py:2814

5896

5914

msgid ""

5897

5915

"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"

5898

5916

"reconfigure."

5899

5917

msgstr ""

5900

5918

5901

#: bzrlib/errors.py:2807

5919

#: bzrlib/errors.py:2826

5902

5920

msgid "'%(display_url)s' is already a branch."

5903

5921

msgstr ""

5904

5922

5905

#: bzrlib/errors.py:2812

5923

#: bzrlib/errors.py:2831

5906

5924

msgid "'%(display_url)s' is already a tree."

5907

5925

msgstr ""

5908

5926

5909

#: bzrlib/errors.py:2817

5927

#: bzrlib/errors.py:2836

5910

5928

msgid "'%(display_url)s' is already a checkout."

5911

5929

msgstr ""

5912

5930

5913

#: bzrlib/errors.py:2822

5931

#: bzrlib/errors.py:2841

5914

5932

msgid "'%(display_url)s' is already a lightweight checkout."

5915

5933

msgstr ""

5916

5934

5917

#: bzrlib/errors.py:2827

5935

#: bzrlib/errors.py:2846

5918

5936

msgid "'%(display_url)s' is already using a shared repository."

5919

5937

msgstr ""

5920

5938

5921

#: bzrlib/errors.py:2832

5939

#: bzrlib/errors.py:2851

5922

5940

msgid "'%(display_url)s' is already standalone."

5923

5941

msgstr ""

5924

5942

5925

#: bzrlib/errors.py:2837

5943

#: bzrlib/errors.py:2856

5926

5944

msgid "Shared repository '%(display_url)s' already creates working trees."

5927

5945

msgstr ""

5928

5946

5929

#: bzrlib/errors.py:2843

5947

#: bzrlib/errors.py:2862

5930

5948

msgid ""

5931

5949

"Shared repository '%(display_url)s' already doesn't create working trees."

5932

5950

msgstr ""

5933

5951

5934

#: bzrlib/errors.py:2849

5952

#: bzrlib/errors.py:2868

5935

5953

msgid "Requested reconfiguration of '%(display_url)s' is not supported."

5936

5954

msgstr ""

5937

5955

5938

#: bzrlib/errors.py:2854

5956

#: bzrlib/errors.py:2873

5939

5957

msgid "No location could be found to bind to at %(display_url)s."

5940

5958

msgstr ""

5941

5959

5942

#: bzrlib/errors.py:2859

5960

#: bzrlib/errors.py:2878

5943

5961

msgid ""

5944

5962

"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "

5945

5963

"status).%(more)s"

5946

5964

msgstr ""

5947

5965

5948

#: bzrlib/errors.py:2878

5966

#: bzrlib/errors.py:2897

5949

5967

msgid ""

5950

5968

"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"

5951

5969

"list).%(more)s"

5952

5970

msgstr ""

5953

5971

5954

#: bzrlib/errors.py:2884

5972

#: bzrlib/errors.py:2903

5955

5973

msgid "Variable {%(name)s} is not available."

5956

5974

msgstr ""

5957

5975

5958

#: bzrlib/errors.py:2892

5976

#: bzrlib/errors.py:2911

5959

5977

msgid "No template specified."

5960

5978

msgstr ""

5961

5979

5962

#: bzrlib/errors.py:2897

5980

#: bzrlib/errors.py:2916

5963

5981

msgid "Unable to create symlink %(path_str)son this platform"

5964

5982

msgstr ""

5965

5983

5966

#: bzrlib/errors.py:2912

5984

#: bzrlib/errors.py:2931

5967

5985

msgid ""

5968

5986

"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "

5969

5987

"\"original\", \"local\"."

5970

5988

msgstr ""

5971

5989

5972

#: bzrlib/errors.py:2946

5990

#: bzrlib/errors.py:2965

5973

5991

msgid ""

5974

5992

"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"

5975

5993

msgstr ""

5976

5994

5977

#: bzrlib/errors.py:2958

5995

#: bzrlib/errors.py:2977

5978

5996

msgid "The \"%(config_id)s\" configuration does not exist."

5979

5997

msgstr ""

5980

5998

5981

#: bzrlib/errors.py:2966

5999

#: bzrlib/errors.py:2985

5982

6000

msgid "The \"%(option_name)s\" configuration option does not exist."

5983

6001

msgstr ""

5984

6002

5985

#: bzrlib/errors.py:2974

6003

#: bzrlib/errors.py:2993

5986

6004

msgid "The alias \"%(alias_name)s\" does not exist."

5987

6005

msgstr ""

5988

6006

5989

#: bzrlib/errors.py:2988

6007

#: bzrlib/errors.py:3007

5990

6008

msgid "\"%(alias_name)s\" is not a valid location alias."

5991

6009

msgstr ""

5992

6010

5993

#: bzrlib/errors.py:2996

6011

#: bzrlib/errors.py:3015

5994

6012

msgid "No %(alias_name)s location assigned."

5995

6013

msgstr ""

5996

6014

5997

#: bzrlib/errors.py:3004

6015

#: bzrlib/errors.py:3023

5998

6016

msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."

5999

6017

msgstr ""

6000

6018

6001

#: bzrlib/errors.py:3014

6019

#: bzrlib/errors.py:3033

6002

6020

msgid "Unknown rules detected: %(unknowns_str)s."

6003

6021

msgstr ""

6004

6022

6005

#: bzrlib/errors.py:3025

6023

#: bzrlib/errors.py:3044

6006

6024

msgid "Tip change rejected: %(msg)s"

6007

6025

msgstr ""

6008

6026

6009

#: bzrlib/errors.py:3033

6027

#: bzrlib/errors.py:3052

6010

6028

msgid "Shelf corrupt."

6011

6029

msgstr ""

6012

6030

6013

#: bzrlib/errors.py:3038

6031

#: bzrlib/errors.py:3057

6014

6032

msgid "Corruption while decompressing repository file%(orig_error)s"

6015

6033

msgstr ""

6016

6034

6017

#: bzrlib/errors.py:3050

6035

#: bzrlib/errors.py:3069

6018

6036

msgid "No changes are shelved with id \"%(shelf_id)d\"."

6019

6037

msgstr ""

6020

6038

6021

#: bzrlib/errors.py:3058

6039

#: bzrlib/errors.py:3077

6022

6040

msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."

6023

6041

msgstr ""

6024

6042

6025

#: bzrlib/errors.py:3066

6043

#: bzrlib/errors.py:3085

6026

6044

msgid ""

6027

6045

"An attempt to access a url outside the server jail was made: '%(url)s'."

6028

6046

msgstr ""

6029

6047

6030

#: bzrlib/errors.py:3074

6048

#: bzrlib/errors.py:3093

6031

6049

msgid "The user aborted the operation."

6032

6050

msgstr ""

6033

6051

6034

#: bzrlib/errors.py:3079

6052

#: bzrlib/errors.py:3098

6035

6053

msgid "Branching '%(url)s'(%(format)s) must create a working tree."

6036

6054

msgstr ""

6037

6055

6038

#: bzrlib/errors.py:3089

6056

#: bzrlib/errors.py:3108

6039

6057

msgid "No such view: %(view_name)s."

6040

6058

msgstr ""

6041

6059

6042

#: bzrlib/errors.py:3099

6060

#: bzrlib/errors.py:3118

6043

6061

msgid ""

6044

6062

"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "

6045

6063

"to a later format."

6046

6064

msgstr ""

6047

6065

6048

#: bzrlib/errors.py:3108

6066

#: bzrlib/errors.py:3127

6049

6067

msgid ""

6050

6068

"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"

6051

6069

msgstr ""

6052

6070

6053

#: bzrlib/errors.py:3175

6071

#: bzrlib/errors.py:3194

6054

6072

msgid "%(bzrdir)r does not support co-located branches."

6055

6073

msgstr ""

6056

6074

6057

#: bzrlib/errors.py:3181

6075

#: bzrlib/errors.py:3200

6058

6076

msgid ""

6059

6077

"Unable to determine your name.\n"

6060

6078

"Please, set your name with the 'whoami' command.\n"

6061

6079

"E.g. bzr whoami \"Your Name <name@example.com>\""

6062

6080

msgstr ""

6063

6081

6064

#: bzrlib/errors.py:3190

6082

#: bzrlib/errors.py:3209

6065

6083

msgid "Invalid pattern(s) found. %(msg)s"

6066

6084

msgstr ""

6067

6085

6068

#: bzrlib/errors.py:3198

6086

#: bzrlib/errors.py:3217

6069

6087

msgid ""

6070

6088

"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "

6071

6089

"unbind` to fix."

6072

6090

msgstr ""

6073

6091

6074

#: bzrlib/errors.py:3209

6092

#: bzrlib/errors.py:3228

6075

6093

msgid "Loop involving %(refs)r while expanding \"%(string)s\"."

6076

6094

msgstr ""

6077

6095

6078

#: bzrlib/errors.py:3218

6096

#: bzrlib/errors.py:3237

6079

6097

msgid "Option %(name)s is not defined while expanding \"%(string)s\"."

6080

6098

msgstr ""

6081

6099

6082

#: bzrlib/errors.py:3227

6100

#: bzrlib/errors.py:3246

6083

6101

msgid ""

6084

6102

"No compatible object available for operations from %(source)r to %(target)r."

6085

6103

msgstr ""

6086

6104

6087

#: bzrlib/errors.py:3237

6105

#: bzrlib/errors.py:3256

6088

6106

msgid ""

6089

6107

"VFS requests over the smart server are not allowed. Encountered: %(method)s, "

6090

6108

"%(arguments)s."

6091

6109

msgstr ""

6092

6110

6093

#: bzrlib/errors.py:3247

6111

#: bzrlib/errors.py:3266

6094

6112

msgid ""

6095

6113

"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "

6096

6114

"format %(format)r"

6097

6115

msgstr ""

6098

6116

6099

#: bzrlib/errors.py:3259

6117

#: bzrlib/errors.py:3278

6100

6118

msgid ""

6101

6119

"Missing feature %(feature)s not provided by this version of Bazaar or any "

6102

6120

"plugin."

6103

6121

msgstr ""

6104

6122

6105

#: bzrlib/errors.py:3272

6123

#: bzrlib/errors.py:3291

6106

6124

msgid "Binary files section encountered."

6107

6125

msgstr ""

6108

6126

6109

#: bzrlib/errors.py:3280

6127

#: bzrlib/errors.py:3299

6110

6128

msgid ""

6111

6129

"Malformed patch header. %(desc)s\n"

6112

6130

"%(line)r"

6113

6131

msgstr ""

6114

6132

6115

#: bzrlib/errors.py:3289

6133

#: bzrlib/errors.py:3308

6116

6134

msgid ""

6117

6135

"Malformed hunk header. %(desc)s\n"

6118

6136

"%(line)r"

6119

6137

msgstr ""

6120

6138

6121

#: bzrlib/errors.py:3298

6139

#: bzrlib/errors.py:3317

6122

6140

msgid ""

6123

6141

"Malformed line. %(desc)s\n"

6124

6142

"%(line)r"

6125

6143

msgstr ""

6126

6144

6127

#: bzrlib/errors.py:3308

6145

#: bzrlib/errors.py:3327

6128

6146

msgid ""

6129

6147

"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "

6130

6148

"but patch says it should be \"%(patch_line)s\""

6131

6149

msgstr ""

6132

6150

6133

#: bzrlib/errors.py:3319

6151

#: bzrlib/errors.py:3338

6134

6152

msgid "The feature %(feature)s has already been registered."

6135

6153

msgstr ""

6136

6154

6460

6478

msgid "lstat/stat of ({0!r}): {1!r}"

6461

6479

msgstr ""

6462

6480

6463

#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008

6481

#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019

6464

6482

#, python-format

6465

6483

msgid "sorry, %r not allowed in path"

6466

6484

msgstr ""

6467

6485

6468

#: bzrlib/osutils.py:1226

6486

#: bzrlib/osutils.py:1237

6469

6487

#, python-format

6470

6488

msgid "%r is too short to calculate a relative path"

6471

6489

msgstr ""

6909

6927

msgid "Created new branch."

6910

6928

msgstr ""

6911

6929

6912

#: bzrlib/push.py:98

6930

#: bzrlib/push.py:97

6913

6931

#, python-format

6914

6932

msgid ""

6915

6933

"Target directory %s already contains a .bzr directory, but it is not valid."

7036

7054

msgid "%s is now not stacked\n"

7037

7055

msgstr ""

7038

7056

7039

#: bzrlib/remote.py:1180 bzrlib/repository.py:289

7057

#: bzrlib/remote.py:1228 bzrlib/repository.py:289

7040

7058

#, python-format

7041

7059

msgid "bzr: ERROR (ignored): %s"

7042

7060

msgstr ""

7043

7061

7044

#: bzrlib/remote.py:2493

7062

#: bzrlib/remote.py:2541

7045

7063

msgid "Copying repository content as tarball..."

7046

7064

msgstr ""

7047

7065

7256

7274

msgid "listening on port: %s"

7257

7275

msgstr ""

7258

7276

7259

#: bzrlib/switch.py:69

7277

#: bzrlib/switch.py:73

7260

7278

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

7261

7279

msgstr ""

7262

7280

7263

#: bzrlib/switch.py:96

7281

#: bzrlib/switch.py:100

7264

7282

msgid ""

7265

7283

"Cannot switch as local commits found in the checkout. Commit these to the "

7266

7284

"bound branch or use --force to throw them away."

7267

7285

msgstr ""

7268

7286

7269

#: bzrlib/switch.py:101

7287

#: bzrlib/switch.py:105

7270

7288

#, python-format

7271

7289

msgid ""

7272

7290

"Unable to connect to current master branch %(target)s: %(error)s To switch "

7273

7291

"anyway, use --force."

7274

7292

msgstr ""

7275

7293

7276

#: bzrlib/switch.py:110

7294

#: bzrlib/switch.py:125

7277

7295

msgid "Cannot switch a branch, only a checkout."

7278

7296

msgstr ""

7279

7297

7280

#: bzrlib/switch.py:146

7298

#: bzrlib/switch.py:163

7281

7299

#, python-format

7282

7300

msgid "Tree is up to date at revision %d."

7283

7301

msgstr ""

7284

7302

7285

#: bzrlib/switch.py:152

7303

#: bzrlib/switch.py:169

7286

7304

#, python-format

7287

7305

msgid "Updated to revision %d."

7288

7306

msgstr ""

7289

7307

7290

#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743

7308

#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747

7291

7309

msgid "Apply phase"

7292

7310

msgstr ""

7293

7311

7294

#: bzrlib/transform.py:1769 bzrlib/transform.py:1837

7312

#: bzrlib/transform.py:1773 bzrlib/transform.py:1841

7295

7313

msgid "removing file"

7296

7314

msgstr ""

7297

7315

7298

#: bzrlib/transform.py:1787 bzrlib/transform.py:1872

7316

#: bzrlib/transform.py:1791 bzrlib/transform.py:1876

7299

7317

msgid "adding file"

7300

7318

msgstr ""

7301

7319

7302

#: bzrlib/transform.py:2587

7320

#: bzrlib/transform.py:2591

7303

7321

msgid "Building tree"

7304

7322

msgstr ""

7305

7323

7306

#: bzrlib/transform.py:2677 bzrlib/transform.py:2704

7324

#: bzrlib/transform.py:2681 bzrlib/transform.py:2708

7307

7325

msgid "Adding file contents"

7308

7326

msgstr ""

7309

7327

7310

#: bzrlib/transform.py:3024

7328

#: bzrlib/transform.py:3028

7311

7329

msgid "Resolution pass"

7312

7330

msgstr ""

7313

7331

7456

7474

7457

7475

#: dummy/help_topics/basic/detail.txt:1

7458

7476

msgid ""

7459

"Bazaar 2.5b5 -- a free distributed version-control tool\n"

7477

"Bazaar 2.5b6 -- a free distributed version-control tool\n"

7460

7478

"http://bazaar.canonical.com/"

7461

7479

msgstr ""

7462

7480

11722

11740

"~~~~~~~~~~~~~~~~~~~~~~"

11723

11741

msgstr ""

11724

11742

11725

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402

11743

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418

11726

11744

msgid "Introduced in: 1.4"

11727

11745

msgstr ""

11728

11746

11914

11932

msgstr ""

11915

11933

11916

11934

#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196

11917

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448

11935

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464

11918

11936

msgid "Introduced in: 1.17"

11919

11937

msgstr ""

11920

11938

11970

11988

#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226

11971

11989

#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241

11972

11990

#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370

11973

#: en/help_topics/hooks.txt:427

11991

#: en/help_topics/hooks.txt:443

11974

11992

msgid "Introduced in: 2.4"

11975

11993

msgstr ""

11976

11994

12071

12089

msgstr ""

12072

12090

12073

12091

#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297

12074

#: en/help_topics/hooks.txt:505

12092

#: en/help_topics/hooks.txt:521

12075

12093

msgid "Introduced in: 1.15"

12076

12094

msgstr ""

12077

12095

12153

12171

msgstr ""

12154

12172

12155

12173

#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334

12156

#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493

12174

#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402

12175

#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509

12157

12176

msgid "Introduced in: 2.5"

12158

12177

msgstr ""

12159

12178

12272

12291

12273

12292

#: en/help_topics/hooks.txt:399

12274

12293

msgid ""

12294

"post_transform\n"

12295

"~~~~~~~~~~~~~~"

12296

msgstr ""

12297

12298

#: en/help_topics/hooks.txt:404

12299

msgid ""

12300

"Called after a tree transform has been performed on a tree. The hook\n"

12301

"is called with the tree that is being transformed and the transform."

12302

msgstr ""

12303

12304

#: en/help_topics/hooks.txt:407

12305

msgid ""

12306

"pre_transform\n"

12307

"~~~~~~~~~~~~~"

12308

msgstr ""

12309

12310

#: en/help_topics/hooks.txt:412

12311

msgid ""

12312

"Called before a tree transform on this tree. The hook is called with\n"

12313

"the tree that is being transformed and the transform."

12314

msgstr ""

12315

12316

#: en/help_topics/hooks.txt:415

12317

msgid ""

12275

12318

"start_commit\n"

12276

12319

"~~~~~~~~~~~~"

12277

12320

msgstr ""

12278

12321

12279

#: en/help_topics/hooks.txt:404

12322

#: en/help_topics/hooks.txt:420

12280

12323

msgid ""

12281

12324

"Called before a commit is performed on a tree. The start commit hook\n"

12282

12325

"is able to change the tree before the commit takes place. start_commit\n"

12284

12327

"being performed on."

12285

12328

msgstr ""

12286

12329

12287

#: en/help_topics/hooks.txt:409

12330

#: en/help_topics/hooks.txt:425

12288

12331

msgid ""

12289

12332

"SmartClientHooks\n"

12290

12333

"----------------"

12291

12334

msgstr ""

12292

12335

12293

#: en/help_topics/hooks.txt:412

12336

#: en/help_topics/hooks.txt:428

12294

12337

msgid ""

12295

12338

"call\n"

12296

12339

"~~~~"

12297

12340

msgstr ""

12298

12341

12299

#: en/help_topics/hooks.txt:415

12342

#: en/help_topics/hooks.txt:431

12300

12343

msgid "Introduced in: unknown"

12301

12344

msgstr ""

12302

12345

12303

#: en/help_topics/hooks.txt:417

12346

#: en/help_topics/hooks.txt:433

12304

12347

msgid ""

12305

12348

"Called when the smart client is submitting a request to the smart\n"

12306

12349

"server. Called with a bzrlib.smart.client.CallHookParams object.\n"

12307

12350

"Streaming request bodies, and responses, are not accessible."

12308

12351

msgstr ""

12309

12352

12310

#: en/help_topics/hooks.txt:421

12353

#: en/help_topics/hooks.txt:437

12311

12354

msgid ""

12312

12355

"SmartServerHooks\n"

12313

12356

"----------------"

12314

12357

msgstr ""

12315

12358

12316

#: en/help_topics/hooks.txt:424

12359

#: en/help_topics/hooks.txt:440

12317

12360

msgid ""

12318

12361

"server_exception\n"

12319

12362

"~~~~~~~~~~~~~~~~"

12320

12363

msgstr ""

12321

12364

12322

#: en/help_topics/hooks.txt:429

12365

#: en/help_topics/hooks.txt:445

12323

12366

msgid ""

12324

12367

"Called by the bzr server when an exception occurs. server_exception is\n"

12325

12368

"called with the sys.exc_info() tuple return true for the hook if the\n"

12327

12370

"normally."

12328

12371

msgstr ""

12329

12372

12330

#: en/help_topics/hooks.txt:434

12373

#: en/help_topics/hooks.txt:450

12331

12374

msgid ""

12332

12375

"server_started\n"

12333

12376

"~~~~~~~~~~~~~~"

12334

12377

msgstr ""

12335

12378

12336

#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456

12379

#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472

12337

12380

msgid "Introduced in: 0.16"

12338

12381

msgstr ""

12339

12382

12340

#: en/help_topics/hooks.txt:439

12383

#: en/help_topics/hooks.txt:455

12341

12384

msgid ""

12342

12385

"Called by the bzr server when it starts serving a directory.\n"

12343

12386

"server_started is called with (backing urls, public url), where\n"

12346

12389

"served."

12347

12390

msgstr ""

12348

12391

12349

#: en/help_topics/hooks.txt:445

12392

#: en/help_topics/hooks.txt:461

12350

12393

msgid ""

12351

12394

"server_started_ex\n"

12352

12395

"~~~~~~~~~~~~~~~~~"

12353

12396

msgstr ""

12354

12397

12355

#: en/help_topics/hooks.txt:450

12398

#: en/help_topics/hooks.txt:466

12356

12399

msgid ""

12357

12400

"Called by the bzr server when it starts serving a directory.\n"

12358

12401

"server_started is called with (backing_urls, server_obj)."

12359

12402

msgstr ""

12360

12403

12361

#: en/help_topics/hooks.txt:453

12404

#: en/help_topics/hooks.txt:469

12362

12405

msgid ""

12363

12406

"server_stopped\n"

12364

12407

"~~~~~~~~~~~~~~"

12365

12408

msgstr ""

12366

12409

12367

#: en/help_topics/hooks.txt:458

12410

#: en/help_topics/hooks.txt:474

12368

12411

msgid ""

12369

12412

"Called by the bzr server when it stops serving a directory.\n"

12370

12413

"server_stopped is called with the same parameters as the\n"

12371

12414

"server_started hook: (backing_urls, public_url)."

12372

12415

msgstr ""

12373

12416

12374

#: en/help_topics/hooks.txt:462

12417

#: en/help_topics/hooks.txt:478

12375

12418

msgid ""

12376

12419

"StatusHooks\n"

12377

12420

"-----------"

12378

12421

msgstr ""

12379

12422

12380

#: en/help_topics/hooks.txt:465

12423

#: en/help_topics/hooks.txt:481

12381

12424

msgid ""

12382

12425

"post_status\n"

12383

12426

"~~~~~~~~~~~"

12384

12427

msgstr ""

12385

12428

12386

#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479

12429

#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495

12387

12430

msgid "Introduced in: 2.3"

12388

12431

msgstr ""

12389

12432

12390

#: en/help_topics/hooks.txt:470

12433

#: en/help_topics/hooks.txt:486

12391

12434

msgid ""

12392

12435

"Called with argument StatusHookParams after Bazaar has displayed the\n"

12393

12436

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12396

12439

"status command. to_file is the output stream for writing."

12397

12440

msgstr ""

12398

12441

12399

#: en/help_topics/hooks.txt:476

12442

#: en/help_topics/hooks.txt:492

12400

12443

msgid ""

12401

12444

"pre_status\n"

12402

12445

"~~~~~~~~~~"

12403

12446

msgstr ""

12404

12447

12405

#: en/help_topics/hooks.txt:481

12448

#: en/help_topics/hooks.txt:497

12406

12449

msgid ""

12407

12450

"Called with argument StatusHookParams before Bazaar displays the\n"

12408

12451

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12411

12454

"status command. to_file is the output stream for writing."

12412

12455

msgstr ""

12413

12456

12414

#: en/help_topics/hooks.txt:487

12457

#: en/help_topics/hooks.txt:503

12415

12458

msgid ""

12416

12459

"TransportHooks\n"

12417

12460

"--------------"

12418

12461

msgstr ""

12419

12462

12420

#: en/help_topics/hooks.txt:490

12463

#: en/help_topics/hooks.txt:506

12421

12464

msgid ""

12422

12465

"post_connect\n"

12423

12466

"~~~~~~~~~~~~"

12424

12467

msgstr ""

12425

12468

12426

#: en/help_topics/hooks.txt:495

12469

#: en/help_topics/hooks.txt:511

12427

12470

msgid ""

12428

12471

"Called after a new connection is established or a reconnect occurs.\n"

12429

12472

"The sole argument passed is either the connected transport or smart\n"

12430

12473

"medium instance."

12431

12474

msgstr ""

12432

12475

12433

#: en/help_topics/hooks.txt:499

12476

#: en/help_topics/hooks.txt:515

12434

12477

msgid ""

12435

12478

"RioVersionInfoBuilderHooks\n"

12436

12479

"--------------------------"

12437

12480

msgstr ""

12438

12481

12439

#: en/help_topics/hooks.txt:502

12482

#: en/help_topics/hooks.txt:518

12440

12483

msgid ""

12441

12484

"revision\n"

12442

12485

"~~~~~~~~"

12443

12486

msgstr ""

12444

12487

12445

#: en/help_topics/hooks.txt:507

12488

#: en/help_topics/hooks.txt:523

12446

12489

msgid ""

12447

12490

"Invoked when adding information about a revision to the RIO stanza\n"

12448

12491

"that is printed. revision is called with a revision object and a RIO\n"