~zyga/bzr/find_ancestors : revision 6437.2.5

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: Asturian <ast@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:15+0000\n"

19

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

18

"X-Launchpad-Export-Date: 2012-02-04 06:18+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 ""

28

29

#: bzrlib/branch.py:3183

29

#: bzrlib/branch.py:3205

30

#, python-format

31

msgid "Pushed up to revision %d."

32

msgstr ""

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] ""

39

msgstr[1] ""

40

41

#: bzrlib/branch.py:3188

41

#: bzrlib/branch.py:3210

42

msgid "No new revisions or tags to push."

43

msgstr ""

44

45

#: bzrlib/branch.py:3190

45

#: bzrlib/branch.py:3212

46

msgid "No new revisions to push."

47

msgstr ""

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 "error alcontráu: %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 "bzr %s --revision toma exactamente un identificador de revisión"

67

68

#: bzrlib/builtins.py:215

68

#: bzrlib/builtins.py:303

69

msgid "Display status summary."

70

msgstr "Amosar resume d'estáu."

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

"Esto ye un informe de ficheros con versiones y desconocíos,\n"

78

"presentándolos agrupaos pol estáu. Los estaos posibles son:"

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

"amestáu\n"

86

" Con versión na copia de trabayu pero non na revisión anterior."

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

" Con versión na revisión anterior pero quitáu o desaniciáu\n"

96

" na copia de trabayu."

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"

107

" seique camudara tamién el testu. Esto incluye los ficheros\n"

108

" pa los que camudó'l nome del direutoriu pá."

109

110

#: bzrlib/builtins.py:232

110

#: bzrlib/builtins.py:320

111

msgid ""

112

"modified\n"

113

" Text has changed since the previous revision."

115

"camudáu\n"

116

" El testu camudó dende la cabera revisión."

117

118

#: bzrlib/builtins.py:235

118

#: bzrlib/builtins.py:323

119

msgid ""

120

"kind changed\n"

121

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

123

"camudó la clase\n"

124

" La clase de ficheru camudó (p.ex. de ficheru a direutoriu)."

125

126

#: bzrlib/builtins.py:238

126

#: bzrlib/builtins.py:326

127

msgid ""

128

"unknown\n"

129

" Not versioned and not matching an ignore pattern."

130

msgstr ""

131

132

#: bzrlib/builtins.py:241

132

#: bzrlib/builtins.py:329

133

msgid ""

134

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

135

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

137

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

138

msgstr ""

139

140

#: bzrlib/builtins.py:246

140

#: bzrlib/builtins.py:334

141

msgid ""

142

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

143

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

144

msgstr ""

145

146

#: bzrlib/builtins.py:249

146

#: bzrlib/builtins.py:337

147

msgid ""

148

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

149

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

150

"use bzr status -SV."

151

msgstr ""

152

153

#: bzrlib/builtins.py:253

153

#: bzrlib/builtins.py:341

154

msgid ""

155

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

156

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

158

"is reported for everything inside that directory."

159

msgstr ""

160

161

#: bzrlib/builtins.py:258

161

#: bzrlib/builtins.py:346

162

msgid ""

163

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

164

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

166

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

167

msgstr ""

168

169

#: bzrlib/builtins.py:263

169

#: bzrlib/builtins.py:351

170

msgid ""

171

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

172

"single revision to the revision argument."

173

msgstr ""

174

175

#: bzrlib/builtins.py:266

175

#: bzrlib/builtins.py:354

176

msgid ""

177

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

178

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

179

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

180

msgstr ""

181

182

#: bzrlib/builtins.py:275

182

#: bzrlib/builtins.py:363

183

msgid "Use short status indicators."

184

msgstr ""

185

186

#: bzrlib/builtins.py:277

186

#: bzrlib/builtins.py:365

187

msgid "Only show versioned files."

188

msgstr ""

189

190

#: bzrlib/builtins.py:279

190

#: bzrlib/builtins.py:367

191

msgid "Don't show pending merges."

192

msgstr ""

193

194

#: bzrlib/builtins.py:282

194

#: bzrlib/builtins.py:370

195

msgid "Do not mark object type using indicator."

196

msgstr ""

197

198

#: bzrlib/builtins.py:297

198

#: bzrlib/builtins.py:385

199

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

200

msgstr ""

201

202

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

202

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

203

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

204

msgstr ""

205

206

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

206

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

207

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

208

msgstr ""

209

210

#: bzrlib/builtins.py:351

210

#: bzrlib/builtins.py:439

211

#, python-format

212

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

213

msgstr ""

214

215

#: bzrlib/builtins.py:362

215

#: bzrlib/builtins.py:450

216

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

217

msgstr ""

218

219

#: bzrlib/builtins.py:369

219

#: bzrlib/builtins.py:457

220

msgid "You cannot specify a NULL revision."

221

msgstr ""

222

223

#: bzrlib/builtins.py:461

223

#: bzrlib/builtins.py:549

224

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

225

msgstr ""

226

227

#: bzrlib/builtins.py:463

227

#: bzrlib/builtins.py:551

228

msgid ""

229

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

230

"this will refuse to run against one."

231

msgstr ""

232

233

#: bzrlib/builtins.py:466

233

#: bzrlib/builtins.py:554

234

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

235

msgstr ""

236

237

#: bzrlib/builtins.py:472

237

#: bzrlib/builtins.py:560

238

msgid ""

239

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

240

msgstr ""

241

242

#: bzrlib/builtins.py:486

242

#: bzrlib/builtins.py:574

243

msgid "No working tree to remove"

244

msgstr ""

245

246

#: bzrlib/builtins.py:488

246

#: bzrlib/builtins.py:576

247

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

248

msgstr ""

249

250

#: bzrlib/builtins.py:497

250

#: bzrlib/builtins.py:585

251

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

252

msgstr ""

253

254

#: bzrlib/builtins.py:537

254

#: bzrlib/builtins.py:625

255

msgid ""

256

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

257

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

258

msgstr ""

259

260

#: bzrlib/builtins.py:548

260

#: bzrlib/builtins.py:636

261

msgid ""

262

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

263

"commit"

264

msgstr ""

265

266

#: bzrlib/builtins.py:552

266

#: bzrlib/builtins.py:640

267

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

268

msgstr ""

269

270

#: bzrlib/builtins.py:556

270

#: bzrlib/builtins.py:644

271

msgid "Show current revision number."

272

msgstr ""

273

274

#: bzrlib/builtins.py:558

274

#: bzrlib/builtins.py:646

275

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

276

msgstr ""

277

278

#: bzrlib/builtins.py:571

278

#: bzrlib/builtins.py:659

279

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

280

msgstr ""

281

282

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

282

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

283

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

284

msgstr ""

285

286

#: bzrlib/builtins.py:612

286

#: bzrlib/builtins.py:700

287

msgid "Show revno of working tree."

288

msgstr ""

289

290

#: bzrlib/builtins.py:660

290

#: bzrlib/builtins.py:748

291

msgid "Add specified files or directories."

292

msgstr ""

293

294

#: bzrlib/builtins.py:662

294

#: bzrlib/builtins.py:750

295

msgid ""

296

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

297

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

298

"any of the named files are already versioned."

299

msgstr ""

300

301

#: bzrlib/builtins.py:666

301

#: bzrlib/builtins.py:754

302

msgid ""

303

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

304

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

309

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

310

msgstr ""

311

312

#: bzrlib/builtins.py:674

312

#: bzrlib/builtins.py:762

313

msgid ""

314

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

315

"unless they are explicitly ignored."

316

msgstr ""

317

318

#: bzrlib/builtins.py:677

318

#: bzrlib/builtins.py:765

319

msgid ""

320

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

321

"are currently unknown."

322

msgstr ""

323

324

#: bzrlib/builtins.py:680

324

#: bzrlib/builtins.py:768

325

msgid ""

326

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

327

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

329

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

330

msgstr ""

331

332

#: bzrlib/builtins.py:685

332

#: bzrlib/builtins.py:773

333

msgid ""

334

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

335

"add them."

336

msgstr ""

337

338

#: bzrlib/builtins.py:688

338

#: bzrlib/builtins.py:776

339

msgid ""

340

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

341

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

346

"into a subdirectory of this one."

347

msgstr ""

348

349

#: bzrlib/builtins.py:696

349

#: bzrlib/builtins.py:784

350

msgid ""

351

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

352

"unless they are explicitly mentioned."

353

msgstr ""

354

355

#: bzrlib/builtins.py:699

355

#: bzrlib/builtins.py:787

356

msgid ""

357

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

358

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

359

"to file size."

360

msgstr ""

361

362

#: bzrlib/builtins.py:706

362

#: bzrlib/builtins.py:794

363

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

364

msgstr ""

365

366

#: bzrlib/builtins.py:712

366

#: bzrlib/builtins.py:800

367

msgid "Lookup file ids from this tree."

368

msgstr ""

369

370

#: bzrlib/builtins.py:748

370

#: bzrlib/builtins.py:836

371

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

372

msgstr ""

373

374

#: bzrlib/builtins.py:753

374

#: bzrlib/builtins.py:841

375

msgid "Create a new versioned directory."

376

msgstr ""

377

378

#: bzrlib/builtins.py:755

378

#: bzrlib/builtins.py:843

379

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

380

msgstr ""

381

382

#: bzrlib/builtins.py:762

382

#: bzrlib/builtins.py:850

383

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

384

msgstr ""

385

386

#: bzrlib/builtins.py:796

386

#: bzrlib/builtins.py:884

387

#, python-format

388

msgid "added %s\n"

389

msgstr ""

390

391

#: bzrlib/builtins.py:838

391

#: bzrlib/builtins.py:926

392

#, python-format

393

msgid "invalid kind %r specified"

394

msgstr ""

395

396

#: bzrlib/builtins.py:875

396

#: bzrlib/builtins.py:963

397

msgid "Move or rename a file."

398

msgstr ""

399

400

#: bzrlib/builtins.py:877

400

#: bzrlib/builtins.py:965

401

msgid " bzr mv SOURCE... DESTINATION"

402

msgstr ""

403

404

#: bzrlib/builtins.py:879

404

#: bzrlib/builtins.py:967

405

msgid ""

406

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

407

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

408

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

409

msgstr ""

410

411

#: bzrlib/builtins.py:883

411

#: bzrlib/builtins.py:971

412

msgid ""

413

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

414

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

417

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

418

msgstr ""

419

420

#: bzrlib/builtins.py:889

420

#: bzrlib/builtins.py:977

421

msgid "Files cannot be moved between branches."

422

msgstr ""

423

424

#: bzrlib/builtins.py:896

424

#: bzrlib/builtins.py:984

425

msgid ""

426

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

427

"moved."

428

msgstr ""

429

430

#: bzrlib/builtins.py:898

430

#: bzrlib/builtins.py:986

431

msgid "Automatically guess renames."

432

msgstr ""

433

434

#: bzrlib/builtins.py:899

434

#: bzrlib/builtins.py:987

435

msgid "Avoid making changes when guessing renames."

436

msgstr ""

437

438

#: bzrlib/builtins.py:908

438

#: bzrlib/builtins.py:996

439

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

440

msgstr ""

441

442

#: bzrlib/builtins.py:912

442

#: bzrlib/builtins.py:1000

443

msgid "missing file argument"

444

msgstr ""

445

446

#: bzrlib/builtins.py:916

446

#: bzrlib/builtins.py:1004

447

msgid "can not move root of branch"

448

msgstr ""

449

450

#: bzrlib/builtins.py:922

450

#: bzrlib/builtins.py:1010

451

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

452

msgstr ""

453

454

#: bzrlib/builtins.py:925

454

#: bzrlib/builtins.py:1013

455

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

456

msgstr ""

457

458

#: bzrlib/builtins.py:962

458

#: bzrlib/builtins.py:1050

459

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

460

msgstr ""

461

462

#: bzrlib/builtins.py:1014

462

#: bzrlib/builtins.py:1102

463

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

464

msgstr ""

465

466

#: bzrlib/builtins.py:1016

466

#: bzrlib/builtins.py:1104

467

msgid ""

468

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

469

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

471

"parent."

472

msgstr ""

473

474

#: bzrlib/builtins.py:1021

474

#: bzrlib/builtins.py:1109

475

msgid ""

476

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

477

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

478

"be able to pull it again."

479

msgstr ""

480

481

#: bzrlib/builtins.py:1025

481

#: bzrlib/builtins.py:1113

482

msgid ""

483

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

484

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

485

"branches have diverged."

486

msgstr ""

487

488

#: bzrlib/builtins.py:1029

488

#: bzrlib/builtins.py:1117

489

msgid ""

490

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

491

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

493

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

494

msgstr ""

495

496

#: bzrlib/builtins.py:1034

496

#: bzrlib/builtins.py:1122

497

msgid ""

498

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

499

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

500

"-Olog_format=<other_format>."

501

msgstr ""

502

503

#: bzrlib/builtins.py:1038

503

#: bzrlib/builtins.py:1126

504

msgid ""

505

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

506

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

507

"with bzr send."

508

msgstr ""

509

510

#: bzrlib/builtins.py:1046

510

#: bzrlib/builtins.py:1134

511

msgid "Show logs of pulled revisions."

512

msgstr ""

513

514

#: bzrlib/builtins.py:1048

514

#: bzrlib/builtins.py:1136

515

msgid ""

516

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

517

msgstr ""

518

519

#: bzrlib/builtins.py:1051

519

#: bzrlib/builtins.py:1139

520

msgid ""

521

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

522

"master branch."

523

msgstr ""

524

525

#: bzrlib/builtins.py:1080

525

#: bzrlib/builtins.py:1168

526

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

527

msgstr ""

528

529

#: bzrlib/builtins.py:1096

529

#: bzrlib/builtins.py:1184

530

msgid "No pull location known or specified."

531

msgstr ""

532

533

#: bzrlib/builtins.py:1102

533

#: bzrlib/builtins.py:1190

534

#, python-format

535

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

536

msgstr ""

537

538

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

538

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

539

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

540

msgstr ""

541

542

#: bzrlib/builtins.py:1150

542

#: bzrlib/builtins.py:1238

543

msgid "Update a mirror of this branch."

544

msgstr ""

545

546

#: bzrlib/builtins.py:1152

546

#: bzrlib/builtins.py:1240

547

msgid ""

548

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

549

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

550

msgstr ""

551

552

#: bzrlib/builtins.py:1155

552

#: bzrlib/builtins.py:1243

553

msgid ""

554

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

555

"the future."

556

msgstr ""

557

558

#: bzrlib/builtins.py:1158

558

#: bzrlib/builtins.py:1246

559

msgid ""

560

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

561

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

562

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

563

msgstr ""

564

565

#: bzrlib/builtins.py:1162

565

#: bzrlib/builtins.py:1250

566

msgid ""

567

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

568

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

569

msgstr ""

570

571

#: bzrlib/builtins.py:1165

571

#: bzrlib/builtins.py:1253

572

msgid ""

573

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

574

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

575

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

576

msgstr ""

577

578

#: bzrlib/builtins.py:1169

578

#: bzrlib/builtins.py:1257

579

msgid ""

580

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

581

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

583

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

584

msgstr ""

585

586

#: bzrlib/builtins.py:1174

586

#: bzrlib/builtins.py:1262

587

msgid ""

588

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

589

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

590

"-Olog_format=<other_format>."

591

msgstr ""

592

593

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

593

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

594

msgid ""

595

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

596

msgstr ""

597

598

#: bzrlib/builtins.py:1188

598

#: bzrlib/builtins.py:1276

599

msgid ""

600

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

601

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

602

msgstr ""

603

604

#: bzrlib/builtins.py:1193

604

#: bzrlib/builtins.py:1281

605

msgid ""

606

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

607

"branch."

608

msgstr ""

609

610

#: bzrlib/builtins.py:1196

610

#: bzrlib/builtins.py:1284

611

msgid ""

612

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

613

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

614

"the branch created."

615

msgstr ""

616

617

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

617

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

618

msgid ""

619

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

620

"strict disables the check."

621

msgstr ""

622

623

#: bzrlib/builtins.py:1204

623

#: bzrlib/builtins.py:1292

624

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

625

msgstr ""

626

627

#: bzrlib/builtins.py:1248

627

#: bzrlib/builtins.py:1336

628

msgid "Could not determine branch to refer to."

629

msgstr ""

630

631

#: bzrlib/builtins.py:1257

631

#: bzrlib/builtins.py:1345

632

#, python-format

633

msgid ""

634

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

635

"use 'bzr push :parent'."

636

msgstr ""

637

638

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

638

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

639

msgid "No push location known or specified."

640

msgstr ""

641

642

#: bzrlib/builtins.py:1267

642

#: bzrlib/builtins.py:1355

643

#, python-format

644

msgid "Using saved push location: %s"

645

msgstr ""

646

647

#: bzrlib/builtins.py:1277

647

#: bzrlib/builtins.py:1365

648

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

649

msgstr ""

650

651

#: bzrlib/builtins.py:1279

651

#: bzrlib/builtins.py:1367

652

msgid ""

653

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

654

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

659

"create ./foo-bar."

660

msgstr ""

661

662

#: bzrlib/builtins.py:1286

662

#: bzrlib/builtins.py:1374

663

msgid ""

664

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

665

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

666

msgstr ""

667

668

#: bzrlib/builtins.py:1289

668

#: bzrlib/builtins.py:1377

669

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

670

msgstr ""

671

672

#: bzrlib/builtins.py:1299

672

#: bzrlib/builtins.py:1387

673

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

674

msgstr ""

675

676

#: bzrlib/builtins.py:1301

676

#: bzrlib/builtins.py:1389

677

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

678

msgstr ""

679

680

#: bzrlib/builtins.py:1304

680

#: bzrlib/builtins.py:1392

681

msgid ""

682

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

683

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

684

msgstr ""

685

686

#: bzrlib/builtins.py:1308

686

#: bzrlib/builtins.py:1396

687

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

688

msgstr ""

689

690

#: bzrlib/builtins.py:1310

690

#: bzrlib/builtins.py:1398

691

msgid ""

692

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

693

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

694

msgstr ""

695

696

#: bzrlib/builtins.py:1315

696

#: bzrlib/builtins.py:1403

697

msgid "Bind new branch to from location."

698

msgstr ""

699

700

#: bzrlib/builtins.py:1362

700

#: bzrlib/builtins.py:1450

701

#, python-format

702

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

703

msgstr ""

704

705

#: bzrlib/builtins.py:1374

705

#: bzrlib/builtins.py:1462

706

#, python-format

707

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

708

msgstr ""

709

710

#: bzrlib/builtins.py:1393

710

#: bzrlib/builtins.py:1481

711

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

712

msgstr ""

713

714

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

714

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

715

#, python-format

716

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

717

msgstr ""

718

719

#: bzrlib/builtins.py:1407

719

#: bzrlib/builtins.py:1500

720

#, python-format

721

msgid "Branched %d revision."

722

msgid_plural "Branched %d revisions."

723

msgstr[0] ""

724

msgstr[1] ""

725

726

#: bzrlib/builtins.py:1412

726

#: bzrlib/builtins.py:1505

727

#, python-format

728

msgid "New branch bound to %s"

729

msgstr ""

730

731

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

731

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

732

#, python-format

733

msgid "Switched to branch: %s"

734

msgstr ""

735

736

#: bzrlib/builtins.py:1422

736

#: bzrlib/builtins.py:1515

737

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

738

msgstr ""

739

740

#: bzrlib/builtins.py:1424

740

#: bzrlib/builtins.py:1517

741

msgid ""

742

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

743

"location."

744

msgstr ""

745

746

#: bzrlib/builtins.py:1431

746

#: bzrlib/builtins.py:1524

747

msgid ""

748

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

749

"location."

750

msgstr ""

751

752

#: bzrlib/builtins.py:1461

752

#: bzrlib/builtins.py:1554

753

msgid "(default)"

754

msgstr ""

755

756

#: bzrlib/builtins.py:1473

756

#: bzrlib/builtins.py:1566

757

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

758

msgstr ""

759

760

#: bzrlib/builtins.py:1475

760

#: bzrlib/builtins.py:1568

761

msgid ""

762

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

763

"for\n"

767

"location using SFTP."

768

msgstr ""

769

770

#: bzrlib/builtins.py:1480

770

#: bzrlib/builtins.py:1573

771

msgid ""

772

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

773

"will\n"

779

"create ./foo-bar."

780

msgstr ""

781

782

#: bzrlib/builtins.py:1487

782

#: bzrlib/builtins.py:1580

783

msgid ""

784

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

785

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

789

"code.)"

790

msgstr ""

791

792

#: bzrlib/builtins.py:1497

792

#: bzrlib/builtins.py:1590

793

msgid ""

794

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

795

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

797

"commits."

798

msgstr ""

799

800

#: bzrlib/builtins.py:1504

800

#: bzrlib/builtins.py:1597

801

msgid "Get file contents from this tree."

802

msgstr ""

803

804

#: bzrlib/builtins.py:1506

804

#: bzrlib/builtins.py:1599

805

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

806

msgstr ""

807

808

#: bzrlib/builtins.py:1547

808

#: bzrlib/builtins.py:1640

809

msgid ""

810

"Show list of renamed files.\n"

811

" "

812

msgstr ""

813

814

#: bzrlib/builtins.py:1577

814

#: bzrlib/builtins.py:1670

815

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

816

msgstr ""

817

818

#: bzrlib/builtins.py:1579

818

#: bzrlib/builtins.py:1672

819

msgid ""

820

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

821

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

822

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

823

msgstr ""

824

825

#: bzrlib/builtins.py:1583

825

#: bzrlib/builtins.py:1676

826

msgid ""

827

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

828

"that is out of date from its branch."

829

msgstr ""

830

831

#: bzrlib/builtins.py:1586

831

#: bzrlib/builtins.py:1679

832

msgid ""

833

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

834

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

836

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

837

msgstr ""

838

839

#: bzrlib/builtins.py:1591

839

#: bzrlib/builtins.py:1684

840

msgid ""

841

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

842

"the branch from the master."

843

msgstr ""

844

845

#: bzrlib/builtins.py:1594

845

#: bzrlib/builtins.py:1687

846

msgid ""

847

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

848

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

852

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

853

msgstr ""

854

855

#: bzrlib/builtins.py:1601

855

#: bzrlib/builtins.py:1694

856

msgid ""

857

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

858

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

859

"current working directory is used."

860

msgstr ""

861

862

#: bzrlib/builtins.py:1617

862

#: bzrlib/builtins.py:1710

863

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

864

msgstr ""

865

866

#: bzrlib/builtins.py:1625

866

#: bzrlib/builtins.py:1718

867

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

868

msgstr ""

869

870

#: bzrlib/builtins.py:1656

870

#: bzrlib/builtins.py:1749

871

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

872

msgstr ""

873

874

#: bzrlib/builtins.py:1672

874

#: bzrlib/builtins.py:1765

875

#, python-format

876

msgid ""

877

"branch has no revision %s\n"

878

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

879

msgstr ""

880

881

#: bzrlib/builtins.py:1678

881

#: bzrlib/builtins.py:1771

882

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

883

msgstr ""

884

885

#: bzrlib/builtins.py:1682

885

#: bzrlib/builtins.py:1775

886

msgid ""

887

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

888

"can be committed with 'bzr commit'."

889

msgstr ""

890

891

#: bzrlib/builtins.py:1691

891

#: bzrlib/builtins.py:1784

892

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

893

msgstr ""

894

895

#: bzrlib/builtins.py:1693

895

#: bzrlib/builtins.py:1786

896

msgid ""

897

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

898

"tree, branch or repository."

899

msgstr ""

900

901

#: bzrlib/builtins.py:1696

901

#: bzrlib/builtins.py:1789

902

msgid ""

903

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

904

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

905

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

906

msgstr ""

907

908

#: bzrlib/builtins.py:1700

908

#: bzrlib/builtins.py:1793

909

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

910

msgstr ""

911

912

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

913

#: bzrlib/builtins.py:6389

912

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

913

#: bzrlib/builtins.py:6442

914

msgid ":Examples:"

915

msgstr ""

916

917

#: bzrlib/builtins.py:1704

917

#: bzrlib/builtins.py:1797

918

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

919

msgstr ""

920

921

#: bzrlib/builtins.py:1706

921

#: bzrlib/builtins.py:1799

922

msgid " bzr info"

923

msgstr ""

924

925

#: bzrlib/builtins.py:1708

925

#: bzrlib/builtins.py:1801

926

msgid ""

927

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

928

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

929

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

930

msgstr ""

931

932

#: bzrlib/builtins.py:1712

932

#: bzrlib/builtins.py:1805

933

msgid " bzr info -v"

934

msgstr ""

935

936

#: bzrlib/builtins.py:1714

936

#: bzrlib/builtins.py:1807

937

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

938

msgstr ""

939

940

#: bzrlib/builtins.py:1716

940

#: bzrlib/builtins.py:1809

941

msgid " bzr info -vv"

942

msgstr ""

943

944

#: bzrlib/builtins.py:1735

944

#: bzrlib/builtins.py:1828

945

msgid "Remove files or directories."

946

msgstr ""

947

948

#: bzrlib/builtins.py:1737

948

#: bzrlib/builtins.py:1830

949

msgid ""

950

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

951

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

954

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

955

msgstr ""

956

957

#: bzrlib/builtins.py:1745

957

#: bzrlib/builtins.py:1838

958

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

959

msgstr ""

960

961

#: bzrlib/builtins.py:1747

961

#: bzrlib/builtins.py:1840

962

msgid "The file deletion mode to be used."

963

msgstr ""

964

965

#: bzrlib/builtins.py:1748

965

#: bzrlib/builtins.py:1841

966

msgid "Deletion Strategy"

967

msgstr ""

968

969

#: bzrlib/builtins.py:1749

969

#: bzrlib/builtins.py:1842

970

msgid "Backup changed files (default)."

971

msgstr ""

972

973

#: bzrlib/builtins.py:1750

973

#: bzrlib/builtins.py:1843

974

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

975

msgstr ""

976

977

#: bzrlib/builtins.py:1751

977

#: bzrlib/builtins.py:1844

978

msgid "Don't backup changed files."

979

msgstr ""

980

981

#: bzrlib/builtins.py:1752

981

#: bzrlib/builtins.py:1845

982

msgid ""

983

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

984

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

985

msgstr ""

986

987

#: bzrlib/builtins.py:1761

987

#: bzrlib/builtins.py:1854

988

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

989

msgstr ""

990

991

#: bzrlib/builtins.py:1778

991

#: bzrlib/builtins.py:1871

992

msgid "No matching files."

993

msgstr ""

994

995

#: bzrlib/builtins.py:1839

995

#: bzrlib/builtins.py:1932

996

msgid "Reconcile bzr metadata in a branch."

997

msgstr ""

998

999

#: bzrlib/builtins.py:1841

999

#: bzrlib/builtins.py:1934

1000

msgid ""

1001

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

1002

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

1004

"advises you to run it."

1005

msgstr ""

1006

1007

#: bzrlib/builtins.py:1846

1007

#: bzrlib/builtins.py:1939

1008

msgid ""

1009

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

1010

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

1012

"correctly in both branches."

1013

msgstr ""

1014

1015

#: bzrlib/builtins.py:1851

1015

#: bzrlib/builtins.py:1944

1016

msgid ""

1017

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

1018

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

1019

msgstr ""

1020

1021

#: bzrlib/builtins.py:1854

1021

#: bzrlib/builtins.py:1947

1022

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

1023

msgstr ""

1024

1025

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

1025

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

1026

msgid ""

1027

"Format for the bzr 2.0 series.\n"

1028

"Uses group-compress storage.\n"

1029

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

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

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

1035

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

1036

msgstr ""

1037

1038

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

1038

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

1039

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

1040

msgstr ""

1041

1042

#: bzrlib/builtins.py:1922

1042

#: bzrlib/builtins.py:2015

1043

msgid "Make a directory into a versioned branch."

1044

msgstr ""

1045

1046

#: bzrlib/builtins.py:1924

1046

#: bzrlib/builtins.py:2017

1047

msgid ""

1048

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

1049

"existing project."

1050

msgstr ""

1051

1052

#: bzrlib/builtins.py:1927

1052

#: bzrlib/builtins.py:2020

1053

msgid ""

1054

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

1055

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

1057

"in the .bzr directory."

1058

msgstr ""

1059

1060

#: bzrlib/builtins.py:1932

1060

#: bzrlib/builtins.py:2025

1061

msgid ""

1062

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

1063

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

1064

msgstr ""

1065

1066

#: bzrlib/builtins.py:1935

1066

#: bzrlib/builtins.py:2028

1067

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

1068

msgstr ""

1069

1070

#: bzrlib/builtins.py:1937

1070

#: bzrlib/builtins.py:2030

1071

msgid ""

1072

" cd ~/project\n"

1073

" bzr init\n"

1076

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

1077

msgstr ""

1078

1079

#: bzrlib/builtins.py:1948

1079

#: bzrlib/builtins.py:2041

1080

msgid ""

1081

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

1082

msgstr ""

1083

1084

#: bzrlib/builtins.py:1951

1084

#: bzrlib/builtins.py:2044

1085

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

1086

msgstr ""

1087

1088

#: bzrlib/builtins.py:1959

1088

#: bzrlib/builtins.py:2052

1089

msgid ""

1090

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

1091

msgstr ""

1092

1093

#: bzrlib/builtins.py:1962

1093

#: bzrlib/builtins.py:2055

1094

msgid "Create a branch without a working tree."

1095

msgstr ""

1096

1097

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

1097

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

1098

#, python-format

1099

msgid ""

1100

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

1101

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

1102

msgstr ""

1103

1104

#: bzrlib/builtins.py:2016

1104

#: bzrlib/builtins.py:2109

1105

msgid ""

1106

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

1107

msgstr ""

1108

1109

#: bzrlib/builtins.py:2027

1109

#: bzrlib/builtins.py:2120

1110

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

1111

msgstr ""

1112

1113

#: bzrlib/builtins.py:2036

1113

#: bzrlib/builtins.py:2129

1114

#, python-format

1115

msgid "Using shared repository: %s\n"

1116

msgstr ""

1117

1118

#: bzrlib/builtins.py:2040

1118

#: bzrlib/builtins.py:2133

1119

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

1120

msgstr ""

1121

1122

#: bzrlib/builtins.py:2042

1122

#: bzrlib/builtins.py:2135

1123

msgid ""

1124

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

1125

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

1127

"speeds up the creation of new branches."

1128

msgstr ""

1129

1130

#: bzrlib/builtins.py:2047

1130

#: bzrlib/builtins.py:2140

1131

msgid ""

1132

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

1133

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

1137

"branches, such as on a server."

1138

msgstr ""

1139

1140

#: bzrlib/builtins.py:2054

1140

#: bzrlib/builtins.py:2147

1141

msgid ""

1142

":Examples:\n"

1143

" Create a shared repository holding just branches::"

1144

msgstr ""

1145

1146

#: bzrlib/builtins.py:2057

1146

#: bzrlib/builtins.py:2150

1147

msgid ""

1148

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

1149

" bzr init repo/trunk"

1150

msgstr ""

1151

1152

#: bzrlib/builtins.py:2060

1152

#: bzrlib/builtins.py:2153

1153

msgid " Make a lightweight checkout elsewhere::"

1154

msgstr ""

1155

1156

#: bzrlib/builtins.py:2062

1156

#: bzrlib/builtins.py:2155

1157

msgid ""

1158

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

1159

" cd trunk-checkout\n"

1160

" (add files here)"

1161

msgstr ""

1162

1163

#: bzrlib/builtins.py:2070

1163

#: bzrlib/builtins.py:2163

1164

msgid ""

1165

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

1166

msgstr ""

1167

1168

#: bzrlib/builtins.py:2074

1168

#: bzrlib/builtins.py:2167

1169

msgid "Repository format"

1170

msgstr ""

1171

1172

#: bzrlib/builtins.py:2076

1172

#: bzrlib/builtins.py:2169

1173

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

1174

msgstr ""

1175

1176

#: bzrlib/builtins.py:2102

1176

#: bzrlib/builtins.py:2195

1177

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

1178

msgstr ""

1179

1180

#: bzrlib/builtins.py:2104

1180

#: bzrlib/builtins.py:2197

1181

msgid ""

1182

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

1183

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

1187

"given."

1188

msgstr ""

1189

1190

#: bzrlib/builtins.py:2111

1190

#: bzrlib/builtins.py:2204

1191

msgid ""

1192

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

1193

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

1194

msgstr ""

1195

1196

#: bzrlib/builtins.py:2114

1196

#: bzrlib/builtins.py:2207

1197

msgid ""

1198

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

1199

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

1203

"in the range."

1204

msgstr ""

1205

1206

#: bzrlib/builtins.py:2121

1206

#: bzrlib/builtins.py:2214

1207

msgid ""

1208

":Exit values:\n"

1209

" 1 - changed\n"

1212

" 0 - no change"

1213

msgstr ""

1214

1215

#: bzrlib/builtins.py:2127

1215

#: bzrlib/builtins.py:2220

1216

msgid ""

1217

":Examples:\n"

1218

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

1219

msgstr ""

1220

1221

#: bzrlib/builtins.py:2130

1221

#: bzrlib/builtins.py:2223

1222

msgid " bzr diff"

1223

msgstr ""

1224

1225

#: bzrlib/builtins.py:2132

1225

#: bzrlib/builtins.py:2225

1226

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

1227

msgstr ""

1228

1229

#: bzrlib/builtins.py:2134

1229

#: bzrlib/builtins.py:2227

1230

msgid " bzr diff -r1"

1231

msgstr ""

1232

1233

#: bzrlib/builtins.py:2136

1233

#: bzrlib/builtins.py:2229

1234

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

1235

msgstr ""

1236

1237

#: bzrlib/builtins.py:2138

1237

#: bzrlib/builtins.py:2231

1238

msgid " bzr diff -r1..3"

1239

msgstr ""

1240

1241

#: bzrlib/builtins.py:2140

1241

#: bzrlib/builtins.py:2233

1242

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

1243

msgstr ""

1244

1245

#: bzrlib/builtins.py:2142

1245

#: bzrlib/builtins.py:2235

1246

msgid " bzr diff -r1..3 xxx"

1247

msgstr ""

1248

1249

#: bzrlib/builtins.py:2144

1249

#: bzrlib/builtins.py:2237

1250

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

1251

msgstr ""

1252

1253

#: bzrlib/builtins.py:2146

1253

#: bzrlib/builtins.py:2239

1254

msgid " bzr diff -c2"

1255

msgstr ""

1256

1257

#: bzrlib/builtins.py:2148

1257

#: bzrlib/builtins.py:2241

1258

msgid ""

1259

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

1260

" \n"

1261

" bzr diff -cX"

1262

msgstr ""

1263

1264

#: bzrlib/builtins.py:2152

1264

#: bzrlib/builtins.py:2245

1265

msgid ""

1266

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

1267

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

1268

" another parent, use::"

1269

msgstr ""

1270

1271

#: bzrlib/builtins.py:2156

1271

#: bzrlib/builtins.py:2249

1272

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

1273

msgstr ""

1274

1275

#: bzrlib/builtins.py:2158

1275

#: bzrlib/builtins.py:2251

1276

msgid ""

1277

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

1278

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

1279

msgstr ""

1280

1281

#: bzrlib/builtins.py:2161

1281

#: bzrlib/builtins.py:2254

1282

msgid " bzr diff -r-2.."

1283

msgstr ""

1284

1285

#: bzrlib/builtins.py:2163

1285

#: bzrlib/builtins.py:2256

1286

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

1287

msgstr ""

1288

1289

#: bzrlib/builtins.py:2165

1289

#: bzrlib/builtins.py:2258

1290

msgid " bzr diff NEWS"

1291

msgstr ""

1292

1293

#: bzrlib/builtins.py:2167

1293

#: bzrlib/builtins.py:2260

1294

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

1295

msgstr ""

1296

1297

#: bzrlib/builtins.py:2169

1297

#: bzrlib/builtins.py:2262

1298

msgid " bzr diff xxx/NEWS"

1299

msgstr ""

1300

1301

#: bzrlib/builtins.py:2171

1301

#: bzrlib/builtins.py:2264

1302

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

1303

msgstr ""

1304

1305

#: bzrlib/builtins.py:2173

1305

#: bzrlib/builtins.py:2266

1306

msgid " bzr diff --old xxx"

1307

msgstr ""

1308

1309

#: bzrlib/builtins.py:2175

1309

#: bzrlib/builtins.py:2268

1310

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

1311

msgstr ""

1312

1313

#: bzrlib/builtins.py:2177

1313

#: bzrlib/builtins.py:2270

1314

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

1315

msgstr ""

1316

1317

#: bzrlib/builtins.py:2179

1317

#: bzrlib/builtins.py:2272

1318

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

1319

msgstr ""

1320

1321

#: bzrlib/builtins.py:2181

1321

#: bzrlib/builtins.py:2274

1322

msgid ""

1323

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

1324

" \n"

1327

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

1328

msgstr ""

1329

1330

#: bzrlib/builtins.py:2191

1330

#: bzrlib/builtins.py:2284

1331

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

1332

msgstr ""

1333

1334

#: bzrlib/builtins.py:2194

1334

#: bzrlib/builtins.py:2287

1335

msgid ""

1336

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

1337

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

1338

msgstr ""

1339

1340

#: bzrlib/builtins.py:2197

1340

#: bzrlib/builtins.py:2290

1341

msgid "Branch/tree to compare from."

1342

msgstr ""

1343

1344

#: bzrlib/builtins.py:2201

1344

#: bzrlib/builtins.py:2294

1345

msgid "Branch/tree to compare to."

1346

msgstr ""

1347

1348

#: bzrlib/builtins.py:2207

1348

#: bzrlib/builtins.py:2300

1349

msgid "Use this command to compare files."

1350

msgstr ""

1351

1352

#: bzrlib/builtins.py:2212

1352

#: bzrlib/builtins.py:2305

1353

msgid "Diff format to use."

1354

msgstr ""

1355

1356

#: bzrlib/builtins.py:2214

1356

#: bzrlib/builtins.py:2307

1357

msgid "Diff format"

1358

msgstr ""

1359

1360

#: bzrlib/builtins.py:2236

1360

#: bzrlib/builtins.py:2329

1361

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

1362

msgstr ""

1363

1364

#: bzrlib/builtins.py:2240

1364

#: bzrlib/builtins.py:2333

1365

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

1366

msgstr ""

1367

1368

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

1369

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

1368

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

1369

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

1370

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

1371

msgstr ""

1372

1373

#: bzrlib/builtins.py:2265

1373

#: bzrlib/builtins.py:2358

1374

msgid ""

1375

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

1376

" "

1377

msgstr ""

1378

1379

#: bzrlib/builtins.py:2343

1379

#: bzrlib/builtins.py:2436

1380

msgid "Show the tree root directory."

1381

msgstr ""

1382

1383

#: bzrlib/builtins.py:2345

1383

#: bzrlib/builtins.py:2438

1384

msgid ""

1385

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

1386

"directory."

1387

msgstr ""

1388

1389

#: bzrlib/builtins.py:2360

1389

#: bzrlib/builtins.py:2453

1390

msgid "The limit argument must be an integer."

1391

msgstr ""

1392

1393

#: bzrlib/builtins.py:2368

1393

#: bzrlib/builtins.py:2461

1394

msgid "The levels argument must be an integer."

1395

msgstr ""

1396

1397

#: bzrlib/builtins.py:2373

1397

#: bzrlib/builtins.py:2466

1398

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

1399

msgstr ""

1400

1401

#: bzrlib/builtins.py:2375

1401

#: bzrlib/builtins.py:2468

1402

msgid ""

1403

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

1404

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

1406

"Here are some simple examples::"

1407

msgstr ""

1408

1409

#: bzrlib/builtins.py:2380

1409

#: bzrlib/builtins.py:2473

1410

msgid ""

1411

" bzr log log the current branch\n"

1412

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

1413

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

1414

msgstr ""

1415

1416

#: bzrlib/builtins.py:2384

1416

#: bzrlib/builtins.py:2477

1417

msgid ""

1418

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

1419

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

1423

"were merged."

1424

msgstr ""

1425

1426

#: bzrlib/builtins.py:2391

1426

#: bzrlib/builtins.py:2484

1427

msgid ":Output control:"

1428

msgstr ""

1429

1430

#: bzrlib/builtins.py:2393

1430

#: bzrlib/builtins.py:2486

1431

msgid ""

1432

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

1433

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

1435

" for more details on log formats."

1436

msgstr ""

1437

1438

#: bzrlib/builtins.py:2398

1438

#: bzrlib/builtins.py:2491

1439

msgid ""

1440

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

1441

" displayed::"

1442

msgstr ""

1443

1444

#: bzrlib/builtins.py:2401

1444

#: bzrlib/builtins.py:2494

1445

msgid ""

1446

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

1447

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

1450

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

1451

msgstr ""

1452

1453

#: bzrlib/builtins.py:2407

1453

#: bzrlib/builtins.py:2500

1454

msgid ""

1455

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

1456

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

1457

" just the top level (mainline)."

1458

msgstr ""

1459

1460

#: bzrlib/builtins.py:2411

1460

#: bzrlib/builtins.py:2504

1461

msgid ""

1462

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

1463

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

1464

" instead, use the -vv option."

1465

msgstr ""

1466

1467

#: bzrlib/builtins.py:2415

1467

#: bzrlib/builtins.py:2508

1468

msgid ":Ordering control:"

1469

msgstr ""

1470

1471

#: bzrlib/builtins.py:2417

1471

#: bzrlib/builtins.py:2510

1472

msgid ""

1473

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

1474

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

1476

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

1477

msgstr ""

1478

1479

#: bzrlib/builtins.py:2422

1479

#: bzrlib/builtins.py:2515

1480

msgid ":Revision filtering:"

1481

msgstr ""

1482

1483

#: bzrlib/builtins.py:2424

1483

#: bzrlib/builtins.py:2517

1484

msgid ""

1485

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

1486

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

1487

msgstr ""

1488

1489

#: bzrlib/builtins.py:2427

1489

#: bzrlib/builtins.py:2520

1490

msgid ""

1491

" -rX display revision X\n"

1492

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

1494

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

1495

msgstr ""

1496

1497

#: bzrlib/builtins.py:2432

1497

#: bzrlib/builtins.py:2525

1498

msgid ""

1499

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

1500

" Some common examples are given below::"

1501

msgstr ""

1502

1503

#: bzrlib/builtins.py:2435

1503

#: bzrlib/builtins.py:2528

1504

msgid ""

1505

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

1506

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

1510

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

1511

msgstr ""

1512

1513

#: bzrlib/builtins.py:2442

1513

#: bzrlib/builtins.py:2535

1514

msgid ""

1515

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

1516

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

1520

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

1521

msgstr ""

1522

1523

#: bzrlib/builtins.py:2449

1523

#: bzrlib/builtins.py:2542

1524

msgid ":Path filtering:"

1525

msgstr ""

1526

1527

#: bzrlib/builtins.py:2451

1527

#: bzrlib/builtins.py:2544

1528

msgid ""

1529

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

1530

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

1531

" nominated files or directories."

1532

msgstr ""

1533

1534

#: bzrlib/builtins.py:2455

1534

#: bzrlib/builtins.py:2548

1535

msgid ""

1536

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

1537

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

1538

" the end or start of the range."

1539

msgstr ""

1540

1541

#: bzrlib/builtins.py:2459

1541

#: bzrlib/builtins.py:2552

1542

msgid ""

1543

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

1544

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

1545

msgstr ""

1546

1547

#: bzrlib/builtins.py:2462

1547

#: bzrlib/builtins.py:2555

1548

msgid ""

1549

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

1550

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

1551

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

1552

msgstr ""

1553

1554

#: bzrlib/builtins.py:2466

1554

#: bzrlib/builtins.py:2559

1555

msgid " In this case:"

1556

msgstr ""

1557

1558

#: bzrlib/builtins.py:2468

1558

#: bzrlib/builtins.py:2561

1559

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

1560

msgstr ""

1561

1562

#: bzrlib/builtins.py:2470

1562

#: bzrlib/builtins.py:2563

1563

msgid ""

1564

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

1565

msgstr ""

1566

1567

#: bzrlib/builtins.py:2472

1567

#: bzrlib/builtins.py:2565

1568

msgid ""

1569

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

1570

" the original file in revision 2."

1571

msgstr ""

1572

1573

#: bzrlib/builtins.py:2475

1573

#: bzrlib/builtins.py:2568

1574

msgid ""

1575

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

1576

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

1577

msgstr ""

1578

1579

#: bzrlib/builtins.py:2478

1579

#: bzrlib/builtins.py:2571

1580

msgid ""

1581

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

1582

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

1583

" until it was last renamed)."

1584

msgstr ""

1585

1586

#: bzrlib/builtins.py:2482

1586

#: bzrlib/builtins.py:2575

1587

msgid ":Other filtering:"

1588

msgstr ""

1589

1590

#: bzrlib/builtins.py:2484

1590

#: bzrlib/builtins.py:2577

1591

msgid ""

1592

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

1593

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

1596

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

1597

msgstr ""

1598

1599

#: bzrlib/builtins.py:2490

1599

#: bzrlib/builtins.py:2583

1600

msgid ":Tips & tricks:"

1601

msgstr ""

1602

1603

#: bzrlib/builtins.py:2492

1603

#: bzrlib/builtins.py:2585

1604

msgid ""

1605

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

1606

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

1609

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

1610

msgstr ""

1611

1612

#: bzrlib/builtins.py:2498

1612

#: bzrlib/builtins.py:2591

1613

msgid ""

1614

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

1615

msgstr ""

1616

1617

#: bzrlib/builtins.py:2500

1617

#: bzrlib/builtins.py:2593

1618

msgid ""

1619

" [ALIASES]\n"

1620

" tip = log -r-1\n"

1622

" show = log -v -p"

1623

msgstr ""

1624

1625

#: bzrlib/builtins.py:2505

1625

#: bzrlib/builtins.py:2598

1626

msgid ""

1627

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

1628

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

1629

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

1630

msgstr ""

1631

1632

#: bzrlib/builtins.py:2509

1632

#: bzrlib/builtins.py:2602

1633

msgid ""

1634

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

1635

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

1636

msgstr ""

1637

1638

#: bzrlib/builtins.py:2512

1638

#: bzrlib/builtins.py:2605

1639

msgid ""

1640

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

1641

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

1643

" be given when using the -v option."

1644

msgstr ""

1645

1646

#: bzrlib/builtins.py:2517

1646

#: bzrlib/builtins.py:2610

1647

msgid ""

1648

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

1649

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

1651

" a list of words but not others."

1652

msgstr ""

1653

1654

#: bzrlib/builtins.py:2522

1654

#: bzrlib/builtins.py:2615

1655

msgid ""

1656

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

1657

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

1659

" trading disk space for faster speed."

1660

msgstr ""

1661

1662

#: bzrlib/builtins.py:2531

1662

#: bzrlib/builtins.py:2624

1663

msgid "Show from oldest to newest."

1664

msgstr ""

1665

1666

#: bzrlib/builtins.py:2534

1666

#: bzrlib/builtins.py:2627

1667

msgid "Show files changed in each revision."

1668

msgstr ""

1669

1670

#: bzrlib/builtins.py:2540

1670

#: bzrlib/builtins.py:2633

1671

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

1672

msgstr ""

1673

1674

#: bzrlib/builtins.py:2544

1674

#: bzrlib/builtins.py:2637

1675

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

1676

msgstr ""

1677

1678

#: bzrlib/builtins.py:2545

1678

#: bzrlib/builtins.py:2638

1679

msgid "Authors"

1680

msgstr ""

1681

1682

#: bzrlib/builtins.py:2550

1682

#: bzrlib/builtins.py:2643

1683

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

1684

msgstr ""

1685

1686

#: bzrlib/builtins.py:2560

1686

#: bzrlib/builtins.py:2653

1687

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

1688

msgstr ""

1689

1690

#: bzrlib/builtins.py:2565

1690

#: bzrlib/builtins.py:2658

1691

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

1692

msgstr ""

1693

1694

#: bzrlib/builtins.py:2567

1694

#: bzrlib/builtins.py:2660

1695

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

1696

msgstr ""

1697

1698

#: bzrlib/builtins.py:2571

1698

#: bzrlib/builtins.py:2664

1699

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

1700

msgstr ""

1701

1702

#: bzrlib/builtins.py:2573

1702

#: bzrlib/builtins.py:2666

1703

msgid ""

1704

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

1705

"rX..Y)."

1706

msgstr ""

1707

1708

#: bzrlib/builtins.py:2577

1708

#: bzrlib/builtins.py:2670

1709

msgid "Show digital signature validity."

1710

msgstr ""

1711

1712

#: bzrlib/builtins.py:2580

1712

#: bzrlib/builtins.py:2673

1713

msgid "Show revisions whose properties match this expression."

1714

msgstr ""

1715

1716

#: bzrlib/builtins.py:2584

1716

#: bzrlib/builtins.py:2677

1717

msgid "Show revisions whose message matches this expression."

1718

msgstr ""

1719

1720

#: bzrlib/builtins.py:2588

1720

#: bzrlib/builtins.py:2681

1721

msgid "Show revisions whose committer matches this expression."

1722

msgstr ""

1723

1724

#: bzrlib/builtins.py:2592

1724

#: bzrlib/builtins.py:2685

1725

msgid "Show revisions whose authors match this expression."

1726

msgstr ""

1727

1728

#: bzrlib/builtins.py:2596

1728

#: bzrlib/builtins.py:2689

1729

msgid "Show revisions whose bugs match this expression."

1730

msgstr ""

1731

1732

#: bzrlib/builtins.py:2650

1732

#: bzrlib/builtins.py:2743

1733

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

1734

msgstr ""

1735

1736

#: bzrlib/builtins.py:2678

1736

#: bzrlib/builtins.py:2771

1737

#, python-format

1738

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

1739

msgstr ""

1740

1741

#: bzrlib/builtins.py:2795

1741

#: bzrlib/builtins.py:2888

1742

#, python-format

1743

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

1744

msgstr ""

1745

1746

#: bzrlib/builtins.py:2811

1746

#: bzrlib/builtins.py:2904

1747

#, python-format

1748

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

1749

msgstr ""

1750

1751

#: bzrlib/builtins.py:2856

1751

#: bzrlib/builtins.py:2949

1752

msgid ""

1753

"List files in a tree.\n"

1754

" "

1755

msgstr ""

1756

1757

#: bzrlib/builtins.py:2865

1757

#: bzrlib/builtins.py:2958

1758

msgid "Recurse into subdirectories."

1759

msgstr ""

1760

1761

#: bzrlib/builtins.py:2867

1761

#: bzrlib/builtins.py:2960

1762

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

1763

msgstr ""

1764

1765

#: bzrlib/builtins.py:2869

1765

#: bzrlib/builtins.py:2962

1766

msgid "Print unknown files."

1767

msgstr ""

1768

1769

#: bzrlib/builtins.py:2870

1769

#: bzrlib/builtins.py:2963

1770

msgid "Print versioned files."

1771

msgstr ""

1772

1773

#: bzrlib/builtins.py:2873

1773

#: bzrlib/builtins.py:2966

1774

msgid "Print ignored files."

1775

msgstr ""

1776

1777

#: bzrlib/builtins.py:2875

1777

#: bzrlib/builtins.py:2968

1778

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

1779

msgstr ""

1780

1781

#: bzrlib/builtins.py:2888

1781

#: bzrlib/builtins.py:2981

1782

msgid "invalid kind specified"

1783

msgstr ""

1784

1785

#: bzrlib/builtins.py:2891

1785

#: bzrlib/builtins.py:2984

1786

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

1787

msgstr ""

1788

1789

#: bzrlib/builtins.py:2900

1789

#: bzrlib/builtins.py:2993

1790

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

1791

msgstr ""

1792

1793

#: bzrlib/builtins.py:2987

1793

#: bzrlib/builtins.py:3080

1794

msgid "Ignore specified files or patterns."

1795

msgstr ""

1796

1797

#: bzrlib/builtins.py:2989

1797

#: bzrlib/builtins.py:3082

1798

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

1799

msgstr ""

1800

1801

#: bzrlib/builtins.py:2991

1801

#: bzrlib/builtins.py:3084

1802

msgid ""

1803

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

1804

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

1807

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

1808

msgstr ""

1809

1810

#: bzrlib/builtins.py:2997

1810

#: bzrlib/builtins.py:3090

1811

msgid ""

1812

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

1813

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

1815

"it."

1816

msgstr ""

1817

1818

#: bzrlib/builtins.py:3002

1818

#: bzrlib/builtins.py:3095

1819

msgid ""

1820

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

1821

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

1824

"can be edited directly using an editor."

1825

msgstr ""

1826

1827

#: bzrlib/builtins.py:3008

1827

#: bzrlib/builtins.py:3101

1828

msgid ""

1829

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

1830

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

1831

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

1832

msgstr ""

1833

1834

#: bzrlib/builtins.py:3012

1834

#: bzrlib/builtins.py:3105

1835

msgid ""

1836

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

1837

"precedence over the '!' exception patterns."

1838

msgstr ""

1839

1840

#: bzrlib/builtins.py:3015

1840

#: bzrlib/builtins.py:3108

1841

msgid ""

1842

":Notes: \n"

1843

" \n"

1845

" the shell on Unix."

1846

msgstr ""

1847

1848

#: bzrlib/builtins.py:3020

1848

#: bzrlib/builtins.py:3113

1849

msgid ""

1850

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

1851

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

1852

msgstr ""

1853

1854

#: bzrlib/builtins.py:3023

1854

#: bzrlib/builtins.py:3116

1855

msgid ""

1856

":Examples:\n"

1857

" Ignore the top level Makefile::"

1858

msgstr ""

1859

1860

#: bzrlib/builtins.py:3026

1860

#: bzrlib/builtins.py:3119

1861

msgid " bzr ignore ./Makefile"

1862

msgstr ""

1863

1864

#: bzrlib/builtins.py:3028

1864

#: bzrlib/builtins.py:3121

1865

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

1866

msgstr ""

1867

1868

#: bzrlib/builtins.py:3030

1868

#: bzrlib/builtins.py:3123

1869

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

1870

msgstr ""

1871

1872

#: bzrlib/builtins.py:3032

1872

#: bzrlib/builtins.py:3125

1873

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

1874

msgstr ""

1875

1876

#: bzrlib/builtins.py:3034

1876

#: bzrlib/builtins.py:3127

1877

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

1878

msgstr ""

1879

1880

#: bzrlib/builtins.py:3036

1880

#: bzrlib/builtins.py:3129

1881

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

1882

msgstr ""

1883

1884

#: bzrlib/builtins.py:3038

1884

#: bzrlib/builtins.py:3131

1885

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

1886

msgstr ""

1887

1888

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

1888

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

1889

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

1890

msgstr ""

1891

1892

#: bzrlib/builtins.py:3042

1892

#: bzrlib/builtins.py:3135

1893

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

1894

msgstr ""

1895

1896

#: bzrlib/builtins.py:3046

1896

#: bzrlib/builtins.py:3139

1897

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

1898

msgstr ""

1899

1900

#: bzrlib/builtins.py:3048

1900

#: bzrlib/builtins.py:3141

1901

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

1902

msgstr ""

1903

1904

#: bzrlib/builtins.py:3050

1904

#: bzrlib/builtins.py:3143

1905

msgid ""

1906

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

1907

" \n"

1913

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

1914

msgstr ""

1915

1916

#: bzrlib/builtins.py:3064

1916

#: bzrlib/builtins.py:3157

1917

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

1918

msgstr ""

1919

1920

#: bzrlib/builtins.py:3076

1920

#: bzrlib/builtins.py:3169

1921

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

1922

msgstr ""

1923

1924

#: bzrlib/builtins.py:3087

1924

#: bzrlib/builtins.py:3180

1925

#, python-format

1926

msgid "Invalid ignore pattern found. %s"

1927

msgid_plural "Invalid ignore patterns found. %s"

1928

msgstr[0] ""

1929

msgstr[1] ""

1930

1931

#: bzrlib/builtins.py:3096

1931

#: bzrlib/builtins.py:3189

1932

msgid "NAME_PATTERN should not be an absolute path"

1933

msgstr ""

1934

1935

#: bzrlib/builtins.py:3109

1935

#: bzrlib/builtins.py:3202

1936

#, python-format

1937

msgid ""

1938

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

1942

"them.\n"

1943

msgstr ""

1944

1945

#: bzrlib/builtins.py:3116

1945

#: bzrlib/builtins.py:3209

1946

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

1947

msgstr ""

1948

1949

#: bzrlib/builtins.py:3118

1949

#: bzrlib/builtins.py:3211

1950

msgid ""

1951

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

1952

"be ignored."

1953

msgstr ""

1954

1955

#: bzrlib/builtins.py:3121

1955

#: bzrlib/builtins.py:3214

1956

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

1957

msgstr ""

1958

1959

#: bzrlib/builtins.py:3123

1959

#: bzrlib/builtins.py:3216

1960

msgid " bzr ls --ignored"

1961

msgstr ""

1962

1963

#: bzrlib/builtins.py:3157

1963

#: bzrlib/builtins.py:3250

1964

#, python-format

1965

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

1966

msgstr ""

1967

1968

#: bzrlib/builtins.py:3164

1968

#: bzrlib/builtins.py:3257

1969

msgid ""

1970

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

1971

msgstr ""

1972

1973

#: bzrlib/builtins.py:3166

1973

#: bzrlib/builtins.py:3259

1974

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

1975

msgstr ""

1976

1977

#: bzrlib/builtins.py:3168

1977

#: bzrlib/builtins.py:3261

1978

msgid ""

1979

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

1980

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

1981

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

1982

msgstr ""

1983

1984

#: bzrlib/builtins.py:3172

1984

#: bzrlib/builtins.py:3265

1985

msgid ""

1986

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

1987

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

1988

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

1989

msgstr ""

1990

1991

#: bzrlib/builtins.py:3176

1991

#: bzrlib/builtins.py:3269

1992

msgid ""

1993

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

1994

"directory will be used."

1995

msgstr ""

1996

1997

#: bzrlib/builtins.py:3179

1997

#: bzrlib/builtins.py:3272

1998

msgid ""

1999

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

2000

msgstr ""

2001

2002

#: bzrlib/builtins.py:3181

2002

#: bzrlib/builtins.py:3274

2003

msgid ""

2004

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

2005

" Supported formats Autodetected by extension\n"

2012

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

2013

msgstr ""

2014

2015

#: bzrlib/builtins.py:3195

2015

#: bzrlib/builtins.py:3288

2016

msgid "Type of file to export to."

2017

msgstr ""

2018

2019

#: bzrlib/builtins.py:3198

2019

#: bzrlib/builtins.py:3291

2020

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

2021

msgstr ""

2022

2023

#: bzrlib/builtins.py:3202

2023

#: bzrlib/builtins.py:3295

2024

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

2025

msgstr ""

2026

2027

#: bzrlib/builtins.py:3204

2027

#: bzrlib/builtins.py:3297

2028

msgid ""

2029

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

2030

"changed."

2031

msgstr ""

2032

2033

#: bzrlib/builtins.py:3207

2033

#: bzrlib/builtins.py:3300

2034

msgid ""

2035

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

2036

msgstr ""

2037

2038

#: bzrlib/builtins.py:3226

2038

#: bzrlib/builtins.py:3319

2039

msgid "--uncommitted requires a working tree"

2040

msgstr ""

2041

2042

#: bzrlib/builtins.py:3235

2042

#: bzrlib/builtins.py:3328

2043

#, python-format

2044

msgid "Unsupported export format: %s"

2045

msgstr ""

2046

2047

#: bzrlib/builtins.py:3239

2047

#: bzrlib/builtins.py:3332

2048

msgid ""

2049

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

2050

msgstr ""

2051

2052

#: bzrlib/builtins.py:3241

2052

#: bzrlib/builtins.py:3334

2053

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

2054

msgstr ""

2055

2056

#: bzrlib/builtins.py:3243

2056

#: bzrlib/builtins.py:3336

2057

msgid ""

2058

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

2059

"binary file."

2060

msgstr ""

2061

2062

#: bzrlib/builtins.py:3249

2062

#: bzrlib/builtins.py:3342

2063

msgid "The path name in the old tree."

2064

msgstr ""

2065

2066

#: bzrlib/builtins.py:3250

2066

#: bzrlib/builtins.py:3343

2067

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

2068

msgstr ""

2069

2070

#: bzrlib/builtins.py:3261

2070

#: bzrlib/builtins.py:3354

2071

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

2072

msgstr ""

2073

2074

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

2074

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

2075

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

2076

msgstr ""

2077

2078

#: bzrlib/builtins.py:3321

2078

#: bzrlib/builtins.py:3414

2079

msgid "Commit changes into a new revision."

2080

msgstr ""

2081

2082

#: bzrlib/builtins.py:3323

2082

#: bzrlib/builtins.py:3416

2083

msgid ""

2084

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

2085

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

2089

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

2090

msgstr ""

2091

2092

#: bzrlib/builtins.py:3330

2092

#: bzrlib/builtins.py:3423

2093

msgid ""

2094

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

2095

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

2096

"as explained below."

2097

msgstr ""

2098

2099

#: bzrlib/builtins.py:3334

2099

#: bzrlib/builtins.py:3427

2100

msgid ":Selective commits:"

2101

msgstr ""

2102

2103

#: bzrlib/builtins.py:3336

2103

#: bzrlib/builtins.py:3429

2104

msgid ""

2105

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

2106

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

2107

" everything within it is committed."

2108

msgstr ""

2109

2110

#: bzrlib/builtins.py:3340

2110

#: bzrlib/builtins.py:3433

2111

msgid ""

2112

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

2113

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

2114

" within foo/bar::"

2115

msgstr ""

2116

2117

#: bzrlib/builtins.py:3344

2117

#: bzrlib/builtins.py:3437

2118

msgid " bzr commit foo -x foo/bar"

2119

msgstr ""

2120

2121

#: bzrlib/builtins.py:3346

2121

#: bzrlib/builtins.py:3439

2122

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

2123

msgstr ""

2124

2125

#: bzrlib/builtins.py:3348

2125

#: bzrlib/builtins.py:3441

2126

msgid ":Custom authors:"

2127

msgstr ""

2128

2129

#: bzrlib/builtins.py:3350

2129

#: bzrlib/builtins.py:3443

2130

msgid ""

2131

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

2132

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

2136

" author."

2137

msgstr ""

2138

2139

#: bzrlib/builtins.py:3357

2139

#: bzrlib/builtins.py:3450

2140

msgid ":Checks:"

2141

msgstr ""

2142

2143

#: bzrlib/builtins.py:3359

2143

#: bzrlib/builtins.py:3452

2144

msgid ""

2145

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

2146

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

2149

" for details."

2150

msgstr ""

2151

2152

#: bzrlib/builtins.py:3365

2152

#: bzrlib/builtins.py:3458

2153

msgid ":Things to note:"

2154

msgstr ""

2155

2156

#: bzrlib/builtins.py:3367

2156

#: bzrlib/builtins.py:3460

2157

msgid ""

2158

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

2159

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

2160

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

2161

msgstr ""

2162

2163

#: bzrlib/builtins.py:3371

2163

#: bzrlib/builtins.py:3464

2164

msgid ""

2165

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

2166

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

2168

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

2169

msgstr ""

2170

2171

#: bzrlib/builtins.py:3381

2171

#: bzrlib/builtins.py:3474

2172

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

2173

msgstr ""

2174

2175

#: bzrlib/builtins.py:3384

2175

#: bzrlib/builtins.py:3477

2176

msgid "Description of the new revision."

2177

msgstr ""

2178

2179

#: bzrlib/builtins.py:3387

2179

#: bzrlib/builtins.py:3480

2180

msgid "Commit even if nothing has changed."

2181

msgstr ""

2182

2183

#: bzrlib/builtins.py:3391

2183

#: bzrlib/builtins.py:3484

2184

msgid "Take commit message from this file."

2185

msgstr ""

2186

2187

#: bzrlib/builtins.py:3393

2187

#: bzrlib/builtins.py:3486

2188

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

2189

msgstr ""

2190

2191

#: bzrlib/builtins.py:3396

2191

#: bzrlib/builtins.py:3489

2192

msgid ""

2193

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

2194

"08:00:00 +0100'."

2195

msgstr ""

2196

2197

#: bzrlib/builtins.py:3399

2197

#: bzrlib/builtins.py:3492

2198

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

2199

msgstr ""

2200

2201

#: bzrlib/builtins.py:3402

2201

#: bzrlib/builtins.py:3495

2202

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

2203

msgstr ""

2204

2205

#: bzrlib/builtins.py:3405

2205

#: bzrlib/builtins.py:3498

2206

msgid ""

2207

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

2208

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

2209

msgstr ""

2210

2211

#: bzrlib/builtins.py:3411

2211

#: bzrlib/builtins.py:3504

2212

msgid ""

2213

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

2214

"the message editor."

2215

msgstr ""

2216

2217

#: bzrlib/builtins.py:3414

2217

#: bzrlib/builtins.py:3507

2218

msgid ""

2219

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

2220

"can not be natively represented."

2221

msgstr ""

2222

2223

#: bzrlib/builtins.py:3432

2223

#: bzrlib/builtins.py:3525

2224

#, python-format

2225

msgid ""

2226

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

2228

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

2229

msgstr ""

2230

2231

#: bzrlib/builtins.py:3441

2231

#: bzrlib/builtins.py:3534

2232

#, python-format

2233

msgid ""

2234

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

2236

"Commit refused."

2237

msgstr ""

2238

2239

#: bzrlib/builtins.py:3450

2239

#: bzrlib/builtins.py:3543

2240

#, python-format

2241

msgid "Unrecognized bug %s. Commit refused."

2242

msgstr ""

2243

2244

#: bzrlib/builtins.py:3453

2244

#: bzrlib/builtins.py:3546

2245

#, python-format

2246

msgid ""

2247

"%s\n"

2248

"Commit refused."

2249

msgstr ""

2250

2251

#: bzrlib/builtins.py:3477

2251

#: bzrlib/builtins.py:3570

2252

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

2253

msgstr ""

2254

2255

#: bzrlib/builtins.py:3517

2255

#: bzrlib/builtins.py:3610

2256

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

2257

msgstr ""

2258

2259

#: bzrlib/builtins.py:3546

2259

#: bzrlib/builtins.py:3639

2260

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

2261

msgstr ""

2262

2263

#: bzrlib/builtins.py:3549

2263

#: bzrlib/builtins.py:3642

2264

msgid ""

2265

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

2266

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

2267

msgstr ""

2268

2269

#: bzrlib/builtins.py:3569

2269

#: bzrlib/builtins.py:3662

2270

msgid ""

2271

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

2272

"-unchanged to force an empty commit."

2273

msgstr ""

2274

2275

#: bzrlib/builtins.py:3573

2275

#: bzrlib/builtins.py:3666

2276

msgid ""

2277

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

2278

"resolve FILE\" to resolve."

2279

msgstr ""

2280

2281

#: bzrlib/builtins.py:3577

2281

#: bzrlib/builtins.py:3670

2282

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

2283

msgstr ""

2284

2285

#: bzrlib/builtins.py:3580

2285

#: bzrlib/builtins.py:3673

2286

msgid ""

2287

"\n"

2288

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

2289

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

2290

msgstr ""

2291

2292

#: bzrlib/builtins.py:3588

2292

#: bzrlib/builtins.py:3681

2293

msgid ""

2294

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

2295

msgstr ""

2296

2297

#: bzrlib/builtins.py:3590

2297

#: bzrlib/builtins.py:3683

2298

msgid ""

2299

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

2300

"to detect data corruption or bzr bugs."

2301

msgstr ""

2302

2303

#: bzrlib/builtins.py:3593

2303

#: bzrlib/builtins.py:3686

2304

msgid ""

2305

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

2306

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

2307

msgstr ""

2308

2309

#: bzrlib/builtins.py:3596

2309

#: bzrlib/builtins.py:3689

2310

msgid ""

2311

"revisions\n"

2312

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

2313

" indicate a problem."

2314

msgstr ""

2315

2316

#: bzrlib/builtins.py:3600

2316

#: bzrlib/builtins.py:3693

2317

msgid ""

2318

"versionedfiles\n"

2319

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

2320

" doesn't indicate a problem."

2321

msgstr ""

2322

2323

#: bzrlib/builtins.py:3604

2323

#: bzrlib/builtins.py:3697

2324

msgid ""

2325

"unreferenced ancestors\n"

2326

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

2328

" subtle problem that Bazaar can work around."

2329

msgstr ""

2330

2331

#: bzrlib/builtins.py:3609

2331

#: bzrlib/builtins.py:3702

2332

msgid ""

2333

"unique file texts\n"

2334

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

2335

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

2336

msgstr ""

2337

2338

#: bzrlib/builtins.py:3613

2338

#: bzrlib/builtins.py:3706

2339

msgid ""

2340

"repeated file texts\n"

2341

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

2344

" indicate a problem."

2345

msgstr ""

2346

2347

#: bzrlib/builtins.py:3619

2347

#: bzrlib/builtins.py:3712

2348

msgid ""

2349

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

2350

"given\n"

2351

"location will be checked."

2352

msgstr ""

2353

2354

#: bzrlib/builtins.py:3624

2354

#: bzrlib/builtins.py:3717

2355

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

2356

msgstr ""

2357

2358

#: bzrlib/builtins.py:3626

2358

#: bzrlib/builtins.py:3719

2359

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

2360

msgstr ""

2361

2362

#: bzrlib/builtins.py:3628

2362

#: bzrlib/builtins.py:3721

2363

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

2364

msgstr ""

2365

2366

#: bzrlib/builtins.py:3630

2366

#: bzrlib/builtins.py:3723

2367

msgid " bzr check --repo bar"

2368

msgstr ""

2369

2370

#: bzrlib/builtins.py:3632

2370

#: bzrlib/builtins.py:3725

2371

msgid " Check everything at 'baz'::"

2372

msgstr ""

2373

2374

#: bzrlib/builtins.py:3634

2374

#: bzrlib/builtins.py:3727

2375

msgid " bzr check baz"

2376

msgstr ""

2377

2378

#: bzrlib/builtins.py:3640

2378

#: bzrlib/builtins.py:3733

2379

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

2380

msgstr ""

2381

2382

#: bzrlib/builtins.py:3642

2382

#: bzrlib/builtins.py:3735

2383

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

2384

msgstr ""

2385

2386

#: bzrlib/builtins.py:3644

2386

#: bzrlib/builtins.py:3737

2387

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

2388

msgstr ""

2389

2390

#: bzrlib/builtins.py:3658

2390

#: bzrlib/builtins.py:3751

2391

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

2392

msgstr ""

2393

2394

#: bzrlib/builtins.py:3660

2394

#: bzrlib/builtins.py:3753

2395

msgid ""

2396

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

2397

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

2400

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

2401

msgstr ""

2402

2403

#: bzrlib/builtins.py:3666

2403

#: bzrlib/builtins.py:3759

2404

msgid ""

2405

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

2406

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

2410

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

2411

msgstr ""

2412

2413

#: bzrlib/builtins.py:3673

2413

#: bzrlib/builtins.py:3766

2414

msgid ""

2415

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

2416

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

2421

"afterwards."

2422

msgstr ""

2423

2424

#: bzrlib/builtins.py:3681

2424

#: bzrlib/builtins.py:3774

2425

msgid ""

2426

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

2427

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

2429

"tried."

2430

msgstr ""

2431

2432

#: bzrlib/builtins.py:3686

2432

#: bzrlib/builtins.py:3779

2433

msgid ""

2434

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

2435

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

2436

msgstr ""

2437

2438

#: bzrlib/builtins.py:3694

2438

#: bzrlib/builtins.py:3787

2439

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

2440

msgstr ""

2441

2442

#: bzrlib/builtins.py:3698

2442

#: bzrlib/builtins.py:3791

2443

msgid "Branch format"

2444

msgstr ""

2445

2446

#: bzrlib/builtins.py:3700

2446

#: bzrlib/builtins.py:3793

2447

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

2448

msgstr ""

2449

2450

#: bzrlib/builtins.py:3702

2450

#: bzrlib/builtins.py:3795

2451

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

2452

msgstr ""

2453

2454

#: bzrlib/builtins.py:3717

2454

#: bzrlib/builtins.py:3810

2455

msgid "Show or set bzr user id."

2456

msgstr ""

2457

2458

#: bzrlib/builtins.py:3719

2458

#: bzrlib/builtins.py:3812

2459

msgid ""

2460

":Examples:\n"

2461

" Show the email of the current user::"

2462

msgstr ""

2463

2464

#: bzrlib/builtins.py:3722

2464

#: bzrlib/builtins.py:3815

2465

msgid " bzr whoami --email"

2466

msgstr ""

2467

2468

#: bzrlib/builtins.py:3724

2468

#: bzrlib/builtins.py:3817

2469

msgid " Set the current user::"

2470

msgstr ""

2471

2472

#: bzrlib/builtins.py:3726

2472

#: bzrlib/builtins.py:3819

2473

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

2474

msgstr ""

2475

2476

#: bzrlib/builtins.py:3730

2476

#: bzrlib/builtins.py:3823

2477

msgid "Display email address only."

2478

msgstr ""

2479

2480

#: bzrlib/builtins.py:3732

2480

#: bzrlib/builtins.py:3825

2481

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

2482

msgstr ""

2483

2484

#: bzrlib/builtins.py:3758

2484

#: bzrlib/builtins.py:3851

2485

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

2486

msgstr ""

2487

2488

#: bzrlib/builtins.py:3780

2488

#: bzrlib/builtins.py:3873

2489

msgid "Print or set the branch nickname."

2490

msgstr ""

2491

2492

#: bzrlib/builtins.py:3782

2492

#: bzrlib/builtins.py:3875

2493

msgid ""

2494

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

2495

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

2496

msgstr ""

2497

2498

#: bzrlib/builtins.py:3785

2498

#: bzrlib/builtins.py:3878

2499

msgid ""

2500

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

2501

"locally."

2502

msgstr ""

2503

2504

#: bzrlib/builtins.py:3805

2504

#: bzrlib/builtins.py:3898

2505

msgid "Set/unset and display aliases."

2506

msgstr ""

2507

2508

#: bzrlib/builtins.py:3807

2508

#: bzrlib/builtins.py:3900

2509

msgid ""

2510

":Examples:\n"

2511

" Show the current aliases::"

2512

msgstr ""

2513

2514

#: bzrlib/builtins.py:3810

2514

#: bzrlib/builtins.py:3903

2515

msgid " bzr alias"

2516

msgstr ""

2517

2518

#: bzrlib/builtins.py:3812

2518

#: bzrlib/builtins.py:3905

2519

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

2520

msgstr ""

2521

2522

#: bzrlib/builtins.py:3814

2522

#: bzrlib/builtins.py:3907

2523

msgid " bzr alias ll"

2524

msgstr ""

2525

2526

#: bzrlib/builtins.py:3816

2526

#: bzrlib/builtins.py:3909

2527

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

2528

msgstr ""

2529

2530

#: bzrlib/builtins.py:3818

2530

#: bzrlib/builtins.py:3911

2531

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

2532

msgstr ""

2533

2534

#: bzrlib/builtins.py:3820

2534

#: bzrlib/builtins.py:3913

2535

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

2536

msgstr ""

2537

2538

#: bzrlib/builtins.py:3822

2538

#: bzrlib/builtins.py:3915

2539

msgid " bzr alias --remove ll"

2540

msgstr ""

2541

2542

#: bzrlib/builtins.py:3827

2542

#: bzrlib/builtins.py:3920

2543

msgid "Remove the alias."

2544

msgstr ""

2545

2546

#: bzrlib/builtins.py:3845

2546

#: bzrlib/builtins.py:3938

2547

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

2548

msgstr ""

2549

2550

#: bzrlib/builtins.py:4026

2550

#: bzrlib/builtins.py:4119

2551

msgid ""

2552

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

2553

msgstr ""

2554

2555

#: bzrlib/builtins.py:4043

2555

#: bzrlib/builtins.py:4136

2556

msgid ""

2557

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

2558

msgstr ""

2559

2560

#: bzrlib/builtins.py:4090

2560

#: bzrlib/builtins.py:4183

2561

msgid "Show version of bzr."

2562

msgstr ""

2563

2564

#: bzrlib/builtins.py:4094

2564

#: bzrlib/builtins.py:4187

2565

msgid "Print just the version number."

2566

msgstr ""

2567

2568

#: bzrlib/builtins.py:4113

2568

#: bzrlib/builtins.py:4206

2569

msgid "It sure does!\n"

2570

msgstr ""

2571

2572

#: bzrlib/builtins.py:4137

2572

#: bzrlib/builtins.py:4230

2573

#, python-format

2574

msgid "merge base is revision %s\n"

2575

msgstr ""

2576

2577

#: bzrlib/builtins.py:4141

2577

#: bzrlib/builtins.py:4234

2578

msgid "Perform a three-way merge."

2579

msgstr ""

2580

2581

#: bzrlib/builtins.py:4143

2581

#: bzrlib/builtins.py:4236

2582

msgid ""

2583

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

2584

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

2589

"the current working tree."

2590

msgstr ""

2591

2592

#: bzrlib/builtins.py:4151

2592

#: bzrlib/builtins.py:4244

2593

msgid ""

2594

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

2595

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

2596

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

2597

msgstr ""

2598

2599

#: bzrlib/builtins.py:4155

2599

#: bzrlib/builtins.py:4248

2600

msgid ""

2601

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

2602

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

2603

msgstr ""

2604

2605

#: bzrlib/builtins.py:4158

2605

#: bzrlib/builtins.py:4251

2606

msgid ""

2607

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

2608

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

2613

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

2614

msgstr ""

2615

2616

#: bzrlib/builtins.py:4166

2616

#: bzrlib/builtins.py:4259

2617

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

2618

msgstr ""

2619

2620

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

2620

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

2621

msgid ""

2622

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

2623

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

2624

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

2625

"before you should commit."

2625

"before you can commit."

2626

msgstr ""

2627

2628

#: bzrlib/builtins.py:4173

2628

#: bzrlib/builtins.py:4266

2629

msgid ""

2630

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

2631

msgstr ""

2632

2633

#: bzrlib/builtins.py:4175

2633

#: bzrlib/builtins.py:4268

2634

msgid ""

2635

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

2636

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

2638

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

2639

msgstr ""

2640

2641

#: bzrlib/builtins.py:4180

2641

#: bzrlib/builtins.py:4273

2642

msgid ""

2643

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

2644

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

2645

"committed to record the result of the merge."

2646

msgstr ""

2647

2648

#: bzrlib/builtins.py:4184

2648

#: bzrlib/builtins.py:4277

2649

msgid ""

2650

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

2651

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

2654

"merge revision which has more than two parents."

2655

msgstr ""

2656

2657

#: bzrlib/builtins.py:4190

2657

#: bzrlib/builtins.py:4283

2658

msgid ""

2659

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

2660

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

2661

"can be given."

2662

msgstr ""

2663

2664

#: bzrlib/builtins.py:4194

2664

#: bzrlib/builtins.py:4287

2665

msgid ""

2666

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

2667

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

2668

msgstr ""

2669

2670

#: bzrlib/builtins.py:4197

2670

#: bzrlib/builtins.py:4290

2671

msgid ""

2672

":Examples:\n"

2673

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

2674

msgstr ""

2675

2676

#: bzrlib/builtins.py:4200

2676

#: bzrlib/builtins.py:4293

2677

msgid " bzr merge ../bzr.dev"

2678

msgstr ""

2679

2680

#: bzrlib/builtins.py:4202

2680

#: bzrlib/builtins.py:4295

2681

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

2682

msgstr ""

2683

2684

#: bzrlib/builtins.py:4204

2684

#: bzrlib/builtins.py:4297

2685

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

2686

msgstr ""

2687

2688

#: bzrlib/builtins.py:4206

2688

#: bzrlib/builtins.py:4299

2689

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

2690

msgstr ""

2691

2692

#: bzrlib/builtins.py:4208

2692

#: bzrlib/builtins.py:4301

2693

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

2694

msgstr ""

2695

2696

#: bzrlib/builtins.py:4210

2696

#: bzrlib/builtins.py:4303

2697

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

2698

msgstr ""

2699

2700

#: bzrlib/builtins.py:4212

2700

#: bzrlib/builtins.py:4305

2701

msgid " bzr merge /tmp/merge"

2702

msgstr ""

2703

2704

#: bzrlib/builtins.py:4214

2704

#: bzrlib/builtins.py:4307

2705

msgid ""

2706

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

2707

" feature1a and feature1b:"

2708

msgstr ""

2709

2710

#: bzrlib/builtins.py:4217

2710

#: bzrlib/builtins.py:4310

2711

msgid ""

2712

" bzr merge ../feature1a\n"

2713

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

2714

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

2715

msgstr ""

2716

2717

#: bzrlib/builtins.py:4229

2717

#: bzrlib/builtins.py:4322

2718

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

2719

msgstr ""

2720

2721

#: bzrlib/builtins.py:4235

2721

#: bzrlib/builtins.py:4328

2722

msgid ""

2723

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

2724

msgstr ""

2725

2726

#: bzrlib/builtins.py:4237

2726

#: bzrlib/builtins.py:4330

2727

msgid ""

2728

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

2729

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

2730

"commit the result."

2731

msgstr ""

2732

2733

#: bzrlib/builtins.py:4242

2733

#: bzrlib/builtins.py:4335

2734

msgid ""

2735

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

2736

msgstr ""

2737

2738

#: bzrlib/builtins.py:4244

2738

#: bzrlib/builtins.py:4337

2739

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

2740

msgstr ""

2741

2742

#: bzrlib/builtins.py:4246

2742

#: bzrlib/builtins.py:4339

2743

msgid "Select changes interactively."

2744

msgstr ""

2745

2746

#: bzrlib/builtins.py:4268

2746

#: bzrlib/builtins.py:4361

2747

msgid ""

2748

"Merging into empty branches not currently supported, "

2749

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

2750

msgstr ""

2751

2752

#: bzrlib/builtins.py:4295

2752

#: bzrlib/builtins.py:4388

2753

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

2754

msgstr ""

2755

2756

#: bzrlib/builtins.py:4306

2756

#: bzrlib/builtins.py:4399

2757

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

2758

msgstr ""

2759

2760

#: bzrlib/builtins.py:4326

2760

#: bzrlib/builtins.py:4419

2761

msgid "merger: "

2762

msgstr ""

2763

2764

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

2764

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

2765

msgid "Nothing to do."

2766

msgstr ""

2767

2768

#: bzrlib/builtins.py:4332

2768

#: bzrlib/builtins.py:4425

2769

msgid "Cannot pull individual files"

2770

msgstr ""

2771

2772

#: bzrlib/builtins.py:4340

2772

#: bzrlib/builtins.py:4433

2773

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

2774

msgstr ""

2775

2776

#: bzrlib/builtins.py:4398

2776

#: bzrlib/builtins.py:4491

2777

#, python-format

2778

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

2779

msgstr ""

2780

2781

#: bzrlib/builtins.py:4407

2781

#: bzrlib/builtins.py:4500

2782

#, python-format

2783

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

2784

msgstr ""

2785

2786

#: bzrlib/builtins.py:4411

2786

#: bzrlib/builtins.py:4504

2787

msgid "Cannot do conflict reduction and show base."

2788

msgstr ""

2789

2790

#: bzrlib/builtins.py:4522

2790

#: bzrlib/builtins.py:4615

2791

msgid "No location specified or remembered"

2792

msgstr ""

2793

2794

#: bzrlib/builtins.py:4524

2794

#: bzrlib/builtins.py:4617

2795

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

2796

msgstr ""

2797

2798

#: bzrlib/builtins.py:4530

2798

#: bzrlib/builtins.py:4623

2799

msgid "Redo a merge."

2800

msgstr ""

2801

2802

#: bzrlib/builtins.py:4532

2802

#: bzrlib/builtins.py:4625

2803

msgid ""

2804

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

2805

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

2806

"lets you try different ones on different files."

2807

msgstr ""

2808

2809

#: bzrlib/builtins.py:4536

2809

#: bzrlib/builtins.py:4629

2810

msgid ""

2811

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

2812

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

2813

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

2814

msgstr ""

2815

2816

#: bzrlib/builtins.py:4540

2816

#: bzrlib/builtins.py:4633

2817

msgid ""

2818

":Examples:\n"

2819

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

2820

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

2821

msgstr ""

2822

2823

#: bzrlib/builtins.py:4544

2823

#: bzrlib/builtins.py:4637

2824

msgid " bzr remerge --show-base"

2825

msgstr ""

2826

2827

#: bzrlib/builtins.py:4546

2827

#: bzrlib/builtins.py:4639

2828

msgid ""

2829

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

2830

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

2831

msgstr ""

2832

2833

#: bzrlib/builtins.py:4549

2833

#: bzrlib/builtins.py:4642

2834

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

2835

msgstr ""

2836

2837

#: bzrlib/builtins.py:4556

2837

#: bzrlib/builtins.py:4649

2838

msgid "Show base revision text in conflicts."

2839

msgstr ""

2840

2841

#: bzrlib/builtins.py:4568

2841

#: bzrlib/builtins.py:4661

2842

msgid ""

2843

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

2844

"merges."

2845

msgstr ""

2846

2847

#: bzrlib/builtins.py:4624

2847

#: bzrlib/builtins.py:4717

2848

msgid "Revert files to a previous revision."

2849

msgstr ""

2850

2851

#: bzrlib/builtins.py:4626

2851

#: bzrlib/builtins.py:4719

2852

msgid ""

2853

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

2854

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

2855

"last committed revision is used."

2856

msgstr ""

2857

2858

#: bzrlib/builtins.py:4630

2858

#: bzrlib/builtins.py:4723

2859

msgid ""

2860

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

2861

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

2864

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

2865

msgstr ""

2866

2867

#: bzrlib/builtins.py:4636

2867

#: bzrlib/builtins.py:4729

2868

msgid ""

2869

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

2870

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

2871

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

2872

msgstr ""

2873

2874

#: bzrlib/builtins.py:4640

2874

#: bzrlib/builtins.py:4733

2875

msgid ""

2876

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

2877

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

2879

"reverted."

2880

msgstr ""

2881

2882

#: bzrlib/builtins.py:4645

2882

#: bzrlib/builtins.py:4738

2883

msgid ""

2884

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

2885

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

2887

"deleted."

2888

msgstr ""

2889

2890

#: bzrlib/builtins.py:4650

2890

#: bzrlib/builtins.py:4743

2891

msgid ""

2892

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

2893

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

2899

"reverting any files."

2900

msgstr ""

2901

2902

#: bzrlib/builtins.py:4659

2902

#: bzrlib/builtins.py:4752

2903

msgid ""

2904

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

2905

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

2913

"target branches."

2914

msgstr ""

2915

2916

#: bzrlib/builtins.py:4673

2916

#: bzrlib/builtins.py:4766

2917

msgid "Do not save backups of reverted files."

2918

msgstr ""

2919

2920

#: bzrlib/builtins.py:4675

2920

#: bzrlib/builtins.py:4768

2921

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

2922

msgstr ""

2923

2924

#: bzrlib/builtins.py:4706

2924

#: bzrlib/builtins.py:4799

2925

msgid ""

2926

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

2927

" "

2928

msgstr ""

2929

2930

#: bzrlib/builtins.py:4711

2930

#: bzrlib/builtins.py:4804

2931

msgid "Show help on all commands."

2932

msgstr ""

2933

2934

#: bzrlib/builtins.py:4740

2934

#: bzrlib/builtins.py:4833

2935

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

2936

msgstr ""

2937

2938

#: bzrlib/builtins.py:4742

2938

#: bzrlib/builtins.py:4835

2939

msgid "OTHER_BRANCH may be local or remote."

2940

msgstr ""

2941

2942

#: bzrlib/builtins.py:4744

2942

#: bzrlib/builtins.py:4837

2943

msgid ""

2944

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

2945

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

2950

" 0 - no missing revisions"

2951

msgstr ""

2952

2953

#: bzrlib/builtins.py:4754

2953

#: bzrlib/builtins.py:4847

2954

msgid ""

2955

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

2956

" remembered pull location::"

2957

msgstr ""

2958

2959

#: bzrlib/builtins.py:4757

2959

#: bzrlib/builtins.py:4850

2960

msgid " bzr missing"

2961

msgstr ""

2962

2963

#: bzrlib/builtins.py:4759

2963

#: bzrlib/builtins.py:4852

2964

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

2965

msgstr ""

2966

2967

#: bzrlib/builtins.py:4761

2967

#: bzrlib/builtins.py:4854

2968

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

2969

msgstr ""

2970

2971

#: bzrlib/builtins.py:4763

2971

#: bzrlib/builtins.py:4856

2972

msgid ""

2973

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

2974

" branch::"

2975

msgstr ""

2976

2977

#: bzrlib/builtins.py:4766

2977

#: bzrlib/builtins.py:4859

2978

msgid " bzr missing -r ..-10"

2979

msgstr ""

2980

2981

#: bzrlib/builtins.py:4768

2981

#: bzrlib/builtins.py:4861

2982

msgid ""

2983

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

2984

" branch::"

2985

msgstr ""

2986

2987

#: bzrlib/builtins.py:4771

2987

#: bzrlib/builtins.py:4864

2988

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

2989

msgstr ""

2990

2991

#: bzrlib/builtins.py:4778

2991

#: bzrlib/builtins.py:4871

2992

msgid "Reverse the order of revisions."

2993

msgstr ""

2994

2995

#: bzrlib/builtins.py:4780

2995

#: bzrlib/builtins.py:4873

2996

msgid "Display changes in the local branch only."

2997

msgstr ""

2998

2999

#: bzrlib/builtins.py:4781

2999

#: bzrlib/builtins.py:4874

3000

msgid "Same as --mine-only."

3001

msgstr ""

3002

3003

#: bzrlib/builtins.py:4783

3003

#: bzrlib/builtins.py:4876

3004

msgid "Display changes in the remote branch only."

3005

msgstr ""

3006

3007

#: bzrlib/builtins.py:4784

3007

#: bzrlib/builtins.py:4877

3008

msgid "Same as --theirs-only."

3009

msgstr ""

3010

3011

#: bzrlib/builtins.py:4789

3011

#: bzrlib/builtins.py:4882

3012

msgid ""

3013

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

3014

"details."

3015

msgstr ""

3016

3017

#: bzrlib/builtins.py:4793

3017

#: bzrlib/builtins.py:4886

3018

msgid ""

3019

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

3020

"details."

3021

msgstr ""

3022

3023

#: bzrlib/builtins.py:4796

3023

#: bzrlib/builtins.py:4889

3024

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

3025

msgstr ""

3026

3027

#: bzrlib/builtins.py:4850

3027

#: bzrlib/builtins.py:4943

3028

msgid "No peer location known or specified."

3029

msgstr ""

3030

3031

#: bzrlib/builtins.py:4854

3031

#: bzrlib/builtins.py:4947

3032

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

3033

msgstr ""

3034

3035

#: bzrlib/builtins.py:4887

3035

#: bzrlib/builtins.py:4980

3036

#, python-format

3037

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

3038

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

3039

msgstr[0] ""

3040

msgstr[1] ""

3041

3042

#: bzrlib/builtins.py:4903

3042

#: bzrlib/builtins.py:4996

3043

#, python-format

3044

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

3045

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

3046

msgstr[0] ""

3047

msgstr[1] ""

3048

3049

#: bzrlib/builtins.py:4915

3049

#: bzrlib/builtins.py:5008

3050

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

3051

msgstr ""

3052

3053

#: bzrlib/builtins.py:4918

3053

#: bzrlib/builtins.py:5011

3054

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

3055

msgstr ""

3056

3057

#: bzrlib/builtins.py:4923

3057

#: bzrlib/builtins.py:5016

3058

msgid "Branches are up to date.\n"

3059

msgstr ""

3060

3061

#: bzrlib/builtins.py:4934

3061

#: bzrlib/builtins.py:5027

3062

msgid "Compress the data within a repository."

3063

msgstr ""

3064

3065

#: bzrlib/builtins.py:4936

3065

#: bzrlib/builtins.py:5029

3066

msgid ""

3067

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

3068

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

3069

"normally not required to be done manually."

3070

msgstr ""

3071

3072

#: bzrlib/builtins.py:4940

3072

#: bzrlib/builtins.py:5033

3073

msgid ""

3074

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

3075

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

3078

"used."

3079

msgstr ""

3080

3081

#: bzrlib/builtins.py:4946

3081

#: bzrlib/builtins.py:5039

3082

msgid ""

3083

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

3084

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

3086

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

3087

msgstr ""

3088

3089

#: bzrlib/builtins.py:4955

3089

#: bzrlib/builtins.py:5048

3090

msgid "Delete obsolete packs to save disk space."

3091

msgstr ""

3092

3093

#: bzrlib/builtins.py:4969

3093

#: bzrlib/builtins.py:5062

3094

msgid "List the installed plugins."

3095

msgstr ""

3096

3097

#: bzrlib/builtins.py:4971

3097

#: bzrlib/builtins.py:5064

3098

msgid ""

3099

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

3100

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

3101

msgstr ""

3102

3103

#: bzrlib/builtins.py:4974

3103

#: bzrlib/builtins.py:5067

3104

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

3105

msgstr ""

3106

3107

#: bzrlib/builtins.py:4976

3107

#: bzrlib/builtins.py:5069

3108

msgid ""

3109

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

3110

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

3113

"customizing log output."

3114

msgstr ""

3115

3116

#: bzrlib/builtins.py:4982

3116

#: bzrlib/builtins.py:5075

3117

msgid ""

3118

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

3119

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

3121

"plugins using the Python programming language."

3122

msgstr ""

3123

3124

#: bzrlib/builtins.py:4998

3124

#: bzrlib/builtins.py:5091

3125

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

3126

msgstr ""

3127

3128

#: bzrlib/builtins.py:5001

3128

#: bzrlib/builtins.py:5094

3129

msgid "Produce long-format testament."

3130

msgstr ""

3131

3132

#: bzrlib/builtins.py:5003

3132

#: bzrlib/builtins.py:5096

3133

msgid "Produce a strict-format testament."

3134

msgstr ""

3135

3136

#: bzrlib/builtins.py:5029

3136

#: bzrlib/builtins.py:5122

3137

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

3138

msgstr ""

3139

3140

#: bzrlib/builtins.py:5031

3140

#: bzrlib/builtins.py:5124

3141

msgid ""

3142

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

3143

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

3144

msgstr ""

3145

3146

#: bzrlib/builtins.py:5034

3146

#: bzrlib/builtins.py:5127

3147

msgid ""

3148

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

3149

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

3150

msgstr ""

3151

3152

#: bzrlib/builtins.py:5042

3152

#: bzrlib/builtins.py:5135

3153

msgid "Show annotations on all lines."

3154

msgstr ""

3155

3156

#: bzrlib/builtins.py:5043

3156

#: bzrlib/builtins.py:5136

3157

msgid "Show commit date in annotations."

3158

msgstr ""

3159

3160

#: bzrlib/builtins.py:5130

3160

#: bzrlib/builtins.py:5223

3161

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

3162

msgstr ""

3163

3164

#: bzrlib/builtins.py:5142

3164

#: bzrlib/builtins.py:5235

3165

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

3166

msgstr ""

3167

3168

#: bzrlib/builtins.py:5146

3168

#: bzrlib/builtins.py:5239

3169

msgid ""

3170

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

3171

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

3172

msgstr ""

3173

3174

#: bzrlib/builtins.py:5149

3174

#: bzrlib/builtins.py:5242

3175

msgid ""

3176

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

3177

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

3178

msgstr ""

3179

3180

#: bzrlib/builtins.py:5152

3180

#: bzrlib/builtins.py:5245

3181

msgid ""

3182

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

3183

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

3184

"that of the master."

3185

msgstr ""

3186

3187

#: bzrlib/builtins.py:5167

3187

#: bzrlib/builtins.py:5260

3188

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

3189

msgstr ""

3190

3191

#: bzrlib/builtins.py:5172

3191

#: bzrlib/builtins.py:5265

3192

msgid "Branch is already bound"

3193

msgstr ""

3194

3195

#: bzrlib/builtins.py:5174

3195

#: bzrlib/builtins.py:5267

3196

msgid "No location supplied and no previous location known"

3197

msgstr ""

3198

3199

#: bzrlib/builtins.py:5180

3199

#: bzrlib/builtins.py:5273

3200

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

3201

msgstr ""

3202

3203

#: bzrlib/builtins.py:5187

3203

#: bzrlib/builtins.py:5280

3204

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

3205

msgstr ""

3206

3207

#: bzrlib/builtins.py:5189

3207

#: bzrlib/builtins.py:5282

3208

msgid ""

3209

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

3210

"commits will be local only."

3211

msgstr ""

3212

3213

#: bzrlib/builtins.py:5200

3213

#: bzrlib/builtins.py:5293

3214

msgid "Local branch is not bound"

3215

msgstr ""

3216

3217

#: bzrlib/builtins.py:5204

3217

#: bzrlib/builtins.py:5297

3218

msgid "Remove the last committed revision."

3219

msgstr ""

3220

3221

#: bzrlib/builtins.py:5206

3221

#: bzrlib/builtins.py:5299

3222

msgid ""

3223

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

3224

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

3225

"remove anything."

3226

msgstr ""

3227

3228

#: bzrlib/builtins.py:5210

3228

#: bzrlib/builtins.py:5303

3229

msgid ""

3230

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

3231

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

3232

"branch at revision 15."

3233

msgstr ""

3234

3235

#: bzrlib/builtins.py:5214

3235

#: bzrlib/builtins.py:5307

3236

msgid ""

3237

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

3238

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

3239

"the commit."

3240

msgstr ""

3241

3242

#: bzrlib/builtins.py:5225

3242

#: bzrlib/builtins.py:5318

3243

msgid "Don't actually make changes."

3244

msgstr ""

3245

3246

#: bzrlib/builtins.py:5226

3246

#: bzrlib/builtins.py:5319

3247

msgid "Say yes to all questions."

3248

msgstr ""

3249

3250

#: bzrlib/builtins.py:5228

3250

#: bzrlib/builtins.py:5321

3251

msgid "Keep tags that point to removed revisions."

3252

msgstr ""

3253

3254

#: bzrlib/builtins.py:5230

3254

#: bzrlib/builtins.py:5323

3255

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

3256

msgstr ""

3257

3258

#: bzrlib/builtins.py:5279

3258

#: bzrlib/builtins.py:5372

3259

msgid "No revisions to uncommit.\n"

3260

msgstr ""

3261

3262

#: bzrlib/builtins.py:5294

3262

#: bzrlib/builtins.py:5387

3263

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

3264

msgstr ""

3265

3266

#: bzrlib/builtins.py:5297

3266

#: bzrlib/builtins.py:5390

3267

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

3268

msgstr ""

3269

3270

#: bzrlib/builtins.py:5301

3270

#: bzrlib/builtins.py:5394

3271

msgid "Uncommit these revisions"

3272

msgstr ""

3273

3274

#: bzrlib/builtins.py:5304

3274

#: bzrlib/builtins.py:5397

3275

msgid "Canceled\n"

3276

msgstr ""

3277

3278

#: bzrlib/builtins.py:5311

3278

#: bzrlib/builtins.py:5404

3279

#, python-format

3280

msgid ""

3281

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

3282

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

3283

msgstr ""

3284

3285

#: bzrlib/builtins.py:5316

3285

#: bzrlib/builtins.py:5409

3286

msgid "Break a dead lock."

3287

msgstr ""

3288

3289

#: bzrlib/builtins.py:5318

3289

#: bzrlib/builtins.py:5411

3290

msgid ""

3291

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

3292

"config file."

3293

msgstr ""

3294

3295

#: bzrlib/builtins.py:5321

3295

#: bzrlib/builtins.py:5414

3296

msgid ""

3297

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

3298

"holding the lock has been stopped."

3299

msgstr ""

3300

3301

#: bzrlib/builtins.py:5324

3301

#: bzrlib/builtins.py:5417

3302

msgid ""

3303

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

3304

"[location]' command."

3305

msgstr ""

3306

3307

#: bzrlib/builtins.py:5327

3307

#: bzrlib/builtins.py:5420

3308

msgid ""

3309

":Examples:\n"

3310

" bzr break-lock\n"

3312

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

3313

msgstr ""

3314

3315

#: bzrlib/builtins.py:5336

3315

#: bzrlib/builtins.py:5429

3316

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

3317

msgstr ""

3318

3319

#: bzrlib/builtins.py:5338

3319

#: bzrlib/builtins.py:5431

3320

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

3321

msgstr ""

3322

3323

#: bzrlib/builtins.py:5373

3323

#: bzrlib/builtins.py:5466

3324

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

3325

msgstr ""

3326

3327

#: bzrlib/builtins.py:5374

3327

#: bzrlib/builtins.py:5467

3328

msgid "Run the bzr server."

3329

msgstr ""

3330

3331

#: bzrlib/builtins.py:5380

3331

#: bzrlib/builtins.py:5473

3332

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

3333

msgstr ""

3334

3335

#: bzrlib/builtins.py:5381

3335

#: bzrlib/builtins.py:5474

3336

msgid "protocol"

3337

msgstr ""

3338

3339

#: bzrlib/builtins.py:5382

3339

#: bzrlib/builtins.py:5475

3340

msgid "Protocol to serve."

3341

msgstr ""

3342

3343

#: bzrlib/builtins.py:5386

3343

#: bzrlib/builtins.py:5479

3344

msgid ""

3345

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

3346

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

3347

"The default port depends on the protocol."

3348

msgstr ""

3349

3350

#: bzrlib/builtins.py:5392

3350

#: bzrlib/builtins.py:5485

3351

msgid "Serve contents of this directory."

3352

msgstr ""

3353

3354

#: bzrlib/builtins.py:5394

3354

#: bzrlib/builtins.py:5487

3355

msgid ""

3356

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

3357

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

3360

"uncontrolled write access to your file system."

3361

msgstr ""

3362

3363

#: bzrlib/builtins.py:5403

3363

#: bzrlib/builtins.py:5496

3364

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

3365

msgstr ""

3366

3367

#: bzrlib/builtins.py:5453

3367

#: bzrlib/builtins.py:5546

3368

msgid "Combine a tree into its containing tree."

3369

msgstr ""

3370

3371

#: bzrlib/builtins.py:5455

3371

#: bzrlib/builtins.py:5548

3372

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

3373

msgstr ""

3374

3375

#: bzrlib/builtins.py:5457

3375

#: bzrlib/builtins.py:5550

3376

msgid ""

3377

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

3378

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

3379

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

3380

msgstr ""

3381

3382

#: bzrlib/builtins.py:5461

3382

#: bzrlib/builtins.py:5554

3383

msgid ""

3384

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

3385

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

3386

"and all history is preserved."

3387

msgstr ""

3388

3389

#: bzrlib/builtins.py:5479

3389

#: bzrlib/builtins.py:5572

3390

#, python-format

3391

msgid ""

3392

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

3393

"You can use bzr upgrade on the repository."

3394

msgstr ""

3395

3396

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

3396

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

3397

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

3398

msgstr ""

3399

3400

#: bzrlib/builtins.py:5499

3400

#: bzrlib/builtins.py:5592

3401

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

3402

msgstr ""

3403

3404

#: bzrlib/builtins.py:5501

3404

#: bzrlib/builtins.py:5594

3405

msgid ""

3406

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

3407

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

3408

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

3409

msgstr ""

3410

3411

#: bzrlib/builtins.py:5505

3411

#: bzrlib/builtins.py:5598

3412

msgid ""

3413

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

3414

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

3415

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

3416

msgstr ""

3417

3418

#: bzrlib/builtins.py:5585

3418

#: bzrlib/builtins.py:5678

3419

msgid "No submit branch specified or known"

3420

msgstr ""

3421

3422

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

3422

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

3423

msgid "No public branch specified or known"

3424

msgstr ""

3425

3426

#: bzrlib/builtins.py:5598

3426

#: bzrlib/builtins.py:5691

3427

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

3428

msgstr ""

3429

3430

#: bzrlib/builtins.py:5607

3430

#: bzrlib/builtins.py:5700

3431

msgid "No revisions to bundle."

3432

msgstr ""

3433

3434

#: bzrlib/builtins.py:5626

3434

#: bzrlib/builtins.py:5719

3435

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

3436

msgstr ""

3437

3438

#: bzrlib/builtins.py:5628

3438

#: bzrlib/builtins.py:5721

3439

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

3440

msgstr ""

3441

3442

#: bzrlib/builtins.py:5630

3442

#: bzrlib/builtins.py:5723

3443

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

3444

msgstr ""

3445

3446

#: bzrlib/builtins.py:5632

3446

#: bzrlib/builtins.py:5725

3447

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

3448

msgstr ""

3449

3450

#: bzrlib/builtins.py:5634

3450

#: bzrlib/builtins.py:5727

3451

msgid ""

3452

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

3453

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

3454

" branch."

3455

msgstr ""

3456

3457

#: bzrlib/builtins.py:5638

3457

#: bzrlib/builtins.py:5731

3458

msgid ""

3459

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

3460

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

3461

msgstr ""

3462

3463

#: bzrlib/builtins.py:5641

3463

#: bzrlib/builtins.py:5734

3464

msgid ""

3465

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

3466

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

3467

"the source branch."

3468

msgstr ""

3469

3470

#: bzrlib/builtins.py:5645

3470

#: bzrlib/builtins.py:5738

3471

msgid ""

3472

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

3473

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

3476

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

3477

msgstr ""

3478

3479

#: bzrlib/builtins.py:5651

3479

#: bzrlib/builtins.py:5744

3480

msgid ""

3481

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

3482

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

3485

"be changed using --from."

3486

msgstr ""

3487

3488

#: bzrlib/builtins.py:5657

3488

#: bzrlib/builtins.py:5750

3489

msgid ""

3490

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

3491

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

3494

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

3495

msgstr ""

3496

3497

#: bzrlib/builtins.py:5663

3497

#: bzrlib/builtins.py:5756

3498

msgid ""

3499

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

3500

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

3502

"in the merge directive."

3503

msgstr ""

3504

3505

#: bzrlib/builtins.py:5668

3505

#: bzrlib/builtins.py:5761

3506

msgid ""

3507

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

3508

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

3509

msgstr ""

3510

3511

#: bzrlib/builtins.py:5671

3511

#: bzrlib/builtins.py:5764

3512

msgid ""

3513

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

3514

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

3515

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

3516

msgstr ""

3517

3518

#: bzrlib/builtins.py:5675

3518

#: bzrlib/builtins.py:5768

3519

msgid ""

3520

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

3521

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

3527

"supported clients."

3528

msgstr ""

3529

3530

#: bzrlib/builtins.py:5682

3530

#: bzrlib/builtins.py:5775

3531

msgid ""

3532

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

3533

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

3535

"in the submit branch."

3536

msgstr ""

3537

3538

#: bzrlib/builtins.py:5687

3538

#: bzrlib/builtins.py:5780

3539

msgid ""

3540

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

3541

"and\n"

3545

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

3546

msgstr ""

3547

3548

#: bzrlib/builtins.py:5693

3548

#: bzrlib/builtins.py:5786

3549

msgid ""

3550

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

3551

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

3552

msgstr ""

3553

3554

#: bzrlib/builtins.py:5696

3554

#: bzrlib/builtins.py:5789

3555

msgid ""

3556

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

3557

"into\n"

3559

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

3560

msgstr ""

3561

3562

#: bzrlib/builtins.py:5720

3562

#: bzrlib/builtins.py:5813

3563

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

3564

msgstr ""

3565

3566

#: bzrlib/builtins.py:5724

3566

#: bzrlib/builtins.py:5817

3567

msgid ""

3568

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

3569

"strict disables the check."

3570

msgstr ""

3571

3572

#: bzrlib/builtins.py:5726

3572

#: bzrlib/builtins.py:5819

3573

msgid "Mail the request to this address."

3574

msgstr ""

3575

3576

#: bzrlib/builtins.py:5730

3576

#: bzrlib/builtins.py:5823

3577

msgid "Body for the email."

3578

msgstr ""

3579

3580

#: bzrlib/builtins.py:5783

3580

#: bzrlib/builtins.py:5876

3581

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

3582

msgstr ""

3583

3584

#: bzrlib/builtins.py:5784

3584

#: bzrlib/builtins.py:5877

3585

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

3586

msgstr ""

3587

3588

#: bzrlib/builtins.py:5787

3588

#: bzrlib/builtins.py:5880

3589

msgid "Remember submit and public branch."

3590

msgstr ""

3591

3592

#: bzrlib/builtins.py:5789

3592

#: bzrlib/builtins.py:5882

3593

msgid ""

3594

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

3595

"working directory."

3596

msgstr ""

3597

3598

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

3598

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

3599

msgid "format"

3600

msgstr ""

3601

3602

#: bzrlib/builtins.py:5800

3602

#: bzrlib/builtins.py:5893

3603

msgid "Use the specified output format."

3604

msgstr ""

3605

3606

#: bzrlib/builtins.py:5822

3606

#: bzrlib/builtins.py:5915

3607

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

3608

msgstr ""

3609

3610

#: bzrlib/builtins.py:5824

3610

#: bzrlib/builtins.py:5917

3611

msgid ""

3612

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

3613

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

3614

"created tag."

3615

msgstr ""

3616

3617

#: bzrlib/builtins.py:5828

3617

#: bzrlib/builtins.py:5921

3618

msgid ""

3619

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

3620

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

3621

msgstr ""

3622

3623

#: bzrlib/builtins.py:5831

3623

#: bzrlib/builtins.py:5924

3624

msgid ""

3625

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

3626

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

3627

msgstr ""

3628

3629

#: bzrlib/builtins.py:5834

3629

#: bzrlib/builtins.py:5927

3630

msgid ""

3631

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

3632

"``bzr\n"

3633

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

3634

msgstr ""

3635

3636

#: bzrlib/builtins.py:5837

3636

#: bzrlib/builtins.py:5930

3637

msgid ""

3638

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

3639

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

3641

"details."

3642

msgstr ""

3643

3644

#: bzrlib/builtins.py:5847

3644

#: bzrlib/builtins.py:5940

3645

msgid "Delete this tag rather than placing it."

3646

msgstr ""

3647

3648

#: bzrlib/builtins.py:5850

3648

#: bzrlib/builtins.py:5943

3649

msgid "Branch in which to place the tag."

3650

msgstr ""

3651

3652

#: bzrlib/builtins.py:5852

3652

#: bzrlib/builtins.py:5945

3653

msgid "Replace existing tags."

3654

msgstr ""

3655

3656

#: bzrlib/builtins.py:5867

3656

#: bzrlib/builtins.py:5960

3657

msgid "No tag specified to delete."

3658

msgstr ""

3659

3660

#: bzrlib/builtins.py:5869

3660

#: bzrlib/builtins.py:5962

3661

#, python-format

3662

msgid "Deleted tag %s."

3663

msgstr ""

3664

3665

#: bzrlib/builtins.py:5883

3665

#: bzrlib/builtins.py:5976

3666

msgid "Please specify a tag name."

3667

msgstr ""

3668

3669

#: bzrlib/builtins.py:5891

3669

#: bzrlib/builtins.py:5984

3670

#, python-format

3671

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

3672

msgstr ""

3673

3674

#: bzrlib/builtins.py:5895

3674

#: bzrlib/builtins.py:5988

3675

#, python-format

3676

msgid "Created tag %s."

3677

msgstr ""

3678

3679

#: bzrlib/builtins.py:5897

3679

#: bzrlib/builtins.py:5990

3680

#, python-format

3681

msgid "Updated tag %s."

3682

msgstr ""

3683

3684

#: bzrlib/builtins.py:5901

3684

#: bzrlib/builtins.py:5994

3685

msgid "List tags."

3686

msgstr ""

3687

3688

#: bzrlib/builtins.py:5903

3688

#: bzrlib/builtins.py:5996

3689

msgid ""

3690

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

3691

msgstr ""

3692

3693

#: bzrlib/builtins.py:5909

3693

#: bzrlib/builtins.py:6002

3694

msgid "Branch whose tags should be displayed."

3695

msgstr ""

3696

3697

#: bzrlib/builtins.py:5911

3697

#: bzrlib/builtins.py:6004

3698

msgid "Sort tags by different criteria."

3699

msgstr ""

3700

3701

#: bzrlib/builtins.py:5911

3701

#: bzrlib/builtins.py:6004

3702

msgid "Sorting"

3703

msgstr ""

3704

3705

#: bzrlib/builtins.py:5980

3705

#: bzrlib/builtins.py:6073

3706

msgid "Reconfigure the type of a bzr directory."

3707

msgstr ""

3708

3709

#: bzrlib/builtins.py:5982

3709

#: bzrlib/builtins.py:6075

3710

msgid "A target configuration must be specified."

3711

msgstr ""

3712

3713

#: bzrlib/builtins.py:5984

3713

#: bzrlib/builtins.py:6077

3714

msgid ""

3715

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

3716

"The order of preference is\n"

3721

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

3722

msgstr ""

3723

3724

#: bzrlib/builtins.py:5998

3724

#: bzrlib/builtins.py:6091

3725

msgid "Tree type"

3726

msgstr ""

3727

3728

#: bzrlib/builtins.py:5999

3728

#: bzrlib/builtins.py:6092

3729

msgid "The relation between branch and tree."

3730

msgstr ""

3731

3732

#: bzrlib/builtins.py:6001

3732

#: bzrlib/builtins.py:6094

3733

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

3734

msgstr ""

3735

3736

#: bzrlib/builtins.py:6002

3736

#: bzrlib/builtins.py:6095

3737

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

3738

msgstr ""

3739

3740

#: bzrlib/builtins.py:6003

3740

#: bzrlib/builtins.py:6096

3741

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

3742

msgstr ""

3743

3744

#: bzrlib/builtins.py:6004

3744

#: bzrlib/builtins.py:6097

3745

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

3746

msgstr ""

3747

3748

#: bzrlib/builtins.py:6009

3748

#: bzrlib/builtins.py:6102

3749

msgid "Repository type"

3750

msgstr ""

3751

3752

#: bzrlib/builtins.py:6010

3752

#: bzrlib/builtins.py:6103

3753

msgid "Location fo the repository."

3754

msgstr ""

3755

3756

#: bzrlib/builtins.py:6012

3756

#: bzrlib/builtins.py:6105

3757

msgid ""

3758

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

3759

msgstr ""

3760

3761

#: bzrlib/builtins.py:6014

3761

#: bzrlib/builtins.py:6107

3762

msgid "Reconfigure to use a shared repository."

3763

msgstr ""

3764

3765

#: bzrlib/builtins.py:6018

3765

#: bzrlib/builtins.py:6111

3766

msgid "Trees in Repository"

3767

msgstr ""

3768

3769

#: bzrlib/builtins.py:6019

3769

#: bzrlib/builtins.py:6112

3770

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

3771

msgstr ""

3772

3773

#: bzrlib/builtins.py:6021

3773

#: bzrlib/builtins.py:6114

3774

msgid ""

3775

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

3776

msgstr ""

3777

3778

#: bzrlib/builtins.py:6023

3778

#: bzrlib/builtins.py:6116

3779

msgid ""

3780

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

3781

msgstr ""

3782

3783

#: bzrlib/builtins.py:6026

3783

#: bzrlib/builtins.py:6119

3784

msgid "Branch to bind checkout to."

3785

msgstr ""

3786

3787

#: bzrlib/builtins.py:6028

3787

#: bzrlib/builtins.py:6121

3788

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

3789

msgstr ""

3790

3791

#: bzrlib/builtins.py:6031

3791

#: bzrlib/builtins.py:6124

3792

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

3793

msgstr ""

3794

3795

#: bzrlib/builtins.py:6035

3795

#: bzrlib/builtins.py:6128

3796

msgid ""

3797

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

3798

"data into it."

3799

msgstr ""

3800

3801

#: bzrlib/builtins.py:6045

3801

#: bzrlib/builtins.py:6138

3802

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

3803

msgstr ""

3804

3805

#: bzrlib/builtins.py:6059

3805

#: bzrlib/builtins.py:6152

3806

msgid "No target configuration specified"

3807

msgstr ""

3808

3809

#: bzrlib/builtins.py:6094

3809

#: bzrlib/builtins.py:6187

3810

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

3811

msgstr ""

3812

3813

#: bzrlib/builtins.py:6096

3813

#: bzrlib/builtins.py:6189

3814

msgid ""

3815

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

3816

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

3818

"of the new location and binds to it."

3819

msgstr ""

3820

3821

#: bzrlib/builtins.py:6101

3821

#: bzrlib/builtins.py:6194

3822

msgid ""

3823

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

3824

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

3825

msgstr ""

3826

3827

#: bzrlib/builtins.py:6104

3827

#: bzrlib/builtins.py:6197

3828

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

3829

msgstr ""

3830

3831

#: bzrlib/builtins.py:6106

3831

#: bzrlib/builtins.py:6199

3832

msgid ""

3833

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

3834

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

3836

"/path/to/newbranch."

3837

msgstr ""

3838

3839

#: bzrlib/builtins.py:6111

3839

#: bzrlib/builtins.py:6204

3840

msgid ""

3841

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

3842

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

3843

"that of the master."

3844

msgstr ""

3845

3846

#: bzrlib/builtins.py:6119

3846

#: bzrlib/builtins.py:6212

3847

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

3848

msgstr ""

3849

3850

#: bzrlib/builtins.py:6122

3850

#: bzrlib/builtins.py:6215

3851

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

3852

msgstr ""

3853

3854

#: bzrlib/builtins.py:6134

3854

#: bzrlib/builtins.py:6229

3855

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

3856

msgstr ""

3857

3858

#: bzrlib/builtins.py:6145

3858

#: bzrlib/builtins.py:6242

3859

msgid "cannot create branch without source branch"

3860

msgstr ""

3861

3862

#: bzrlib/builtins.py:6209

3862

#: bzrlib/builtins.py:6262

3863

msgid "Manage filtered views."

3864

msgstr ""

3865

3866

#: bzrlib/builtins.py:6211

3866

#: bzrlib/builtins.py:6264

3867

msgid ""

3868

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

3869

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

3873

"must be within the current view."

3874

msgstr ""

3875

3876

#: bzrlib/builtins.py:6218

3876

#: bzrlib/builtins.py:6271

3877

msgid ""

3878

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

3879

"a selected change and is deleted once that change is committed.\n"

3881

"and switch between them."

3882

msgstr ""

3883

3884

#: bzrlib/builtins.py:6223

3884

#: bzrlib/builtins.py:6276

3885

msgid ""

3886

"To disable the current view without deleting it, you can switch to\n"

3887

"the pseudo view called ``off``. This can be useful when you need\n"

3889

"want to switch back to your view after that."

3890

msgstr ""

3891

3892

#: bzrlib/builtins.py:6228

3892

#: bzrlib/builtins.py:6281

3893

msgid ""

3894

":Examples:\n"

3895

" To define the current view::"

3896

msgstr ""

3897

3898

#: bzrlib/builtins.py:6231

3898

#: bzrlib/builtins.py:6284

3899

msgid " bzr view file1 dir1 ..."

3900

msgstr ""

3901

3902

#: bzrlib/builtins.py:6233

3902

#: bzrlib/builtins.py:6286

3903

msgid " To list the current view::"

3904

msgstr ""

3905

3906

#: bzrlib/builtins.py:6235

3906

#: bzrlib/builtins.py:6288

3907

msgid " bzr view"

3908

msgstr ""

3909

3910

#: bzrlib/builtins.py:6237

3910

#: bzrlib/builtins.py:6290

3911

msgid " To delete the current view::"

3912

msgstr ""

3913

3914

#: bzrlib/builtins.py:6239

3914

#: bzrlib/builtins.py:6292

3915

msgid " bzr view --delete"

3916

msgstr ""

3917

3918

#: bzrlib/builtins.py:6241

3918

#: bzrlib/builtins.py:6294

3919

msgid " To disable the current view without deleting it::"

3920

msgstr ""

3921

3922

#: bzrlib/builtins.py:6243

3922

#: bzrlib/builtins.py:6296

3923

msgid " bzr view --switch off"

3924

msgstr ""

3925

3926

#: bzrlib/builtins.py:6245

3926

#: bzrlib/builtins.py:6298

3927

msgid " To define a named view and switch to it::"

3928

msgstr ""

3929

3930

#: bzrlib/builtins.py:6247

3930

#: bzrlib/builtins.py:6300

3931

msgid " bzr view --name view-name file1 dir1 ..."

3932

msgstr ""

3933

3934

#: bzrlib/builtins.py:6249

3934

#: bzrlib/builtins.py:6302

3935

msgid " To list a named view::"

3936

msgstr ""

3937

3938

#: bzrlib/builtins.py:6251

3938

#: bzrlib/builtins.py:6304

3939

msgid " bzr view --name view-name"

3940

msgstr ""

3941

3942

#: bzrlib/builtins.py:6253

3942

#: bzrlib/builtins.py:6306

3943

msgid " To delete a named view::"

3944

msgstr ""

3945

3946

#: bzrlib/builtins.py:6255

3946

#: bzrlib/builtins.py:6308

3947

msgid " bzr view --name view-name --delete"

3948

msgstr ""

3949

3950

#: bzrlib/builtins.py:6257

3950

#: bzrlib/builtins.py:6310

3951

msgid " To switch to a named view::"

3952

msgstr ""

3953

3954

#: bzrlib/builtins.py:6259

3954

#: bzrlib/builtins.py:6312

3955

msgid " bzr view --switch view-name"

3956

msgstr ""

3957

3958

#: bzrlib/builtins.py:6261

3958

#: bzrlib/builtins.py:6314

3959

msgid " To list all views defined::"

3960

msgstr ""

3961

3962

#: bzrlib/builtins.py:6263

3962

#: bzrlib/builtins.py:6316

3963

msgid " bzr view --all"

3964

msgstr ""

3965

3966

#: bzrlib/builtins.py:6265

3966

#: bzrlib/builtins.py:6318

3967

msgid " To delete all views::"

3968

msgstr ""

3969

3970

#: bzrlib/builtins.py:6267

3970

#: bzrlib/builtins.py:6320

3971

msgid " bzr view --delete --all"

3972

msgstr ""

3973

3974

#: bzrlib/builtins.py:6274

3974

#: bzrlib/builtins.py:6327

3975

msgid "Apply list or delete action to all views."

3976

msgstr ""

3977

3978

#: bzrlib/builtins.py:6277

3978

#: bzrlib/builtins.py:6330

3979

msgid "Delete the view."

3980

msgstr ""

3981

3982

#: bzrlib/builtins.py:6280

3982

#: bzrlib/builtins.py:6333

3983

msgid "Name of the view to define, list or delete."

3984

msgstr ""

3985

3986

#: bzrlib/builtins.py:6284

3986

#: bzrlib/builtins.py:6337

3987

msgid "Name of the view to switch to."

3988

msgstr ""

3989

3990

#: bzrlib/builtins.py:6303

3990

#: bzrlib/builtins.py:6356

3991

msgid "Both --delete and a file list specified"

3992

msgstr ""

3993

3994

#: bzrlib/builtins.py:6306

3994

#: bzrlib/builtins.py:6359

3995

msgid "Both --delete and --switch specified"

3996

msgstr ""

3997

3998

#: bzrlib/builtins.py:6309

3998

#: bzrlib/builtins.py:6362

3999

msgid "Deleted all views.\n"

4000

msgstr ""

4001

4002

#: bzrlib/builtins.py:6311

4002

#: bzrlib/builtins.py:6364

4003

msgid "No current view to delete"

4004

msgstr ""

4005

4006

#: bzrlib/builtins.py:6314

4006

#: bzrlib/builtins.py:6367

4007

#, python-format

4008

msgid "Deleted '%s' view.\n"

4009

msgstr ""

4010

4011

#: bzrlib/builtins.py:6318

4011

#: bzrlib/builtins.py:6371

4012

msgid "Both --switch and a file list specified"

4013

msgstr ""

4014

4015

#: bzrlib/builtins.py:6321

4015

#: bzrlib/builtins.py:6374

4016

msgid "Both --switch and --all specified"

4017

msgstr ""

4018

4019

#: bzrlib/builtins.py:6324

4019

#: bzrlib/builtins.py:6377

4020

msgid "No current view to disable"

4021

msgstr ""

4022

4023

#: bzrlib/builtins.py:6326

4023

#: bzrlib/builtins.py:6379

4024

#, python-format

4025

msgid "Disabled '%s' view.\n"

4026

msgstr ""

4027

4028

#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352

4028

#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405

4029

msgid "Using '{0}' view: {1}\n"

4030

msgstr ""

4031

4032

#: bzrlib/builtins.py:6333

4032

#: bzrlib/builtins.py:6386

4033

msgid "Views defined:\n"

4034

msgstr ""

4035

4036

#: bzrlib/builtins.py:6342

4036

#: bzrlib/builtins.py:6395

4037

msgid "No views defined.\n"

4038

msgstr ""

4039

4040

#: bzrlib/builtins.py:6349

4040

#: bzrlib/builtins.py:6402

4041

msgid "Cannot change the 'off' pseudo view"

4042

msgstr ""

4043

4044

#: bzrlib/builtins.py:6357

4044

#: bzrlib/builtins.py:6410

4045

msgid "No current view.\n"

4046

msgstr ""

4047

4048

#: bzrlib/builtins.py:6360

4048

#: bzrlib/builtins.py:6413

4049

msgid "'{0}' view is: {1}\n"

4050

msgstr ""

4051

4052

#: bzrlib/builtins.py:6380

4052

#: bzrlib/builtins.py:6433

4053

msgid " <no hooks installed>\n"

4054

msgstr ""

4055

4056

#: bzrlib/builtins.py:6384

4056

#: bzrlib/builtins.py:6437

4057

msgid "Remove a branch."

4058

msgstr ""

4059

4060

#: bzrlib/builtins.py:6386

4060

#: bzrlib/builtins.py:6439

4061

msgid ""

4062

"This will remove the branch from the specified location but \n"

4063

"will keep any working tree or repository in place."

4064

msgstr ""

4065

4066

#: bzrlib/builtins.py:6391

4066

#: bzrlib/builtins.py:6444

4067

msgid " Remove the branch at repo/trunk::"

4068

msgstr ""

4069

4070

#: bzrlib/builtins.py:6393

4070

#: bzrlib/builtins.py:6446

4071

msgid " bzr remove-branch repo/trunk"

4072

msgstr ""

4073

4074

#: bzrlib/builtins.py:6408

4074

#: bzrlib/builtins.py:6461

4075

msgid "Plaintext diff output."

4076

msgstr ""

4077

4078

#: bzrlib/builtins.py:6409

4078

#: bzrlib/builtins.py:6462

4079

msgid "Temporarily set aside some changes from the current tree."

4080

msgstr ""

4081

4082

#: bzrlib/builtins.py:6411

4082

#: bzrlib/builtins.py:6464

4083

msgid ""

4084

"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"

4085

"ie. out of the way, until a later time when you can bring them back from\n"

4088

"will they survive its deletion."

4089

msgstr ""

4090

4091

#: bzrlib/builtins.py:6417

4091

#: bzrlib/builtins.py:6470

4092

msgid "If shelve --list is specified, previously-shelved changes are listed."

4093

msgstr ""

4094

4095

#: bzrlib/builtins.py:6419

4095

#: bzrlib/builtins.py:6472

4096

msgid ""

4097

"Shelve is intended to help separate several sets of changes that have\n"

4098

"been inappropriately mingled. If you just want to get rid of all changes\n"

4100

"shelve all text changes at once, use shelve --all."

4101

msgstr ""

4102

4103

#: bzrlib/builtins.py:6424

4103

#: bzrlib/builtins.py:6477

4104

msgid ""

4105

"If filenames are specified, only the changes to those files will be\n"

4106

"shelved. Other files will be left untouched."

4107

msgstr ""

4108

4109

#: bzrlib/builtins.py:6427

4109

#: bzrlib/builtins.py:6480

4110

msgid ""

4111

"If a revision is specified, changes since that revision will be shelved."

4112

msgstr ""

4113

4114

#: bzrlib/builtins.py:6429

4114

#: bzrlib/builtins.py:6482

4115

msgid ""

4116

"You can put multiple items on the shelf, and by default, 'unshelve' will\n"

4117

"restore the most recently shelved changes."

4118

msgstr ""

4119

4120

#: bzrlib/builtins.py:6432

4120

#: bzrlib/builtins.py:6485

4121

msgid ""

4122

"For complicated changes, it is possible to edit the changes in a separate\n"

4123

"editor program to decide what the file remaining in the working copy\n"

4124

"should look like. To do this, add the configuration option"

4125

msgstr ""

4126

4127

#: bzrlib/builtins.py:6436

4127

#: bzrlib/builtins.py:6489

4128

msgid " change_editor = PROGRAM @new_path @old_path"

4129

msgstr ""

4130

4131

#: bzrlib/builtins.py:6438

4131

#: bzrlib/builtins.py:6491

4132

msgid ""

4133

"where @new_path is replaced with the path of the new version of the \n"

4134

"file and @old_path is replaced with the path of the old version of \n"

4137

" "

4138

msgstr ""

4139

4140

#: bzrlib/builtins.py:6450

4140

#: bzrlib/builtins.py:6503

4141

msgid "Shelve all changes."

4142

msgstr ""

4143

4144

#: bzrlib/builtins.py:6452

4144

#: bzrlib/builtins.py:6505

4145

msgid "Method to use for writing diffs."

4146

msgstr ""

4147

4148

#: bzrlib/builtins.py:6452

4148

#: bzrlib/builtins.py:6505

4149

msgid "writer"

4150

msgstr ""

4151

4152

#: bzrlib/builtins.py:6456

4152

#: bzrlib/builtins.py:6509

4153

msgid "List shelved changes."

4154

msgstr ""

4155

4156

#: bzrlib/builtins.py:6458

4156

#: bzrlib/builtins.py:6511

4157

msgid "Destroy removed changes instead of shelving them."

4158

msgstr ""

4159

4160

#: bzrlib/builtins.py:6487

4160

#: bzrlib/builtins.py:6540

4161

msgid "No shelved changes."

4162

msgstr ""

4163

4164

#: bzrlib/builtins.py:6498

4164

#: bzrlib/builtins.py:6551

4165

msgid "Restore shelved changes."

4166

msgstr ""

4167

4168

#: bzrlib/builtins.py:6500

4168

#: bzrlib/builtins.py:6553

4169

msgid ""

4170

"By default, the most recently shelved changes are restored. However if you\n"

4171

"specify a shelf by id those changes will be restored instead. This works\n"

4172

"best when the changes don't depend on each other."

4173

msgstr ""

4174

4175

#: bzrlib/builtins.py:6509

4175

#: bzrlib/builtins.py:6562

4176

msgid "The action to perform."

4177

msgstr ""

4178

4179

#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694

4179

#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694

4180

msgid "action"

4181

msgstr ""

4182

4183

#: bzrlib/builtins.py:6511

4183

#: bzrlib/builtins.py:6564

4184

msgid "Apply changes and remove from the shelf."

4185

msgstr ""

4186

4187

#: bzrlib/builtins.py:6512

4187

#: bzrlib/builtins.py:6565

4188

msgid "Show changes, but do not apply or remove them."

4189

msgstr ""

4190

4191

#: bzrlib/builtins.py:6513

4191

#: bzrlib/builtins.py:6566

4192

msgid ""

4193

"Instead of unshelving the changes, show the diff that would result from "

4194

"unshelving."

4195

msgstr ""

4196

4197

#: bzrlib/builtins.py:6515

4197

#: bzrlib/builtins.py:6568

4198

msgid "Delete changes without applying them."

4199

msgstr ""

4200

4201

#: bzrlib/builtins.py:6516

4201

#: bzrlib/builtins.py:6569

4202

msgid "Apply changes but don't delete them."

4203

msgstr ""

4204

4205

#: bzrlib/builtins.py:6531

4205

#: bzrlib/builtins.py:6584

4206

msgid "Remove unwanted files from working tree."

4207

msgstr ""

4208

4209

#: bzrlib/builtins.py:6533

4209

#: bzrlib/builtins.py:6586

4210

msgid ""

4211

"By default, only unknown files, not ignored files, are deleted. Versioned\n"

4212

"files are never deleted."

4213

msgstr ""

4214

4215

#: bzrlib/builtins.py:6536

4215

#: bzrlib/builtins.py:6589

4216

msgid ""

4217

"Another class is 'detritus', which includes files emitted by bzr during\n"

4218

"normal operations and selftests. (The value of these files decreases with\n"

4219

"time.)"

4220

msgstr ""

4221

4222

#: bzrlib/builtins.py:6540

4222

#: bzrlib/builtins.py:6593

4223

msgid ""

4224

"If no options are specified, unknown files are deleted. Otherwise, option\n"

4225

"flags are respected, and may be combined."

4226

msgstr ""

4227

4228

#: bzrlib/builtins.py:6543

4228

#: bzrlib/builtins.py:6596

4229

msgid "To check what clean-tree will do, use --dry-run."

4230

msgstr ""

4231

4232

#: bzrlib/builtins.py:6546

4232

#: bzrlib/builtins.py:6599

4233

msgid "Delete all ignored files."

4234

msgstr ""

4235

4236

#: bzrlib/builtins.py:6547

4236

#: bzrlib/builtins.py:6600

4237

msgid ""

4238

"Delete conflict files, merge and revert backups, and failed selftest dirs."

4239

msgstr ""

4240

4241

#: bzrlib/builtins.py:6550

4241

#: bzrlib/builtins.py:6603

4242

msgid "Delete files unknown to bzr (default)."

4243

msgstr ""

4244

4245

#: bzrlib/builtins.py:6551

4245

#: bzrlib/builtins.py:6604

4246

msgid "Show files to delete instead of deleting them."

4247

msgstr ""

4248

4249

#: bzrlib/builtins.py:6553

4249

#: bzrlib/builtins.py:6606

4250

msgid "Do not prompt before deleting."

4251

msgstr ""

4252

4306

msgstr[0] ""

4307

msgstr[1] ""

4308

4309

#: bzrlib/bzrdir.py:489

4309

#: bzrlib/bzrdir.py:490

4310

msgid ""

4311

"making backup of {0}\n"

4312

" to {1}"

4313

msgstr ""

4314

4315

#: bzrlib/bzrdir.py:512

4315

#: bzrlib/bzrdir.py:513

4316

msgid "renamed {0} to {1}"

4317

msgstr ""

4318

4319

#: bzrlib/bzrdir.py:1663

4319

#: bzrlib/bzrdir.py:1652

4320

#, python-format

4321

msgid ""

4322

"Source repository format does not support stacking, using format:\n"

4323

" %s"

4324

msgstr ""

4325

4326

#: bzrlib/bzrdir.py:1683

4326

#: bzrlib/bzrdir.py:1672

4327

#, python-format

4328

msgid ""

4329

"Source branch format does not support stacking, using format:\n"

4330

" %s"

4331

msgstr ""

4332

4333

#: bzrlib/bzrdir.py:1829

4333

#: bzrlib/bzrdir.py:1818

4334

msgid "starting repository conversion"

4335

msgstr ""

4336

4337

#: bzrlib/bzrdir.py:2058

4337

#: bzrlib/bzrdir.py:2039

4338

msgid "Using default stacking branch {0} at {1}"

4339

msgstr ""

4340

4573

msgid "bzr version-info --revision takes exactly one revision specifier"

4574

msgstr ""

4575

4576

#: bzrlib/commands.py:228

4576

#: bzrlib/commands.py:229

4577

#, python-format

4578

msgid "unknown command \"%s\""

4579

msgstr ""

4580

4581

#: bzrlib/commands.py:475

4581

#: bzrlib/commands.py:476

4582

msgid "No help for this command."

4583

msgstr ""

4584

4585

#: bzrlib/commands.py:488

4585

#: bzrlib/commands.py:489

4586

#, python-format

4587

msgid ":Purpose: %s\n"

4588

msgstr ""

4589

4590

#: bzrlib/commands.py:490

4590

#: bzrlib/commands.py:491

4591

#, python-format

4592

msgid ""

4593

":Usage:\n"

4594

"%s\n"

4595

msgstr ""

4596

4597

#: bzrlib/commands.py:492

4597

#: bzrlib/commands.py:493

4598

#, python-format

4599

msgid ":Usage: %s\n"

4600

msgstr ""

4601

4602

#: bzrlib/commands.py:511

4602

#: bzrlib/commands.py:512

4603

#, python-format

4604

msgid ":Options:%s"

4605

msgstr ""

4606

4607

#: bzrlib/commands.py:522

4607

#: bzrlib/commands.py:523

4608

#, python-format

4609

msgid ""

4610

":Description:\n"

4612

"\n"

4613

msgstr ""

4614

4615

#: bzrlib/commands.py:532

4615

#: bzrlib/commands.py:533

4616

#, python-format

4617

msgid ""

4618

"See bzr help %s for more details and examples.\n"

4619

"\n"

4620

msgstr ""

4621

4622

#: bzrlib/commands.py:537

4622

#: bzrlib/commands.py:538

4623

msgid ":Aliases: "

4624

msgstr ""

4625

4626

#: bzrlib/commands.py:541

4626

#: bzrlib/commands.py:542

4627

#, python-format

4628

msgid ":From: plugin \"%s\"\n"

4629

msgstr ""

4630

4631

#: bzrlib/commands.py:553

4631

#: bzrlib/commands.py:554

4632

msgid ":doc:`{0} <{1}-help>`"

4633

msgstr ""

4634

4635

#: bzrlib/commands.py:557

4635

#: bzrlib/commands.py:558

4636

#, python-format

4637

msgid ":See also: %s"

4638

msgstr ""

4639

4640

#: bzrlib/commands.py:815 bzrlib/gpg.py:324

4640

#: bzrlib/commands.py:816 bzrlib/gpg.py:324

4641

msgid "Only ASCII permitted in option names"

4642

msgstr ""

4643

4644

#: bzrlib/commands.py:840 bzrlib/commands.py:848

4644

#: bzrlib/commands.py:841 bzrlib/commands.py:849

4645

msgid "command {0!r} needs one or more {1}"

4646

msgstr ""

4647

4648

#: bzrlib/commands.py:857

4648

#: bzrlib/commands.py:858

4649

msgid "command {0!r} requires argument {1}"

4650

msgstr ""

4651

4652

#: bzrlib/commands.py:864

4652

#: bzrlib/commands.py:865

4653

msgid "extra argument to command {0}: {1}"

4654

msgstr ""

4655

4656

#: bzrlib/commands.py:961

4656

#: bzrlib/commands.py:962

4657

#, python-format

4658

msgid "Profile data written to \"%s\"."

4659

msgstr ""

4755

msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."

4756

msgstr ""

4757

4758

#: bzrlib/config.py:2499

4758

#: bzrlib/config.py:2485

4759

msgid "{0} is not an SI unit."

4760

msgstr ""

4761

4762

#: bzrlib/config.py:2956

4762

#: bzrlib/config.py:2949

4763

msgid ""

4764

"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "

4765

"will be saved."

4766

msgstr ""

4767

4768

#: bzrlib/config.py:3100

4768

#: bzrlib/config.py:3093

4769

#, python-format

4770

msgid "Invalid '%s', should be of the form 'name=value'"

4771

msgstr ""

4772

4773

#: bzrlib/config.py:3969

4773

#: bzrlib/config.py:3962

4774

msgid "Display, set or remove a configuration option."

4775

msgstr ""

4776

4777

#: bzrlib/config.py:3971

4777

#: bzrlib/config.py:3964

4778

msgid "Display the active value for a given option."

4779

msgstr ""

4780

4781

#: bzrlib/config.py:3973

4781

#: bzrlib/config.py:3966

4782

msgid ""

4783

"If --all is specified, NAME is interpreted as a regular expression and all\n"

4784

"matching options are displayed mentioning their scope. The active value\n"

4785

"that bzr will take into account is the first one displayed for each option."

4786

msgstr ""

4787

4788

#: bzrlib/config.py:3977

4788

#: bzrlib/config.py:3970

4789

msgid "If no NAME is given, --all .* is implied."

4790

msgstr ""

4791

4792

#: bzrlib/config.py:3979

4792

#: bzrlib/config.py:3972

4793

msgid ""

4794

"Setting a value is achieved by using name=value without spaces. The value\n"

4795

"is set in the most relevant scope and can be checked by displaying the\n"

4796

"option again."

4797

msgstr ""

4798

4799

#: bzrlib/config.py:3991

4799

#: bzrlib/config.py:3984

4800

msgid "Reduce the scope to the specified configuration file."

4801

msgstr ""

4802

4803

#: bzrlib/config.py:3995

4803

#: bzrlib/config.py:3988

4804

msgid "Display all the defined values for the matching options."

4805

msgstr ""

4806

4807

#: bzrlib/config.py:3997

4807

#: bzrlib/config.py:3990

4808

msgid "Remove the option from the configuration file."

4809

msgstr ""

4810

4884

msgstr[0] ""

4885

msgstr[1] ""

4886

4887

#: bzrlib/controldir.py:698

4887

#: bzrlib/controldir.py:710

4888

msgid "{0} is{1} redirected to {2}"

4889

msgstr ""

4890

4990

msgid "The value '%(value)s' is not a valid value."

4991

msgstr ""

4992

4993

#: bzrlib/errors.py:424

4994

msgid "Bad value \"%(value)s\" for option \"%(name)s\"."

4995

msgstr ""

4996

4993

4997

#: bzrlib/errors.py:443

4994

4998

msgid "Generic path error: %(path)r%(extra)s)"

4995

4999

msgstr ""

5089

5093

msgstr ""

5090

5094

5091

5095

#: bzrlib/errors.py:705

5096

msgid "A control directory already exists: \"%(path)s\"."

5097

msgstr ""

5098

5099

#: bzrlib/errors.py:710

5092

5100

msgid "Already a branch: \"%(path)s\"."

5093

5101

msgstr ""

5094

5102

5095

#: bzrlib/errors.py:711

5103

#: bzrlib/errors.py:715

5104

msgid "Parent branch already exists: \"%(path)s\"."

5105

msgstr ""

5106

5107

#: bzrlib/errors.py:721

5096

5108

msgid ""

5097

5109

"Directory contains a branch, but no working tree (use bzr checkout if you "

5098

5110

"wish to build a working tree): \"%(path)s\""

5099

5111

msgstr ""

5100

5112

5101

#: bzrlib/errors.py:716

5113

#: bzrlib/errors.py:726

5102

5114

msgid ""

5103

5115

"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""

5104

5116

msgstr ""

5105

5117

5106

#: bzrlib/errors.py:726

5118

#: bzrlib/errors.py:736

5107

5119

msgid ""

5108

5120

"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""

5109

5121

msgstr ""

5110

5122

5111

#: bzrlib/errors.py:736

5123

#: bzrlib/errors.py:746

5112

5124

msgid "No repository present: \"%(path)s\""

5113

5125

msgstr ""

5114

5126

5115

#: bzrlib/errors.py:743

5127

#: bzrlib/errors.py:753

5116

5128

msgid ""

5117

5129

"Unsupported branch format: %(format)s\n"

5118

5130

"Please run 'bzr upgrade'"

5119

5131

msgstr ""

5120

5132

5121

#: bzrlib/errors.py:749

5133

#: bzrlib/errors.py:759

5122

5134

msgid "Unknown %(kind)s format: %(format)r"

5123

5135

msgstr ""

5124

5136

5125

#: bzrlib/errors.py:758

5137

#: bzrlib/errors.py:768

5126

5138

msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."

5127

5139

msgstr ""

5128

5140

5129

#: bzrlib/errors.py:768

5141

#: bzrlib/errors.py:778

5130

5142

msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"

5131

5143

msgstr ""

5132

5144

5133

#: bzrlib/errors.py:783

5145

#: bzrlib/errors.py:793

5134

5146

msgid ""

5135

5147

"%(target)s\n"

5136

5148

"is not compatible with\n"

5138

5150

"%(details)s"

5139

5151

msgstr ""

5140

5152

5141

#: bzrlib/errors.py:799

5153

#: bzrlib/errors.py:809

5142

5154

msgid "Revision is not compatible with %(repo_format)s"

5143

5155

msgstr ""

5144

5156

5145

#: bzrlib/errors.py:809

5157

#: bzrlib/errors.py:819

5146

5158

msgid "%(context_info)s%(path)s is already versioned."

5147

5159

msgstr ""

5148

5160

5149

#: bzrlib/errors.py:830

5161

#: bzrlib/errors.py:840

5150

5162

msgid "%(context_info)s%(path)s is not versioned."

5151

5163

msgstr ""

5152

5164

5153

#: bzrlib/errors.py:851

5165

#: bzrlib/errors.py:861

5154

5166

msgid "Path(s) are not versioned: %(paths_as_string)s"

5155

5167

msgstr ""

5156

5168

5157

#: bzrlib/errors.py:862

5169

#: bzrlib/errors.py:872

5158

5170

msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"

5159

5171

msgstr ""

5160

5172

5161

#: bzrlib/errors.py:881

5173

#: bzrlib/errors.py:891

5162

5174

msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""

5163

5175

msgstr ""

5164

5176

5165

#: bzrlib/errors.py:889

5177

#: bzrlib/errors.py:899

5166

5178

msgid ""

5167

5179

"Filename %(filename)r is not valid in your current filesystem encoding "

5168

5180

"%(fs_encoding)s"

5169

5181

msgstr ""

5170

5182

5171

#: bzrlib/errors.py:900

5183

#: bzrlib/errors.py:910

5172

5184

msgid "Cannot operate on \"%(filename)s\" because it is a control file"

5173

5185

msgstr ""

5174

5186

5175

#: bzrlib/errors.py:918

5187

#: bzrlib/errors.py:928

5176

5188

msgid "The lock for '%(lock_description)s' is in use and cannot be broken."

5177

5189

msgstr ""

5178

5190

5179

#: bzrlib/errors.py:957

5191

#: bzrlib/errors.py:967

5180

5192

msgid "Cannot lock %(lock)s: %(why)s"

5181

5193

msgstr ""

5182

5194

5183

#: bzrlib/errors.py:967

5195

#: bzrlib/errors.py:977

5184

5196

msgid ""

5185

5197

"A transaction related operation was attempted after the transaction finished."

5186

5198

msgstr ""

5187

5199

5188

#: bzrlib/errors.py:994

5200

#: bzrlib/errors.py:1004

5189

5201

msgid "Cannot lock: transport is read only: %(transport)s"

5190

5202

msgstr ""

5191

5203

5192

#: bzrlib/errors.py:1002

5204

#: bzrlib/errors.py:1012

5193

5205

msgid "Could not acquire lock \"%(lock)s\": %(msg)s"

5194

5206

msgstr ""

5195

5207

5196

#: bzrlib/errors.py:1013

5208

#: bzrlib/errors.py:1023

5197

5209

msgid ""

5198

5210

"Lock was broken while still open: %(lock)s - check storage consistency!"

5199

5211

msgstr ""

5200

5212

5201

#: bzrlib/errors.py:1024

5213

#: bzrlib/errors.py:1034

5202

5214

msgid ""

5203

5215

"Lock was released and re-acquired before being broken: %(lock)s: held by "

5204

5216

"%(holder)r, wanted to break %(target)r"

5205

5217

msgstr ""

5206

5218

5207

#: bzrlib/errors.py:1036

5219

#: bzrlib/errors.py:1046

5208

5220

msgid ""

5209

5221

"Lock is apparently held, but corrupted: %(corruption_info)s\n"

5210

5222

"Use 'bzr break-lock' to clear it"

5211

5223

msgstr ""

5212

5224

5213

#: bzrlib/errors.py:1049

5225

#: bzrlib/errors.py:1059

5214

5226

msgid "Lock not held: %(lock)s"

5215

5227

msgstr ""

5216

5228

5217

#: bzrlib/errors.py:1078

5229

#: bzrlib/errors.py:1088

5218

5230

msgid "No changes to commit"

5219

5231

msgstr ""

5220

5232

5221

#: bzrlib/errors.py:1083

5233

#: bzrlib/errors.py:1093

5222

5234

msgid ""

5223

5235

"Selected-file commit of merges is not supported yet: files %(files_str)s"

5224

5236

msgstr ""

5225

5237

5226

#: bzrlib/errors.py:1093

5238

#: bzrlib/errors.py:1103

5227

5239

msgid ""

5228

5240

"Excluding paths during commit is not supported by repository at "

5229

5241

"%(repository)r."

5230

5242

msgstr ""

5231

5243

5232

#: bzrlib/errors.py:1102

5244

#: bzrlib/errors.py:1112

5233

5245

msgid ""

5234

5246

"The specified commit message contains characters unsupported by the current "

5235

5247

"encoding."

5236

5248

msgstr ""

5237

5249

5238

#: bzrlib/errors.py:1108

5250

#: bzrlib/errors.py:1118

5239

5251

msgid "Upgrade URL cannot work with readonly URLs."

5240

5252

msgstr ""

5241

5253

5242

#: bzrlib/errors.py:1113

5254

#: bzrlib/errors.py:1123

5243

5255

msgid "The branch format %(format)s is already at the most recent format."

5244

5256

msgstr ""

5245

5257

5246

#: bzrlib/errors.py:1136

5258

#: bzrlib/errors.py:1146

5247

5259

msgid "Option --change does not accept revision ranges"

5248

5260

msgstr ""

5249

5261

5250

#: bzrlib/errors.py:1141

5262

#: bzrlib/errors.py:1151

5251

5263

msgid "No namespace registered for string: %(spec)r"

5252

5264

msgstr ""

5253

5265

5254

#: bzrlib/errors.py:1160

5266

#: bzrlib/errors.py:1170

5255

5267

msgid ""

5256

5268

"Requested revision: '%(spec)s' does not exist in branch: "

5257

5269

"%(branch_url)s%(extra)s"

5258

5270

msgstr ""

5259

5271

5260

#: bzrlib/errors.py:1174

5272

#: bzrlib/errors.py:1184

5261

5273

msgid ""

5262

5274

"Operation denied because it would change the main history, which is not "

5263

5275

"permitted by the append_revisions_only setting on branch \"%(location)s\"."

5264

5276

msgstr ""

5265

5277

5266

#: bzrlib/errors.py:1185

5278

#: bzrlib/errors.py:1195

5267

5279

msgid ""

5268

5280

"These branches have diverged. Use the missing command to see how.\n"

5269

5281

"Use the merge command to reconcile them."

5270

5282

msgstr ""

5271

5283

5272

#: bzrlib/errors.py:1205

5284

#: bzrlib/errors.py:1215

5273

5285

msgid ""

5274

5286

"Branches have no common ancestor, and no merge base revision was specified."

5275

5287

msgstr ""

5276

5288

5277

#: bzrlib/errors.py:1211

5289

#: bzrlib/errors.py:1221

5278

5290

msgid ""

5279

5291

"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."

5280

5292

msgstr ""

5281

5293

5282

#: bzrlib/errors.py:1217

5294

#: bzrlib/errors.py:1227

5283

5295

msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"

5284

5296

msgstr ""

5285

5297

5286

#: bzrlib/errors.py:1226

5298

#: bzrlib/errors.py:1236

5287

5299

msgid ""

5288

5300

"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."

5289

5301

msgstr ""

5290

5302

5291

#: bzrlib/errors.py:1235

5303

#: bzrlib/errors.py:1245

5292

5304

msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"

5293

5305

msgstr ""

5294

5306

5295

#: bzrlib/errors.py:1244

5307

#: bzrlib/errors.py:1254

5296

5308

msgid "Branch %(branch)s has no commits."

5297

5309

msgstr ""

5298

5310

5299

#: bzrlib/errors.py:1262

5311

#: bzrlib/errors.py:1272

5300

5312

msgid ""

5301

5313

"Bound branch %(branch)s is out of date with master branch "

5302

5314

"%(master)s.%(extra_help)s"

5303

5315

msgstr ""

5304

5316

5305

#: bzrlib/errors.py:1274

5317

#: bzrlib/errors.py:1284

5306

5318

msgid ""

5307

5319

"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "

5308

5320

"bound to %(remote)s."

5309

5321

msgstr ""

5310

5322

5311

#: bzrlib/errors.py:1286

5323

#: bzrlib/errors.py:1296

5312

5324

msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"

5313

5325

msgstr ""

5314

5326

5315

#: bzrlib/errors.py:1295

5327

#: bzrlib/errors.py:1305

5316

5328

msgid ""

5317

5329

"Unable to connect to target of bound branch %(branch)s => %(target)s: "

5318

5330

"%(error)s"

5319

5331

msgstr ""

5320

5332

5321

#: bzrlib/errors.py:1307

5333

#: bzrlib/errors.py:1317

5322

5334

msgid "Error in processing weave: %(msg)s"

5323

5335

msgstr ""

5324

5336

5325

#: bzrlib/errors.py:1316

5337

#: bzrlib/errors.py:1326

5326

5338

msgid "Revision {%(revision_id)s} already present in %(weave)s"

5327

5339

msgstr ""

5328

5340

5329

#: bzrlib/errors.py:1327

5341

#: bzrlib/errors.py:1337

5330

5342

msgid "Revision {%(revision_id)s} not present in %(weave)s"

5331

5343

msgstr ""

5332

5344

5333

#: bzrlib/errors.py:1337

5345

#: bzrlib/errors.py:1347

5334

5346

msgid "Weave invariant violated: %(what)s"

5335

5347

msgstr ""

5336

5348

5337

#: bzrlib/errors.py:1346

5349

#: bzrlib/errors.py:1356

5338

5350

msgid "Parents are mismatched between two revisions. %(msg)s"

5339

5351

msgstr ""

5340

5352

5341

#: bzrlib/errors.py:1368

5353

#: bzrlib/errors.py:1378

5342

5354

msgid ""

5343

5355

"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "

5344

5356

"%(weave_b)s"

5345

5357

msgstr ""

5346

5358

5347

#: bzrlib/errors.py:1380

5359

#: bzrlib/errors.py:1390

5348

5360

msgid "Versioned file error"

5349

5361

msgstr ""

5350

5362

5351

#: bzrlib/errors.py:1385

5363

#: bzrlib/errors.py:1395

5352

5364

msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."

5353

5365

msgstr ""

5354

5366

5355

#: bzrlib/errors.py:1395

5367

#: bzrlib/errors.py:1405

5356

5368

msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."

5357

5369

msgstr ""

5358

5370

5359

#: bzrlib/errors.py:1405

5371

#: bzrlib/errors.py:1415

5360

5372

msgid "Text did not match its checksum: %(msg)s"

5361

5373

msgstr ""

5362

5374

5363

#: bzrlib/errors.py:1531

5375

#: bzrlib/errors.py:1541

5364

5376

msgid "Export format %(format)r not supported"

5365

5377

msgstr ""

5366

5378

5367

#: bzrlib/errors.py:1540

5379

#: bzrlib/errors.py:1550

5368

5380

msgid "Transport error: %(msg)s %(orig_error)s"

5369

5381

msgstr ""

5370

5382

5371

#: bzrlib/errors.py:1566

5383

#: bzrlib/errors.py:1576

5372

5384

msgid "Generic bzr smart protocol error: %(details)s"

5373

5385

msgstr ""

5374

5386

5375

#: bzrlib/errors.py:1574

5387

#: bzrlib/errors.py:1584

5376

5388

msgid "Received bad protocol version marker: %(marker)r"

5377

5389

msgstr ""

5378

5390

5379

#: bzrlib/errors.py:1606

5391

#: bzrlib/errors.py:1616

5380

5392

msgid "Transport operation not possible: %(msg)s %(orig_error)s"

5381

5393

msgstr ""

5382

5394

5383

#: bzrlib/errors.py:1611

5395

#: bzrlib/errors.py:1621

5384

5396

msgid "Connection error: %(msg)s %(orig_error)s"

5385

5397

msgstr ""

5386

5398

5387

#: bzrlib/errors.py:1616

5399

#: bzrlib/errors.py:1626

5388

5400

msgid "%(msg)s %(host)s%(port)s%(orig_error)s"

5389

5401

msgstr ""

5390

5402

5391

#: bzrlib/errors.py:1637

5403

#: bzrlib/errors.py:1647

5392

5404

msgid "Connection closed: %(msg)s %(orig_error)s"

5393

5405

msgstr ""

5394

5406

5395

#: bzrlib/errors.py:1642

5407

#: bzrlib/errors.py:1652

5396

5408

msgid "Connection Timeout: %(msg)s%(orig_error)s"

5397

5409

msgstr ""

5398

5410

5399

#: bzrlib/errors.py:1647

5411

#: bzrlib/errors.py:1657

5400

5412

msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"

5401

5413

msgstr ""

5402

5414

5403

#: bzrlib/errors.py:1657

5415

#: bzrlib/errors.py:1667

5404

5416

msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"

5405

5417

msgstr ""

5406

5418

5407

#: bzrlib/errors.py:1672

5419

#: bzrlib/errors.py:1682

5420

msgid "Certificate error: %(error)s"

5421

msgstr ""

5422

5423

#: bzrlib/errors.py:1690

5408

5424

msgid "Invalid http range %(range)r for %(path)s: %(msg)s"

5409

5425

msgstr ""

5410

5426

5411

#: bzrlib/errors.py:1686

5427

#: bzrlib/errors.py:1704

5412

5428

msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"

5413

5429

msgstr ""

5414

5430

5415

#: bzrlib/errors.py:1694

5431

#: bzrlib/errors.py:1712

5416

5432

msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"

5417

5433

msgstr ""

5418

5434

5419

#: bzrlib/errors.py:1703

5435

#: bzrlib/errors.py:1721

5420

5436

msgid "%(source)s is%(permanently)s redirected to %(target)s"

5421

5437

msgstr ""

5422

5438

5423

#: bzrlib/errors.py:1717

5439

#: bzrlib/errors.py:1735

5424

5440

msgid "Too many redirections"

5425

5441

msgstr ""

5426

5442

5427

#: bzrlib/errors.py:1722

5443

#: bzrlib/errors.py:1740

5428

5444

msgid "Working tree has conflicts."

5429

5445

msgstr ""

5430

5446

5431

#: bzrlib/errors.py:1726

5447

#: bzrlib/errors.py:1744

5432

5448

msgid "Config file %(filename)s is not UTF-8 encoded\n"

5433

5449

msgstr ""

5434

5450

5435

#: bzrlib/errors.py:1735

5451

#: bzrlib/errors.py:1753

5436

5452

msgid ""

5437

5453

"Error(s) parsing config file %(filename)s:\n"

5438

5454

"%(errors)s"

5439

5455

msgstr ""

5440

5456

5441

#: bzrlib/errors.py:1746

5442

msgid "Bad value \"%(value)s\" for option \"%(name)s\"."

5457

#: bzrlib/errors.py:1763

5458

msgid ""

5459

"Bad value \"%(value)s\" for option \"%(name)s\".\n"

5460

"See ``bzr help %(name)s``"

5443

5461

msgstr ""

5444

5462

5445

#: bzrlib/errors.py:1754

5463

#: bzrlib/errors.py:1773

5446

5464

msgid "%(username)r does not seem to contain a reasonable email address"

5447

5465

msgstr ""

5448

5466

5449

#: bzrlib/errors.py:1763

5467

#: bzrlib/errors.py:1782

5450

5468

msgid "Failed to GPG sign data with command \"%(command_line)s\""

5451

5469

msgstr ""

5452

5470

5453

#: bzrlib/errors.py:1771

5471

#: bzrlib/errors.py:1790

5454

5472

msgid "Failed to verify GPG signature data with error \"%(error)s\""

5455

5473

msgstr ""

5456

5474

5457

#: bzrlib/errors.py:1779

5475

#: bzrlib/errors.py:1798

5458

5476

msgid "Unable to import library \"%(library)s\": %(error)s"

5459

5477

msgstr ""

5460

5478

5461

#: bzrlib/errors.py:1787

5479

#: bzrlib/errors.py:1806

5462

5480

msgid "python-gpgme is not installed, it is needed to verify signatures"

5463

5481

msgstr ""

5464

5482

5465

#: bzrlib/errors.py:1795

5483

#: bzrlib/errors.py:1814

5466

5484

msgid ""

5467

5485

"The working tree for %(basedir)s has changed since the last commit, but "

5468

5486

"weave merge requires that it be unchanged"

5469

5487

msgstr ""

5470

5488

5471

#: bzrlib/errors.py:1805

5489

#: bzrlib/errors.py:1824

5472

5490

msgid ""

5473

5491

"Can't reprocess and show base, because reprocessing obscures the "

5474

5492

"relationship of conflicting lines to the base"

5475

5493

msgstr ""

5476

5494

5477

#: bzrlib/errors.py:1811

5495

#: bzrlib/errors.py:1830

5478

5496

msgid "Cycle in graph %(graph)r"

5479

5497

msgstr ""

5480

5498

5481

#: bzrlib/errors.py:1839

5499

#: bzrlib/errors.py:1858

5482

5500

msgid "File %(filename)s is not conflicted."

5483

5501

msgstr ""

5484

5502

5485

#: bzrlib/errors.py:1861

5503

#: bzrlib/errors.py:1880

5486

5504

msgid "No bundle was found in \"%(filename)s\"."

5487

5505

msgstr ""

5488

5506

5489

#: bzrlib/errors.py:1870

5507

#: bzrlib/errors.py:1889

5490

5508

msgid "Unable to handle bundle version %(version)s: %(msg)s"

5491

5509

msgstr ""

5492

5510

5493

#: bzrlib/errors.py:1880

5511

#: bzrlib/errors.py:1899

5494

5512

msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"

5495

5513

msgstr ""

5496

5514

5497

#: bzrlib/errors.py:1893

5515

#: bzrlib/errors.py:1912

5498

5516

msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"

5499

5517

msgstr ""

5500

5518

5501

#: bzrlib/errors.py:1903

5519

#: bzrlib/errors.py:1922

5502

5520

msgid "Key %(key)s is already present in map"

5503

5521

msgstr ""

5504

5522

5505

#: bzrlib/errors.py:1908

5523

#: bzrlib/errors.py:1927

5506

5524

msgid "The prefix %(prefix)s is in the help search path twice."

5507

5525

msgstr ""

5508

5526

5509

#: bzrlib/errors.py:1918

5527

#: bzrlib/errors.py:1937

5510

5528

msgid ""

5511

5529

"No final name for trans_id %(trans_id)r\n"

5512

5530

"file-id: %(file_id)r\n"

5513

5531

"root trans-id: %(root_trans_id)r\n"

5514

5532

msgstr ""

5515

5533

5516

#: bzrlib/errors.py:1950

5534

#: bzrlib/errors.py:1969

5517

5535

msgid "Attempt to reuse a transform that has already been applied."

5518

5536

msgstr ""

5519

5537

5520

#: bzrlib/errors.py:1955

5538

#: bzrlib/errors.py:1974

5521

5539

msgid "Moving the root directory is not supported at this time"

5522

5540

msgstr ""

5523

5541

5524

#: bzrlib/errors.py:1960

5542

#: bzrlib/errors.py:1979

5525

5543

msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"

5526

5544

msgstr ""

5527

5545

5528

#: bzrlib/errors.py:1971

5546

#: bzrlib/errors.py:1990

5529

5547

msgid ""

5530

5548

"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5531

5549

msgstr ""

5532

5550

5533

#: bzrlib/errors.py:2007

5551

#: bzrlib/errors.py:2026

5534

5552

msgid ""

5535

5553

"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5536

5554

msgstr ""

5537

5555

5538

#: bzrlib/errors.py:2037

5556

#: bzrlib/errors.py:2056

5539

5557

msgid "Unable to import paramiko (required for sftp support): %(error)s"

5540

5558

msgstr ""

5541

5559

5542

#: bzrlib/errors.py:2045

5560

#: bzrlib/errors.py:2064

5543

5561

msgid "Nothing to merge."

5544

5562

msgstr ""

5545

5563

5546

#: bzrlib/errors.py:2050

5564

#: bzrlib/errors.py:2069

5547

5565

msgid "Format %(format)s cannot be initialised by this version of bzr."

5548

5566

msgstr ""

5549

5567

5550

#: bzrlib/errors.py:2059

5568

#: bzrlib/errors.py:2078

5551

5569

msgid ""

5552

5570

"Cannot convert from format %(from_format)s to format %(format)s. "

5553

5571

"%(problem)s"

5554

5572

msgstr ""

5555

5573

5556

#: bzrlib/errors.py:2071

5574

#: bzrlib/errors.py:2090

5557

5575

msgid "Could not find an appropriate Differ for file \"%(path)s\""

5558

5576

msgstr ""

5559

5577

5560

#: bzrlib/errors.py:2079

5578

#: bzrlib/errors.py:2098

5561

5579

msgid "%(exe_name)s could not be found on this machine"

5562

5580

msgstr ""

5563

5581

5564

#: bzrlib/errors.py:2087

5582

#: bzrlib/errors.py:2106

5565

5583

msgid "Diff is not installed on this machine: %(msg)s"

5566

5584

msgstr ""

5567

5585

5568

#: bzrlib/errors.py:2095

5586

#: bzrlib/errors.py:2114

5569

5587

msgid "Diff3 is not installed on this machine."

5570

5588

msgstr ""

5571

5589

5572

#: bzrlib/errors.py:2101

5590

#: bzrlib/errors.py:2120

5573

5591

msgid "The content being inserted is already present."

5574

5592

msgstr ""

5575

5593

5576

#: bzrlib/errors.py:2106

5594

#: bzrlib/errors.py:2125

5577

5595

msgid ""

5578

5596

"This tree contains left-over files from a failed operation.\n"

5579

5597

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5581

5599

" keep, and delete it when you are done."

5582

5600

msgstr ""

5583

5601

5584

#: bzrlib/errors.py:2117

5602

#: bzrlib/errors.py:2136

5585

5603

msgid ""

5586

5604

"This tree contains left-over files from a failed operation.\n"

5587

5605

" Please examine %(pending_deletion)s to see if it contains any files you\n"

5588

5606

" wish to keep, and delete it when you are done."

5589

5607

msgstr ""

5590

5608

5591

#: bzrlib/errors.py:2127

5609

#: bzrlib/errors.py:2146

5592

5610

msgid ""

5593

5611

"Unable to delete transform temporary directory %(limbo_dir)s.\n"

5594

5612

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5596

5614

" keep, and delete it when you are done."

5597

5615

msgstr ""

5598

5616

5599

#: bzrlib/errors.py:2138

5617

#: bzrlib/errors.py:2157

5600

5618

msgid ""

5601

5619

"Unable to delete transform temporary directory %(pending_deletion)s. Please "

5602

5620

"examine %(pending_deletion)s to see if it contains any files you wish to "

5603

5621

"keep, and delete it when you are done."

5604

5622

msgstr ""

5605

5623

5606

#: bzrlib/errors.py:2148

5624

#: bzrlib/errors.py:2167

5607

5625

msgid "Working tree is out of date, please run 'bzr update'.%(more)s"

5608

5626

msgstr ""

5609

5627

5610

#: bzrlib/errors.py:2162

5628

#: bzrlib/errors.py:2181

5611

5629

msgid ""

5612

5630

"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."

5613

5631

msgstr ""

5614

5632

5615

#: bzrlib/errors.py:2175

5633

#: bzrlib/errors.py:2194

5616

5634

msgid "Error in merge modified format"

5617

5635

msgstr ""

5618

5636

5619

#: bzrlib/errors.py:2180

5637

#: bzrlib/errors.py:2199

5620

5638

msgid "Format error in conflict listings"

5621

5639

msgstr ""

5622

5640

5623

#: bzrlib/errors.py:2184

5641

#: bzrlib/errors.py:2203

5624

5642

msgid ""

5625

5643

"Inconsistency in dirstate file %(dirstate_path)s.\n"

5626

5644

"Error: %(description)s"

5627

5645

msgstr ""

5628

5646

5629

#: bzrlib/errors.py:2195

5647

#: bzrlib/errors.py:2214

5630

5648

msgid ""

5631

5649

"An error has been detected in the repository %(repo_path)s.\n"

5632

5650

"Please run bzr reconcile on this repository."

5633

5651

msgstr ""

5634

5652

5635

#: bzrlib/errors.py:2206

5653

#: bzrlib/errors.py:2225

5636

5654

msgid ""

5637

5655

"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"

5638

5656

"reason: %(reason)s"

5639

5657

msgstr ""

5640

5658

5641

#: bzrlib/errors.py:2219

5659

#: bzrlib/errors.py:2238

5642

5660

msgid ""

5643

5661

"An inconsistent delta was supplied: %(delta)r\n"

5644

5662

"reason: %(reason)s"

5645

5663

msgstr ""

5646

5664

5647

#: bzrlib/errors.py:2231

5665

#: bzrlib/errors.py:2250

5648

5666

msgid "To use this feature you must upgrade your branch at %(path)s."

5649

5667

msgstr ""

5650

5668

5651

#: bzrlib/errors.py:2240

5669

#: bzrlib/errors.py:2259

5652

5670

msgid "To use this feature you must upgrade your repository at %(path)s."

5653

5671

msgstr ""

5654

5672

5655

#: bzrlib/errors.py:2245

5673

#: bzrlib/errors.py:2264

5656

5674

msgid ""

5657

5675

"To use this feature you must upgrade your branch at %(path)s to a format "

5658

5676

"which supports rich roots."

5659

5677

msgstr ""

5660

5678

5661

#: bzrlib/errors.py:2251

5679

#: bzrlib/errors.py:2270

5662

5680

msgid "Cannot perform local-only commits on unbound branches."

5663

5681

msgstr ""

5664

5682

5665

#: bzrlib/errors.py:2256

5683

#: bzrlib/errors.py:2275

5666

5684

msgid "The method %(mname)s is not supported on objects of type %(tname)s."

5667

5685

msgstr ""

5668

5686

5669

#: bzrlib/errors.py:2277

5687

#: bzrlib/errors.py:2296

5670

5688

msgid "Ghost tags not supported by format %(format)r."

5671

5689

msgstr ""

5672

5690

5673

#: bzrlib/errors.py:2285

5691

#: bzrlib/errors.py:2304

5674

5692

msgid "File is binary but should be text."

5675

5693

msgstr ""

5676

5694

5677

#: bzrlib/errors.py:2290

5695

#: bzrlib/errors.py:2309

5678

5696

msgid "The path %(path)s is not permitted on this platform"

5679

5697

msgstr ""

5680

5698

5681

#: bzrlib/errors.py:2299

5699

#: bzrlib/errors.py:2318

5682

5700

msgid ""

5683

5701

"Testament did not match expected value.\n"

5684

5702

" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"

5685

5703

" {%(measured)s}"

5686

5704

msgstr ""

5687

5705

5688

#: bzrlib/errors.py:2311

5706

#: bzrlib/errors.py:2330

5689

5707

msgid "Not a bzr revision-bundle: %(text)r"

5690

5708

msgstr ""

5691

5709

5692

#: bzrlib/errors.py:2320

5710

#: bzrlib/errors.py:2339

5693

5711

msgid "Bad bzr revision-bundle: %(text)r"

5694

5712

msgstr ""

5695

5713

5696

#: bzrlib/errors.py:2329

5714

#: bzrlib/errors.py:2348

5697

5715

msgid "Malformed bzr revision-bundle header: %(text)r"

5698

5716

msgstr ""

5699

5717

5700

#: bzrlib/errors.py:2334

5718

#: bzrlib/errors.py:2353

5701

5719

msgid "Malformed patches in bzr revision-bundle: %(text)r"

5702

5720

msgstr ""

5703

5721

5704

#: bzrlib/errors.py:2339

5722

#: bzrlib/errors.py:2358

5705

5723

msgid "Malformed footer in bzr revision-bundle: %(text)r"

5706

5724

msgstr ""

5707

5725

5708

#: bzrlib/errors.py:2344

5726

#: bzrlib/errors.py:2363

5709

5727

msgid "End of line marker was not \\n in bzr revision-bundle"

5710

5728

msgstr ""

5711

5729

5712

#: bzrlib/errors.py:2354

5730

#: bzrlib/errors.py:2373

5713

5731

msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"

5714

5732

msgstr ""

5715

5733

5716

#: bzrlib/errors.py:2364

5734

#: bzrlib/errors.py:2383

5717

5735

msgid "Root class for inventory serialization errors"

5718

5736

msgstr ""

5719

5737

5720

#: bzrlib/errors.py:2368

5738

#: bzrlib/errors.py:2387

5721

5739

msgid ""

5722

5740

"The inventory was not in the expected format:\n"

5723

5741

" %(msg)s"

5724

5742

msgstr ""

5725

5743

5726

#: bzrlib/errors.py:2377

5744

#: bzrlib/errors.py:2396

5727

5745

msgid "This operation requires rich root data storage"

5728

5746

msgstr ""

5729

5747

5730

#: bzrlib/errors.py:2390

5748

#: bzrlib/errors.py:2409

5731

5749

msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"

5732

5750

msgstr ""

5733

5751

5734

#: bzrlib/errors.py:2399

5752

#: bzrlib/errors.py:2418

5735

5753

msgid ""

5736

5754

"Don't know how to handle SSH connections. Please set BZR_SSH environment "

5737

5755

"variable."

5738

5756

msgstr ""

5739

5757

5740

#: bzrlib/errors.py:2406

5758

#: bzrlib/errors.py:2425

5741

5759

msgid ""

5742

5760

"Could not determine revno for {%(revision_id)s} because its ancestry shows a "

5743

5761

"ghost at {%(ghost_revision_id)s}"

5744

5762

msgstr ""

5745

5763

5746

#: bzrlib/errors.py:2416

5764

#: bzrlib/errors.py:2435

5747

5765

msgid "Ghost revision {%(revision_id)s} cannot be used here."

5748

5766

msgstr ""

5749

5767

5750

#: bzrlib/errors.py:2467

5768

#: bzrlib/errors.py:2486

5751

5769

msgid ""

5752

5770

"A merge directive must provide either a bundle or a public branch location."

5753

5771

msgstr ""

5754

5772

5755

#: bzrlib/errors.py:2474

5773

#: bzrlib/errors.py:2493

5756

5774

msgid "Bad merge directive payload %(start)r"

5757

5775

msgstr ""

5758

5776

5759

#: bzrlib/errors.py:2484

5777

#: bzrlib/errors.py:2503

5760

5778

msgid "Preview patch does not match requested changes."

5761

5779

msgstr ""

5762

5780

5763

#: bzrlib/errors.py:2490

5781

#: bzrlib/errors.py:2509

5764

5782

msgid "Patch_type was %(patch_type)s, but no patch was supplied."

5765

5783

msgstr ""

5766

5784

5767

#: bzrlib/errors.py:2500

5785

#: bzrlib/errors.py:2519

5768

5786

msgid ""

5769

5787

"Your branch does not have all of the revisions required in order to merge "

5770

5788

"this merge directive and the target location specified in the merge "

5771

5789

"directive is not a branch: %(location)s."

5772

5790

msgstr ""

5773

5791

5774

#: bzrlib/errors.py:2512

5792

#: bzrlib/errors.py:2531

5775

5793

msgid "Unsupported entry kind %(kind)s"

5776

5794

msgstr ""

5777

5795

5778

#: bzrlib/errors.py:2520

5796

#: bzrlib/errors.py:2539

5779

5797

msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"

5780

5798

msgstr ""

5781

5799

5782

#: bzrlib/errors.py:2530

5800

#: bzrlib/errors.py:2549

5783

5801

msgid "Subsume target %(other_tree)s needs to be upgraded."

5784

5802

msgstr ""

5785

5803

5786

#: bzrlib/errors.py:2549

5804

#: bzrlib/errors.py:2568

5787

5805

msgid "No such tag: %(tag_name)s"

5788

5806

msgstr ""

5789

5807

5790

#: bzrlib/errors.py:2557

5808

#: bzrlib/errors.py:2576

5791

5809

msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."

5792

5810

msgstr ""

5793

5811

5794

#: bzrlib/errors.py:2566

5812

#: bzrlib/errors.py:2585

5795

5813

msgid "Tag %(tag_name)s already exists."

5796

5814

msgstr ""

5797

5815

5798

#: bzrlib/errors.py:2574

5816

#: bzrlib/errors.py:2593

5799

5817

msgid ""

5800

5818

"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "

5801

5819

"bugs\" for more information on this feature."

5802

5820

msgstr ""

5803

5821

5804

#: bzrlib/errors.py:2584

5822

#: bzrlib/errors.py:2603

5805

5823

msgid ""

5806

5824

"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"

5807

5825

msgstr ""

5808

5826

5809

#: bzrlib/errors.py:2594

5827

#: bzrlib/errors.py:2613

5810

5828

msgid ""

5811

5829

"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"

5812

5830

msgstr ""

5813

5831

5814

#: bzrlib/errors.py:2604

5832

#: bzrlib/errors.py:2623

5815

5833

msgid "Invalid line in bugs property: '%(line)s'"

5816

5834

msgstr ""

5817

5835

5818

#: bzrlib/errors.py:2612

5836

#: bzrlib/errors.py:2631

5819

5837

msgid "Invalid bug status: '%(status)s'"

5820

5838

msgstr ""

5821

5839

5822

#: bzrlib/errors.py:2620

5840

#: bzrlib/errors.py:2639

5823

5841

msgid "Could not understand response from smart server: %(response_tuple)r"

5824

5842

msgstr ""

5825

5843

5826

#: bzrlib/errors.py:2659

5844

#: bzrlib/errors.py:2678

5827

5845

msgid "Server sent an unexpected error: %(error_tuple)r"

5828

5846

msgstr ""

5829

5847

5830

#: bzrlib/errors.py:2678

5848

#: bzrlib/errors.py:2697

5831

5849

msgid "Unrecognised container format: %(container_format)r"

5832

5850

msgstr ""

5833

5851

5834

#: bzrlib/errors.py:2686

5852

#: bzrlib/errors.py:2705

5835

5853

msgid "Unexpected end of container stream"

5836

5854

msgstr ""

5837

5855

5838

#: bzrlib/errors.py:2691

5856

#: bzrlib/errors.py:2710

5839

5857

msgid "Unknown record type: %(record_type)r"

5840

5858

msgstr ""

5841

5859

5842

#: bzrlib/errors.py:2699

5860

#: bzrlib/errors.py:2718

5843

5861

msgid "Invalid record: %(reason)s"

5844

5862

msgstr ""

5845

5863

5846

#: bzrlib/errors.py:2707

5864

#: bzrlib/errors.py:2726

5847

5865

msgid "Container has data after end marker: %(excess)r"

5848

5866

msgstr ""

5849

5867

5850

#: bzrlib/errors.py:2715

5868

#: bzrlib/errors.py:2734

5851

5869

msgid "Container has multiple records with the same name: %(name)s"

5852

5870

msgstr ""

5853

5871

5854

#: bzrlib/errors.py:2728

5872

#: bzrlib/errors.py:2747

5855

5873

msgid "Corrupt or incompatible data stream: %(reason)s"

5856

5874

msgstr ""

5857

5875

5858

#: bzrlib/errors.py:2736

5876

#: bzrlib/errors.py:2755

5859

5877

msgid "SMTP error: %(error)s"

5860

5878

msgstr ""

5861

5879

5862

#: bzrlib/errors.py:2744

5880

#: bzrlib/errors.py:2763

5863

5881

msgid "No message supplied."

5864

5882

msgstr ""

5865

5883

5866

#: bzrlib/errors.py:2749

5884

#: bzrlib/errors.py:2768

5867

5885

msgid "No mail-to address (--mail-to) or output (-o) specified."

5868

5886

msgstr ""

5869

5887

5870

#: bzrlib/errors.py:2754

5888

#: bzrlib/errors.py:2773

5871

5889

msgid "Unknown mail client: %(mail_client)s"

5872

5890

msgstr ""

5873

5891

5874

#: bzrlib/errors.py:2762

5892

#: bzrlib/errors.py:2781

5875

5893

msgid ""

5876

5894

"Unable to find mail client with the following names: "

5877

5895

"%(mail_command_list_string)s"

5878

5896

msgstr ""

5879

5897

5880

#: bzrlib/errors.py:2772

5898

#: bzrlib/errors.py:2791

5881

5899

msgid "SMTP connection to %(host)s refused"

5882

5900

msgstr ""

5883

5901

5884

#: bzrlib/errors.py:2781

5902

#: bzrlib/errors.py:2800

5885

5903

msgid "Please specify smtp_server. No server at default %(host)s."

5886

5904

msgstr ""

5887

5905

5888

#: bzrlib/errors.py:2795

5906

#: bzrlib/errors.py:2814

5889

5907

msgid ""

5890

5908

"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"

5891

5909

"reconfigure."

5892

5910

msgstr ""

5893

5911

5894

#: bzrlib/errors.py:2807

5912

#: bzrlib/errors.py:2826

5895

5913

msgid "'%(display_url)s' is already a branch."

5896

5914

msgstr ""

5897

5915

5898

#: bzrlib/errors.py:2812

5916

#: bzrlib/errors.py:2831

5899

5917

msgid "'%(display_url)s' is already a tree."

5900

5918

msgstr ""

5901

5919

5902

#: bzrlib/errors.py:2817

5920

#: bzrlib/errors.py:2836

5903

5921

msgid "'%(display_url)s' is already a checkout."

5904

5922

msgstr ""

5905

5923

5906

#: bzrlib/errors.py:2822

5924

#: bzrlib/errors.py:2841

5907

5925

msgid "'%(display_url)s' is already a lightweight checkout."

5908

5926

msgstr ""

5909

5927

5910

#: bzrlib/errors.py:2827

5928

#: bzrlib/errors.py:2846

5911

5929

msgid "'%(display_url)s' is already using a shared repository."

5912

5930

msgstr ""

5913

5931

5914

#: bzrlib/errors.py:2832

5932

#: bzrlib/errors.py:2851

5915

5933

msgid "'%(display_url)s' is already standalone."

5916

5934

msgstr ""

5917

5935

5918

#: bzrlib/errors.py:2837

5936

#: bzrlib/errors.py:2856

5919

5937

msgid "Shared repository '%(display_url)s' already creates working trees."

5920

5938

msgstr ""

5921

5939

5922

#: bzrlib/errors.py:2843

5940

#: bzrlib/errors.py:2862

5923

5941

msgid ""

5924

5942

"Shared repository '%(display_url)s' already doesn't create working trees."

5925

5943

msgstr ""

5926

5944

5927

#: bzrlib/errors.py:2849

5945

#: bzrlib/errors.py:2868

5928

5946

msgid "Requested reconfiguration of '%(display_url)s' is not supported."

5929

5947

msgstr ""

5930

5948

5931

#: bzrlib/errors.py:2854

5949

#: bzrlib/errors.py:2873

5932

5950

msgid "No location could be found to bind to at %(display_url)s."

5933

5951

msgstr ""

5934

5952

5935

#: bzrlib/errors.py:2859

5953

#: bzrlib/errors.py:2878

5936

5954

msgid ""

5937

5955

"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "

5938

5956

"status).%(more)s"

5939

5957

msgstr ""

5940

5958

5941

#: bzrlib/errors.py:2878

5959

#: bzrlib/errors.py:2897

5942

5960

msgid ""

5943

5961

"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"

5944

5962

"list).%(more)s"

5945

5963

msgstr ""

5946

5964

5947

#: bzrlib/errors.py:2884

5965

#: bzrlib/errors.py:2903

5948

5966

msgid "Variable {%(name)s} is not available."

5949

5967

msgstr ""

5950

5968

5951

#: bzrlib/errors.py:2892

5969

#: bzrlib/errors.py:2911

5952

5970

msgid "No template specified."

5953

5971

msgstr ""

5954

5972

5955

#: bzrlib/errors.py:2897

5973

#: bzrlib/errors.py:2916

5956

5974

msgid "Unable to create symlink %(path_str)son this platform"

5957

5975

msgstr ""

5958

5976

5959

#: bzrlib/errors.py:2912

5977

#: bzrlib/errors.py:2931

5960

5978

msgid ""

5961

5979

"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "

5962

5980

"\"original\", \"local\"."

5963

5981

msgstr ""

5964

5982

5965

#: bzrlib/errors.py:2946

5983

#: bzrlib/errors.py:2965

5966

5984

msgid ""

5967

5985

"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"

5968

5986

msgstr ""

5969

5987

5970

#: bzrlib/errors.py:2958

5988

#: bzrlib/errors.py:2977

5971

5989

msgid "The \"%(config_id)s\" configuration does not exist."

5972

5990

msgstr ""

5973

5991

5974

#: bzrlib/errors.py:2966

5992

#: bzrlib/errors.py:2985

5975

5993

msgid "The \"%(option_name)s\" configuration option does not exist."

5976

5994

msgstr ""

5977

5995

5978

#: bzrlib/errors.py:2974

5996

#: bzrlib/errors.py:2993

5979

5997

msgid "The alias \"%(alias_name)s\" does not exist."

5980

5998

msgstr ""

5981

5999

5982

#: bzrlib/errors.py:2988

6000

#: bzrlib/errors.py:3007

5983

6001

msgid "\"%(alias_name)s\" is not a valid location alias."

5984

6002

msgstr ""

5985

6003

5986

#: bzrlib/errors.py:2996

6004

#: bzrlib/errors.py:3015

5987

6005

msgid "No %(alias_name)s location assigned."

5988

6006

msgstr ""

5989

6007

5990

#: bzrlib/errors.py:3004

6008

#: bzrlib/errors.py:3023

5991

6009

msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."

5992

6010

msgstr ""

5993

6011

5994

#: bzrlib/errors.py:3014

6012

#: bzrlib/errors.py:3033

5995

6013

msgid "Unknown rules detected: %(unknowns_str)s."

5996

6014

msgstr ""

5997

6015

5998

#: bzrlib/errors.py:3025

6016

#: bzrlib/errors.py:3044

5999

6017

msgid "Tip change rejected: %(msg)s"

6000

6018

msgstr ""

6001

6019

6002

#: bzrlib/errors.py:3033

6020

#: bzrlib/errors.py:3052

6003

6021

msgid "Shelf corrupt."

6004

6022

msgstr ""

6005

6023

6006

#: bzrlib/errors.py:3038

6024

#: bzrlib/errors.py:3057

6007

6025

msgid "Corruption while decompressing repository file%(orig_error)s"

6008

6026

msgstr ""

6009

6027

6010

#: bzrlib/errors.py:3050

6028

#: bzrlib/errors.py:3069

6011

6029

msgid "No changes are shelved with id \"%(shelf_id)d\"."

6012

6030

msgstr ""

6013

6031

6014

#: bzrlib/errors.py:3058

6032

#: bzrlib/errors.py:3077

6015

6033

msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."

6016

6034

msgstr ""

6017

6035

6018

#: bzrlib/errors.py:3066

6036

#: bzrlib/errors.py:3085

6019

6037

msgid ""

6020

6038

"An attempt to access a url outside the server jail was made: '%(url)s'."

6021

6039

msgstr ""

6022

6040

6023

#: bzrlib/errors.py:3074

6041

#: bzrlib/errors.py:3093

6024

6042

msgid "The user aborted the operation."

6025

6043

msgstr ""

6026

6044

6027

#: bzrlib/errors.py:3079

6045

#: bzrlib/errors.py:3098

6028

6046

msgid "Branching '%(url)s'(%(format)s) must create a working tree."

6029

6047

msgstr ""

6030

6048

6031

#: bzrlib/errors.py:3089

6049

#: bzrlib/errors.py:3108

6032

6050

msgid "No such view: %(view_name)s."

6033

6051

msgstr ""

6034

6052

6035

#: bzrlib/errors.py:3099

6053

#: bzrlib/errors.py:3118

6036

6054

msgid ""

6037

6055

"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "

6038

6056

"to a later format."

6039

6057

msgstr ""

6040

6058

6041

#: bzrlib/errors.py:3108

6059

#: bzrlib/errors.py:3127

6042

6060

msgid ""

6043

6061

"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"

6044

6062

msgstr ""

6045

6063

6046

#: bzrlib/errors.py:3175

6064

#: bzrlib/errors.py:3194

6047

6065

msgid "%(bzrdir)r does not support co-located branches."

6048

6066

msgstr ""

6049

6067

6050

#: bzrlib/errors.py:3181

6068

#: bzrlib/errors.py:3200

6051

6069

msgid ""

6052

6070

"Unable to determine your name.\n"

6053

6071

"Please, set your name with the 'whoami' command.\n"

6054

6072

"E.g. bzr whoami \"Your Name <name@example.com>\""

6055

6073

msgstr ""

6056

6074

6057

#: bzrlib/errors.py:3190

6075

#: bzrlib/errors.py:3209

6058

6076

msgid "Invalid pattern(s) found. %(msg)s"

6059

6077

msgstr ""

6060

6078

6061

#: bzrlib/errors.py:3198

6079

#: bzrlib/errors.py:3217

6062

6080

msgid ""

6063

6081

"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "

6064

6082

"unbind` to fix."

6065

6083

msgstr ""

6066

6084

6067

#: bzrlib/errors.py:3209

6085

#: bzrlib/errors.py:3228

6068

6086

msgid "Loop involving %(refs)r while expanding \"%(string)s\"."

6069

6087

msgstr ""

6070

6088

6071

#: bzrlib/errors.py:3218

6089

#: bzrlib/errors.py:3237

6072

6090

msgid "Option %(name)s is not defined while expanding \"%(string)s\"."

6073

6091

msgstr ""

6074

6092

6075

#: bzrlib/errors.py:3227

6093

#: bzrlib/errors.py:3246

6076

6094

msgid ""

6077

6095

"No compatible object available for operations from %(source)r to %(target)r."

6078

6096

msgstr ""

6079

6097

6080

#: bzrlib/errors.py:3237

6098

#: bzrlib/errors.py:3256

6081

6099

msgid ""

6082

6100

"VFS requests over the smart server are not allowed. Encountered: %(method)s, "

6083

6101

"%(arguments)s."

6084

6102

msgstr ""

6085

6103

6086

#: bzrlib/errors.py:3247

6104

#: bzrlib/errors.py:3266

6087

6105

msgid ""

6088

6106

"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "

6089

6107

"format %(format)r"

6090

6108

msgstr ""

6091

6109

6092

#: bzrlib/errors.py:3259

6110

#: bzrlib/errors.py:3278

6093

6111

msgid ""

6094

6112

"Missing feature %(feature)s not provided by this version of Bazaar or any "

6095

6113

"plugin."

6096

6114

msgstr ""

6097

6115

6098

#: bzrlib/errors.py:3272

6116

#: bzrlib/errors.py:3291

6099

6117

msgid "Binary files section encountered."

6100

6118

msgstr ""

6101

6119

6102

#: bzrlib/errors.py:3280

6120

#: bzrlib/errors.py:3299

6103

6121

msgid ""

6104

6122

"Malformed patch header. %(desc)s\n"

6105

6123

"%(line)r"

6106

6124

msgstr ""

6107

6125

6108

#: bzrlib/errors.py:3289

6126

#: bzrlib/errors.py:3308

6109

6127

msgid ""

6110

6128

"Malformed hunk header. %(desc)s\n"

6111

6129

"%(line)r"

6112

6130

msgstr ""

6113

6131

6114

#: bzrlib/errors.py:3298

6132

#: bzrlib/errors.py:3317

6115

6133

msgid ""

6116

6134

"Malformed line. %(desc)s\n"

6117

6135

"%(line)r"

6118

6136

msgstr ""

6119

6137

6120

#: bzrlib/errors.py:3308

6138

#: bzrlib/errors.py:3327

6121

6139

msgid ""

6122

6140

"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "

6123

6141

"but patch says it should be \"%(patch_line)s\""

6124

6142

msgstr ""

6125

6143

6126

#: bzrlib/errors.py:3319

6144

#: bzrlib/errors.py:3338

6127

6145

msgid "The feature %(feature)s has already been registered."

6128

6146

msgstr ""

6129

6147

6453

6471

msgid "lstat/stat of ({0!r}): {1!r}"

6454

6472

msgstr ""

6455

6473

6456

#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008

6474

#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019

6457

6475

#, python-format

6458

6476

msgid "sorry, %r not allowed in path"

6459

6477

msgstr ""

6460

6478

6461

#: bzrlib/osutils.py:1226

6479

#: bzrlib/osutils.py:1237

6462

6480

#, python-format

6463

6481

msgid "%r is too short to calculate a relative path"

6464

6482

msgstr ""

6902

6920

msgid "Created new branch."

6903

6921

msgstr ""

6904

6922

6905

#: bzrlib/push.py:98

6923

#: bzrlib/push.py:97

6906

6924

#, python-format

6907

6925

msgid ""

6908

6926

"Target directory %s already contains a .bzr directory, but it is not valid."

7029

7047

msgid "%s is now not stacked\n"

7030

7048

msgstr ""

7031

7049

7032

#: bzrlib/remote.py:1180 bzrlib/repository.py:289

7050

#: bzrlib/remote.py:1228 bzrlib/repository.py:289

7033

7051

#, python-format

7034

7052

msgid "bzr: ERROR (ignored): %s"

7035

7053

msgstr ""

7036

7054

7037

#: bzrlib/remote.py:2493

7055

#: bzrlib/remote.py:2541

7038

7056

msgid "Copying repository content as tarball..."

7039

7057

msgstr ""

7040

7058

7249

7267

msgid "listening on port: %s"

7250

7268

msgstr ""

7251

7269

7252

#: bzrlib/switch.py:69

7270

#: bzrlib/switch.py:73

7253

7271

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

7254

7272

msgstr ""

7255

7273

7256

#: bzrlib/switch.py:96

7274

#: bzrlib/switch.py:100

7257

7275

msgid ""

7258

7276

"Cannot switch as local commits found in the checkout. Commit these to the "

7259

7277

"bound branch or use --force to throw them away."

7260

7278

msgstr ""

7261

7279

7262

#: bzrlib/switch.py:101

7280

#: bzrlib/switch.py:105

7263

7281

#, python-format

7264

7282

msgid ""

7265

7283

"Unable to connect to current master branch %(target)s: %(error)s To switch "

7266

7284

"anyway, use --force."

7267

7285

msgstr ""

7268

7286

7269

#: bzrlib/switch.py:110

7287

#: bzrlib/switch.py:125

7270

7288

msgid "Cannot switch a branch, only a checkout."

7271

7289

msgstr ""

7272

7290

7273

#: bzrlib/switch.py:146

7291

#: bzrlib/switch.py:163

7274

7292

#, python-format

7275

7293

msgid "Tree is up to date at revision %d."

7276

7294

msgstr ""

7277

7295

7278

#: bzrlib/switch.py:152

7296

#: bzrlib/switch.py:169

7279

7297

#, python-format

7280

7298

msgid "Updated to revision %d."

7281

7299

msgstr ""

7282

7300

7283

#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743

7301

#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747

7284

7302

msgid "Apply phase"

7285

7303

msgstr ""

7286

7304

7287

#: bzrlib/transform.py:1769 bzrlib/transform.py:1837

7305

#: bzrlib/transform.py:1773 bzrlib/transform.py:1841

7288

7306

msgid "removing file"

7289

7307

msgstr ""

7290

7308

7291

#: bzrlib/transform.py:1787 bzrlib/transform.py:1872

7309

#: bzrlib/transform.py:1791 bzrlib/transform.py:1876

7292

7310

msgid "adding file"

7293

7311

msgstr ""

7294

7312

7295

#: bzrlib/transform.py:2587

7313

#: bzrlib/transform.py:2591

7296

7314

msgid "Building tree"

7297

7315

msgstr ""

7298

7316

7299

#: bzrlib/transform.py:2677 bzrlib/transform.py:2704

7317

#: bzrlib/transform.py:2681 bzrlib/transform.py:2708

7300

7318

msgid "Adding file contents"

7301

7319

msgstr ""

7302

7320

7303

#: bzrlib/transform.py:3024

7321

#: bzrlib/transform.py:3028

7304

7322

msgid "Resolution pass"

7305

7323

msgstr ""

7306

7324

7449

7467

7450

7468

#: dummy/help_topics/basic/detail.txt:1

7451

7469

msgid ""

7452

"Bazaar 2.5b5 -- a free distributed version-control tool\n"

7470

"Bazaar 2.5b6 -- a free distributed version-control tool\n"

7453

7471

"http://bazaar.canonical.com/"

7454

7472

msgstr ""

7455

7473

11715

11733

"~~~~~~~~~~~~~~~~~~~~~~"

11716

11734

msgstr ""

11717

11735

11718

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402

11736

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418

11719

11737

msgid "Introduced in: 1.4"

11720

11738

msgstr ""

11721

11739

11907

11925

msgstr ""

11908

11926

11909

11927

#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196

11910

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448

11928

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464

11911

11929

msgid "Introduced in: 1.17"

11912

11930

msgstr ""

11913

11931

11963

11981

#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226

11964

11982

#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241

11965

11983

#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370

11966

#: en/help_topics/hooks.txt:427

11984

#: en/help_topics/hooks.txt:443

11967

11985

msgid "Introduced in: 2.4"

11968

11986

msgstr ""

11969

11987

12064

12082

msgstr ""

12065

12083

12066

12084

#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297

12067

#: en/help_topics/hooks.txt:505

12085

#: en/help_topics/hooks.txt:521

12068

12086

msgid "Introduced in: 1.15"

12069

12087

msgstr ""

12070

12088

12146

12164

msgstr ""

12147

12165

12148

12166

#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334

12149

#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493

12167

#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402

12168

#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509

12150

12169

msgid "Introduced in: 2.5"

12151

12170

msgstr ""

12152

12171

12265

12284

12266

12285

#: en/help_topics/hooks.txt:399

12267

12286

msgid ""

12287

"post_transform\n"

12288

"~~~~~~~~~~~~~~"

12289

msgstr ""

12290

12291

#: en/help_topics/hooks.txt:404

12292

msgid ""

12293

"Called after a tree transform has been performed on a tree. The hook\n"

12294

"is called with the tree that is being transformed and the transform."

12295

msgstr ""

12296

12297

#: en/help_topics/hooks.txt:407

12298

msgid ""

12299

"pre_transform\n"

12300

"~~~~~~~~~~~~~"

12301

msgstr ""

12302

12303

#: en/help_topics/hooks.txt:412

12304

msgid ""

12305

"Called before a tree transform on this tree. The hook is called with\n"

12306

"the tree that is being transformed and the transform."

12307

msgstr ""

12308

12309

#: en/help_topics/hooks.txt:415

12310

msgid ""

12268

12311

"start_commit\n"

12269

12312

"~~~~~~~~~~~~"

12270

12313

msgstr ""

12271

12314

12272

#: en/help_topics/hooks.txt:404

12315

#: en/help_topics/hooks.txt:420

12273

12316

msgid ""

12274

12317

"Called before a commit is performed on a tree. The start commit hook\n"

12275

12318

"is able to change the tree before the commit takes place. start_commit\n"

12277

12320

"being performed on."

12278

12321

msgstr ""

12279

12322

12280

#: en/help_topics/hooks.txt:409

12323

#: en/help_topics/hooks.txt:425

12281

12324

msgid ""

12282

12325

"SmartClientHooks\n"

12283

12326

"----------------"

12284

12327

msgstr ""

12285

12328

12286

#: en/help_topics/hooks.txt:412

12329

#: en/help_topics/hooks.txt:428

12287

12330

msgid ""

12288

12331

"call\n"

12289

12332

"~~~~"

12290

12333

msgstr ""

12291

12334

12292

#: en/help_topics/hooks.txt:415

12335

#: en/help_topics/hooks.txt:431

12293

12336

msgid "Introduced in: unknown"

12294

12337

msgstr ""

12295

12338

12296

#: en/help_topics/hooks.txt:417

12339

#: en/help_topics/hooks.txt:433

12297

12340

msgid ""

12298

12341

"Called when the smart client is submitting a request to the smart\n"

12299

12342

"server. Called with a bzrlib.smart.client.CallHookParams object.\n"

12300

12343

"Streaming request bodies, and responses, are not accessible."

12301

12344

msgstr ""

12302

12345

12303

#: en/help_topics/hooks.txt:421

12346

#: en/help_topics/hooks.txt:437

12304

12347

msgid ""

12305

12348

"SmartServerHooks\n"

12306

12349

"----------------"

12307

12350

msgstr ""

12308

12351

12309

#: en/help_topics/hooks.txt:424

12352

#: en/help_topics/hooks.txt:440

12310

12353

msgid ""

12311

12354

"server_exception\n"

12312

12355

"~~~~~~~~~~~~~~~~"

12313

12356

msgstr ""

12314

12357

12315

#: en/help_topics/hooks.txt:429

12358

#: en/help_topics/hooks.txt:445

12316

12359

msgid ""

12317

12360

"Called by the bzr server when an exception occurs. server_exception is\n"

12318

12361

"called with the sys.exc_info() tuple return true for the hook if the\n"

12320

12363

"normally."

12321

12364

msgstr ""

12322

12365

12323

#: en/help_topics/hooks.txt:434

12366

#: en/help_topics/hooks.txt:450

12324

12367

msgid ""

12325

12368

"server_started\n"

12326

12369

"~~~~~~~~~~~~~~"

12327

12370

msgstr ""

12328

12371

12329

#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456

12372

#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472

12330

12373

msgid "Introduced in: 0.16"

12331

12374

msgstr ""

12332

12375

12333

#: en/help_topics/hooks.txt:439

12376

#: en/help_topics/hooks.txt:455

12334

12377

msgid ""

12335

12378

"Called by the bzr server when it starts serving a directory.\n"

12336

12379

"server_started is called with (backing urls, public url), where\n"

12339

12382

"served."

12340

12383

msgstr ""

12341

12384

12342

#: en/help_topics/hooks.txt:445

12385

#: en/help_topics/hooks.txt:461

12343

12386

msgid ""

12344

12387

"server_started_ex\n"

12345

12388

"~~~~~~~~~~~~~~~~~"

12346

12389

msgstr ""

12347

12390

12348

#: en/help_topics/hooks.txt:450

12391

#: en/help_topics/hooks.txt:466

12349

12392

msgid ""

12350

12393

"Called by the bzr server when it starts serving a directory.\n"

12351

12394

"server_started is called with (backing_urls, server_obj)."

12352

12395

msgstr ""

12353

12396

12354

#: en/help_topics/hooks.txt:453

12397

#: en/help_topics/hooks.txt:469

12355

12398

msgid ""

12356

12399

"server_stopped\n"

12357

12400

"~~~~~~~~~~~~~~"

12358

12401

msgstr ""

12359

12402

12360

#: en/help_topics/hooks.txt:458

12403

#: en/help_topics/hooks.txt:474

12361

12404

msgid ""

12362

12405

"Called by the bzr server when it stops serving a directory.\n"

12363

12406

"server_stopped is called with the same parameters as the\n"

12364

12407

"server_started hook: (backing_urls, public_url)."

12365

12408

msgstr ""

12366

12409

12367

#: en/help_topics/hooks.txt:462

12410

#: en/help_topics/hooks.txt:478

12368

12411

msgid ""

12369

12412

"StatusHooks\n"

12370

12413

"-----------"

12371

12414

msgstr ""

12372

12415

12373

#: en/help_topics/hooks.txt:465

12416

#: en/help_topics/hooks.txt:481

12374

12417

msgid ""

12375

12418

"post_status\n"

12376

12419

"~~~~~~~~~~~"

12377

12420

msgstr ""

12378

12421

12379

#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479

12422

#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495

12380

12423

msgid "Introduced in: 2.3"

12381

12424

msgstr ""

12382

12425

12383

#: en/help_topics/hooks.txt:470

12426

#: en/help_topics/hooks.txt:486

12384

12427

msgid ""

12385

12428

"Called with argument StatusHookParams after Bazaar has displayed the\n"

12386

12429

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12389

12432

"status command. to_file is the output stream for writing."

12390

12433

msgstr ""

12391

12434

12392

#: en/help_topics/hooks.txt:476

12435

#: en/help_topics/hooks.txt:492

12393

12436

msgid ""

12394

12437

"pre_status\n"

12395

12438

"~~~~~~~~~~"

12396

12439

msgstr ""

12397

12440

12398

#: en/help_topics/hooks.txt:481

12441

#: en/help_topics/hooks.txt:497

12399

12442

msgid ""

12400

12443

"Called with argument StatusHookParams before Bazaar displays the\n"

12401

12444

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12404

12447

"status command. to_file is the output stream for writing."

12405

12448

msgstr ""

12406

12449

12407

#: en/help_topics/hooks.txt:487

12450

#: en/help_topics/hooks.txt:503

12408

12451

msgid ""

12409

12452

"TransportHooks\n"

12410

12453

"--------------"

12411

12454

msgstr ""

12412

12455

12413

#: en/help_topics/hooks.txt:490

12456

#: en/help_topics/hooks.txt:506

12414

12457

msgid ""

12415

12458

"post_connect\n"

12416

12459

"~~~~~~~~~~~~"

12417

12460

msgstr ""

12418

12461

12419

#: en/help_topics/hooks.txt:495

12462

#: en/help_topics/hooks.txt:511

12420

12463

msgid ""

12421

12464

"Called after a new connection is established or a reconnect occurs.\n"

12422

12465

"The sole argument passed is either the connected transport or smart\n"

12423

12466

"medium instance."

12424

12467

msgstr ""

12425

12468

12426

#: en/help_topics/hooks.txt:499

12469

#: en/help_topics/hooks.txt:515

12427

12470

msgid ""

12428

12471

"RioVersionInfoBuilderHooks\n"

12429

12472

"--------------------------"

12430

12473

msgstr ""

12431

12474

12432

#: en/help_topics/hooks.txt:502

12475

#: en/help_topics/hooks.txt:518

12433

12476

msgid ""

12434

12477

"revision\n"

12435

12478

"~~~~~~~~"

12436

12479

msgstr ""

12437

12480

12438

#: en/help_topics/hooks.txt:507

12481

#: en/help_topics/hooks.txt:523

12439

12482

msgid ""

12440

12483

"Invoked when adding information about a revision to the RIO stanza\n"

12441

12484

"that is printed. revision is called with a revision object and a RIO\n"