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

7

msgstr ""

8

"Project-Id-Version: bzr\n"

9

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

10

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

10

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

11

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

12

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

13

"Language-Team: Catalan <ca@li.org>\n"

15

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

16

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

17

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

18

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

19

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

18

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

19

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

20

21

#: bzrlib/add.py:95

22

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

26

msgid "Unstacking"

27

msgstr ""

28

29

#: bzrlib/branch.py:3205

29

#: bzrlib/branch.py:3183

30

#, python-format

31

msgid "Pushed up to revision %d."

32

msgstr ""

33

34

#: bzrlib/branch.py:3207

34

#: bzrlib/branch.py:3185

35

#, python-format

36

msgid "%d tag updated."

37

msgid_plural "%d tags updated."

38

msgstr[0] ""

39

msgstr[1] ""

40

41

#: bzrlib/branch.py:3210

41

#: bzrlib/branch.py:3188

42

msgid "No new revisions or tags to push."

43

msgstr ""

44

45

#: bzrlib/branch.py:3212

45

#: bzrlib/branch.py:3190

46

msgid "No new revisions to push."

47

msgstr ""

48

49

#: bzrlib/branch.py:3232

49

#: bzrlib/branch.py:3210

50

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

51

msgstr ""

52

53

#: bzrlib/branch.py:3235

53

#: bzrlib/branch.py:3213

54

#, python-format

55

msgid "found error:%s"

56

msgstr ""

57

58

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

58

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

59

#, python-format

60

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

61

msgstr ""

62

63

#: bzrlib/builtins.py:218

63

#: bzrlib/builtins.py:130

64

#, python-format

65

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

66

msgstr ""

67

68

#: bzrlib/builtins.py:303

68

#: bzrlib/builtins.py:215

69

msgid "Display status summary."

70

msgstr ""

71

72

#: bzrlib/builtins.py:305

72

#: bzrlib/builtins.py:217

73

msgid ""

74

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

75

"grouped by state. Possible states are:"

76

msgstr ""

77

78

#: bzrlib/builtins.py:308

78

#: bzrlib/builtins.py:220

79

msgid ""

80

"added\n"

81

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

82

msgstr ""

83

84

#: bzrlib/builtins.py:311

84

#: bzrlib/builtins.py:223

85

msgid ""

86

"removed\n"

87

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

88

" in the working copy."

89

msgstr ""

90

91

#: bzrlib/builtins.py:315

91

#: bzrlib/builtins.py:227

92

msgid ""

93

"renamed\n"

94

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

96

" parent directory was renamed."

97

msgstr ""

98

99

#: bzrlib/builtins.py:320

99

#: bzrlib/builtins.py:232

100

msgid ""

101

"modified\n"

102

" Text has changed since the previous revision."

103

msgstr ""

104

105

#: bzrlib/builtins.py:323

105

#: bzrlib/builtins.py:235

106

msgid ""

107

"kind changed\n"

108

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

109

msgstr ""

110

111

#: bzrlib/builtins.py:326

111

#: bzrlib/builtins.py:238

112

msgid ""

113

"unknown\n"

114

" Not versioned and not matching an ignore pattern."

115

msgstr ""

116

117

#: bzrlib/builtins.py:329

117

#: bzrlib/builtins.py:241

118

msgid ""

119

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

120

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

122

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

123

msgstr ""

124

125

#: bzrlib/builtins.py:334

125

#: bzrlib/builtins.py:246

126

msgid ""

127

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

128

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

129

msgstr ""

130

131

#: bzrlib/builtins.py:337

131

#: bzrlib/builtins.py:249

132

msgid ""

133

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

134

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

135

"use bzr status -SV."

136

msgstr ""

137

138

#: bzrlib/builtins.py:341

138

#: bzrlib/builtins.py:253

139

msgid ""

140

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

141

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

143

"is reported for everything inside that directory."

144

msgstr ""

145

146

#: bzrlib/builtins.py:346

146

#: bzrlib/builtins.py:258

147

msgid ""

148

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

149

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

151

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

152

msgstr ""

153

154

#: bzrlib/builtins.py:351

154

#: bzrlib/builtins.py:263

155

msgid ""

156

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

157

"single revision to the revision argument."

158

msgstr ""

159

160

#: bzrlib/builtins.py:354

160

#: bzrlib/builtins.py:266

161

msgid ""

162

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

163

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

164

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

165

msgstr ""

166

167

#: bzrlib/builtins.py:363

167

#: bzrlib/builtins.py:275

168

msgid "Use short status indicators."

169

msgstr ""

170

171

#: bzrlib/builtins.py:365

171

#: bzrlib/builtins.py:277

172

msgid "Only show versioned files."

173

msgstr ""

174

175

#: bzrlib/builtins.py:367

175

#: bzrlib/builtins.py:279

176

msgid "Don't show pending merges."

177

msgstr ""

178

179

#: bzrlib/builtins.py:370

179

#: bzrlib/builtins.py:282

180

msgid "Do not mark object type using indicator."

181

msgstr ""

182

183

#: bzrlib/builtins.py:385

183

#: bzrlib/builtins.py:297

184

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

185

msgstr ""

186

187

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

187

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

188

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

189

msgstr ""

190

191

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

191

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

192

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

193

msgstr ""

194

195

#: bzrlib/builtins.py:439

195

#: bzrlib/builtins.py:351

196

#, python-format

197

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

198

msgstr ""

199

200

#: bzrlib/builtins.py:450

200

#: bzrlib/builtins.py:362

201

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

202

msgstr ""

203

204

#: bzrlib/builtins.py:457

204

#: bzrlib/builtins.py:369

205

msgid "You cannot specify a NULL revision."

206

msgstr ""

207

208

#: bzrlib/builtins.py:549

208

#: bzrlib/builtins.py:461

209

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

210

msgstr ""

211

212

#: bzrlib/builtins.py:551

212

#: bzrlib/builtins.py:463

213

msgid ""

214

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

215

"this will refuse to run against one."

216

msgstr ""

217

218

#: bzrlib/builtins.py:554

218

#: bzrlib/builtins.py:466

219

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

220

msgstr ""

221

222

#: bzrlib/builtins.py:560

222

#: bzrlib/builtins.py:472

223

msgid ""

224

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

225

msgstr ""

226

227

#: bzrlib/builtins.py:574

227

#: bzrlib/builtins.py:486

228

msgid "No working tree to remove"

229

msgstr ""

230

231

#: bzrlib/builtins.py:576

231

#: bzrlib/builtins.py:488

232

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

233

msgstr ""

234

235

#: bzrlib/builtins.py:585

235

#: bzrlib/builtins.py:497

236

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

237

msgstr ""

238

239

#: bzrlib/builtins.py:625

239

#: bzrlib/builtins.py:537

240

msgid ""

241

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

242

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

243

msgstr ""

244

245

#: bzrlib/builtins.py:636

245

#: bzrlib/builtins.py:548

246

msgid ""

247

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

248

"commit"

249

msgstr ""

250

251

#: bzrlib/builtins.py:640

251

#: bzrlib/builtins.py:552

252

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

253

msgstr ""

254

255

#: bzrlib/builtins.py:644

255

#: bzrlib/builtins.py:556

256

msgid "Show current revision number."

257

msgstr ""

258

259

#: bzrlib/builtins.py:646

259

#: bzrlib/builtins.py:558

260

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

261

msgstr ""

262

263

#: bzrlib/builtins.py:659

263

#: bzrlib/builtins.py:571

264

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

265

msgstr ""

266

267

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

267

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

268

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

269

msgstr ""

270

271

#: bzrlib/builtins.py:700

271

#: bzrlib/builtins.py:612

272

msgid "Show revno of working tree."

273

msgstr ""

274

275

#: bzrlib/builtins.py:748

275

#: bzrlib/builtins.py:660

276

msgid "Add specified files or directories."

277

msgstr ""

278

279

#: bzrlib/builtins.py:750

279

#: bzrlib/builtins.py:662

280

msgid ""

281

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

282

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

283

"any of the named files are already versioned."

284

msgstr ""

285

286

#: bzrlib/builtins.py:754

286

#: bzrlib/builtins.py:666

287

msgid ""

288

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

289

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

294

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

295

msgstr ""

296

297

#: bzrlib/builtins.py:762

297

#: bzrlib/builtins.py:674

298

msgid ""

299

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

300

"unless they are explicitly ignored."

301

msgstr ""

302

303

#: bzrlib/builtins.py:765

303

#: bzrlib/builtins.py:677

304

msgid ""

305

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

306

"are currently unknown."

307

msgstr ""

308

309

#: bzrlib/builtins.py:768

309

#: bzrlib/builtins.py:680

310

msgid ""

311

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

312

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

314

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

315

msgstr ""

316

317

#: bzrlib/builtins.py:773

317

#: bzrlib/builtins.py:685

318

msgid ""

319

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

320

"add them."

321

msgstr ""

322

323

#: bzrlib/builtins.py:776

323

#: bzrlib/builtins.py:688

324

msgid ""

325

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

326

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

331

"into a subdirectory of this one."

332

msgstr ""

333

334

#: bzrlib/builtins.py:784

334

#: bzrlib/builtins.py:696

335

msgid ""

336

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

337

"unless they are explicitly mentioned."

338

msgstr ""

339

340

#: bzrlib/builtins.py:787

340

#: bzrlib/builtins.py:699

341

msgid ""

342

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

343

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

344

"to file size."

345

msgstr ""

346

347

#: bzrlib/builtins.py:794

347

#: bzrlib/builtins.py:706

348

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

349

msgstr ""

350

351

#: bzrlib/builtins.py:800

351

#: bzrlib/builtins.py:712

352

msgid "Lookup file ids from this tree."

353

msgstr ""

354

355

#: bzrlib/builtins.py:836

355

#: bzrlib/builtins.py:748

356

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

357

msgstr ""

358

359

#: bzrlib/builtins.py:841

359

#: bzrlib/builtins.py:753

360

msgid "Create a new versioned directory."

361

msgstr ""

362

363

#: bzrlib/builtins.py:843

363

#: bzrlib/builtins.py:755

364

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

365

msgstr ""

366

367

#: bzrlib/builtins.py:850

367

#: bzrlib/builtins.py:762

368

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

369

msgstr ""

370

371

#: bzrlib/builtins.py:884

371

#: bzrlib/builtins.py:796

372

#, python-format

373

msgid "added %s\n"

374

msgstr ""

375

376

#: bzrlib/builtins.py:926

376

#: bzrlib/builtins.py:838

377

#, python-format

378

msgid "invalid kind %r specified"

379

msgstr ""

380

381

#: bzrlib/builtins.py:963

381

#: bzrlib/builtins.py:875

382

msgid "Move or rename a file."

383

msgstr ""

384

385

#: bzrlib/builtins.py:965

385

#: bzrlib/builtins.py:877

386

msgid " bzr mv SOURCE... DESTINATION"

387

msgstr ""

388

389

#: bzrlib/builtins.py:967

389

#: bzrlib/builtins.py:879

390

msgid ""

391

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

392

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

393

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

394

msgstr ""

395

396

#: bzrlib/builtins.py:971

396

#: bzrlib/builtins.py:883

397

msgid ""

398

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

399

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

402

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

403

msgstr ""

404

405

#: bzrlib/builtins.py:977

405

#: bzrlib/builtins.py:889

406

msgid "Files cannot be moved between branches."

407

msgstr ""

408

409

#: bzrlib/builtins.py:984

409

#: bzrlib/builtins.py:896

410

msgid ""

411

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

412

"moved."

413

msgstr ""

414

415

#: bzrlib/builtins.py:986

415

#: bzrlib/builtins.py:898

416

msgid "Automatically guess renames."

417

msgstr ""

418

419

#: bzrlib/builtins.py:987

419

#: bzrlib/builtins.py:899

420

msgid "Avoid making changes when guessing renames."

421

msgstr ""

422

423

#: bzrlib/builtins.py:996

423

#: bzrlib/builtins.py:908

424

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

425

msgstr ""

426

427

#: bzrlib/builtins.py:1000

427

#: bzrlib/builtins.py:912

428

msgid "missing file argument"

429

msgstr ""

430

431

#: bzrlib/builtins.py:1004

431

#: bzrlib/builtins.py:916

432

msgid "can not move root of branch"

433

msgstr ""

434

435

#: bzrlib/builtins.py:1010

435

#: bzrlib/builtins.py:922

436

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

437

msgstr ""

438

439

#: bzrlib/builtins.py:1013

439

#: bzrlib/builtins.py:925

440

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

441

msgstr ""

442

443

#: bzrlib/builtins.py:1050

443

#: bzrlib/builtins.py:962

444

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

445

msgstr ""

446

447

#: bzrlib/builtins.py:1102

447

#: bzrlib/builtins.py:1014

448

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

449

msgstr ""

450

451

#: bzrlib/builtins.py:1104

451

#: bzrlib/builtins.py:1016

452

msgid ""

453

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

454

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

456

"parent."

457

msgstr ""

458

459

#: bzrlib/builtins.py:1109

459

#: bzrlib/builtins.py:1021

460

msgid ""

461

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

462

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

463

"be able to pull it again."

464

msgstr ""

465

466

#: bzrlib/builtins.py:1113

466

#: bzrlib/builtins.py:1025

467

msgid ""

468

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

469

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

470

"branches have diverged."

471

msgstr ""

472

473

#: bzrlib/builtins.py:1117

473

#: bzrlib/builtins.py:1029

474

msgid ""

475

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

476

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

478

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

479

msgstr ""

480

481

#: bzrlib/builtins.py:1122

481

#: bzrlib/builtins.py:1034

482

msgid ""

483

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

484

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

485

"-Olog_format=<other_format>."

486

msgstr ""

487

488

#: bzrlib/builtins.py:1126

488

#: bzrlib/builtins.py:1038

489

msgid ""

490

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

491

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

492

"with bzr send."

493

msgstr ""

494

495

#: bzrlib/builtins.py:1134

495

#: bzrlib/builtins.py:1046

496

msgid "Show logs of pulled revisions."

497

msgstr ""

498

499

#: bzrlib/builtins.py:1136

499

#: bzrlib/builtins.py:1048

500

msgid ""

501

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

502

msgstr ""

503

504

#: bzrlib/builtins.py:1139

504

#: bzrlib/builtins.py:1051

505

msgid ""

506

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

507

"master branch."

508

msgstr ""

509

510

#: bzrlib/builtins.py:1168

510

#: bzrlib/builtins.py:1080

511

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

512

msgstr ""

513

514

#: bzrlib/builtins.py:1184

514

#: bzrlib/builtins.py:1096

515

msgid "No pull location known or specified."

516

msgstr ""

517

518

#: bzrlib/builtins.py:1190

518

#: bzrlib/builtins.py:1102

519

#, python-format

520

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

521

msgstr ""

522

523

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

523

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

524

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

525

msgstr ""

526

527

#: bzrlib/builtins.py:1238

527

#: bzrlib/builtins.py:1150

528

msgid "Update a mirror of this branch."

529

msgstr ""

530

531

#: bzrlib/builtins.py:1240

531

#: bzrlib/builtins.py:1152

532

msgid ""

533

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

534

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

535

msgstr ""

536

537

#: bzrlib/builtins.py:1243

537

#: bzrlib/builtins.py:1155

538

msgid ""

539

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

540

"the future."

541

msgstr ""

542

543

#: bzrlib/builtins.py:1246

543

#: bzrlib/builtins.py:1158

544

msgid ""

545

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

546

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

547

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

548

msgstr ""

549

550

#: bzrlib/builtins.py:1250

550

#: bzrlib/builtins.py:1162

551

msgid ""

552

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

553

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

554

msgstr ""

555

556

#: bzrlib/builtins.py:1253

556

#: bzrlib/builtins.py:1165

557

msgid ""

558

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

559

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

560

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

561

msgstr ""

562

563

#: bzrlib/builtins.py:1257

563

#: bzrlib/builtins.py:1169

564

msgid ""

565

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

566

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

568

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

569

msgstr ""

570

571

#: bzrlib/builtins.py:1262

571

#: bzrlib/builtins.py:1174

572

msgid ""

573

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

574

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

575

"-Olog_format=<other_format>."

576

msgstr ""

577

578

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

578

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

579

msgid ""

580

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

581

msgstr ""

582

583

#: bzrlib/builtins.py:1276

583

#: bzrlib/builtins.py:1188

584

msgid ""

585

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

586

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

587

msgstr ""

588

589

#: bzrlib/builtins.py:1281

589

#: bzrlib/builtins.py:1193

590

msgid ""

591

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

592

"branch."

593

msgstr ""

594

595

#: bzrlib/builtins.py:1284

595

#: bzrlib/builtins.py:1196

596

msgid ""

597

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

598

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

599

"the branch created."

600

msgstr ""

601

602

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

602

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

603

msgid ""

604

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

605

"strict disables the check."

606

msgstr ""

607

608

#: bzrlib/builtins.py:1292

608

#: bzrlib/builtins.py:1204

609

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

610

msgstr ""

611

612

#: bzrlib/builtins.py:1336

612

#: bzrlib/builtins.py:1248

613

msgid "Could not determine branch to refer to."

614

msgstr ""

615

616

#: bzrlib/builtins.py:1345

616

#: bzrlib/builtins.py:1257

617

#, python-format

618

msgid ""

619

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

620

"use 'bzr push :parent'."

621

msgstr ""

622

623

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

623

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

624

msgid "No push location known or specified."

625

msgstr ""

626

627

#: bzrlib/builtins.py:1355

627

#: bzrlib/builtins.py:1267

628

#, python-format

629

msgid "Using saved push location: %s"

630

msgstr ""

631

632

#: bzrlib/builtins.py:1365

632

#: bzrlib/builtins.py:1277

633

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

634

msgstr ""

635

636

#: bzrlib/builtins.py:1367

636

#: bzrlib/builtins.py:1279

637

msgid ""

638

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

639

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

644

"create ./foo-bar."

645

msgstr ""

646

647

#: bzrlib/builtins.py:1374

647

#: bzrlib/builtins.py:1286

648

msgid ""

649

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

650

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

651

msgstr ""

652

653

#: bzrlib/builtins.py:1377

653

#: bzrlib/builtins.py:1289

654

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

655

msgstr ""

656

657

#: bzrlib/builtins.py:1387

657

#: bzrlib/builtins.py:1299

658

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

659

msgstr ""

660

661

#: bzrlib/builtins.py:1389

661

#: bzrlib/builtins.py:1301

662

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

663

msgstr ""

664

665

#: bzrlib/builtins.py:1392

665

#: bzrlib/builtins.py:1304

666

msgid ""

667

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

668

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

669

msgstr ""

670

671

#: bzrlib/builtins.py:1396

671

#: bzrlib/builtins.py:1308

672

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

673

msgstr ""

674

675

#: bzrlib/builtins.py:1398

675

#: bzrlib/builtins.py:1310

676

msgid ""

677

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

678

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

679

msgstr ""

680

681

#: bzrlib/builtins.py:1403

681

#: bzrlib/builtins.py:1315

682

msgid "Bind new branch to from location."

683

msgstr ""

684

685

#: bzrlib/builtins.py:1450

685

#: bzrlib/builtins.py:1362

686

#, python-format

687

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

688

msgstr ""

689

690

#: bzrlib/builtins.py:1462

690

#: bzrlib/builtins.py:1374

691

#, python-format

692

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

693

msgstr ""

694

695

#: bzrlib/builtins.py:1481

695

#: bzrlib/builtins.py:1393

696

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

697

msgstr ""

698

699

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

699

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

700

#, python-format

701

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

702

msgstr ""

703

704

#: bzrlib/builtins.py:1500

704

#: bzrlib/builtins.py:1407

705

#, python-format

706

msgid "Branched %d revision."

707

msgid_plural "Branched %d revisions."

708

msgstr[0] ""

709

msgstr[1] ""

710

711

#: bzrlib/builtins.py:1505

711

#: bzrlib/builtins.py:1412

712

#, python-format

713

msgid "New branch bound to %s"

714

msgstr ""

715

716

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

716

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

717

#, python-format

718

msgid "Switched to branch: %s"

719

msgstr ""

720

721

#: bzrlib/builtins.py:1515

721

#: bzrlib/builtins.py:1422

722

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

723

msgstr ""

724

725

#: bzrlib/builtins.py:1517

725

#: bzrlib/builtins.py:1424

726

msgid ""

727

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

728

"location."

729

msgstr ""

730

731

#: bzrlib/builtins.py:1524

731

#: bzrlib/builtins.py:1431

732

msgid ""

733

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

734

"location."

735

msgstr ""

736

737

#: bzrlib/builtins.py:1554

737

#: bzrlib/builtins.py:1461

738

msgid "(default)"

739

msgstr ""

740

741

#: bzrlib/builtins.py:1566

741

#: bzrlib/builtins.py:1473

742

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

743

msgstr ""

744

745

#: bzrlib/builtins.py:1568

745

#: bzrlib/builtins.py:1475

746

msgid ""

747

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

748

"for\n"

752

"location using SFTP."

753

msgstr ""

754

755

#: bzrlib/builtins.py:1573

755

#: bzrlib/builtins.py:1480

756

msgid ""

757

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

758

"will\n"

764

"create ./foo-bar."

765

msgstr ""

766

767

#: bzrlib/builtins.py:1580

767

#: bzrlib/builtins.py:1487

768

msgid ""

769

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

770

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

774

"code.)"

775

msgstr ""

776

777

#: bzrlib/builtins.py:1590

777

#: bzrlib/builtins.py:1497

778

msgid ""

779

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

780

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

782

"commits."

783

msgstr ""

784

785

#: bzrlib/builtins.py:1597

785

#: bzrlib/builtins.py:1504

786

msgid "Get file contents from this tree."

787

msgstr ""

788

789

#: bzrlib/builtins.py:1599

789

#: bzrlib/builtins.py:1506

790

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

791

msgstr ""

792

793

#: bzrlib/builtins.py:1640

793

#: bzrlib/builtins.py:1547

794

msgid ""

795

"Show list of renamed files.\n"

796

" "

797

msgstr ""

798

799

#: bzrlib/builtins.py:1670

799

#: bzrlib/builtins.py:1577

800

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

801

msgstr ""

802

803

#: bzrlib/builtins.py:1672

803

#: bzrlib/builtins.py:1579

804

msgid ""

805

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

806

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

807

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

808

msgstr ""

809

810

#: bzrlib/builtins.py:1676

810

#: bzrlib/builtins.py:1583

811

msgid ""

812

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

813

"that is out of date from its branch."

814

msgstr ""

815

816

#: bzrlib/builtins.py:1679

816

#: bzrlib/builtins.py:1586

817

msgid ""

818

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

819

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

821

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

822

msgstr ""

823

824

#: bzrlib/builtins.py:1684

824

#: bzrlib/builtins.py:1591

825

msgid ""

826

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

827

"the branch from the master."

828

msgstr ""

829

830

#: bzrlib/builtins.py:1687

830

#: bzrlib/builtins.py:1594

831

msgid ""

832

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

833

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

837

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

838

msgstr ""

839

840

#: bzrlib/builtins.py:1694

840

#: bzrlib/builtins.py:1601

841

msgid ""

842

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

843

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

844

"current working directory is used."

845

msgstr ""

846

847

#: bzrlib/builtins.py:1710

847

#: bzrlib/builtins.py:1617

848

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

849

msgstr ""

850

851

#: bzrlib/builtins.py:1718

851

#: bzrlib/builtins.py:1625

852

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

853

msgstr ""

854

855

#: bzrlib/builtins.py:1749

855

#: bzrlib/builtins.py:1656

856

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

857

msgstr ""

858

859

#: bzrlib/builtins.py:1765

859

#: bzrlib/builtins.py:1672

860

#, python-format

861

msgid ""

862

"branch has no revision %s\n"

863

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

864

msgstr ""

865

866

#: bzrlib/builtins.py:1771

866

#: bzrlib/builtins.py:1678

867

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

868

msgstr ""

869

870

#: bzrlib/builtins.py:1775

870

#: bzrlib/builtins.py:1682

871

msgid ""

872

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

873

"can be committed with 'bzr commit'."

874

msgstr ""

875

876

#: bzrlib/builtins.py:1784

876

#: bzrlib/builtins.py:1691

877

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

878

msgstr ""

879

880

#: bzrlib/builtins.py:1786

880

#: bzrlib/builtins.py:1693

881

msgid ""

882

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

883

"tree, branch or repository."

884

msgstr ""

885

886

#: bzrlib/builtins.py:1789

886

#: bzrlib/builtins.py:1696

887

msgid ""

888

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

889

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

890

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

891

msgstr ""

892

893

#: bzrlib/builtins.py:1793

893

#: bzrlib/builtins.py:1700

894

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

895

msgstr ""

896

897

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

898

#: bzrlib/builtins.py:6442

897

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

898

#: bzrlib/builtins.py:6389

899

msgid ":Examples:"

900

msgstr ""

901

902

#: bzrlib/builtins.py:1797

902

#: bzrlib/builtins.py:1704

903

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

904

msgstr ""

905

906

#: bzrlib/builtins.py:1799

906

#: bzrlib/builtins.py:1706

907

msgid " bzr info"

908

msgstr ""

909

910

#: bzrlib/builtins.py:1801

910

#: bzrlib/builtins.py:1708

911

msgid ""

912

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

913

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

914

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

915

msgstr ""

916

917

#: bzrlib/builtins.py:1805

917

#: bzrlib/builtins.py:1712

918

msgid " bzr info -v"

919

msgstr ""

920

921

#: bzrlib/builtins.py:1807

921

#: bzrlib/builtins.py:1714

922

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

923

msgstr ""

924

925

#: bzrlib/builtins.py:1809

925

#: bzrlib/builtins.py:1716

926

msgid " bzr info -vv"

927

msgstr ""

928

929

#: bzrlib/builtins.py:1828

929

#: bzrlib/builtins.py:1735

930

msgid "Remove files or directories."

931

msgstr ""

932

933

#: bzrlib/builtins.py:1830

933

#: bzrlib/builtins.py:1737

934

msgid ""

935

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

936

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

939

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

940

msgstr ""

941

942

#: bzrlib/builtins.py:1838

942

#: bzrlib/builtins.py:1745

943

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

944

msgstr ""

945

946

#: bzrlib/builtins.py:1840

946

#: bzrlib/builtins.py:1747

947

msgid "The file deletion mode to be used."

948

msgstr ""

949

950

#: bzrlib/builtins.py:1841

950

#: bzrlib/builtins.py:1748

951

msgid "Deletion Strategy"

952

msgstr ""

953

954

#: bzrlib/builtins.py:1842

954

#: bzrlib/builtins.py:1749

955

msgid "Backup changed files (default)."

956

msgstr ""

957

958

#: bzrlib/builtins.py:1843

958

#: bzrlib/builtins.py:1750

959

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

960

msgstr ""

961

962

#: bzrlib/builtins.py:1844

962

#: bzrlib/builtins.py:1751

963

msgid "Don't backup changed files."

964

msgstr ""

965

966

#: bzrlib/builtins.py:1845

966

#: bzrlib/builtins.py:1752

967

msgid ""

968

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

969

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

970

msgstr ""

971

972

#: bzrlib/builtins.py:1854

972

#: bzrlib/builtins.py:1761

973

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

974

msgstr ""

975

976

#: bzrlib/builtins.py:1871

976

#: bzrlib/builtins.py:1778

977

msgid "No matching files."

978

msgstr ""

979

980

#: bzrlib/builtins.py:1932

980

#: bzrlib/builtins.py:1839

981

msgid "Reconcile bzr metadata in a branch."

982

msgstr ""

983

984

#: bzrlib/builtins.py:1934

984

#: bzrlib/builtins.py:1841

985

msgid ""

986

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

987

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

989

"advises you to run it."

990

msgstr ""

991

992

#: bzrlib/builtins.py:1939

992

#: bzrlib/builtins.py:1846

993

msgid ""

994

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

995

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

997

"correctly in both branches."

998

msgstr ""

999

1000

#: bzrlib/builtins.py:1944

1000

#: bzrlib/builtins.py:1851

1001

msgid ""

1002

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

1003

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

1004

msgstr ""

1005

1006

#: bzrlib/builtins.py:1947

1006

#: bzrlib/builtins.py:1854

1007

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

1008

msgstr ""

1009

1010

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

1010

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

1011

msgid ""

1012

"Format for the bzr 2.0 series.\n"

1013

"Uses group-compress storage.\n"

1014

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

1015

msgstr ""

1016

1017

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

1017

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

1018

msgid ""

1019

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

1020

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

1021

msgstr ""

1022

1023

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

1023

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

1024

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

1025

msgstr ""

1026

1027

#: bzrlib/builtins.py:2015

1027

#: bzrlib/builtins.py:1922

1028

msgid "Make a directory into a versioned branch."

1029

msgstr ""

1030

1031

#: bzrlib/builtins.py:2017

1031

#: bzrlib/builtins.py:1924

1032

msgid ""

1033

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

1034

"existing project."

1035

msgstr ""

1036

1037

#: bzrlib/builtins.py:2020

1037

#: bzrlib/builtins.py:1927

1038

msgid ""

1039

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

1040

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

1042

"in the .bzr directory."

1043

msgstr ""

1044

1045

#: bzrlib/builtins.py:2025

1045

#: bzrlib/builtins.py:1932

1046

msgid ""

1047

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

1048

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

1049

msgstr ""

1050

1051

#: bzrlib/builtins.py:2028

1051

#: bzrlib/builtins.py:1935

1052

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

1053

msgstr ""

1054

1055

#: bzrlib/builtins.py:2030

1055

#: bzrlib/builtins.py:1937

1056

msgid ""

1057

" cd ~/project\n"

1058

" bzr init\n"

1061

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

1062

msgstr ""

1063

1064

#: bzrlib/builtins.py:2041

1064

#: bzrlib/builtins.py:1948

1065

msgid ""

1066

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

1067

msgstr ""

1068

1069

#: bzrlib/builtins.py:2044

1069

#: bzrlib/builtins.py:1951

1070

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

1071

msgstr ""

1072

1073

#: bzrlib/builtins.py:2052

1073

#: bzrlib/builtins.py:1959

1074

msgid ""

1075

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

1076

msgstr ""

1077

1078

#: bzrlib/builtins.py:2055

1078

#: bzrlib/builtins.py:1962

1079

msgid "Create a branch without a working tree."

1080

msgstr ""

1081

1082

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

1082

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

1083

#, python-format

1084

msgid ""

1085

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

1086

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

1087

msgstr ""

1088

1089

#: bzrlib/builtins.py:2109

1089

#: bzrlib/builtins.py:2016

1090

msgid ""

1091

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

1092

msgstr ""

1093

1094

#: bzrlib/builtins.py:2120

1094

#: bzrlib/builtins.py:2027

1095

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

1096

msgstr ""

1097

1098

#: bzrlib/builtins.py:2129

1098

#: bzrlib/builtins.py:2036

1099

#, python-format

1100

msgid "Using shared repository: %s\n"

1101

msgstr ""

1102

1103

#: bzrlib/builtins.py:2133

1103

#: bzrlib/builtins.py:2040

1104

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

1105

msgstr ""

1106

1107

#: bzrlib/builtins.py:2135

1107

#: bzrlib/builtins.py:2042

1108

msgid ""

1109

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

1110

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

1112

"speeds up the creation of new branches."

1113

msgstr ""

1114

1115

#: bzrlib/builtins.py:2140

1115

#: bzrlib/builtins.py:2047

1116

msgid ""

1117

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

1118

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

1122

"branches, such as on a server."

1123

msgstr ""

1124

1125

#: bzrlib/builtins.py:2147

1125

#: bzrlib/builtins.py:2054

1126

msgid ""

1127

":Examples:\n"

1128

" Create a shared repository holding just branches::"

1129

msgstr ""

1130

1131

#: bzrlib/builtins.py:2150

1131

#: bzrlib/builtins.py:2057

1132

msgid ""

1133

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

1134

" bzr init repo/trunk"

1135

msgstr ""

1136

1137

#: bzrlib/builtins.py:2153

1137

#: bzrlib/builtins.py:2060

1138

msgid " Make a lightweight checkout elsewhere::"

1139

msgstr ""

1140

1141

#: bzrlib/builtins.py:2155

1141

#: bzrlib/builtins.py:2062

1142

msgid ""

1143

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

1144

" cd trunk-checkout\n"

1145

" (add files here)"

1146

msgstr ""

1147

1148

#: bzrlib/builtins.py:2163

1148

#: bzrlib/builtins.py:2070

1149

msgid ""

1150

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

1151

msgstr ""

1152

1153

#: bzrlib/builtins.py:2167

1153

#: bzrlib/builtins.py:2074

1154

msgid "Repository format"

1155

msgstr ""

1156

1157

#: bzrlib/builtins.py:2169

1157

#: bzrlib/builtins.py:2076

1158

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

1159

msgstr ""

1160

1161

#: bzrlib/builtins.py:2195

1161

#: bzrlib/builtins.py:2102

1162

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

1163

msgstr ""

1164

1165

#: bzrlib/builtins.py:2197

1165

#: bzrlib/builtins.py:2104

1166

msgid ""

1167

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

1168

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

1172

"given."

1173

msgstr ""

1174

1175

#: bzrlib/builtins.py:2204

1175

#: bzrlib/builtins.py:2111

1176

msgid ""

1177

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

1178

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

1179

msgstr ""

1180

1181

#: bzrlib/builtins.py:2207

1181

#: bzrlib/builtins.py:2114

1182

msgid ""

1183

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

1184

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

1188

"in the range."

1189

msgstr ""

1190

1191

#: bzrlib/builtins.py:2214

1191

#: bzrlib/builtins.py:2121

1192

msgid ""

1193

":Exit values:\n"

1194

" 1 - changed\n"

1197

" 0 - no change"

1198

msgstr ""

1199

1200

#: bzrlib/builtins.py:2220

1200

#: bzrlib/builtins.py:2127

1201

msgid ""

1202

":Examples:\n"

1203

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

1204

msgstr ""

1205

1206

#: bzrlib/builtins.py:2223

1206

#: bzrlib/builtins.py:2130

1207

msgid " bzr diff"

1208

msgstr ""

1209

1210

#: bzrlib/builtins.py:2225

1210

#: bzrlib/builtins.py:2132

1211

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

1212

msgstr ""

1213

1214

#: bzrlib/builtins.py:2227

1214

#: bzrlib/builtins.py:2134

1215

msgid " bzr diff -r1"

1216

msgstr ""

1217

1218

#: bzrlib/builtins.py:2229

1218

#: bzrlib/builtins.py:2136

1219

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

1220

msgstr ""

1221

1222

#: bzrlib/builtins.py:2231

1222

#: bzrlib/builtins.py:2138

1223

msgid " bzr diff -r1..3"

1224

msgstr ""

1225

1226

#: bzrlib/builtins.py:2233

1226

#: bzrlib/builtins.py:2140

1227

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

1228

msgstr ""

1229

1230

#: bzrlib/builtins.py:2235

1230

#: bzrlib/builtins.py:2142

1231

msgid " bzr diff -r1..3 xxx"

1232

msgstr ""

1233

1234

#: bzrlib/builtins.py:2237

1234

#: bzrlib/builtins.py:2144

1235

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

1236

msgstr ""

1237

1238

#: bzrlib/builtins.py:2239

1238

#: bzrlib/builtins.py:2146

1239

msgid " bzr diff -c2"

1240

msgstr ""

1241

1242

#: bzrlib/builtins.py:2241

1242

#: bzrlib/builtins.py:2148

1243

msgid ""

1244

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

1245

" \n"

1246

" bzr diff -cX"

1247

msgstr ""

1248

1249

#: bzrlib/builtins.py:2245

1249

#: bzrlib/builtins.py:2152

1250

msgid ""

1251

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

1252

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

1253

" another parent, use::"

1254

msgstr ""

1255

1256

#: bzrlib/builtins.py:2249

1256

#: bzrlib/builtins.py:2156

1257

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

1258

msgstr ""

1259

1260

#: bzrlib/builtins.py:2251

1260

#: bzrlib/builtins.py:2158

1261

msgid ""

1262

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

1263

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

1264

msgstr ""

1265

1266

#: bzrlib/builtins.py:2254

1266

#: bzrlib/builtins.py:2161

1267

msgid " bzr diff -r-2.."

1268

msgstr ""

1269

1270

#: bzrlib/builtins.py:2256

1270

#: bzrlib/builtins.py:2163

1271

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

1272

msgstr ""

1273

1274

#: bzrlib/builtins.py:2258

1274

#: bzrlib/builtins.py:2165

1275

msgid " bzr diff NEWS"

1276

msgstr ""

1277

1278

#: bzrlib/builtins.py:2260

1278

#: bzrlib/builtins.py:2167

1279

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

1280

msgstr ""

1281

1282

#: bzrlib/builtins.py:2262

1282

#: bzrlib/builtins.py:2169

1283

msgid " bzr diff xxx/NEWS"

1284

msgstr ""

1285

1286

#: bzrlib/builtins.py:2264

1286

#: bzrlib/builtins.py:2171

1287

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

1288

msgstr ""

1289

1290

#: bzrlib/builtins.py:2266

1290

#: bzrlib/builtins.py:2173

1291

msgid " bzr diff --old xxx"

1292

msgstr ""

1293

1294

#: bzrlib/builtins.py:2268

1294

#: bzrlib/builtins.py:2175

1295

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

1296

msgstr ""

1297

1298

#: bzrlib/builtins.py:2270

1298

#: bzrlib/builtins.py:2177

1299

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

1300

msgstr ""

1301

1302

#: bzrlib/builtins.py:2272

1302

#: bzrlib/builtins.py:2179

1303

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

1304

msgstr ""

1305

1306

#: bzrlib/builtins.py:2274

1306

#: bzrlib/builtins.py:2181

1307

msgid ""

1308

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

1309

" \n"

1312

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

1313

msgstr ""

1314

1315

#: bzrlib/builtins.py:2284

1315

#: bzrlib/builtins.py:2191

1316

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

1317

msgstr ""

1318

1319

#: bzrlib/builtins.py:2287

1319

#: bzrlib/builtins.py:2194

1320

msgid ""

1321

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

1322

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

1323

msgstr ""

1324

1325

#: bzrlib/builtins.py:2290

1325

#: bzrlib/builtins.py:2197

1326

msgid "Branch/tree to compare from."

1327

msgstr ""

1328

1329

#: bzrlib/builtins.py:2294

1329

#: bzrlib/builtins.py:2201

1330

msgid "Branch/tree to compare to."

1331

msgstr ""

1332

1333

#: bzrlib/builtins.py:2300

1333

#: bzrlib/builtins.py:2207

1334

msgid "Use this command to compare files."

1335

msgstr ""

1336

1337

#: bzrlib/builtins.py:2305

1337

#: bzrlib/builtins.py:2212

1338

msgid "Diff format to use."

1339

msgstr ""

1340

1341

#: bzrlib/builtins.py:2307

1341

#: bzrlib/builtins.py:2214

1342

msgid "Diff format"

1343

msgstr ""

1344

1345

#: bzrlib/builtins.py:2329

1345

#: bzrlib/builtins.py:2236

1346

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

1347

msgstr ""

1348

1349

#: bzrlib/builtins.py:2333

1349

#: bzrlib/builtins.py:2240

1350

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

1351

msgstr ""

1352

1353

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

1354

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

1353

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

1354

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

1355

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

1356

msgstr ""

1357

1358

#: bzrlib/builtins.py:2358

1358

#: bzrlib/builtins.py:2265

1359

msgid ""

1360

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

1361

" "

1362

msgstr ""

1363

1364

#: bzrlib/builtins.py:2436

1364

#: bzrlib/builtins.py:2343

1365

msgid "Show the tree root directory."

1366

msgstr ""

1367

1368

#: bzrlib/builtins.py:2438

1368

#: bzrlib/builtins.py:2345

1369

msgid ""

1370

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

1371

"directory."

1372

msgstr ""

1373

1374

#: bzrlib/builtins.py:2453

1374

#: bzrlib/builtins.py:2360

1375

msgid "The limit argument must be an integer."

1376

msgstr ""

1377

1378

#: bzrlib/builtins.py:2461

1378

#: bzrlib/builtins.py:2368

1379

msgid "The levels argument must be an integer."

1380

msgstr ""

1381

1382

#: bzrlib/builtins.py:2466

1382

#: bzrlib/builtins.py:2373

1383

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

1384

msgstr ""

1385

1386

#: bzrlib/builtins.py:2468

1386

#: bzrlib/builtins.py:2375

1387

msgid ""

1388

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

1389

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

1391

"Here are some simple examples::"

1392

msgstr ""

1393

1394

#: bzrlib/builtins.py:2473

1394

#: bzrlib/builtins.py:2380

1395

msgid ""

1396

" bzr log log the current branch\n"

1397

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

1398

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

1399

msgstr ""

1400

1401

#: bzrlib/builtins.py:2477

1401

#: bzrlib/builtins.py:2384

1402

msgid ""

1403

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

1404

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

1408

"were merged."

1409

msgstr ""

1410

1411

#: bzrlib/builtins.py:2484

1411

#: bzrlib/builtins.py:2391

1412

msgid ":Output control:"

1413

msgstr ""

1414

1415

#: bzrlib/builtins.py:2486

1415

#: bzrlib/builtins.py:2393

1416

msgid ""

1417

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

1418

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

1420

" for more details on log formats."

1421

msgstr ""

1422

1423

#: bzrlib/builtins.py:2491

1423

#: bzrlib/builtins.py:2398

1424

msgid ""

1425

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

1426

" displayed::"

1427

msgstr ""

1428

1429

#: bzrlib/builtins.py:2494

1429

#: bzrlib/builtins.py:2401

1430

msgid ""

1431

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

1432

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

1435

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

1436

msgstr ""

1437

1438

#: bzrlib/builtins.py:2500

1438

#: bzrlib/builtins.py:2407

1439

msgid ""

1440

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

1441

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

1442

" just the top level (mainline)."

1443

msgstr ""

1444

1445

#: bzrlib/builtins.py:2504

1445

#: bzrlib/builtins.py:2411

1446

msgid ""

1447

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

1448

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

1449

" instead, use the -vv option."

1450

msgstr ""

1451

1452

#: bzrlib/builtins.py:2508

1452

#: bzrlib/builtins.py:2415

1453

msgid ":Ordering control:"

1454

msgstr ""

1455

1456

#: bzrlib/builtins.py:2510

1456

#: bzrlib/builtins.py:2417

1457

msgid ""

1458

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

1459

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

1461

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

1462

msgstr ""

1463

1464

#: bzrlib/builtins.py:2515

1464

#: bzrlib/builtins.py:2422

1465

msgid ":Revision filtering:"

1466

msgstr ""

1467

1468

#: bzrlib/builtins.py:2517

1468

#: bzrlib/builtins.py:2424

1469

msgid ""

1470

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

1471

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

1472

msgstr ""

1473

1474

#: bzrlib/builtins.py:2520

1474

#: bzrlib/builtins.py:2427

1475

msgid ""

1476

" -rX display revision X\n"

1477

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

1479

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

1480

msgstr ""

1481

1482

#: bzrlib/builtins.py:2525

1482

#: bzrlib/builtins.py:2432

1483

msgid ""

1484

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

1485

" Some common examples are given below::"

1486

msgstr ""

1487

1488

#: bzrlib/builtins.py:2528

1488

#: bzrlib/builtins.py:2435

1489

msgid ""

1490

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

1491

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

1495

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

1496

msgstr ""

1497

1498

#: bzrlib/builtins.py:2535

1498

#: bzrlib/builtins.py:2442

1499

msgid ""

1500

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

1501

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

1505

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

1506

msgstr ""

1507

1508

#: bzrlib/builtins.py:2542

1508

#: bzrlib/builtins.py:2449

1509

msgid ":Path filtering:"

1510

msgstr ""

1511

1512

#: bzrlib/builtins.py:2544

1512

#: bzrlib/builtins.py:2451

1513

msgid ""

1514

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

1515

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

1516

" nominated files or directories."

1517

msgstr ""

1518

1519

#: bzrlib/builtins.py:2548

1519

#: bzrlib/builtins.py:2455

1520

msgid ""

1521

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

1522

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

1523

" the end or start of the range."

1524

msgstr ""

1525

1526

#: bzrlib/builtins.py:2552

1526

#: bzrlib/builtins.py:2459

1527

msgid ""

1528

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

1529

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

1530

msgstr ""

1531

1532

#: bzrlib/builtins.py:2555

1532

#: bzrlib/builtins.py:2462

1533

msgid ""

1534

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

1535

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

1536

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

1537

msgstr ""

1538

1539

#: bzrlib/builtins.py:2559

1539

#: bzrlib/builtins.py:2466

1540

msgid " In this case:"

1541

msgstr ""

1542

1543

#: bzrlib/builtins.py:2561

1543

#: bzrlib/builtins.py:2468

1544

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

1545

msgstr ""

1546

1547

#: bzrlib/builtins.py:2563

1547

#: bzrlib/builtins.py:2470

1548

msgid ""

1549

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

1550

msgstr ""

1551

1552

#: bzrlib/builtins.py:2565

1552

#: bzrlib/builtins.py:2472

1553

msgid ""

1554

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

1555

" the original file in revision 2."

1556

msgstr ""

1557

1558

#: bzrlib/builtins.py:2568

1558

#: bzrlib/builtins.py:2475

1559

msgid ""

1560

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

1561

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

1562

msgstr ""

1563

1564

#: bzrlib/builtins.py:2571

1564

#: bzrlib/builtins.py:2478

1565

msgid ""

1566

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

1567

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

1568

" until it was last renamed)."

1569

msgstr ""

1570

1571

#: bzrlib/builtins.py:2575

1571

#: bzrlib/builtins.py:2482

1572

msgid ":Other filtering:"

1573

msgstr ""

1574

1575

#: bzrlib/builtins.py:2577

1575

#: bzrlib/builtins.py:2484

1576

msgid ""

1577

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

1578

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

1581

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

1582

msgstr ""

1583

1584

#: bzrlib/builtins.py:2583

1584

#: bzrlib/builtins.py:2490

1585

msgid ":Tips & tricks:"

1586

msgstr ""

1587

1588

#: bzrlib/builtins.py:2585

1588

#: bzrlib/builtins.py:2492

1589

msgid ""

1590

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

1591

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

1594

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

1595

msgstr ""

1596

1597

#: bzrlib/builtins.py:2591

1597

#: bzrlib/builtins.py:2498

1598

msgid ""

1599

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

1600

msgstr ""

1601

1602

#: bzrlib/builtins.py:2593

1602

#: bzrlib/builtins.py:2500

1603

msgid ""

1604

" [ALIASES]\n"

1605

" tip = log -r-1\n"

1607

" show = log -v -p"

1608

msgstr ""

1609

1610

#: bzrlib/builtins.py:2598

1610

#: bzrlib/builtins.py:2505

1611

msgid ""

1612

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

1613

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

1614

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

1615

msgstr ""

1616

1617

#: bzrlib/builtins.py:2602

1617

#: bzrlib/builtins.py:2509

1618

msgid ""

1619

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

1620

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

1621

msgstr ""

1622

1623

#: bzrlib/builtins.py:2605

1623

#: bzrlib/builtins.py:2512

1624

msgid ""

1625

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

1626

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

1628

" be given when using the -v option."

1629

msgstr ""

1630

1631

#: bzrlib/builtins.py:2610

1631

#: bzrlib/builtins.py:2517

1632

msgid ""

1633

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

1634

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

1636

" a list of words but not others."

1637

msgstr ""

1638

1639

#: bzrlib/builtins.py:2615

1639

#: bzrlib/builtins.py:2522

1640

msgid ""

1641

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

1642

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

1644

" trading disk space for faster speed."

1645

msgstr ""

1646

1647

#: bzrlib/builtins.py:2624

1647

#: bzrlib/builtins.py:2531

1648

msgid "Show from oldest to newest."

1649

msgstr ""

1650

1651

#: bzrlib/builtins.py:2627

1651

#: bzrlib/builtins.py:2534

1652

msgid "Show files changed in each revision."

1653

msgstr ""

1654

1655

#: bzrlib/builtins.py:2633

1655

#: bzrlib/builtins.py:2540

1656

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

1657

msgstr ""

1658

1659

#: bzrlib/builtins.py:2637

1659

#: bzrlib/builtins.py:2544

1660

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

1661

msgstr ""

1662

1663

#: bzrlib/builtins.py:2638

1663

#: bzrlib/builtins.py:2545

1664

msgid "Authors"

1665

msgstr ""

1666

1667

#: bzrlib/builtins.py:2643

1667

#: bzrlib/builtins.py:2550

1668

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

1669

msgstr ""

1670

1671

#: bzrlib/builtins.py:2653

1671

#: bzrlib/builtins.py:2560

1672

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

1673

msgstr ""

1674

1675

#: bzrlib/builtins.py:2658

1675

#: bzrlib/builtins.py:2565

1676

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

1677

msgstr ""

1678

1679

#: bzrlib/builtins.py:2660

1679

#: bzrlib/builtins.py:2567

1680

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

1681

msgstr ""

1682

1683

#: bzrlib/builtins.py:2664

1683

#: bzrlib/builtins.py:2571

1684

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

1685

msgstr ""

1686

1687

#: bzrlib/builtins.py:2666

1687

#: bzrlib/builtins.py:2573

1688

msgid ""

1689

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

1690

"rX..Y)."

1691

msgstr ""

1692

1693

#: bzrlib/builtins.py:2670

1693

#: bzrlib/builtins.py:2577

1694

msgid "Show digital signature validity."

1695

msgstr ""

1696

1697

#: bzrlib/builtins.py:2673

1697

#: bzrlib/builtins.py:2580

1698

msgid "Show revisions whose properties match this expression."

1699

msgstr ""

1700

1701

#: bzrlib/builtins.py:2677

1701

#: bzrlib/builtins.py:2584

1702

msgid "Show revisions whose message matches this expression."

1703

msgstr ""

1704

1705

#: bzrlib/builtins.py:2681

1705

#: bzrlib/builtins.py:2588

1706

msgid "Show revisions whose committer matches this expression."

1707

msgstr ""

1708

1709

#: bzrlib/builtins.py:2685

1709

#: bzrlib/builtins.py:2592

1710

msgid "Show revisions whose authors match this expression."

1711

msgstr ""

1712

1713

#: bzrlib/builtins.py:2689

1713

#: bzrlib/builtins.py:2596

1714

msgid "Show revisions whose bugs match this expression."

1715

msgstr ""

1716

1717

#: bzrlib/builtins.py:2743

1717

#: bzrlib/builtins.py:2650

1718

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

1719

msgstr ""

1720

1721

#: bzrlib/builtins.py:2771

1721

#: bzrlib/builtins.py:2678

1722

#, python-format

1723

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

1724

msgstr ""

1725

1726

#: bzrlib/builtins.py:2888

1726

#: bzrlib/builtins.py:2795

1727

#, python-format

1728

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

1729

msgstr ""

1730

1731

#: bzrlib/builtins.py:2904

1731

#: bzrlib/builtins.py:2811

1732

#, python-format

1733

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

1734

msgstr ""

1735

1736

#: bzrlib/builtins.py:2949

1736

#: bzrlib/builtins.py:2856

1737

msgid ""

1738

"List files in a tree.\n"

1739

" "

1740

msgstr ""

1741

1742

#: bzrlib/builtins.py:2958

1742

#: bzrlib/builtins.py:2865

1743

msgid "Recurse into subdirectories."

1744

msgstr ""

1745

1746

#: bzrlib/builtins.py:2960

1746

#: bzrlib/builtins.py:2867

1747

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

1748

msgstr ""

1749

1750

#: bzrlib/builtins.py:2962

1750

#: bzrlib/builtins.py:2869

1751

msgid "Print unknown files."

1752

msgstr ""

1753

1754

#: bzrlib/builtins.py:2963

1754

#: bzrlib/builtins.py:2870

1755

msgid "Print versioned files."

1756

msgstr ""

1757

1758

#: bzrlib/builtins.py:2966

1758

#: bzrlib/builtins.py:2873

1759

msgid "Print ignored files."

1760

msgstr ""

1761

1762

#: bzrlib/builtins.py:2968

1762

#: bzrlib/builtins.py:2875

1763

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

1764

msgstr ""

1765

1766

#: bzrlib/builtins.py:2981

1766

#: bzrlib/builtins.py:2888

1767

msgid "invalid kind specified"

1768

msgstr ""

1769

1770

#: bzrlib/builtins.py:2984

1770

#: bzrlib/builtins.py:2891

1771

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

1772

msgstr ""

1773

1774

#: bzrlib/builtins.py:2993

1774

#: bzrlib/builtins.py:2900

1775

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

1776

msgstr ""

1777

1778

#: bzrlib/builtins.py:3080

1778

#: bzrlib/builtins.py:2987

1779

msgid "Ignore specified files or patterns."

1780

msgstr ""

1781

1782

#: bzrlib/builtins.py:3082

1782

#: bzrlib/builtins.py:2989

1783

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

1784

msgstr ""

1785

1786

#: bzrlib/builtins.py:3084

1786

#: bzrlib/builtins.py:2991

1787

msgid ""

1788

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

1789

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

1792

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

1793

msgstr ""

1794

1795

#: bzrlib/builtins.py:3090

1795

#: bzrlib/builtins.py:2997

1796

msgid ""

1797

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

1798

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

1800

"it."

1801

msgstr ""

1802

1803

#: bzrlib/builtins.py:3095

1803

#: bzrlib/builtins.py:3002

1804

msgid ""

1805

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

1806

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

1809

"can be edited directly using an editor."

1810

msgstr ""

1811

1812

#: bzrlib/builtins.py:3101

1812

#: bzrlib/builtins.py:3008

1813

msgid ""

1814

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

1815

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

1816

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

1817

msgstr ""

1818

1819

#: bzrlib/builtins.py:3105

1819

#: bzrlib/builtins.py:3012

1820

msgid ""

1821

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

1822

"precedence over the '!' exception patterns."

1823

msgstr ""

1824

1825

#: bzrlib/builtins.py:3108

1825

#: bzrlib/builtins.py:3015

1826

msgid ""

1827

":Notes: \n"

1828

" \n"

1830

" the shell on Unix."

1831

msgstr ""

1832

1833

#: bzrlib/builtins.py:3113

1833

#: bzrlib/builtins.py:3020

1834

msgid ""

1835

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

1836

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

1837

msgstr ""

1838

1839

#: bzrlib/builtins.py:3116

1839

#: bzrlib/builtins.py:3023

1840

msgid ""

1841

":Examples:\n"

1842

" Ignore the top level Makefile::"

1843

msgstr ""

1844

1845

#: bzrlib/builtins.py:3119

1845

#: bzrlib/builtins.py:3026

1846

msgid " bzr ignore ./Makefile"

1847

msgstr ""

1848

1849

#: bzrlib/builtins.py:3121

1849

#: bzrlib/builtins.py:3028

1850

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

1851

msgstr ""

1852

1853

#: bzrlib/builtins.py:3123

1853

#: bzrlib/builtins.py:3030

1854

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

1855

msgstr ""

1856

1857

#: bzrlib/builtins.py:3125

1857

#: bzrlib/builtins.py:3032

1858

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

1859

msgstr ""

1860

1861

#: bzrlib/builtins.py:3127

1861

#: bzrlib/builtins.py:3034

1862

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

1863

msgstr ""

1864

1865

#: bzrlib/builtins.py:3129

1865

#: bzrlib/builtins.py:3036

1866

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

1867

msgstr ""

1868

1869

#: bzrlib/builtins.py:3131

1869

#: bzrlib/builtins.py:3038

1870

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

1871

msgstr ""

1872

1873

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

1873

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

1874

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

1875

msgstr ""

1876

1877

#: bzrlib/builtins.py:3135

1877

#: bzrlib/builtins.py:3042

1878

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

1879

msgstr ""

1880

1881

#: bzrlib/builtins.py:3139

1881

#: bzrlib/builtins.py:3046

1882

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

1883

msgstr ""

1884

1885

#: bzrlib/builtins.py:3141

1885

#: bzrlib/builtins.py:3048

1886

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

1887

msgstr ""

1888

1889

#: bzrlib/builtins.py:3143

1889

#: bzrlib/builtins.py:3050

1890

msgid ""

1891

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

1892

" \n"

1898

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

1899

msgstr ""

1900

1901

#: bzrlib/builtins.py:3157

1901

#: bzrlib/builtins.py:3064

1902

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

1903

msgstr ""

1904

1905

#: bzrlib/builtins.py:3169

1905

#: bzrlib/builtins.py:3076

1906

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

1907

msgstr ""

1908

1909

#: bzrlib/builtins.py:3180

1909

#: bzrlib/builtins.py:3087

1910

#, python-format

1911

msgid "Invalid ignore pattern found. %s"

1912

msgid_plural "Invalid ignore patterns found. %s"

1913

msgstr[0] ""

1914

msgstr[1] ""

1915

1916

#: bzrlib/builtins.py:3189

1916

#: bzrlib/builtins.py:3096

1917

msgid "NAME_PATTERN should not be an absolute path"

1918

msgstr ""

1919

1920

#: bzrlib/builtins.py:3202

1920

#: bzrlib/builtins.py:3109

1921

#, python-format

1922

msgid ""

1923

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

1927

"them.\n"

1928

msgstr ""

1929

1930

#: bzrlib/builtins.py:3209

1930

#: bzrlib/builtins.py:3116

1931

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

1932

msgstr ""

1933

1934

#: bzrlib/builtins.py:3211

1934

#: bzrlib/builtins.py:3118

1935

msgid ""

1936

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

1937

"be ignored."

1938

msgstr ""

1939

1940

#: bzrlib/builtins.py:3214

1940

#: bzrlib/builtins.py:3121

1941

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

1942

msgstr ""

1943

1944

#: bzrlib/builtins.py:3216

1944

#: bzrlib/builtins.py:3123

1945

msgid " bzr ls --ignored"

1946

msgstr ""

1947

1948

#: bzrlib/builtins.py:3250

1948

#: bzrlib/builtins.py:3157

1949

#, python-format

1950

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

1951

msgstr ""

1952

1953

#: bzrlib/builtins.py:3257

1953

#: bzrlib/builtins.py:3164

1954

msgid ""

1955

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

1956

msgstr ""

1957

1958

#: bzrlib/builtins.py:3259

1958

#: bzrlib/builtins.py:3166

1959

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

1960

msgstr ""

1961

1962

#: bzrlib/builtins.py:3261

1962

#: bzrlib/builtins.py:3168

1963

msgid ""

1964

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

1965

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

1966

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

1967

msgstr ""

1968

1969

#: bzrlib/builtins.py:3265

1969

#: bzrlib/builtins.py:3172

1970

msgid ""

1971

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

1972

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

1973

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

1974

msgstr ""

1975

1976

#: bzrlib/builtins.py:3269

1976

#: bzrlib/builtins.py:3176

1977

msgid ""

1978

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

1979

"directory will be used."

1980

msgstr ""

1981

1982

#: bzrlib/builtins.py:3272

1982

#: bzrlib/builtins.py:3179

1983

msgid ""

1984

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

1985

msgstr ""

1986

1987

#: bzrlib/builtins.py:3274

1987

#: bzrlib/builtins.py:3181

1988

msgid ""

1989

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

1990

" Supported formats Autodetected by extension\n"

1997

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

1998

msgstr ""

1999

2000

#: bzrlib/builtins.py:3288

2000

#: bzrlib/builtins.py:3195

2001

msgid "Type of file to export to."

2002

msgstr ""

2003

2004

#: bzrlib/builtins.py:3291

2004

#: bzrlib/builtins.py:3198

2005

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

2006

msgstr ""

2007

2008

#: bzrlib/builtins.py:3295

2008

#: bzrlib/builtins.py:3202

2009

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

2010

msgstr ""

2011

2012

#: bzrlib/builtins.py:3297

2012

#: bzrlib/builtins.py:3204

2013

msgid ""

2014

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

2015

"changed."

2016

msgstr ""

2017

2018

#: bzrlib/builtins.py:3300

2018

#: bzrlib/builtins.py:3207

2019

msgid ""

2020

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

2021

msgstr ""

2022

2023

#: bzrlib/builtins.py:3319

2023

#: bzrlib/builtins.py:3226

2024

msgid "--uncommitted requires a working tree"

2025

msgstr ""

2026

2027

#: bzrlib/builtins.py:3328

2027

#: bzrlib/builtins.py:3235

2028

#, python-format

2029

msgid "Unsupported export format: %s"

2030

msgstr ""

2031

2032

#: bzrlib/builtins.py:3332

2032

#: bzrlib/builtins.py:3239

2033

msgid ""

2034

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

2035

msgstr ""

2036

2037

#: bzrlib/builtins.py:3334

2037

#: bzrlib/builtins.py:3241

2038

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

2039

msgstr ""

2040

2041

#: bzrlib/builtins.py:3336

2041

#: bzrlib/builtins.py:3243

2042

msgid ""

2043

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

2044

"binary file."

2045

msgstr ""

2046

2047

#: bzrlib/builtins.py:3342

2047

#: bzrlib/builtins.py:3249

2048

msgid "The path name in the old tree."

2049

msgstr ""

2050

2051

#: bzrlib/builtins.py:3343

2051

#: bzrlib/builtins.py:3250

2052

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

2053

msgstr ""

2054

2055

#: bzrlib/builtins.py:3354

2055

#: bzrlib/builtins.py:3261

2056

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

2057

msgstr ""

2058

2059

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

2059

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

2060

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

2061

msgstr ""

2062

2063

#: bzrlib/builtins.py:3414

2063

#: bzrlib/builtins.py:3321

2064

msgid "Commit changes into a new revision."

2065

msgstr ""

2066

2067

#: bzrlib/builtins.py:3416

2067

#: bzrlib/builtins.py:3323

2068

msgid ""

2069

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

2070

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

2074

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

2075

msgstr ""

2076

2077

#: bzrlib/builtins.py:3423

2077

#: bzrlib/builtins.py:3330

2078

msgid ""

2079

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

2080

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

2081

"as explained below."

2082

msgstr ""

2083

2084

#: bzrlib/builtins.py:3427

2084

#: bzrlib/builtins.py:3334

2085

msgid ":Selective commits:"

2086

msgstr ""

2087

2088

#: bzrlib/builtins.py:3429

2088

#: bzrlib/builtins.py:3336

2089

msgid ""

2090

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

2091

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

2092

" everything within it is committed."

2093

msgstr ""

2094

2095

#: bzrlib/builtins.py:3433

2095

#: bzrlib/builtins.py:3340

2096

msgid ""

2097

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

2098

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

2099

" within foo/bar::"

2100

msgstr ""

2101

2102

#: bzrlib/builtins.py:3437

2102

#: bzrlib/builtins.py:3344

2103

msgid " bzr commit foo -x foo/bar"

2104

msgstr ""

2105

2106

#: bzrlib/builtins.py:3439

2106

#: bzrlib/builtins.py:3346

2107

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

2108

msgstr ""

2109

2110

#: bzrlib/builtins.py:3441

2110

#: bzrlib/builtins.py:3348

2111

msgid ":Custom authors:"

2112

msgstr ""

2113

2114

#: bzrlib/builtins.py:3443

2114

#: bzrlib/builtins.py:3350

2115

msgid ""

2116

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

2117

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

2121

" author."

2122

msgstr ""

2123

2124

#: bzrlib/builtins.py:3450

2124

#: bzrlib/builtins.py:3357

2125

msgid ":Checks:"

2126

msgstr ""

2127

2128

#: bzrlib/builtins.py:3452

2128

#: bzrlib/builtins.py:3359

2129

msgid ""

2130

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

2131

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

2134

" for details."

2135

msgstr ""

2136

2137

#: bzrlib/builtins.py:3458

2137

#: bzrlib/builtins.py:3365

2138

msgid ":Things to note:"

2139

msgstr ""

2140

2141

#: bzrlib/builtins.py:3460

2141

#: bzrlib/builtins.py:3367

2142

msgid ""

2143

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

2144

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

2145

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

2146

msgstr ""

2147

2148

#: bzrlib/builtins.py:3464

2148

#: bzrlib/builtins.py:3371

2149

msgid ""

2150

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

2151

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

2153

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

2154

msgstr ""

2155

2156

#: bzrlib/builtins.py:3474

2156

#: bzrlib/builtins.py:3381

2157

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

2158

msgstr ""

2159

2160

#: bzrlib/builtins.py:3477

2160

#: bzrlib/builtins.py:3384

2161

msgid "Description of the new revision."

2162

msgstr ""

2163

2164

#: bzrlib/builtins.py:3480

2164

#: bzrlib/builtins.py:3387

2165

msgid "Commit even if nothing has changed."

2166

msgstr ""

2167

2168

#: bzrlib/builtins.py:3484

2168

#: bzrlib/builtins.py:3391

2169

msgid "Take commit message from this file."

2170

msgstr ""

2171

2172

#: bzrlib/builtins.py:3486

2172

#: bzrlib/builtins.py:3393

2173

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

2174

msgstr ""

2175

2176

#: bzrlib/builtins.py:3489

2176

#: bzrlib/builtins.py:3396

2177

msgid ""

2178

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

2179

"08:00:00 +0100'."

2180

msgstr ""

2181

2182

#: bzrlib/builtins.py:3492

2182

#: bzrlib/builtins.py:3399

2183

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

2184

msgstr ""

2185

2186

#: bzrlib/builtins.py:3495

2186

#: bzrlib/builtins.py:3402

2187

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

2188

msgstr ""

2189

2190

#: bzrlib/builtins.py:3498

2190

#: bzrlib/builtins.py:3405

2191

msgid ""

2192

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

2193

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

2194

msgstr ""

2195

2196

#: bzrlib/builtins.py:3504

2196

#: bzrlib/builtins.py:3411

2197

msgid ""

2198

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

2199

"the message editor."

2200

msgstr ""

2201

2202

#: bzrlib/builtins.py:3507

2202

#: bzrlib/builtins.py:3414

2203

msgid ""

2204

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

2205

"can not be natively represented."

2206

msgstr ""

2207

2208

#: bzrlib/builtins.py:3525

2208

#: bzrlib/builtins.py:3432

2209

#, python-format

2210

msgid ""

2211

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

2213

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

2214

msgstr ""

2215

2216

#: bzrlib/builtins.py:3534

2216

#: bzrlib/builtins.py:3441

2217

#, python-format

2218

msgid ""

2219

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

2221

"Commit refused."

2222

msgstr ""

2223

2224

#: bzrlib/builtins.py:3543

2224

#: bzrlib/builtins.py:3450

2225

#, python-format

2226

msgid "Unrecognized bug %s. Commit refused."

2227

msgstr ""

2228

2229

#: bzrlib/builtins.py:3546

2229

#: bzrlib/builtins.py:3453

2230

#, python-format

2231

msgid ""

2232

"%s\n"

2233

"Commit refused."

2234

msgstr ""

2235

2236

#: bzrlib/builtins.py:3570

2236

#: bzrlib/builtins.py:3477

2237

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

2238

msgstr ""

2239

2240

#: bzrlib/builtins.py:3610

2240

#: bzrlib/builtins.py:3517

2241

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

2242

msgstr ""

2243

2244

#: bzrlib/builtins.py:3639

2244

#: bzrlib/builtins.py:3546

2245

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

2246

msgstr ""

2247

2248

#: bzrlib/builtins.py:3642

2248

#: bzrlib/builtins.py:3549

2249

msgid ""

2250

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

2251

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

2252

msgstr ""

2253

2254

#: bzrlib/builtins.py:3662

2254

#: bzrlib/builtins.py:3569

2255

msgid ""

2256

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

2257

"-unchanged to force an empty commit."

2258

msgstr ""

2259

2260

#: bzrlib/builtins.py:3666

2260

#: bzrlib/builtins.py:3573

2261

msgid ""

2262

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

2263

"resolve FILE\" to resolve."

2264

msgstr ""

2265

2266

#: bzrlib/builtins.py:3670

2266

#: bzrlib/builtins.py:3577

2267

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

2268

msgstr ""

2269

2270

#: bzrlib/builtins.py:3673

2270

#: bzrlib/builtins.py:3580

2271

msgid ""

2272

"\n"

2273

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

2274

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

2275

msgstr ""

2276

2277

#: bzrlib/builtins.py:3681

2277

#: bzrlib/builtins.py:3588

2278

msgid ""

2279

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

2280

msgstr ""

2281

2282

#: bzrlib/builtins.py:3683

2282

#: bzrlib/builtins.py:3590

2283

msgid ""

2284

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

2285

"to detect data corruption or bzr bugs."

2286

msgstr ""

2287

2288

#: bzrlib/builtins.py:3686

2288

#: bzrlib/builtins.py:3593

2289

msgid ""

2290

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

2291

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

2292

msgstr ""

2293

2294

#: bzrlib/builtins.py:3689

2294

#: bzrlib/builtins.py:3596

2295

msgid ""

2296

"revisions\n"

2297

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

2298

" indicate a problem."

2299

msgstr ""

2300

2301

#: bzrlib/builtins.py:3693

2301

#: bzrlib/builtins.py:3600

2302

msgid ""

2303

"versionedfiles\n"

2304

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

2305

" doesn't indicate a problem."

2306

msgstr ""

2307

2308

#: bzrlib/builtins.py:3697

2308

#: bzrlib/builtins.py:3604

2309

msgid ""

2310

"unreferenced ancestors\n"

2311

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

2313

" subtle problem that Bazaar can work around."

2314

msgstr ""

2315

2316

#: bzrlib/builtins.py:3702

2316

#: bzrlib/builtins.py:3609

2317

msgid ""

2318

"unique file texts\n"

2319

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

2320

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

2321

msgstr ""

2322

2323

#: bzrlib/builtins.py:3706

2323

#: bzrlib/builtins.py:3613

2324

msgid ""

2325

"repeated file texts\n"

2326

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

2329

" indicate a problem."

2330

msgstr ""

2331

2332

#: bzrlib/builtins.py:3712

2332

#: bzrlib/builtins.py:3619

2333

msgid ""

2334

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

2335

"given\n"

2336

"location will be checked."

2337

msgstr ""

2338

2339

#: bzrlib/builtins.py:3717

2339

#: bzrlib/builtins.py:3624

2340

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

2341

msgstr ""

2342

2343

#: bzrlib/builtins.py:3719

2343

#: bzrlib/builtins.py:3626

2344

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

2345

msgstr ""

2346

2347

#: bzrlib/builtins.py:3721

2347

#: bzrlib/builtins.py:3628

2348

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

2349

msgstr ""

2350

2351

#: bzrlib/builtins.py:3723

2351

#: bzrlib/builtins.py:3630

2352

msgid " bzr check --repo bar"

2353

msgstr ""

2354

2355

#: bzrlib/builtins.py:3725

2355

#: bzrlib/builtins.py:3632

2356

msgid " Check everything at 'baz'::"

2357

msgstr ""

2358

2359

#: bzrlib/builtins.py:3727

2359

#: bzrlib/builtins.py:3634

2360

msgid " bzr check baz"

2361

msgstr ""

2362

2363

#: bzrlib/builtins.py:3733

2363

#: bzrlib/builtins.py:3640

2364

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

2365

msgstr ""

2366

2367

#: bzrlib/builtins.py:3735

2367

#: bzrlib/builtins.py:3642

2368

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

2369

msgstr ""

2370

2371

#: bzrlib/builtins.py:3737

2371

#: bzrlib/builtins.py:3644

2372

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

2373

msgstr ""

2374

2375

#: bzrlib/builtins.py:3751

2375

#: bzrlib/builtins.py:3658

2376

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

2377

msgstr ""

2378

2379

#: bzrlib/builtins.py:3753

2379

#: bzrlib/builtins.py:3660

2380

msgid ""

2381

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

2382

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

2385

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

2386

msgstr ""

2387

2388

#: bzrlib/builtins.py:3759

2388

#: bzrlib/builtins.py:3666

2389

msgid ""

2390

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

2391

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

2395

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

2396

msgstr ""

2397

2398

#: bzrlib/builtins.py:3766

2398

#: bzrlib/builtins.py:3673

2399

msgid ""

2400

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

2401

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

2406

"afterwards."

2407

msgstr ""

2408

2409

#: bzrlib/builtins.py:3774

2409

#: bzrlib/builtins.py:3681

2410

msgid ""

2411

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

2412

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

2414

"tried."

2415

msgstr ""

2416

2417

#: bzrlib/builtins.py:3779

2417

#: bzrlib/builtins.py:3686

2418

msgid ""

2419

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

2420

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

2421

msgstr ""

2422

2423

#: bzrlib/builtins.py:3787

2423

#: bzrlib/builtins.py:3694

2424

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

2425

msgstr ""

2426

2427

#: bzrlib/builtins.py:3791

2427

#: bzrlib/builtins.py:3698

2428

msgid "Branch format"

2429

msgstr ""

2430

2431

#: bzrlib/builtins.py:3793

2431

#: bzrlib/builtins.py:3700

2432

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

2433

msgstr ""

2434

2435

#: bzrlib/builtins.py:3795

2435

#: bzrlib/builtins.py:3702

2436

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

2437

msgstr ""

2438

2439

#: bzrlib/builtins.py:3810

2439

#: bzrlib/builtins.py:3717

2440

msgid "Show or set bzr user id."

2441

msgstr ""

2442

2443

#: bzrlib/builtins.py:3812

2443

#: bzrlib/builtins.py:3719

2444

msgid ""

2445

":Examples:\n"

2446

" Show the email of the current user::"

2447

msgstr ""

2448

2449

#: bzrlib/builtins.py:3815

2449

#: bzrlib/builtins.py:3722

2450

msgid " bzr whoami --email"

2451

msgstr ""

2452

2453

#: bzrlib/builtins.py:3817

2453

#: bzrlib/builtins.py:3724

2454

msgid " Set the current user::"

2455

msgstr ""

2456

2457

#: bzrlib/builtins.py:3819

2457

#: bzrlib/builtins.py:3726

2458

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

2459

msgstr ""

2460

2461

#: bzrlib/builtins.py:3823

2461

#: bzrlib/builtins.py:3730

2462

msgid "Display email address only."

2463

msgstr ""

2464

2465

#: bzrlib/builtins.py:3825

2465

#: bzrlib/builtins.py:3732

2466

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

2467

msgstr ""

2468

2469

#: bzrlib/builtins.py:3851

2469

#: bzrlib/builtins.py:3758

2470

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

2471

msgstr ""

2472

2473

#: bzrlib/builtins.py:3873

2473

#: bzrlib/builtins.py:3780

2474

msgid "Print or set the branch nickname."

2475

msgstr ""

2476

2477

#: bzrlib/builtins.py:3875

2477

#: bzrlib/builtins.py:3782

2478

msgid ""

2479

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

2480

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

2481

msgstr ""

2482

2483

#: bzrlib/builtins.py:3878

2483

#: bzrlib/builtins.py:3785

2484

msgid ""

2485

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

2486

"locally."

2487

msgstr ""

2488

2489

#: bzrlib/builtins.py:3898

2489

#: bzrlib/builtins.py:3805

2490

msgid "Set/unset and display aliases."

2491

msgstr ""

2492

2493

#: bzrlib/builtins.py:3900

2493

#: bzrlib/builtins.py:3807

2494

msgid ""

2495

":Examples:\n"

2496

" Show the current aliases::"

2497

msgstr ""

2498

2499

#: bzrlib/builtins.py:3903

2499

#: bzrlib/builtins.py:3810

2500

msgid " bzr alias"

2501

msgstr ""

2502

2503

#: bzrlib/builtins.py:3905

2503

#: bzrlib/builtins.py:3812

2504

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

2505

msgstr ""

2506

2507

#: bzrlib/builtins.py:3907

2507

#: bzrlib/builtins.py:3814

2508

msgid " bzr alias ll"

2509

msgstr ""

2510

2511

#: bzrlib/builtins.py:3909

2511

#: bzrlib/builtins.py:3816

2512

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

2513

msgstr ""

2514

2515

#: bzrlib/builtins.py:3911

2515

#: bzrlib/builtins.py:3818

2516

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

2517

msgstr ""

2518

2519

#: bzrlib/builtins.py:3913

2519

#: bzrlib/builtins.py:3820

2520

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

2521

msgstr ""

2522

2523

#: bzrlib/builtins.py:3915

2523

#: bzrlib/builtins.py:3822

2524

msgid " bzr alias --remove ll"

2525

msgstr ""

2526

2527

#: bzrlib/builtins.py:3920

2527

#: bzrlib/builtins.py:3827

2528

msgid "Remove the alias."

2529

msgstr ""

2530

2531

#: bzrlib/builtins.py:3938

2531

#: bzrlib/builtins.py:3845

2532

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

2533

msgstr ""

2534

2535

#: bzrlib/builtins.py:4119

2535

#: bzrlib/builtins.py:4026

2536

msgid ""

2537

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

2538

msgstr ""

2539

2540

#: bzrlib/builtins.py:4136

2540

#: bzrlib/builtins.py:4043

2541

msgid ""

2542

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

2543

msgstr ""

2544

2545

#: bzrlib/builtins.py:4183

2545

#: bzrlib/builtins.py:4090

2546

msgid "Show version of bzr."

2547

msgstr ""

2548

2549

#: bzrlib/builtins.py:4187

2549

#: bzrlib/builtins.py:4094

2550

msgid "Print just the version number."

2551

msgstr ""

2552

2553

#: bzrlib/builtins.py:4206

2553

#: bzrlib/builtins.py:4113

2554

msgid "It sure does!\n"

2555

msgstr ""

2556

2557

#: bzrlib/builtins.py:4230

2557

#: bzrlib/builtins.py:4137

2558

#, python-format

2559

msgid "merge base is revision %s\n"

2560

msgstr ""

2561

2562

#: bzrlib/builtins.py:4234

2562

#: bzrlib/builtins.py:4141

2563

msgid "Perform a three-way merge."

2564

msgstr ""

2565

2566

#: bzrlib/builtins.py:4236

2566

#: bzrlib/builtins.py:4143

2567

msgid ""

2568

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

2569

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

2574

"the current working tree."

2575

msgstr ""

2576

2577

#: bzrlib/builtins.py:4244

2577

#: bzrlib/builtins.py:4151

2578

msgid ""

2579

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

2580

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

2581

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

2582

msgstr ""

2583

2584

#: bzrlib/builtins.py:4248

2584

#: bzrlib/builtins.py:4155

2585

msgid ""

2586

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

2587

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

2588

msgstr ""

2589

2590

#: bzrlib/builtins.py:4251

2590

#: bzrlib/builtins.py:4158

2591

msgid ""

2592

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

2593

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

2598

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

2599

msgstr ""

2600

2601

#: bzrlib/builtins.py:4259

2601

#: bzrlib/builtins.py:4166

2602

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

2603

msgstr ""

2604

2605

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

2605

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

2606

msgid ""

2607

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

2608

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

2609

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

2610

"before you can commit."

2610

"before you should commit."

2611

msgstr ""

2612

2613

#: bzrlib/builtins.py:4266

2613

#: bzrlib/builtins.py:4173

2614

msgid ""

2615

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

2616

msgstr ""

2617

2618

#: bzrlib/builtins.py:4268

2618

#: bzrlib/builtins.py:4175

2619

msgid ""

2620

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

2621

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

2623

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

2624

msgstr ""

2625

2626

#: bzrlib/builtins.py:4273

2626

#: bzrlib/builtins.py:4180

2627

msgid ""

2628

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

2629

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

2630

"committed to record the result of the merge."

2631

msgstr ""

2632

2633

#: bzrlib/builtins.py:4277

2633

#: bzrlib/builtins.py:4184

2634

msgid ""

2635

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

2636

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

2639

"merge revision which has more than two parents."

2640

msgstr ""

2641

2642

#: bzrlib/builtins.py:4283

2642

#: bzrlib/builtins.py:4190

2643

msgid ""

2644

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

2645

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

2646

"can be given."

2647

msgstr ""

2648

2649

#: bzrlib/builtins.py:4287

2649

#: bzrlib/builtins.py:4194

2650

msgid ""

2651

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

2652

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

2653

msgstr ""

2654

2655

#: bzrlib/builtins.py:4290

2655

#: bzrlib/builtins.py:4197

2656

msgid ""

2657

":Examples:\n"

2658

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

2659

msgstr ""

2660

2661

#: bzrlib/builtins.py:4293

2661

#: bzrlib/builtins.py:4200

2662

msgid " bzr merge ../bzr.dev"

2663

msgstr ""

2664

2665

#: bzrlib/builtins.py:4295

2665

#: bzrlib/builtins.py:4202

2666

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

2667

msgstr ""

2668

2669

#: bzrlib/builtins.py:4297

2669

#: bzrlib/builtins.py:4204

2670

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

2671

msgstr ""

2672

2673

#: bzrlib/builtins.py:4299

2673

#: bzrlib/builtins.py:4206

2674

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

2675

msgstr ""

2676

2677

#: bzrlib/builtins.py:4301

2677

#: bzrlib/builtins.py:4208

2678

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

2679

msgstr ""

2680

2681

#: bzrlib/builtins.py:4303

2681

#: bzrlib/builtins.py:4210

2682

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

2683

msgstr ""

2684

2685

#: bzrlib/builtins.py:4305

2685

#: bzrlib/builtins.py:4212

2686

msgid " bzr merge /tmp/merge"

2687

msgstr ""

2688

2689

#: bzrlib/builtins.py:4307

2689

#: bzrlib/builtins.py:4214

2690

msgid ""

2691

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

2692

" feature1a and feature1b:"

2693

msgstr ""

2694

2695

#: bzrlib/builtins.py:4310

2695

#: bzrlib/builtins.py:4217

2696

msgid ""

2697

" bzr merge ../feature1a\n"

2698

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

2699

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

2700

msgstr ""

2701

2702

#: bzrlib/builtins.py:4322

2702

#: bzrlib/builtins.py:4229

2703

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

2704

msgstr ""

2705

2706

#: bzrlib/builtins.py:4328

2706

#: bzrlib/builtins.py:4235

2707

msgid ""

2708

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

2709

msgstr ""

2710

2711

#: bzrlib/builtins.py:4330

2711

#: bzrlib/builtins.py:4237

2712

msgid ""

2713

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

2714

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

2715

"commit the result."

2716

msgstr ""

2717

2718

#: bzrlib/builtins.py:4335

2718

#: bzrlib/builtins.py:4242

2719

msgid ""

2720

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

2721

msgstr ""

2722

2723

#: bzrlib/builtins.py:4337

2723

#: bzrlib/builtins.py:4244

2724

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

2725

msgstr ""

2726

2727

#: bzrlib/builtins.py:4339

2727

#: bzrlib/builtins.py:4246

2728

msgid "Select changes interactively."

2729

msgstr ""

2730

2731

#: bzrlib/builtins.py:4361

2731

#: bzrlib/builtins.py:4268

2732

msgid ""

2733

"Merging into empty branches not currently supported, "

2734

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

2735

msgstr ""

2736

2737

#: bzrlib/builtins.py:4388

2737

#: bzrlib/builtins.py:4295

2738

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

2739

msgstr ""

2740

2741

#: bzrlib/builtins.py:4399

2741

#: bzrlib/builtins.py:4306

2742

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

2743

msgstr ""

2744

2745

#: bzrlib/builtins.py:4419

2745

#: bzrlib/builtins.py:4326

2746

msgid "merger: "

2747

msgstr ""

2748

2749

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

2749

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

2750

msgid "Nothing to do."

2751

msgstr ""

2752

2753

#: bzrlib/builtins.py:4425

2753

#: bzrlib/builtins.py:4332

2754

msgid "Cannot pull individual files"

2755

msgstr ""

2756

2757

#: bzrlib/builtins.py:4433

2757

#: bzrlib/builtins.py:4340

2758

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

2759

msgstr ""

2760

2761

#: bzrlib/builtins.py:4491

2761

#: bzrlib/builtins.py:4398

2762

#, python-format

2763

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

2764

msgstr ""

2765

2766

#: bzrlib/builtins.py:4500

2766

#: bzrlib/builtins.py:4407

2767

#, python-format

2768

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

2769

msgstr ""

2770

2771

#: bzrlib/builtins.py:4504

2771

#: bzrlib/builtins.py:4411

2772

msgid "Cannot do conflict reduction and show base."

2773

msgstr ""

2774

2775

#: bzrlib/builtins.py:4615

2775

#: bzrlib/builtins.py:4522

2776

msgid "No location specified or remembered"

2777

msgstr ""

2778

2779

#: bzrlib/builtins.py:4617

2779

#: bzrlib/builtins.py:4524

2780

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

2781

msgstr ""

2782

2783

#: bzrlib/builtins.py:4623

2783

#: bzrlib/builtins.py:4530

2784

msgid "Redo a merge."

2785

msgstr ""

2786

2787

#: bzrlib/builtins.py:4625

2787

#: bzrlib/builtins.py:4532

2788

msgid ""

2789

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

2790

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

2791

"lets you try different ones on different files."

2792

msgstr ""

2793

2794

#: bzrlib/builtins.py:4629

2794

#: bzrlib/builtins.py:4536

2795

msgid ""

2796

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

2797

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

2798

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

2799

msgstr ""

2800

2801

#: bzrlib/builtins.py:4633

2801

#: bzrlib/builtins.py:4540

2802

msgid ""

2803

":Examples:\n"

2804

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

2805

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

2806

msgstr ""

2807

2808

#: bzrlib/builtins.py:4637

2808

#: bzrlib/builtins.py:4544

2809

msgid " bzr remerge --show-base"

2810

msgstr ""

2811

2812

#: bzrlib/builtins.py:4639

2812

#: bzrlib/builtins.py:4546

2813

msgid ""

2814

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

2815

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

2816

msgstr ""

2817

2818

#: bzrlib/builtins.py:4642

2818

#: bzrlib/builtins.py:4549

2819

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

2820

msgstr ""

2821

2822

#: bzrlib/builtins.py:4649

2822

#: bzrlib/builtins.py:4556

2823

msgid "Show base revision text in conflicts."

2824

msgstr ""

2825

2826

#: bzrlib/builtins.py:4661

2826

#: bzrlib/builtins.py:4568

2827

msgid ""

2828

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

2829

"merges."

2830

msgstr ""

2831

2832

#: bzrlib/builtins.py:4717

2832

#: bzrlib/builtins.py:4624

2833

msgid "Revert files to a previous revision."

2834

msgstr ""

2835

2836

#: bzrlib/builtins.py:4719

2836

#: bzrlib/builtins.py:4626

2837

msgid ""

2838

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

2839

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

2840

"last committed revision is used."

2841

msgstr ""

2842

2843

#: bzrlib/builtins.py:4723

2843

#: bzrlib/builtins.py:4630

2844

msgid ""

2845

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

2846

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

2849

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

2850

msgstr ""

2851

2852

#: bzrlib/builtins.py:4729

2852

#: bzrlib/builtins.py:4636

2853

msgid ""

2854

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

2855

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

2856

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

2857

msgstr ""

2858

2859

#: bzrlib/builtins.py:4733

2859

#: bzrlib/builtins.py:4640

2860

msgid ""

2861

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

2862

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

2864

"reverted."

2865

msgstr ""

2866

2867

#: bzrlib/builtins.py:4738

2867

#: bzrlib/builtins.py:4645

2868

msgid ""

2869

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

2870

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

2872

"deleted."

2873

msgstr ""

2874

2875

#: bzrlib/builtins.py:4743

2875

#: bzrlib/builtins.py:4650

2876

msgid ""

2877

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

2878

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

2884

"reverting any files."

2885

msgstr ""

2886

2887

#: bzrlib/builtins.py:4752

2887

#: bzrlib/builtins.py:4659

2888

msgid ""

2889

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

2890

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

2898

"target branches."

2899

msgstr ""

2900

2901

#: bzrlib/builtins.py:4766

2901

#: bzrlib/builtins.py:4673

2902

msgid "Do not save backups of reverted files."

2903

msgstr ""

2904

2905

#: bzrlib/builtins.py:4768

2905

#: bzrlib/builtins.py:4675

2906

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

2907

msgstr ""

2908

2909

#: bzrlib/builtins.py:4799

2909

#: bzrlib/builtins.py:4706

2910

msgid ""

2911

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

2912

" "

2913

msgstr ""

2914

2915

#: bzrlib/builtins.py:4804

2915

#: bzrlib/builtins.py:4711

2916

msgid "Show help on all commands."

2917

msgstr ""

2918

2919

#: bzrlib/builtins.py:4833

2919

#: bzrlib/builtins.py:4740

2920

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

2921

msgstr ""

2922

2923

#: bzrlib/builtins.py:4835

2923

#: bzrlib/builtins.py:4742

2924

msgid "OTHER_BRANCH may be local or remote."

2925

msgstr ""

2926

2927

#: bzrlib/builtins.py:4837

2927

#: bzrlib/builtins.py:4744

2928

msgid ""

2929

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

2930

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

2935

" 0 - no missing revisions"

2936

msgstr ""

2937

2938

#: bzrlib/builtins.py:4847

2938

#: bzrlib/builtins.py:4754

2939

msgid ""

2940

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

2941

" remembered pull location::"

2942

msgstr ""

2943

2944

#: bzrlib/builtins.py:4850

2944

#: bzrlib/builtins.py:4757

2945

msgid " bzr missing"

2946

msgstr ""

2947

2948

#: bzrlib/builtins.py:4852

2948

#: bzrlib/builtins.py:4759

2949

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

2950

msgstr ""

2951

2952

#: bzrlib/builtins.py:4854

2952

#: bzrlib/builtins.py:4761

2953

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

2954

msgstr ""

2955

2956

#: bzrlib/builtins.py:4856

2956

#: bzrlib/builtins.py:4763

2957

msgid ""

2958

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

2959

" branch::"

2960

msgstr ""

2961

2962

#: bzrlib/builtins.py:4859

2962

#: bzrlib/builtins.py:4766

2963

msgid " bzr missing -r ..-10"

2964

msgstr ""

2965

2966

#: bzrlib/builtins.py:4861

2966

#: bzrlib/builtins.py:4768

2967

msgid ""

2968

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

2969

" branch::"

2970

msgstr ""

2971

2972

#: bzrlib/builtins.py:4864

2972

#: bzrlib/builtins.py:4771

2973

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

2974

msgstr ""

2975

2976

#: bzrlib/builtins.py:4871

2976

#: bzrlib/builtins.py:4778

2977

msgid "Reverse the order of revisions."

2978

msgstr ""

2979

2980

#: bzrlib/builtins.py:4873

2980

#: bzrlib/builtins.py:4780

2981

msgid "Display changes in the local branch only."

2982

msgstr ""

2983

2984

#: bzrlib/builtins.py:4874

2984

#: bzrlib/builtins.py:4781

2985

msgid "Same as --mine-only."

2986

msgstr ""

2987

2988

#: bzrlib/builtins.py:4876

2988

#: bzrlib/builtins.py:4783

2989

msgid "Display changes in the remote branch only."

2990

msgstr ""

2991

2992

#: bzrlib/builtins.py:4877

2992

#: bzrlib/builtins.py:4784

2993

msgid "Same as --theirs-only."

2994

msgstr ""

2995

2996

#: bzrlib/builtins.py:4882

2996

#: bzrlib/builtins.py:4789

2997

msgid ""

2998

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

2999

"details."

3000

msgstr ""

3001

3002

#: bzrlib/builtins.py:4886

3002

#: bzrlib/builtins.py:4793

3003

msgid ""

3004

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

3005

"details."

3006

msgstr ""

3007

3008

#: bzrlib/builtins.py:4889

3008

#: bzrlib/builtins.py:4796

3009

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

3010

msgstr ""

3011

3012

#: bzrlib/builtins.py:4943

3012

#: bzrlib/builtins.py:4850

3013

msgid "No peer location known or specified."

3014

msgstr ""

3015

3016

#: bzrlib/builtins.py:4947

3016

#: bzrlib/builtins.py:4854

3017

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

3018

msgstr ""

3019

3020

#: bzrlib/builtins.py:4980

3020

#: bzrlib/builtins.py:4887

3021

#, python-format

3022

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

3023

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

3024

msgstr[0] ""

3025

msgstr[1] ""

3026

3027

#: bzrlib/builtins.py:4996

3027

#: bzrlib/builtins.py:4903

3028

#, python-format

3029

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

3030

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

3031

msgstr[0] ""

3032

msgstr[1] ""

3033

3034

#: bzrlib/builtins.py:5008

3034

#: bzrlib/builtins.py:4915

3035

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

3036

msgstr ""

3037

3038

#: bzrlib/builtins.py:5011

3038

#: bzrlib/builtins.py:4918

3039

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

3040

msgstr ""

3041

3042

#: bzrlib/builtins.py:5016

3042

#: bzrlib/builtins.py:4923

3043

msgid "Branches are up to date.\n"

3044

msgstr ""

3045

3046

#: bzrlib/builtins.py:5027

3046

#: bzrlib/builtins.py:4934

3047

msgid "Compress the data within a repository."

3048

msgstr ""

3049

3050

#: bzrlib/builtins.py:5029

3050

#: bzrlib/builtins.py:4936

3051

msgid ""

3052

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

3053

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

3054

"normally not required to be done manually."

3055

msgstr ""

3056

3057

#: bzrlib/builtins.py:5033

3057

#: bzrlib/builtins.py:4940

3058

msgid ""

3059

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

3060

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

3063

"used."

3064

msgstr ""

3065

3066

#: bzrlib/builtins.py:5039

3066

#: bzrlib/builtins.py:4946

3067

msgid ""

3068

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

3069

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

3071

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

3072

msgstr ""

3073

3074

#: bzrlib/builtins.py:5048

3074

#: bzrlib/builtins.py:4955

3075

msgid "Delete obsolete packs to save disk space."

3076

msgstr ""

3077

3078

#: bzrlib/builtins.py:5062

3078

#: bzrlib/builtins.py:4969

3079

msgid "List the installed plugins."

3080

msgstr ""

3081

3082

#: bzrlib/builtins.py:5064

3082

#: bzrlib/builtins.py:4971

3083

msgid ""

3084

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

3085

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

3086

msgstr ""

3087

3088

#: bzrlib/builtins.py:5067

3088

#: bzrlib/builtins.py:4974

3089

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

3090

msgstr ""

3091

3092

#: bzrlib/builtins.py:5069

3092

#: bzrlib/builtins.py:4976

3093

msgid ""

3094

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

3095

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

3098

"customizing log output."

3099

msgstr ""

3100

3101

#: bzrlib/builtins.py:5075

3101

#: bzrlib/builtins.py:4982

3102

msgid ""

3103

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

3104

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

3106

"plugins using the Python programming language."

3107

msgstr ""

3108

3109

#: bzrlib/builtins.py:5091

3109

#: bzrlib/builtins.py:4998

3110

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

3111

msgstr ""

3112

3113

#: bzrlib/builtins.py:5094

3113

#: bzrlib/builtins.py:5001

3114

msgid "Produce long-format testament."

3115

msgstr ""

3116

3117

#: bzrlib/builtins.py:5096

3117

#: bzrlib/builtins.py:5003

3118

msgid "Produce a strict-format testament."

3119

msgstr ""

3120

3121

#: bzrlib/builtins.py:5122

3121

#: bzrlib/builtins.py:5029

3122

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

3123

msgstr ""

3124

3125

#: bzrlib/builtins.py:5124

3125

#: bzrlib/builtins.py:5031

3126

msgid ""

3127

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

3128

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

3129

msgstr ""

3130

3131

#: bzrlib/builtins.py:5127

3131

#: bzrlib/builtins.py:5034

3132

msgid ""

3133

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

3134

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

3135

msgstr ""

3136

3137

#: bzrlib/builtins.py:5135

3137

#: bzrlib/builtins.py:5042

3138

msgid "Show annotations on all lines."

3139

msgstr ""

3140

3141

#: bzrlib/builtins.py:5136

3141

#: bzrlib/builtins.py:5043

3142

msgid "Show commit date in annotations."

3143

msgstr ""

3144

3145

#: bzrlib/builtins.py:5223

3145

#: bzrlib/builtins.py:5130

3146

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

3147

msgstr ""

3148

3149

#: bzrlib/builtins.py:5235

3149

#: bzrlib/builtins.py:5142

3150

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

3151

msgstr ""

3152

3153

#: bzrlib/builtins.py:5239

3153

#: bzrlib/builtins.py:5146

3154

msgid ""

3155

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

3156

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

3157

msgstr ""

3158

3159

#: bzrlib/builtins.py:5242

3159

#: bzrlib/builtins.py:5149

3160

msgid ""

3161

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

3162

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

3163

msgstr ""

3164

3165

#: bzrlib/builtins.py:5245

3165

#: bzrlib/builtins.py:5152

3166

msgid ""

3167

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

3168

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

3169

"that of the master."

3170

msgstr ""

3171

3172

#: bzrlib/builtins.py:5260

3172

#: bzrlib/builtins.py:5167

3173

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

3174

msgstr ""

3175

3176

#: bzrlib/builtins.py:5265

3176

#: bzrlib/builtins.py:5172

3177

msgid "Branch is already bound"

3178

msgstr ""

3179

3180

#: bzrlib/builtins.py:5267

3180

#: bzrlib/builtins.py:5174

3181

msgid "No location supplied and no previous location known"

3182

msgstr ""

3183

3184

#: bzrlib/builtins.py:5273

3184

#: bzrlib/builtins.py:5180

3185

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

3186

msgstr ""

3187

3188

#: bzrlib/builtins.py:5280

3188

#: bzrlib/builtins.py:5187

3189

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

3190

msgstr ""

3191

3192

#: bzrlib/builtins.py:5282

3192

#: bzrlib/builtins.py:5189

3193

msgid ""

3194

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

3195

"commits will be local only."

3196

msgstr ""

3197

3198

#: bzrlib/builtins.py:5293

3198

#: bzrlib/builtins.py:5200

3199

msgid "Local branch is not bound"

3200

msgstr ""

3201

3202

#: bzrlib/builtins.py:5297

3202

#: bzrlib/builtins.py:5204

3203

msgid "Remove the last committed revision."

3204

msgstr ""

3205

3206

#: bzrlib/builtins.py:5299

3206

#: bzrlib/builtins.py:5206

3207

msgid ""

3208

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

3209

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

3210

"remove anything."

3211

msgstr ""

3212

3213

#: bzrlib/builtins.py:5303

3213

#: bzrlib/builtins.py:5210

3214

msgid ""

3215

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

3216

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

3217

"branch at revision 15."

3218

msgstr ""

3219

3220

#: bzrlib/builtins.py:5307

3220

#: bzrlib/builtins.py:5214

3221

msgid ""

3222

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

3223

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

3224

"the commit."

3225

msgstr ""

3226

3227

#: bzrlib/builtins.py:5318

3227

#: bzrlib/builtins.py:5225

3228

msgid "Don't actually make changes."

3229

msgstr ""

3230

3231

#: bzrlib/builtins.py:5319

3231

#: bzrlib/builtins.py:5226

3232

msgid "Say yes to all questions."

3233

msgstr ""

3234

3235

#: bzrlib/builtins.py:5321

3235

#: bzrlib/builtins.py:5228

3236

msgid "Keep tags that point to removed revisions."

3237

msgstr ""

3238

3239

#: bzrlib/builtins.py:5323

3239

#: bzrlib/builtins.py:5230

3240

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

3241

msgstr ""

3242

3243

#: bzrlib/builtins.py:5372

3243

#: bzrlib/builtins.py:5279

3244

msgid "No revisions to uncommit.\n"

3245

msgstr ""

3246

3247

#: bzrlib/builtins.py:5387

3247

#: bzrlib/builtins.py:5294

3248

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

3249

msgstr ""

3250

3251

#: bzrlib/builtins.py:5390

3251

#: bzrlib/builtins.py:5297

3252

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

3253

msgstr ""

3254

3255

#: bzrlib/builtins.py:5394

3255

#: bzrlib/builtins.py:5301

3256

msgid "Uncommit these revisions"

3257

msgstr ""

3258

3259

#: bzrlib/builtins.py:5397

3259

#: bzrlib/builtins.py:5304

3260

msgid "Canceled\n"

3261

msgstr ""

3262

3263

#: bzrlib/builtins.py:5404

3263

#: bzrlib/builtins.py:5311

3264

#, python-format

3265

msgid ""

3266

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

3267

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

3268

msgstr ""

3269

3270

#: bzrlib/builtins.py:5409

3270

#: bzrlib/builtins.py:5316

3271

msgid "Break a dead lock."

3272

msgstr ""

3273

3274

#: bzrlib/builtins.py:5411

3274

#: bzrlib/builtins.py:5318

3275

msgid ""

3276

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

3277

"config file."

3278

msgstr ""

3279

3280

#: bzrlib/builtins.py:5414

3280

#: bzrlib/builtins.py:5321

3281

msgid ""

3282

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

3283

"holding the lock has been stopped."

3284

msgstr ""

3285

3286

#: bzrlib/builtins.py:5417

3286

#: bzrlib/builtins.py:5324

3287

msgid ""

3288

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

3289

"[location]' command."

3290

msgstr ""

3291

3292

#: bzrlib/builtins.py:5420

3292

#: bzrlib/builtins.py:5327

3293

msgid ""

3294

":Examples:\n"

3295

" bzr break-lock\n"

3297

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

3298

msgstr ""

3299

3300

#: bzrlib/builtins.py:5429

3300

#: bzrlib/builtins.py:5336

3301

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

3302

msgstr ""

3303

3304

#: bzrlib/builtins.py:5431

3304

#: bzrlib/builtins.py:5338

3305

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

3306

msgstr ""

3307

3308

#: bzrlib/builtins.py:5466

3308

#: bzrlib/builtins.py:5373

3309

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

3310

msgstr ""

3311

3312

#: bzrlib/builtins.py:5467

3312

#: bzrlib/builtins.py:5374

3313

msgid "Run the bzr server."

3314

msgstr ""

3315

3316

#: bzrlib/builtins.py:5473

3316

#: bzrlib/builtins.py:5380

3317

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

3318

msgstr ""

3319

3320

#: bzrlib/builtins.py:5474

3320

#: bzrlib/builtins.py:5381

3321

msgid "protocol"

3322

msgstr ""

3323

3324

#: bzrlib/builtins.py:5475

3324

#: bzrlib/builtins.py:5382

3325

msgid "Protocol to serve."

3326

msgstr ""

3327

3328

#: bzrlib/builtins.py:5479

3328

#: bzrlib/builtins.py:5386

3329

msgid ""

3330

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

3331

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

3332

"The default port depends on the protocol."

3333

msgstr ""

3334

3335

#: bzrlib/builtins.py:5485

3335

#: bzrlib/builtins.py:5392

3336

msgid "Serve contents of this directory."

3337

msgstr ""

3338

3339

#: bzrlib/builtins.py:5487

3339

#: bzrlib/builtins.py:5394

3340

msgid ""

3341

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

3342

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

3345

"uncontrolled write access to your file system."

3346

msgstr ""

3347

3348

#: bzrlib/builtins.py:5496

3348

#: bzrlib/builtins.py:5403

3349

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

3350

msgstr ""

3351

3352

#: bzrlib/builtins.py:5546

3352

#: bzrlib/builtins.py:5453

3353

msgid "Combine a tree into its containing tree."

3354

msgstr ""

3355

3356

#: bzrlib/builtins.py:5548

3356

#: bzrlib/builtins.py:5455

3357

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

3358

msgstr ""

3359

3360

#: bzrlib/builtins.py:5550

3360

#: bzrlib/builtins.py:5457

3361

msgid ""

3362

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

3363

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

3364

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

3365

msgstr ""

3366

3367

#: bzrlib/builtins.py:5554

3367

#: bzrlib/builtins.py:5461

3368

msgid ""

3369

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

3370

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

3371

"and all history is preserved."

3372

msgstr ""

3373

3374

#: bzrlib/builtins.py:5572

3374

#: bzrlib/builtins.py:5479

3375

#, python-format

3376

msgid ""

3377

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

3378

"You can use bzr upgrade on the repository."

3379

msgstr ""

3380

3381

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

3381

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

3382

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

3383

msgstr ""

3384

3385

#: bzrlib/builtins.py:5592

3385

#: bzrlib/builtins.py:5499

3386

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

3387

msgstr ""

3388

3389

#: bzrlib/builtins.py:5594

3389

#: bzrlib/builtins.py:5501

3390

msgid ""

3391

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

3392

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

3393

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

3394

msgstr ""

3395

3396

#: bzrlib/builtins.py:5598

3396

#: bzrlib/builtins.py:5505

3397

msgid ""

3398

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

3399

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

3400

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

3401

msgstr ""

3402

3403

#: bzrlib/builtins.py:5678

3403

#: bzrlib/builtins.py:5585

3404

msgid "No submit branch specified or known"

3405

msgstr ""

3406

3407

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

3407

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

3408

msgid "No public branch specified or known"

3409

msgstr ""

3410

3411

#: bzrlib/builtins.py:5691

3411

#: bzrlib/builtins.py:5598

3412

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

3413

msgstr ""

3414

3415

#: bzrlib/builtins.py:5700

3415

#: bzrlib/builtins.py:5607

3416

msgid "No revisions to bundle."

3417

msgstr ""

3418

3419

#: bzrlib/builtins.py:5719

3419

#: bzrlib/builtins.py:5626

3420

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

3421

msgstr ""

3422

3423

#: bzrlib/builtins.py:5721

3423

#: bzrlib/builtins.py:5628

3424

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

3425

msgstr ""

3426

3427

#: bzrlib/builtins.py:5723

3427

#: bzrlib/builtins.py:5630

3428

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

3429

msgstr ""

3430

3431

#: bzrlib/builtins.py:5725

3431

#: bzrlib/builtins.py:5632

3432

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

3433

msgstr ""

3434

3435

#: bzrlib/builtins.py:5727

3435

#: bzrlib/builtins.py:5634

3436

msgid ""

3437

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

3438

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

3439

" branch."

3440

msgstr ""

3441

3442

#: bzrlib/builtins.py:5731

3442

#: bzrlib/builtins.py:5638

3443

msgid ""

3444

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

3445

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

3446

msgstr ""

3447

3448

#: bzrlib/builtins.py:5734

3448

#: bzrlib/builtins.py:5641

3449

msgid ""

3450

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

3451

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

3452

"the source branch."

3453

msgstr ""

3454

3455

#: bzrlib/builtins.py:5738

3455

#: bzrlib/builtins.py:5645

3456

msgid ""

3457

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

3458

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

3461

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

3462

msgstr ""

3463

3464

#: bzrlib/builtins.py:5744

3464

#: bzrlib/builtins.py:5651

3465

msgid ""

3466

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

3467

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

3470

"be changed using --from."

3471

msgstr ""

3472

3473

#: bzrlib/builtins.py:5750

3473

#: bzrlib/builtins.py:5657

3474

msgid ""

3475

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

3476

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

3479

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

3480

msgstr ""

3481

3482

#: bzrlib/builtins.py:5756

3482

#: bzrlib/builtins.py:5663

3483

msgid ""

3484

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

3485

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

3487

"in the merge directive."

3488

msgstr ""

3489

3490

#: bzrlib/builtins.py:5761

3490

#: bzrlib/builtins.py:5668

3491

msgid ""

3492

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

3493

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

3494

msgstr ""

3495

3496

#: bzrlib/builtins.py:5764

3496

#: bzrlib/builtins.py:5671

3497

msgid ""

3498

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

3499

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

3500

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

3501

msgstr ""

3502

3503

#: bzrlib/builtins.py:5768

3503

#: bzrlib/builtins.py:5675

3504

msgid ""

3505

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

3506

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

3512

"supported clients."

3513

msgstr ""

3514

3515

#: bzrlib/builtins.py:5775

3515

#: bzrlib/builtins.py:5682

3516

msgid ""

3517

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

3518

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

3520

"in the submit branch."

3521

msgstr ""

3522

3523

#: bzrlib/builtins.py:5780

3523

#: bzrlib/builtins.py:5687

3524

msgid ""

3525

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

3526

"and\n"

3530

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

3531

msgstr ""

3532

3533

#: bzrlib/builtins.py:5786

3533

#: bzrlib/builtins.py:5693

3534

msgid ""

3535

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

3536

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

3537

msgstr ""

3538

3539

#: bzrlib/builtins.py:5789

3539

#: bzrlib/builtins.py:5696

3540

msgid ""

3541

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

3542

"into\n"

3544

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

3545

msgstr ""

3546

3547

#: bzrlib/builtins.py:5813

3547

#: bzrlib/builtins.py:5720

3548

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

3549

msgstr ""

3550

3551

#: bzrlib/builtins.py:5817

3551

#: bzrlib/builtins.py:5724

3552

msgid ""

3553

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

3554

"strict disables the check."

3555

msgstr ""

3556

3557

#: bzrlib/builtins.py:5819

3557

#: bzrlib/builtins.py:5726

3558

msgid "Mail the request to this address."

3559

msgstr ""

3560

3561

#: bzrlib/builtins.py:5823

3561

#: bzrlib/builtins.py:5730

3562

msgid "Body for the email."

3563

msgstr ""

3564

3565

#: bzrlib/builtins.py:5876

3565

#: bzrlib/builtins.py:5783

3566

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

3567

msgstr ""

3568

3569

#: bzrlib/builtins.py:5877

3569

#: bzrlib/builtins.py:5784

3570

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

3571

msgstr ""

3572

3573

#: bzrlib/builtins.py:5880

3573

#: bzrlib/builtins.py:5787

3574

msgid "Remember submit and public branch."

3575

msgstr ""

3576

3577

#: bzrlib/builtins.py:5882

3577

#: bzrlib/builtins.py:5789

3578

msgid ""

3579

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

3580

"working directory."

3581

msgstr ""

3582

3583

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

3583

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

3584

msgid "format"

3585

msgstr ""

3586

3587

#: bzrlib/builtins.py:5893

3587

#: bzrlib/builtins.py:5800

3588

msgid "Use the specified output format."

3589

msgstr ""

3590

3591

#: bzrlib/builtins.py:5915

3591

#: bzrlib/builtins.py:5822

3592

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

3593

msgstr ""

3594

3595

#: bzrlib/builtins.py:5917

3595

#: bzrlib/builtins.py:5824

3596

msgid ""

3597

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

3598

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

3599

"created tag."

3600

msgstr ""

3601

3602

#: bzrlib/builtins.py:5921

3602

#: bzrlib/builtins.py:5828

3603

msgid ""

3604

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

3605

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

3606

msgstr ""

3607

3608

#: bzrlib/builtins.py:5924

3608

#: bzrlib/builtins.py:5831

3609

msgid ""

3610

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

3611

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

3612

msgstr ""

3613

3614

#: bzrlib/builtins.py:5927

3614

#: bzrlib/builtins.py:5834

3615

msgid ""

3616

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

3617

"``bzr\n"

3618

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

3619

msgstr ""

3620

3621

#: bzrlib/builtins.py:5930

3621

#: bzrlib/builtins.py:5837

3622

msgid ""

3623

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

3624

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

3626

"details."

3627

msgstr ""

3628

3629

#: bzrlib/builtins.py:5940

3629

#: bzrlib/builtins.py:5847

3630

msgid "Delete this tag rather than placing it."

3631

msgstr ""

3632

3633

#: bzrlib/builtins.py:5943

3633

#: bzrlib/builtins.py:5850

3634

msgid "Branch in which to place the tag."

3635

msgstr ""

3636

3637

#: bzrlib/builtins.py:5945

3637

#: bzrlib/builtins.py:5852

3638

msgid "Replace existing tags."

3639

msgstr ""

3640

3641

#: bzrlib/builtins.py:5960

3641

#: bzrlib/builtins.py:5867

3642

msgid "No tag specified to delete."

3643

msgstr ""

3644

3645

#: bzrlib/builtins.py:5962

3645

#: bzrlib/builtins.py:5869

3646

#, python-format

3647

msgid "Deleted tag %s."

3648

msgstr ""

3649

3650

#: bzrlib/builtins.py:5976

3650

#: bzrlib/builtins.py:5883

3651

msgid "Please specify a tag name."

3652

msgstr ""

3653

3654

#: bzrlib/builtins.py:5984

3654

#: bzrlib/builtins.py:5891

3655

#, python-format

3656

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

3657

msgstr ""

3658

3659

#: bzrlib/builtins.py:5988

3659

#: bzrlib/builtins.py:5895

3660

#, python-format

3661

msgid "Created tag %s."

3662

msgstr ""

3663

3664

#: bzrlib/builtins.py:5990

3664

#: bzrlib/builtins.py:5897

3665

#, python-format

3666

msgid "Updated tag %s."

3667

msgstr ""

3668

3669

#: bzrlib/builtins.py:5994

3669

#: bzrlib/builtins.py:5901

3670

msgid "List tags."

3671

msgstr ""

3672

3673

#: bzrlib/builtins.py:5996

3673

#: bzrlib/builtins.py:5903

3674

msgid ""

3675

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

3676

msgstr ""

3677

3678

#: bzrlib/builtins.py:6002

3678

#: bzrlib/builtins.py:5909

3679

msgid "Branch whose tags should be displayed."

3680

msgstr ""

3681

3682

#: bzrlib/builtins.py:6004

3682

#: bzrlib/builtins.py:5911

3683

msgid "Sort tags by different criteria."

3684

msgstr ""

3685

3686

#: bzrlib/builtins.py:6004

3686

#: bzrlib/builtins.py:5911

3687

msgid "Sorting"

3688

msgstr ""

3689

3690

#: bzrlib/builtins.py:6073

3690

#: bzrlib/builtins.py:5980

3691

msgid "Reconfigure the type of a bzr directory."

3692

msgstr ""

3693

3694

#: bzrlib/builtins.py:6075

3694

#: bzrlib/builtins.py:5982

3695

msgid "A target configuration must be specified."

3696

msgstr ""

3697

3698

#: bzrlib/builtins.py:6077

3698

#: bzrlib/builtins.py:5984

3699

msgid ""

3700

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

3701

"The order of preference is\n"

3706

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

3707

msgstr ""

3708

3709

#: bzrlib/builtins.py:6091

3709

#: bzrlib/builtins.py:5998

3710

msgid "Tree type"

3711

msgstr ""

3712

3713

#: bzrlib/builtins.py:6092

3713

#: bzrlib/builtins.py:5999

3714

msgid "The relation between branch and tree."

3715

msgstr ""

3716

3717

#: bzrlib/builtins.py:6094

3717

#: bzrlib/builtins.py:6001

3718

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

3719

msgstr ""

3720

3721

#: bzrlib/builtins.py:6095

3721

#: bzrlib/builtins.py:6002

3722

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

3723

msgstr ""

3724

3725

#: bzrlib/builtins.py:6096

3725

#: bzrlib/builtins.py:6003

3726

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

3727

msgstr ""

3728

3729

#: bzrlib/builtins.py:6097

3729

#: bzrlib/builtins.py:6004

3730

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

3731

msgstr ""

3732

3733

#: bzrlib/builtins.py:6102

3733

#: bzrlib/builtins.py:6009

3734

msgid "Repository type"

3735

msgstr ""

3736

3737

#: bzrlib/builtins.py:6103

3737

#: bzrlib/builtins.py:6010

3738

msgid "Location fo the repository."

3739

msgstr ""

3740

3741

#: bzrlib/builtins.py:6105

3741

#: bzrlib/builtins.py:6012

3742

msgid ""

3743

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

3744

msgstr ""

3745

3746

#: bzrlib/builtins.py:6107

3746

#: bzrlib/builtins.py:6014

3747

msgid "Reconfigure to use a shared repository."

3748

msgstr ""

3749

3750

#: bzrlib/builtins.py:6111

3750

#: bzrlib/builtins.py:6018

3751

msgid "Trees in Repository"

3752

msgstr ""

3753

3754

#: bzrlib/builtins.py:6112

3754

#: bzrlib/builtins.py:6019

3755

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

3756

msgstr ""

3757

3758

#: bzrlib/builtins.py:6114

3758

#: bzrlib/builtins.py:6021

3759

msgid ""

3760

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

3761

msgstr ""

3762

3763

#: bzrlib/builtins.py:6116

3763

#: bzrlib/builtins.py:6023

3764

msgid ""

3765

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

3766

msgstr ""

3767

3768

#: bzrlib/builtins.py:6119

3768

#: bzrlib/builtins.py:6026

3769

msgid "Branch to bind checkout to."

3770

msgstr ""

3771

3772

#: bzrlib/builtins.py:6121

3772

#: bzrlib/builtins.py:6028

3773

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

3774

msgstr ""

3775

3776

#: bzrlib/builtins.py:6124

3776

#: bzrlib/builtins.py:6031

3777

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

3778

msgstr ""

3779

3780

#: bzrlib/builtins.py:6128

3780

#: bzrlib/builtins.py:6035

3781

msgid ""

3782

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

3783

"data into it."

3784

msgstr ""

3785

3786

#: bzrlib/builtins.py:6138

3786

#: bzrlib/builtins.py:6045

3787

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

3788

msgstr ""

3789

3790

#: bzrlib/builtins.py:6152

3790

#: bzrlib/builtins.py:6059

3791

msgid "No target configuration specified"

3792

msgstr ""

3793

3794

#: bzrlib/builtins.py:6187

3794

#: bzrlib/builtins.py:6094

3795

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

3796

msgstr ""

3797

3798

#: bzrlib/builtins.py:6189

3798

#: bzrlib/builtins.py:6096

3799

msgid ""

3800

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

3801

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

3803

"of the new location and binds to it."

3804

msgstr ""

3805

3806

#: bzrlib/builtins.py:6194

3806

#: bzrlib/builtins.py:6101

3807

msgid ""

3808

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

3809

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

3810

msgstr ""

3811

3812

#: bzrlib/builtins.py:6197

3812

#: bzrlib/builtins.py:6104

3813

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

3814

msgstr ""

3815

3816

#: bzrlib/builtins.py:6199

3816

#: bzrlib/builtins.py:6106

3817

msgid ""

3818

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

3819

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

3821

"/path/to/newbranch."

3822

msgstr ""

3823

3824

#: bzrlib/builtins.py:6204

3824

#: bzrlib/builtins.py:6111

3825

msgid ""

3826

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

3827

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

3828

"that of the master."

3829

msgstr ""

3830

3831

#: bzrlib/builtins.py:6212

3831

#: bzrlib/builtins.py:6119

3832

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

3833

msgstr ""

3834

3835

#: bzrlib/builtins.py:6215

3835

#: bzrlib/builtins.py:6122

3836

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

3837

msgstr ""

3838

3839

#: bzrlib/builtins.py:6229

3839

#: bzrlib/builtins.py:6134

3840

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

3841

msgstr ""

3842

3843

#: bzrlib/builtins.py:6242

3843

#: bzrlib/builtins.py:6145

3844

msgid "cannot create branch without source branch"

3845

msgstr ""

3846

3847

#: bzrlib/builtins.py:6262

3847

#: bzrlib/builtins.py:6209

3848

msgid "Manage filtered views."

3849

msgstr ""

3850

3851

#: bzrlib/builtins.py:6264

3851

#: bzrlib/builtins.py:6211

3852

msgid ""

3853

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

3854

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

3858

"must be within the current view."

3859

msgstr ""

3860

3861

#: bzrlib/builtins.py:6271

3861

#: bzrlib/builtins.py:6218

3862

msgid ""

3863

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

3864

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

3866

"and switch between them."

3867

msgstr ""

3868

3869

#: bzrlib/builtins.py:6276

3869

#: bzrlib/builtins.py:6223

3870

msgid ""

3871

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

3872

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

3874

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

3875

msgstr ""

3876

3877

#: bzrlib/builtins.py:6281

3877

#: bzrlib/builtins.py:6228

3878

msgid ""

3879

":Examples:\n"

3880

" To define the current view::"

3881

msgstr ""

3882

3883

#: bzrlib/builtins.py:6284

3883

#: bzrlib/builtins.py:6231

3884

msgid " bzr view file1 dir1 ..."

3885

msgstr ""

3886

3887

#: bzrlib/builtins.py:6286

3887

#: bzrlib/builtins.py:6233

3888

msgid " To list the current view::"

3889

msgstr ""

3890

3891

#: bzrlib/builtins.py:6288

3891

#: bzrlib/builtins.py:6235

3892

msgid " bzr view"

3893

msgstr ""

3894

3895

#: bzrlib/builtins.py:6290

3895

#: bzrlib/builtins.py:6237

3896

msgid " To delete the current view::"

3897

msgstr ""

3898

3899

#: bzrlib/builtins.py:6292

3899

#: bzrlib/builtins.py:6239

3900

msgid " bzr view --delete"

3901

msgstr ""

3902

3903

#: bzrlib/builtins.py:6294

3903

#: bzrlib/builtins.py:6241

3904

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

3905

msgstr ""

3906

3907

#: bzrlib/builtins.py:6296

3907

#: bzrlib/builtins.py:6243

3908

msgid " bzr view --switch off"

3909

msgstr ""

3910

3911

#: bzrlib/builtins.py:6298

3911

#: bzrlib/builtins.py:6245

3912

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

3913

msgstr ""

3914

3915

#: bzrlib/builtins.py:6300

3915

#: bzrlib/builtins.py:6247

3916

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

3917

msgstr ""

3918

3919

#: bzrlib/builtins.py:6302

3919

#: bzrlib/builtins.py:6249

3920

msgid " To list a named view::"

3921

msgstr ""

3922

3923

#: bzrlib/builtins.py:6304

3923

#: bzrlib/builtins.py:6251

3924

msgid " bzr view --name view-name"

3925

msgstr ""

3926

3927

#: bzrlib/builtins.py:6306

3927

#: bzrlib/builtins.py:6253

3928

msgid " To delete a named view::"

3929

msgstr ""

3930

3931

#: bzrlib/builtins.py:6308

3931

#: bzrlib/builtins.py:6255

3932

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

3933

msgstr ""

3934

3935

#: bzrlib/builtins.py:6310

3935

#: bzrlib/builtins.py:6257

3936

msgid " To switch to a named view::"

3937

msgstr ""

3938

3939

#: bzrlib/builtins.py:6312

3939

#: bzrlib/builtins.py:6259

3940

msgid " bzr view --switch view-name"

3941

msgstr ""

3942

3943

#: bzrlib/builtins.py:6314

3943

#: bzrlib/builtins.py:6261

3944

msgid " To list all views defined::"

3945

msgstr ""

3946

3947

#: bzrlib/builtins.py:6316

3947

#: bzrlib/builtins.py:6263

3948

msgid " bzr view --all"

3949

msgstr ""

3950

3951

#: bzrlib/builtins.py:6318

3951

#: bzrlib/builtins.py:6265

3952

msgid " To delete all views::"

3953

msgstr ""

3954

3955

#: bzrlib/builtins.py:6320

3955

#: bzrlib/builtins.py:6267

3956

msgid " bzr view --delete --all"

3957

msgstr ""

3958

3959

#: bzrlib/builtins.py:6327

3959

#: bzrlib/builtins.py:6274

3960

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

3961

msgstr ""

3962

3963

#: bzrlib/builtins.py:6330

3963

#: bzrlib/builtins.py:6277

3964

msgid "Delete the view."

3965

msgstr ""

3966

3967

#: bzrlib/builtins.py:6333

3967

#: bzrlib/builtins.py:6280

3968

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

3969

msgstr ""

3970

3971

#: bzrlib/builtins.py:6337

3971

#: bzrlib/builtins.py:6284

3972

msgid "Name of the view to switch to."

3973

msgstr ""

3974

3975

#: bzrlib/builtins.py:6356

3975

#: bzrlib/builtins.py:6303

3976

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

3977

msgstr ""

3978

3979

#: bzrlib/builtins.py:6359

3979

#: bzrlib/builtins.py:6306

3980

msgid "Both --delete and --switch specified"

3981

msgstr ""

3982

3983

#: bzrlib/builtins.py:6362

3983

#: bzrlib/builtins.py:6309

3984

msgid "Deleted all views.\n"

3985

msgstr ""

3986

3987

#: bzrlib/builtins.py:6364

3987

#: bzrlib/builtins.py:6311

3988

msgid "No current view to delete"

3989

msgstr ""

3990

3991

#: bzrlib/builtins.py:6367

3991

#: bzrlib/builtins.py:6314

3992

#, python-format

3993

msgid "Deleted '%s' view.\n"

3994

msgstr ""

3995

3996

#: bzrlib/builtins.py:6371

3996

#: bzrlib/builtins.py:6318

3997

msgid "Both --switch and a file list specified"

3998

msgstr ""

3999

4000

#: bzrlib/builtins.py:6374

4000

#: bzrlib/builtins.py:6321

4001

msgid "Both --switch and --all specified"

4002

msgstr ""

4003

4004

#: bzrlib/builtins.py:6377

4004

#: bzrlib/builtins.py:6324

4005

msgid "No current view to disable"

4006

msgstr ""

4007

4008

#: bzrlib/builtins.py:6379

4008

#: bzrlib/builtins.py:6326

4009

#, python-format

4010

msgid "Disabled '%s' view.\n"

4011

msgstr ""

4012

4013

#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405

4013

#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352

4014

msgid "Using '{0}' view: {1}\n"

4015

msgstr ""

4016

4017

#: bzrlib/builtins.py:6386

4017

#: bzrlib/builtins.py:6333

4018

msgid "Views defined:\n"

4019

msgstr ""

4020

4021

#: bzrlib/builtins.py:6395

4021

#: bzrlib/builtins.py:6342

4022

msgid "No views defined.\n"

4023

msgstr ""

4024

4025

#: bzrlib/builtins.py:6402

4025

#: bzrlib/builtins.py:6349

4026

msgid "Cannot change the 'off' pseudo view"

4027

msgstr ""

4028

4029

#: bzrlib/builtins.py:6410

4029

#: bzrlib/builtins.py:6357

4030

msgid "No current view.\n"

4031

msgstr ""

4032

4033

#: bzrlib/builtins.py:6413

4033

#: bzrlib/builtins.py:6360

4034

msgid "'{0}' view is: {1}\n"

4035

msgstr ""

4036

4037

#: bzrlib/builtins.py:6433

4037

#: bzrlib/builtins.py:6380

4038

msgid " <no hooks installed>\n"

4039

msgstr ""

4040

4041

#: bzrlib/builtins.py:6437

4041

#: bzrlib/builtins.py:6384

4042

msgid "Remove a branch."

4043

msgstr ""

4044

4045

#: bzrlib/builtins.py:6439

4045

#: bzrlib/builtins.py:6386

4046

msgid ""

4047

"This will remove the branch from the specified location but \n"

4048

"will keep any working tree or repository in place."

4049

msgstr ""

4050

4051

#: bzrlib/builtins.py:6444

4051

#: bzrlib/builtins.py:6391

4052

msgid " Remove the branch at repo/trunk::"

4053

msgstr ""

4054

4055

#: bzrlib/builtins.py:6446

4055

#: bzrlib/builtins.py:6393

4056

msgid " bzr remove-branch repo/trunk"

4057

msgstr ""

4058

4059

#: bzrlib/builtins.py:6461

4059

#: bzrlib/builtins.py:6408

4060

msgid "Plaintext diff output."

4061

msgstr ""

4062

4063

#: bzrlib/builtins.py:6462

4063

#: bzrlib/builtins.py:6409

4064

msgid "Temporarily set aside some changes from the current tree."

4065

msgstr ""

4066

4067

#: bzrlib/builtins.py:6464

4067

#: bzrlib/builtins.py:6411

4068

msgid ""

4069

"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"

4070

"ie. out of the way, until a later time when you can bring them back from\n"

4073

"will they survive its deletion."

4074

msgstr ""

4075

4076

#: bzrlib/builtins.py:6470

4076

#: bzrlib/builtins.py:6417

4077

msgid "If shelve --list is specified, previously-shelved changes are listed."

4078

msgstr ""

4079

4080

#: bzrlib/builtins.py:6472

4080

#: bzrlib/builtins.py:6419

4081

msgid ""

4082

"Shelve is intended to help separate several sets of changes that have\n"

4083

"been inappropriately mingled. If you just want to get rid of all changes\n"

4085

"shelve all text changes at once, use shelve --all."

4086

msgstr ""

4087

4088

#: bzrlib/builtins.py:6477

4088

#: bzrlib/builtins.py:6424

4089

msgid ""

4090

"If filenames are specified, only the changes to those files will be\n"

4091

"shelved. Other files will be left untouched."

4092

msgstr ""

4093

4094

#: bzrlib/builtins.py:6480

4094

#: bzrlib/builtins.py:6427

4095

msgid ""

4096

"If a revision is specified, changes since that revision will be shelved."

4097

msgstr ""

4098

4099

#: bzrlib/builtins.py:6482

4099

#: bzrlib/builtins.py:6429

4100

msgid ""

4101

"You can put multiple items on the shelf, and by default, 'unshelve' will\n"

4102

"restore the most recently shelved changes."

4103

msgstr ""

4104

4105

#: bzrlib/builtins.py:6485

4105

#: bzrlib/builtins.py:6432

4106

msgid ""

4107

"For complicated changes, it is possible to edit the changes in a separate\n"

4108

"editor program to decide what the file remaining in the working copy\n"

4109

"should look like. To do this, add the configuration option"

4110

msgstr ""

4111

4112

#: bzrlib/builtins.py:6489

4112

#: bzrlib/builtins.py:6436

4113

msgid " change_editor = PROGRAM @new_path @old_path"

4114

msgstr ""

4115

4116

#: bzrlib/builtins.py:6491

4116

#: bzrlib/builtins.py:6438

4117

msgid ""

4118

"where @new_path is replaced with the path of the new version of the \n"

4119

"file and @old_path is replaced with the path of the old version of \n"

4122

" "

4123

msgstr ""

4124

4125

#: bzrlib/builtins.py:6503

4125

#: bzrlib/builtins.py:6450

4126

msgid "Shelve all changes."

4127

msgstr ""

4128

4129

#: bzrlib/builtins.py:6505

4129

#: bzrlib/builtins.py:6452

4130

msgid "Method to use for writing diffs."

4131

msgstr ""

4132

4133

#: bzrlib/builtins.py:6505

4133

#: bzrlib/builtins.py:6452

4134

msgid "writer"

4135

msgstr ""

4136

4137

#: bzrlib/builtins.py:6509

4137

#: bzrlib/builtins.py:6456

4138

msgid "List shelved changes."

4139

msgstr ""

4140

4141

#: bzrlib/builtins.py:6511

4141

#: bzrlib/builtins.py:6458

4142

msgid "Destroy removed changes instead of shelving them."

4143

msgstr ""

4144

4145

#: bzrlib/builtins.py:6540

4145

#: bzrlib/builtins.py:6487

4146

msgid "No shelved changes."

4147

msgstr ""

4148

4149

#: bzrlib/builtins.py:6551

4149

#: bzrlib/builtins.py:6498

4150

msgid "Restore shelved changes."

4151

msgstr ""

4152

4153

#: bzrlib/builtins.py:6553

4153

#: bzrlib/builtins.py:6500

4154

msgid ""

4155

"By default, the most recently shelved changes are restored. However if you\n"

4156

"specify a shelf by id those changes will be restored instead. This works\n"

4157

"best when the changes don't depend on each other."

4158

msgstr ""

4159

4160

#: bzrlib/builtins.py:6562

4160

#: bzrlib/builtins.py:6509

4161

msgid "The action to perform."

4162

msgstr ""

4163

4164

#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694

4164

#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694

4165

msgid "action"

4166

msgstr ""

4167

4168

#: bzrlib/builtins.py:6564

4168

#: bzrlib/builtins.py:6511

4169

msgid "Apply changes and remove from the shelf."

4170

msgstr ""

4171

4172

#: bzrlib/builtins.py:6565

4172

#: bzrlib/builtins.py:6512

4173

msgid "Show changes, but do not apply or remove them."

4174

msgstr ""

4175

4176

#: bzrlib/builtins.py:6566

4176

#: bzrlib/builtins.py:6513

4177

msgid ""

4178

"Instead of unshelving the changes, show the diff that would result from "

4179

"unshelving."

4180

msgstr ""

4181

4182

#: bzrlib/builtins.py:6568

4182

#: bzrlib/builtins.py:6515

4183

msgid "Delete changes without applying them."

4184

msgstr ""

4185

4186

#: bzrlib/builtins.py:6569

4186

#: bzrlib/builtins.py:6516

4187

msgid "Apply changes but don't delete them."

4188

msgstr ""

4189

4190

#: bzrlib/builtins.py:6584

4190

#: bzrlib/builtins.py:6531

4191

msgid "Remove unwanted files from working tree."

4192

msgstr ""

4193

4194

#: bzrlib/builtins.py:6586

4194

#: bzrlib/builtins.py:6533

4195

msgid ""

4196

"By default, only unknown files, not ignored files, are deleted. Versioned\n"

4197

"files are never deleted."

4198

msgstr ""

4199

4200

#: bzrlib/builtins.py:6589

4200

#: bzrlib/builtins.py:6536

4201

msgid ""

4202

"Another class is 'detritus', which includes files emitted by bzr during\n"

4203

"normal operations and selftests. (The value of these files decreases with\n"

4204

"time.)"

4205

msgstr ""

4206

4207

#: bzrlib/builtins.py:6593

4207

#: bzrlib/builtins.py:6540

4208

msgid ""

4209

"If no options are specified, unknown files are deleted. Otherwise, option\n"

4210

"flags are respected, and may be combined."

4211

msgstr ""

4212

4213

#: bzrlib/builtins.py:6596

4213

#: bzrlib/builtins.py:6543

4214

msgid "To check what clean-tree will do, use --dry-run."

4215

msgstr ""

4216

4217

#: bzrlib/builtins.py:6599

4217

#: bzrlib/builtins.py:6546

4218

msgid "Delete all ignored files."

4219

msgstr ""

4220

4221

#: bzrlib/builtins.py:6600

4221

#: bzrlib/builtins.py:6547

4222

msgid ""

4223

"Delete conflict files, merge and revert backups, and failed selftest dirs."

4224

msgstr ""

4225

4226

#: bzrlib/builtins.py:6603

4226

#: bzrlib/builtins.py:6550

4227

msgid "Delete files unknown to bzr (default)."

4228

msgstr ""

4229

4230

#: bzrlib/builtins.py:6604

4230

#: bzrlib/builtins.py:6551

4231

msgid "Show files to delete instead of deleting them."

4232

msgstr ""

4233

4234

#: bzrlib/builtins.py:6606

4234

#: bzrlib/builtins.py:6553

4235

msgid "Do not prompt before deleting."

4236

msgstr ""

4237

4291

msgstr[0] ""

4292

msgstr[1] ""

4293

4294

#: bzrlib/bzrdir.py:490

4294

#: bzrlib/bzrdir.py:489

4295

msgid ""

4296

"making backup of {0}\n"

4297

" to {1}"

4298

msgstr ""

4299

4300

#: bzrlib/bzrdir.py:513

4300

#: bzrlib/bzrdir.py:512

4301

msgid "renamed {0} to {1}"

4302

msgstr ""

4303

4304

#: bzrlib/bzrdir.py:1652

4304

#: bzrlib/bzrdir.py:1663

4305

#, python-format

4306

msgid ""

4307

"Source repository format does not support stacking, using format:\n"

4308

" %s"

4309

msgstr ""

4310

4311

#: bzrlib/bzrdir.py:1672

4311

#: bzrlib/bzrdir.py:1683

4312

#, python-format

4313

msgid ""

4314

"Source branch format does not support stacking, using format:\n"

4315

" %s"

4316

msgstr ""

4317

4318

#: bzrlib/bzrdir.py:1818

4318

#: bzrlib/bzrdir.py:1829

4319

msgid "starting repository conversion"

4320

msgstr ""

4321

4322

#: bzrlib/bzrdir.py:2039

4322

#: bzrlib/bzrdir.py:2058

4323

msgid "Using default stacking branch {0} at {1}"

4324

msgstr ""

4325

4558

msgid "bzr version-info --revision takes exactly one revision specifier"

4559

msgstr ""

4560

4561

#: bzrlib/commands.py:229

4561

#: bzrlib/commands.py:228

4562

#, python-format

4563

msgid "unknown command \"%s\""

4564

msgstr ""

4565

4566

#: bzrlib/commands.py:476

4566

#: bzrlib/commands.py:475

4567

msgid "No help for this command."

4568

msgstr ""

4569

4570

#: bzrlib/commands.py:489

4570

#: bzrlib/commands.py:488

4571

#, python-format

4572

msgid ":Purpose: %s\n"

4573

msgstr ""

4574

4575

#: bzrlib/commands.py:491

4575

#: bzrlib/commands.py:490

4576

#, python-format

4577

msgid ""

4578

":Usage:\n"

4579

"%s\n"

4580

msgstr ""

4581

4582

#: bzrlib/commands.py:493

4582

#: bzrlib/commands.py:492

4583

#, python-format

4584

msgid ":Usage: %s\n"

4585

msgstr ""

4586

4587

#: bzrlib/commands.py:512

4587

#: bzrlib/commands.py:511

4588

#, python-format

4589

msgid ":Options:%s"

4590

msgstr ""

4591

4592

#: bzrlib/commands.py:523

4592

#: bzrlib/commands.py:522

4593

#, python-format

4594

msgid ""

4595

":Description:\n"

4597

"\n"

4598

msgstr ""

4599

4600

#: bzrlib/commands.py:533

4600

#: bzrlib/commands.py:532

4601

#, python-format

4602

msgid ""

4603

"See bzr help %s for more details and examples.\n"

4604

"\n"

4605

msgstr ""

4606

4607

#: bzrlib/commands.py:538

4607

#: bzrlib/commands.py:537

4608

msgid ":Aliases: "

4609

msgstr ""

4610

4611

#: bzrlib/commands.py:542

4611

#: bzrlib/commands.py:541

4612

#, python-format

4613

msgid ":From: plugin \"%s\"\n"

4614

msgstr ""

4615

4616

#: bzrlib/commands.py:554

4616

#: bzrlib/commands.py:553

4617

msgid ":doc:`{0} <{1}-help>`"

4618

msgstr ""

4619

4620

#: bzrlib/commands.py:558

4620

#: bzrlib/commands.py:557

4621

#, python-format

4622

msgid ":See also: %s"

4623

msgstr ""

4624

4625

#: bzrlib/commands.py:816 bzrlib/gpg.py:324

4625

#: bzrlib/commands.py:815 bzrlib/gpg.py:324

4626

msgid "Only ASCII permitted in option names"

4627

msgstr ""

4628

4629

#: bzrlib/commands.py:841 bzrlib/commands.py:849

4629

#: bzrlib/commands.py:840 bzrlib/commands.py:848

4630

msgid "command {0!r} needs one or more {1}"

4631

msgstr ""

4632

4633

#: bzrlib/commands.py:858

4633

#: bzrlib/commands.py:857

4634

msgid "command {0!r} requires argument {1}"

4635

msgstr ""

4636

4637

#: bzrlib/commands.py:865

4637

#: bzrlib/commands.py:864

4638

msgid "extra argument to command {0}: {1}"

4639

msgstr ""

4640

4641

#: bzrlib/commands.py:962

4641

#: bzrlib/commands.py:961

4642

#, python-format

4643

msgid "Profile data written to \"%s\"."

4644

msgstr ""

4740

msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."

4741

msgstr ""

4742

4743

#: bzrlib/config.py:2485

4743

#: bzrlib/config.py:2499

4744

msgid "{0} is not an SI unit."

4745

msgstr ""

4746

4747

#: bzrlib/config.py:2949

4747

#: bzrlib/config.py:2956

4748

msgid ""

4749

"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "

4750

"will be saved."

4751

msgstr ""

4752

4753

#: bzrlib/config.py:3093

4753

#: bzrlib/config.py:3100

4754

#, python-format

4755

msgid "Invalid '%s', should be of the form 'name=value'"

4756

msgstr ""

4757

4758

#: bzrlib/config.py:3962

4758

#: bzrlib/config.py:3969

4759

msgid "Display, set or remove a configuration option."

4760

msgstr ""

4761

4762

#: bzrlib/config.py:3964

4762

#: bzrlib/config.py:3971

4763

msgid "Display the active value for a given option."

4764

msgstr ""

4765

4766

#: bzrlib/config.py:3966

4766

#: bzrlib/config.py:3973

4767

msgid ""

4768

"If --all is specified, NAME is interpreted as a regular expression and all\n"

4769

"matching options are displayed mentioning their scope. The active value\n"

4770

"that bzr will take into account is the first one displayed for each option."

4771

msgstr ""

4772

4773

#: bzrlib/config.py:3970

4773

#: bzrlib/config.py:3977

4774

msgid "If no NAME is given, --all .* is implied."

4775

msgstr ""

4776

4777

#: bzrlib/config.py:3972

4777

#: bzrlib/config.py:3979

4778

msgid ""

4779

"Setting a value is achieved by using name=value without spaces. The value\n"

4780

"is set in the most relevant scope and can be checked by displaying the\n"

4781

"option again."

4782

msgstr ""

4783

4784

#: bzrlib/config.py:3984

4784

#: bzrlib/config.py:3991

4785

msgid "Reduce the scope to the specified configuration file."

4786

msgstr ""

4787

4788

#: bzrlib/config.py:3988

4788

#: bzrlib/config.py:3995

4789

msgid "Display all the defined values for the matching options."

4790

msgstr ""

4791

4792

#: bzrlib/config.py:3990

4792

#: bzrlib/config.py:3997

4793

msgid "Remove the option from the configuration file."

4794

msgstr ""

4795

4869

msgstr[0] ""

4870

msgstr[1] ""

4871

4872

#: bzrlib/controldir.py:710

4872

#: bzrlib/controldir.py:698

4873

msgid "{0} is{1} redirected to {2}"

4874

msgstr ""

4875

4975

msgid "The value '%(value)s' is not a valid value."

4976

msgstr ""

4977

4978

#: bzrlib/errors.py:424

4979

msgid "Bad value \"%(value)s\" for option \"%(name)s\"."

4980

msgstr ""

4981

4982

4978

#: bzrlib/errors.py:443

4983

4979

msgid "Generic path error: %(path)r%(extra)s)"

4984

4980

msgstr ""

5078

5074

msgstr ""

5079

5075

5080

5076

#: bzrlib/errors.py:705

5081

msgid "A control directory already exists: \"%(path)s\"."

5082

msgstr ""

5083

5084

#: bzrlib/errors.py:710

5085

5077

msgid "Already a branch: \"%(path)s\"."

5086

5078

msgstr ""

5087

5079

5088

#: bzrlib/errors.py:715

5089

msgid "Parent branch already exists: \"%(path)s\"."

5090

msgstr ""

5091

5092

#: bzrlib/errors.py:721

5080

#: bzrlib/errors.py:711

5093

5081

msgid ""

5094

5082

"Directory contains a branch, but no working tree (use bzr checkout if you "

5095

5083

"wish to build a working tree): \"%(path)s\""

5096

5084

msgstr ""

5097

5085

5086

#: bzrlib/errors.py:716

5087

msgid ""

5088

"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""

5089

msgstr ""

5090

5098

5091

#: bzrlib/errors.py:726

5099

5092

msgid ""

5100

"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""

5093

"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""

5101

5094

msgstr ""

5102

5095

5103

5096

#: bzrlib/errors.py:736

5104

msgid ""

5105

"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""

5106

msgstr ""

5107

5108

#: bzrlib/errors.py:746

5109

5097

msgid "No repository present: \"%(path)s\""

5110

5098

msgstr ""

5111

5099

5112

#: bzrlib/errors.py:753

5100

#: bzrlib/errors.py:743

5113

5101

msgid ""

5114

5102

"Unsupported branch format: %(format)s\n"

5115

5103

"Please run 'bzr upgrade'"

5116

5104

msgstr ""

5117

5105

5118

#: bzrlib/errors.py:759

5106

#: bzrlib/errors.py:749

5119

5107

msgid "Unknown %(kind)s format: %(format)r"

5120

5108

msgstr ""

5121

5109

5110

#: bzrlib/errors.py:758

5111

msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."

5112

msgstr ""

5113

5122

5114

#: bzrlib/errors.py:768

5123

msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."

5124

msgstr ""

5125

5126

#: bzrlib/errors.py:778

5127

5115

msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"

5128

5116

msgstr ""

5129

5117

5130

#: bzrlib/errors.py:793

5118

#: bzrlib/errors.py:783

5131

5119

msgid ""

5132

5120

"%(target)s\n"

5133

5121

"is not compatible with\n"

5135

5123

"%(details)s"

5136

5124

msgstr ""

5137

5125

5126

#: bzrlib/errors.py:799

5127

msgid "Revision is not compatible with %(repo_format)s"

5128

msgstr ""

5129

5138

5130

#: bzrlib/errors.py:809

5139

msgid "Revision is not compatible with %(repo_format)s"

5140

msgstr ""

5141

5142

#: bzrlib/errors.py:819

5143

5131

msgid "%(context_info)s%(path)s is already versioned."

5144

5132

msgstr ""

5145

5133

5146

#: bzrlib/errors.py:840

5134

#: bzrlib/errors.py:830

5147

5135

msgid "%(context_info)s%(path)s is not versioned."

5148

5136

msgstr ""

5149

5137

5150

#: bzrlib/errors.py:861

5138

#: bzrlib/errors.py:851

5151

5139

msgid "Path(s) are not versioned: %(paths_as_string)s"

5152

5140

msgstr ""

5153

5141

5154

#: bzrlib/errors.py:872

5142

#: bzrlib/errors.py:862

5155

5143

msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"

5156

5144

msgstr ""

5157

5145

5158

#: bzrlib/errors.py:891

5146

#: bzrlib/errors.py:881

5159

5147

msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""

5160

5148

msgstr ""

5161

5149

5162

#: bzrlib/errors.py:899

5150

#: bzrlib/errors.py:889

5163

5151

msgid ""

5164

5152

"Filename %(filename)r is not valid in your current filesystem encoding "

5165

5153

"%(fs_encoding)s"

5166

5154

msgstr ""

5167

5155

5168

#: bzrlib/errors.py:910

5156

#: bzrlib/errors.py:900

5169

5157

msgid "Cannot operate on \"%(filename)s\" because it is a control file"

5170

5158

msgstr ""

5171

5159

5172

#: bzrlib/errors.py:928

5160

#: bzrlib/errors.py:918

5173

5161

msgid "The lock for '%(lock_description)s' is in use and cannot be broken."

5174

5162

msgstr ""

5175

5163

5164

#: bzrlib/errors.py:957

5165

msgid "Cannot lock %(lock)s: %(why)s"

5166

msgstr ""

5167

5176

5168

#: bzrlib/errors.py:967

5177

msgid "Cannot lock %(lock)s: %(why)s"

5178

msgstr ""

5179

5180

#: bzrlib/errors.py:977

5181

5169

msgid ""

5182

5170

"A transaction related operation was attempted after the transaction finished."

5183

5171

msgstr ""

5184

5172

5185

#: bzrlib/errors.py:1004

5173

#: bzrlib/errors.py:994

5186

5174

msgid "Cannot lock: transport is read only: %(transport)s"

5187

5175

msgstr ""

5188

5176

5189

#: bzrlib/errors.py:1012

5177

#: bzrlib/errors.py:1002

5190

5178

msgid "Could not acquire lock \"%(lock)s\": %(msg)s"

5191

5179

msgstr ""

5192

5180

5193

#: bzrlib/errors.py:1023

5181

#: bzrlib/errors.py:1013

5194

5182

msgid ""

5195

5183

"Lock was broken while still open: %(lock)s - check storage consistency!"

5196

5184

msgstr ""

5197

5185

5198

#: bzrlib/errors.py:1034

5186

#: bzrlib/errors.py:1024

5199

5187

msgid ""

5200

5188

"Lock was released and re-acquired before being broken: %(lock)s: held by "

5201

5189

"%(holder)r, wanted to break %(target)r"

5202

5190

msgstr ""

5203

5191

5204

#: bzrlib/errors.py:1046

5192

#: bzrlib/errors.py:1036

5205

5193

msgid ""

5206

5194

"Lock is apparently held, but corrupted: %(corruption_info)s\n"

5207

5195

"Use 'bzr break-lock' to clear it"

5208

5196

msgstr ""

5209

5197

5210

#: bzrlib/errors.py:1059

5198

#: bzrlib/errors.py:1049

5211

5199

msgid "Lock not held: %(lock)s"

5212

5200

msgstr ""

5213

5201

5214

#: bzrlib/errors.py:1088

5202

#: bzrlib/errors.py:1078

5215

5203

msgid "No changes to commit"

5216

5204

msgstr ""

5217

5205

5206

#: bzrlib/errors.py:1083

5207

msgid ""

5208

"Selected-file commit of merges is not supported yet: files %(files_str)s"

5209

msgstr ""

5210

5218

5211

#: bzrlib/errors.py:1093

5219

5212

msgid ""

5220

"Selected-file commit of merges is not supported yet: files %(files_str)s"

5221

msgstr ""

5222

5223

#: bzrlib/errors.py:1103

5224

msgid ""

5225

5213

"Excluding paths during commit is not supported by repository at "

5226

5214

"%(repository)r."

5227

5215

msgstr ""

5228

5216

5229

#: bzrlib/errors.py:1112

5217

#: bzrlib/errors.py:1102

5230

5218

msgid ""

5231

5219

"The specified commit message contains characters unsupported by the current "

5232

5220

"encoding."

5233

5221

msgstr ""

5234

5222

5235

#: bzrlib/errors.py:1118

5223

#: bzrlib/errors.py:1108

5236

5224

msgid "Upgrade URL cannot work with readonly URLs."

5237

5225

msgstr ""

5238

5226

5239

#: bzrlib/errors.py:1123

5227

#: bzrlib/errors.py:1113

5240

5228

msgid "The branch format %(format)s is already at the most recent format."

5241

5229

msgstr ""

5242

5230

5243

#: bzrlib/errors.py:1146

5231

#: bzrlib/errors.py:1136

5244

5232

msgid "Option --change does not accept revision ranges"

5245

5233

msgstr ""

5246

5234

5247

#: bzrlib/errors.py:1151

5235

#: bzrlib/errors.py:1141

5248

5236

msgid "No namespace registered for string: %(spec)r"

5249

5237

msgstr ""

5250

5238

5251

#: bzrlib/errors.py:1170

5239

#: bzrlib/errors.py:1160

5252

5240

msgid ""

5253

5241

"Requested revision: '%(spec)s' does not exist in branch: "

5254

5242

"%(branch_url)s%(extra)s"

5255

5243

msgstr ""

5256

5244

5257

#: bzrlib/errors.py:1184

5245

#: bzrlib/errors.py:1174

5258

5246

msgid ""

5259

5247

"Operation denied because it would change the main history, which is not "

5260

5248

"permitted by the append_revisions_only setting on branch \"%(location)s\"."

5261

5249

msgstr ""

5262

5250

5263

#: bzrlib/errors.py:1195

5251

#: bzrlib/errors.py:1185

5264

5252

msgid ""

5265

5253

"These branches have diverged. Use the missing command to see how.\n"

5266

5254

"Use the merge command to reconcile them."

5267

5255

msgstr ""

5268

5256

5269

#: bzrlib/errors.py:1215

5257

#: bzrlib/errors.py:1205

5270

5258

msgid ""

5271

5259

"Branches have no common ancestor, and no merge base revision was specified."

5272

5260

msgstr ""

5273

5261

5274

#: bzrlib/errors.py:1221

5262

#: bzrlib/errors.py:1211

5275

5263

msgid ""

5276

5264

"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."

5277

5265

msgstr ""

5278

5266

5279

#: bzrlib/errors.py:1227

5267

#: bzrlib/errors.py:1217

5280

5268

msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"

5281

5269

msgstr ""

5282

5270

5283

#: bzrlib/errors.py:1236

5271

#: bzrlib/errors.py:1226

5284

5272

msgid ""

5285

5273

"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."

5286

5274

msgstr ""

5287

5275

5288

#: bzrlib/errors.py:1245

5276

#: bzrlib/errors.py:1235

5289

5277

msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"

5290

5278

msgstr ""

5291

5279

5292

#: bzrlib/errors.py:1254

5280

#: bzrlib/errors.py:1244

5293

5281

msgid "Branch %(branch)s has no commits."

5294

5282

msgstr ""

5295

5283

5296

#: bzrlib/errors.py:1272

5284

#: bzrlib/errors.py:1262

5297

5285

msgid ""

5298

5286

"Bound branch %(branch)s is out of date with master branch "

5299

5287

"%(master)s.%(extra_help)s"

5300

5288

msgstr ""

5301

5289

5302

#: bzrlib/errors.py:1284

5290

#: bzrlib/errors.py:1274

5303

5291

msgid ""

5304

5292

"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "

5305

5293

"bound to %(remote)s."

5306

5294

msgstr ""

5307

5295

5308

#: bzrlib/errors.py:1296

5296

#: bzrlib/errors.py:1286

5309

5297

msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"

5310

5298

msgstr ""

5311

5299

5312

#: bzrlib/errors.py:1305

5300

#: bzrlib/errors.py:1295

5313

5301

msgid ""

5314

5302

"Unable to connect to target of bound branch %(branch)s => %(target)s: "

5315

5303

"%(error)s"

5316

5304

msgstr ""

5317

5305

5318

#: bzrlib/errors.py:1317

5306

#: bzrlib/errors.py:1307

5319

5307

msgid "Error in processing weave: %(msg)s"

5320

5308

msgstr ""

5321

5309

5322

#: bzrlib/errors.py:1326

5310

#: bzrlib/errors.py:1316

5323

5311

msgid "Revision {%(revision_id)s} already present in %(weave)s"

5324

5312

msgstr ""

5325

5313

5314

#: bzrlib/errors.py:1327

5315

msgid "Revision {%(revision_id)s} not present in %(weave)s"

5316

msgstr ""

5317

5326

5318

#: bzrlib/errors.py:1337

5327

msgid "Revision {%(revision_id)s} not present in %(weave)s"

5328

msgstr ""

5329

5330

#: bzrlib/errors.py:1347

5331

5319

msgid "Weave invariant violated: %(what)s"

5332

5320

msgstr ""

5333

5321

5334

#: bzrlib/errors.py:1356

5322

#: bzrlib/errors.py:1346

5335

5323

msgid "Parents are mismatched between two revisions. %(msg)s"

5336

5324

msgstr ""

5337

5325

5338

#: bzrlib/errors.py:1378

5326

#: bzrlib/errors.py:1368

5339

5327

msgid ""

5340

5328

"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "

5341

5329

"%(weave_b)s"

5342

5330

msgstr ""

5343

5331

5344

#: bzrlib/errors.py:1390

5332

#: bzrlib/errors.py:1380

5345

5333

msgid "Versioned file error"

5346

5334

msgstr ""

5347

5335

5336

#: bzrlib/errors.py:1385

5337

msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."

5338

msgstr ""

5339

5348

5340

#: bzrlib/errors.py:1395

5349

msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."

5341

msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."

5350

5342

msgstr ""

5351

5343

5352

5344

#: bzrlib/errors.py:1405

5353

msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."

5354

msgstr ""

5355

5356

#: bzrlib/errors.py:1415

5357

5345

msgid "Text did not match its checksum: %(msg)s"

5358

5346

msgstr ""

5359

5347

5360

#: bzrlib/errors.py:1541

5348

#: bzrlib/errors.py:1531

5361

5349

msgid "Export format %(format)r not supported"

5362

5350

msgstr ""

5363

5351

5364

#: bzrlib/errors.py:1550

5352

#: bzrlib/errors.py:1540

5365

5353

msgid "Transport error: %(msg)s %(orig_error)s"

5366

5354

msgstr ""

5367

5355

5368

#: bzrlib/errors.py:1576

5356

#: bzrlib/errors.py:1566

5369

5357

msgid "Generic bzr smart protocol error: %(details)s"

5370

5358

msgstr ""

5371

5359

5372

#: bzrlib/errors.py:1584

5360

#: bzrlib/errors.py:1574

5373

5361

msgid "Received bad protocol version marker: %(marker)r"

5374

5362

msgstr ""

5375

5363

5376

#: bzrlib/errors.py:1616

5364

#: bzrlib/errors.py:1606

5377

5365

msgid "Transport operation not possible: %(msg)s %(orig_error)s"

5378

5366

msgstr ""

5379

5367

5380

#: bzrlib/errors.py:1621

5368

#: bzrlib/errors.py:1611

5381

5369

msgid "Connection error: %(msg)s %(orig_error)s"

5382

5370

msgstr ""

5383

5371

5384

#: bzrlib/errors.py:1626

5372

#: bzrlib/errors.py:1616

5385

5373

msgid "%(msg)s %(host)s%(port)s%(orig_error)s"

5386

5374

msgstr ""

5387

5375

5388

#: bzrlib/errors.py:1647

5376

#: bzrlib/errors.py:1637

5389

5377

msgid "Connection closed: %(msg)s %(orig_error)s"

5390

5378

msgstr ""

5391

5379

5392

#: bzrlib/errors.py:1652

5380

#: bzrlib/errors.py:1642

5393

5381

msgid "Connection Timeout: %(msg)s%(orig_error)s"

5394

5382

msgstr ""

5395

5383

5384

#: bzrlib/errors.py:1647

5385

msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"

5386

msgstr ""

5387

5396

5388

#: bzrlib/errors.py:1657

5397

msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"

5398

msgstr ""

5399

5400

#: bzrlib/errors.py:1667

5401

5389

msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"

5402

5390

msgstr ""

5403

5391

5404

#: bzrlib/errors.py:1682

5405

msgid "Certificate error: %(error)s"

5406

msgstr ""

5407

5408

#: bzrlib/errors.py:1690

5392

#: bzrlib/errors.py:1672

5409

5393

msgid "Invalid http range %(range)r for %(path)s: %(msg)s"

5410

5394

msgstr ""

5411

5395

5412

#: bzrlib/errors.py:1704

5396

#: bzrlib/errors.py:1686

5413

5397

msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"

5414

5398

msgstr ""

5415

5399

5416

#: bzrlib/errors.py:1712

5400

#: bzrlib/errors.py:1694

5417

5401

msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"

5418

5402

msgstr ""

5419

5403

5420

#: bzrlib/errors.py:1721

5404

#: bzrlib/errors.py:1703

5421

5405

msgid "%(source)s is%(permanently)s redirected to %(target)s"

5422

5406

msgstr ""

5423

5407

5424

#: bzrlib/errors.py:1735

5408

#: bzrlib/errors.py:1717

5425

5409

msgid "Too many redirections"

5426

5410

msgstr ""

5427

5411

5428

#: bzrlib/errors.py:1740

5412

#: bzrlib/errors.py:1722

5429

5413

msgid "Working tree has conflicts."

5430

5414

msgstr ""

5431

5415

5432

#: bzrlib/errors.py:1744

5416

#: bzrlib/errors.py:1726

5433

5417

msgid "Config file %(filename)s is not UTF-8 encoded\n"

5434

5418

msgstr ""

5435

5419

5436

#: bzrlib/errors.py:1753

5420

#: bzrlib/errors.py:1735

5437

5421

msgid ""

5438

5422

"Error(s) parsing config file %(filename)s:\n"

5439

5423

"%(errors)s"

5440

5424

msgstr ""

5441

5425

5426

#: bzrlib/errors.py:1746

5427

msgid "Bad value \"%(value)s\" for option \"%(name)s\"."

5428

msgstr ""

5429

5430

#: bzrlib/errors.py:1754

5431

msgid "%(username)r does not seem to contain a reasonable email address"

5432

msgstr ""

5433

5442

5434

#: bzrlib/errors.py:1763

5443

msgid ""

5444

"Bad value \"%(value)s\" for option \"%(name)s\".\n"

5445

"See ``bzr help %(name)s``"

5446

msgstr ""

5447

5448

#: bzrlib/errors.py:1773

5449

msgid "%(username)r does not seem to contain a reasonable email address"

5450

msgstr ""

5451

5452

#: bzrlib/errors.py:1782

5453

5435

msgid "Failed to GPG sign data with command \"%(command_line)s\""

5454

5436

msgstr ""

5455

5437

5456

#: bzrlib/errors.py:1790

5438

#: bzrlib/errors.py:1771

5457

5439

msgid "Failed to verify GPG signature data with error \"%(error)s\""

5458

5440

msgstr ""

5459

5441

5460

#: bzrlib/errors.py:1798

5442

#: bzrlib/errors.py:1779

5461

5443

msgid "Unable to import library \"%(library)s\": %(error)s"

5462

5444

msgstr ""

5463

5445

5464

#: bzrlib/errors.py:1806

5446

#: bzrlib/errors.py:1787

5465

5447

msgid "python-gpgme is not installed, it is needed to verify signatures"

5466

5448

msgstr ""

5467

5449

5468

#: bzrlib/errors.py:1814

5450

#: bzrlib/errors.py:1795

5469

5451

msgid ""

5470

5452

"The working tree for %(basedir)s has changed since the last commit, but "

5471

5453

"weave merge requires that it be unchanged"

5472

5454

msgstr ""

5473

5455

5474

#: bzrlib/errors.py:1824

5456

#: bzrlib/errors.py:1805

5475

5457

msgid ""

5476

5458

"Can't reprocess and show base, because reprocessing obscures the "

5477

5459

"relationship of conflicting lines to the base"

5478

5460

msgstr ""

5479

5461

5480

#: bzrlib/errors.py:1830

5462

#: bzrlib/errors.py:1811

5481

5463

msgid "Cycle in graph %(graph)r"

5482

5464

msgstr ""

5483

5465

5484

#: bzrlib/errors.py:1858

5466

#: bzrlib/errors.py:1839

5485

5467

msgid "File %(filename)s is not conflicted."

5486

5468

msgstr ""

5487

5469

5488

#: bzrlib/errors.py:1880

5470

#: bzrlib/errors.py:1861

5489

5471

msgid "No bundle was found in \"%(filename)s\"."

5490

5472

msgstr ""

5491

5473

5492

#: bzrlib/errors.py:1889

5474

#: bzrlib/errors.py:1870

5493

5475

msgid "Unable to handle bundle version %(version)s: %(msg)s"

5494

5476

msgstr ""

5495

5477

5496

#: bzrlib/errors.py:1899

5478

#: bzrlib/errors.py:1880

5497

5479

msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"

5498

5480

msgstr ""

5499

5481

5500

#: bzrlib/errors.py:1912

5482

#: bzrlib/errors.py:1893

5501

5483

msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"

5502

5484

msgstr ""

5503

5485

5504

#: bzrlib/errors.py:1922

5486

#: bzrlib/errors.py:1903

5505

5487

msgid "Key %(key)s is already present in map"

5506

5488

msgstr ""

5507

5489

5508

#: bzrlib/errors.py:1927

5490

#: bzrlib/errors.py:1908

5509

5491

msgid "The prefix %(prefix)s is in the help search path twice."

5510

5492

msgstr ""

5511

5493

5512

#: bzrlib/errors.py:1937

5494

#: bzrlib/errors.py:1918

5513

5495

msgid ""

5514

5496

"No final name for trans_id %(trans_id)r\n"

5515

5497

"file-id: %(file_id)r\n"

5516

5498

"root trans-id: %(root_trans_id)r\n"

5517

5499

msgstr ""

5518

5500

5519

#: bzrlib/errors.py:1969

5501

#: bzrlib/errors.py:1950

5520

5502

msgid "Attempt to reuse a transform that has already been applied."

5521

5503

msgstr ""

5522

5504

5523

#: bzrlib/errors.py:1974

5505

#: bzrlib/errors.py:1955

5524

5506

msgid "Moving the root directory is not supported at this time"

5525

5507

msgstr ""

5526

5508

5527

#: bzrlib/errors.py:1979

5509

#: bzrlib/errors.py:1960

5528

5510

msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"

5529

5511

msgstr ""

5530

5512

5531

#: bzrlib/errors.py:1990

5513

#: bzrlib/errors.py:1971

5532

5514

msgid ""

5533

5515

"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5534

5516

msgstr ""

5535

5517

5536

#: bzrlib/errors.py:2026

5518

#: bzrlib/errors.py:2007

5537

5519

msgid ""

5538

5520

"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5539

5521

msgstr ""

5540

5522

5541

#: bzrlib/errors.py:2056

5523

#: bzrlib/errors.py:2037

5542

5524

msgid "Unable to import paramiko (required for sftp support): %(error)s"

5543

5525

msgstr ""

5544

5526

5545

#: bzrlib/errors.py:2064

5527

#: bzrlib/errors.py:2045

5546

5528

msgid "Nothing to merge."

5547

5529

msgstr ""

5548

5530

5549

#: bzrlib/errors.py:2069

5531

#: bzrlib/errors.py:2050

5550

5532

msgid "Format %(format)s cannot be initialised by this version of bzr."

5551

5533

msgstr ""

5552

5534

5553

#: bzrlib/errors.py:2078

5535

#: bzrlib/errors.py:2059

5554

5536

msgid ""

5555

5537

"Cannot convert from format %(from_format)s to format %(format)s. "

5556

5538

"%(problem)s"

5557

5539

msgstr ""

5558

5540

5559

#: bzrlib/errors.py:2090

5541

#: bzrlib/errors.py:2071

5560

5542

msgid "Could not find an appropriate Differ for file \"%(path)s\""

5561

5543

msgstr ""

5562

5544

5563

#: bzrlib/errors.py:2098

5545

#: bzrlib/errors.py:2079

5564

5546

msgid "%(exe_name)s could not be found on this machine"

5565

5547

msgstr ""

5566

5548

5567

#: bzrlib/errors.py:2106

5549

#: bzrlib/errors.py:2087

5568

5550

msgid "Diff is not installed on this machine: %(msg)s"

5569

5551

msgstr ""

5570

5552

5571

#: bzrlib/errors.py:2114

5553

#: bzrlib/errors.py:2095

5572

5554

msgid "Diff3 is not installed on this machine."

5573

5555

msgstr ""

5574

5556

5575

#: bzrlib/errors.py:2120

5557

#: bzrlib/errors.py:2101

5576

5558

msgid "The content being inserted is already present."

5577

5559

msgstr ""

5578

5560

5579

#: bzrlib/errors.py:2125

5561

#: bzrlib/errors.py:2106

5580

5562

msgid ""

5581

5563

"This tree contains left-over files from a failed operation.\n"

5582

5564

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5584

5566

" keep, and delete it when you are done."

5585

5567

msgstr ""

5586

5568

5587

#: bzrlib/errors.py:2136

5569

#: bzrlib/errors.py:2117

5588

5570

msgid ""

5589

5571

"This tree contains left-over files from a failed operation.\n"

5590

5572

" Please examine %(pending_deletion)s to see if it contains any files you\n"

5591

5573

" wish to keep, and delete it when you are done."

5592

5574

msgstr ""

5593

5575

5594

#: bzrlib/errors.py:2146

5576

#: bzrlib/errors.py:2127

5595

5577

msgid ""

5596

5578

"Unable to delete transform temporary directory %(limbo_dir)s.\n"

5597

5579

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5599

5581

" keep, and delete it when you are done."

5600

5582

msgstr ""

5601

5583

5602

#: bzrlib/errors.py:2157

5584

#: bzrlib/errors.py:2138

5603

5585

msgid ""

5604

5586

"Unable to delete transform temporary directory %(pending_deletion)s. Please "

5605

5587

"examine %(pending_deletion)s to see if it contains any files you wish to "

5606

5588

"keep, and delete it when you are done."

5607

5589

msgstr ""

5608

5590

5609

#: bzrlib/errors.py:2167

5591

#: bzrlib/errors.py:2148

5610

5592

msgid "Working tree is out of date, please run 'bzr update'.%(more)s"

5611

5593

msgstr ""

5612

5594

5613

#: bzrlib/errors.py:2181

5595

#: bzrlib/errors.py:2162

5614

5596

msgid ""

5615

5597

"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."

5616

5598

msgstr ""

5617

5599

5618

#: bzrlib/errors.py:2194

5600

#: bzrlib/errors.py:2175

5619

5601

msgid "Error in merge modified format"

5620

5602

msgstr ""

5621

5603

5622

#: bzrlib/errors.py:2199

5604

#: bzrlib/errors.py:2180

5623

5605

msgid "Format error in conflict listings"

5624

5606

msgstr ""

5625

5607

5626

#: bzrlib/errors.py:2203

5608

#: bzrlib/errors.py:2184

5627

5609

msgid ""

5628

5610

"Inconsistency in dirstate file %(dirstate_path)s.\n"

5629

5611

"Error: %(description)s"

5630

5612

msgstr ""

5631

5613

5632

#: bzrlib/errors.py:2214

5614

#: bzrlib/errors.py:2195

5633

5615

msgid ""

5634

5616

"An error has been detected in the repository %(repo_path)s.\n"

5635

5617

"Please run bzr reconcile on this repository."

5636

5618

msgstr ""

5637

5619

5638

#: bzrlib/errors.py:2225

5620

#: bzrlib/errors.py:2206

5639

5621

msgid ""

5640

5622

"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"

5641

5623

"reason: %(reason)s"

5642

5624

msgstr ""

5643

5625

5644

#: bzrlib/errors.py:2238

5626

#: bzrlib/errors.py:2219

5645

5627

msgid ""

5646

5628

"An inconsistent delta was supplied: %(delta)r\n"

5647

5629

"reason: %(reason)s"

5648

5630

msgstr ""

5649

5631

5650

#: bzrlib/errors.py:2250

5632

#: bzrlib/errors.py:2231

5651

5633

msgid "To use this feature you must upgrade your branch at %(path)s."

5652

5634

msgstr ""

5653

5635

5654

#: bzrlib/errors.py:2259

5636

#: bzrlib/errors.py:2240

5655

5637

msgid "To use this feature you must upgrade your repository at %(path)s."

5656

5638

msgstr ""

5657

5639

5658

#: bzrlib/errors.py:2264

5640

#: bzrlib/errors.py:2245

5659

5641

msgid ""

5660

5642

"To use this feature you must upgrade your branch at %(path)s to a format "

5661

5643

"which supports rich roots."

5662

5644

msgstr ""

5663

5645

5664

#: bzrlib/errors.py:2270

5646

#: bzrlib/errors.py:2251

5665

5647

msgid "Cannot perform local-only commits on unbound branches."

5666

5648

msgstr ""

5667

5649

5668

#: bzrlib/errors.py:2275

5650

#: bzrlib/errors.py:2256

5669

5651

msgid "The method %(mname)s is not supported on objects of type %(tname)s."

5670

5652

msgstr ""

5671

5653

5672

#: bzrlib/errors.py:2296

5654

#: bzrlib/errors.py:2277

5673

5655

msgid "Ghost tags not supported by format %(format)r."

5674

5656

msgstr ""

5675

5657

5676

#: bzrlib/errors.py:2304

5658

#: bzrlib/errors.py:2285

5677

5659

msgid "File is binary but should be text."

5678

5660

msgstr ""

5679

5661

5680

#: bzrlib/errors.py:2309

5662

#: bzrlib/errors.py:2290

5681

5663

msgid "The path %(path)s is not permitted on this platform"

5682

5664

msgstr ""

5683

5665

5684

#: bzrlib/errors.py:2318

5666

#: bzrlib/errors.py:2299

5685

5667

msgid ""

5686

5668

"Testament did not match expected value.\n"

5687

5669

" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"

5688

5670

" {%(measured)s}"

5689

5671

msgstr ""

5690

5672

5691

#: bzrlib/errors.py:2330

5673

#: bzrlib/errors.py:2311

5692

5674

msgid "Not a bzr revision-bundle: %(text)r"

5693

5675

msgstr ""

5694

5676

5695

#: bzrlib/errors.py:2339

5677

#: bzrlib/errors.py:2320

5696

5678

msgid "Bad bzr revision-bundle: %(text)r"

5697

5679

msgstr ""

5698

5680

5699

#: bzrlib/errors.py:2348

5681

#: bzrlib/errors.py:2329

5700

5682

msgid "Malformed bzr revision-bundle header: %(text)r"

5701

5683

msgstr ""

5702

5684

5703

#: bzrlib/errors.py:2353

5685

#: bzrlib/errors.py:2334

5704

5686

msgid "Malformed patches in bzr revision-bundle: %(text)r"

5705

5687

msgstr ""

5706

5688

5707

#: bzrlib/errors.py:2358

5689

#: bzrlib/errors.py:2339

5708

5690

msgid "Malformed footer in bzr revision-bundle: %(text)r"

5709

5691

msgstr ""

5710

5692

5711

#: bzrlib/errors.py:2363

5693

#: bzrlib/errors.py:2344

5712

5694

msgid "End of line marker was not \\n in bzr revision-bundle"

5713

5695

msgstr ""

5714

5696

5715

#: bzrlib/errors.py:2373

5697

#: bzrlib/errors.py:2354

5716

5698

msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"

5717

5699

msgstr ""

5718

5700

5719

#: bzrlib/errors.py:2383

5701

#: bzrlib/errors.py:2364

5720

5702

msgid "Root class for inventory serialization errors"

5721

5703

msgstr ""

5722

5704

5723

#: bzrlib/errors.py:2387

5705

#: bzrlib/errors.py:2368

5724

5706

msgid ""

5725

5707

"The inventory was not in the expected format:\n"

5726

5708

" %(msg)s"

5727

5709

msgstr ""

5728

5710

5729

#: bzrlib/errors.py:2396

5711

#: bzrlib/errors.py:2377

5730

5712

msgid "This operation requires rich root data storage"

5731

5713

msgstr ""

5732

5714

5733

#: bzrlib/errors.py:2409

5715

#: bzrlib/errors.py:2390

5734

5716

msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"

5735

5717

msgstr ""

5736

5718

5737

#: bzrlib/errors.py:2418

5719

#: bzrlib/errors.py:2399

5738

5720

msgid ""

5739

5721

"Don't know how to handle SSH connections. Please set BZR_SSH environment "

5740

5722

"variable."

5741

5723

msgstr ""

5742

5724

5743

#: bzrlib/errors.py:2425

5725

#: bzrlib/errors.py:2406

5744

5726

msgid ""

5745

5727

"Could not determine revno for {%(revision_id)s} because its ancestry shows a "

5746

5728

"ghost at {%(ghost_revision_id)s}"

5747

5729

msgstr ""

5748

5730

5749

#: bzrlib/errors.py:2435

5731

#: bzrlib/errors.py:2416

5750

5732

msgid "Ghost revision {%(revision_id)s} cannot be used here."

5751

5733

msgstr ""

5752

5734

5753

#: bzrlib/errors.py:2486

5735

#: bzrlib/errors.py:2467

5754

5736

msgid ""

5755

5737

"A merge directive must provide either a bundle or a public branch location."

5756

5738

msgstr ""

5757

5739

5758

#: bzrlib/errors.py:2493

5740

#: bzrlib/errors.py:2474

5759

5741

msgid "Bad merge directive payload %(start)r"

5760

5742

msgstr ""

5761

5743

5762

#: bzrlib/errors.py:2503

5744

#: bzrlib/errors.py:2484

5763

5745

msgid "Preview patch does not match requested changes."

5764

5746

msgstr ""

5765

5747

5766

#: bzrlib/errors.py:2509

5748

#: bzrlib/errors.py:2490

5767

5749

msgid "Patch_type was %(patch_type)s, but no patch was supplied."

5768

5750

msgstr ""

5769

5751

5770

#: bzrlib/errors.py:2519

5752

#: bzrlib/errors.py:2500

5771

5753

msgid ""

5772

5754

"Your branch does not have all of the revisions required in order to merge "

5773

5755

"this merge directive and the target location specified in the merge "

5774

5756

"directive is not a branch: %(location)s."

5775

5757

msgstr ""

5776

5758

5777

#: bzrlib/errors.py:2531

5759

#: bzrlib/errors.py:2512

5778

5760

msgid "Unsupported entry kind %(kind)s"

5779

5761

msgstr ""

5780

5762

5781

#: bzrlib/errors.py:2539

5763

#: bzrlib/errors.py:2520

5782

5764

msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"

5783

5765

msgstr ""

5784

5766

5767

#: bzrlib/errors.py:2530

5768

msgid "Subsume target %(other_tree)s needs to be upgraded."

5769

msgstr ""

5770

5785

5771

#: bzrlib/errors.py:2549

5786

msgid "Subsume target %(other_tree)s needs to be upgraded."

5787

msgstr ""

5788

5789

#: bzrlib/errors.py:2568

5790

5772

msgid "No such tag: %(tag_name)s"

5791

5773

msgstr ""

5792

5774

5793

#: bzrlib/errors.py:2576

5775

#: bzrlib/errors.py:2557

5794

5776

msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."

5795

5777

msgstr ""

5796

5778

5797

#: bzrlib/errors.py:2585

5779

#: bzrlib/errors.py:2566

5798

5780

msgid "Tag %(tag_name)s already exists."

5799

5781

msgstr ""

5800

5782

5801

#: bzrlib/errors.py:2593

5783

#: bzrlib/errors.py:2574

5802

5784

msgid ""

5803

5785

"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "

5804

5786

"bugs\" for more information on this feature."

5805

5787

msgstr ""

5806

5788

5807

#: bzrlib/errors.py:2603

5789

#: bzrlib/errors.py:2584

5808

5790

msgid ""

5809

5791

"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"

5810

5792

msgstr ""

5811

5793

5812

#: bzrlib/errors.py:2613

5794

#: bzrlib/errors.py:2594

5813

5795

msgid ""

5814

5796

"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"

5815

5797

msgstr ""

5816

5798

5817

#: bzrlib/errors.py:2623

5799

#: bzrlib/errors.py:2604

5818

5800

msgid "Invalid line in bugs property: '%(line)s'"

5819

5801

msgstr ""

5820

5802

5821

#: bzrlib/errors.py:2631

5803

#: bzrlib/errors.py:2612

5822

5804

msgid "Invalid bug status: '%(status)s'"

5823

5805

msgstr ""

5824

5806

5825

#: bzrlib/errors.py:2639

5807

#: bzrlib/errors.py:2620

5826

5808

msgid "Could not understand response from smart server: %(response_tuple)r"

5827

5809

msgstr ""

5828

5810

5811

#: bzrlib/errors.py:2659

5812

msgid "Server sent an unexpected error: %(error_tuple)r"

5813

msgstr ""

5814

5829

5815

#: bzrlib/errors.py:2678

5830

msgid "Server sent an unexpected error: %(error_tuple)r"

5831

msgstr ""

5832

5833

#: bzrlib/errors.py:2697

5834

5816

msgid "Unrecognised container format: %(container_format)r"

5835

5817

msgstr ""

5836

5818

5837

#: bzrlib/errors.py:2705

5819

#: bzrlib/errors.py:2686

5838

5820

msgid "Unexpected end of container stream"

5839

5821

msgstr ""

5840

5822

5841

#: bzrlib/errors.py:2710

5823

#: bzrlib/errors.py:2691

5842

5824

msgid "Unknown record type: %(record_type)r"

5843

5825

msgstr ""

5844

5826

5845

#: bzrlib/errors.py:2718

5827

#: bzrlib/errors.py:2699

5846

5828

msgid "Invalid record: %(reason)s"

5847

5829

msgstr ""

5848

5830

5849

#: bzrlib/errors.py:2726

5831

#: bzrlib/errors.py:2707

5850

5832

msgid "Container has data after end marker: %(excess)r"

5851

5833

msgstr ""

5852

5834

5853

#: bzrlib/errors.py:2734

5835

#: bzrlib/errors.py:2715

5854

5836

msgid "Container has multiple records with the same name: %(name)s"

5855

5837

msgstr ""

5856

5838

5857

#: bzrlib/errors.py:2747

5839

#: bzrlib/errors.py:2728

5858

5840

msgid "Corrupt or incompatible data stream: %(reason)s"

5859

5841

msgstr ""

5860

5842

5861

#: bzrlib/errors.py:2755

5843

#: bzrlib/errors.py:2736

5862

5844

msgid "SMTP error: %(error)s"

5863

5845

msgstr ""

5864

5846

5865

#: bzrlib/errors.py:2763

5847

#: bzrlib/errors.py:2744

5866

5848

msgid "No message supplied."

5867

5849

msgstr ""

5868

5850

5869

#: bzrlib/errors.py:2768

5851

#: bzrlib/errors.py:2749

5870

5852

msgid "No mail-to address (--mail-to) or output (-o) specified."

5871

5853

msgstr ""

5872

5854

5873

#: bzrlib/errors.py:2773

5855

#: bzrlib/errors.py:2754

5874

5856

msgid "Unknown mail client: %(mail_client)s"

5875

5857

msgstr ""

5876

5858

5877

#: bzrlib/errors.py:2781

5859

#: bzrlib/errors.py:2762

5878

5860

msgid ""

5879

5861

"Unable to find mail client with the following names: "

5880

5862

"%(mail_command_list_string)s"

5881

5863

msgstr ""

5882

5864

5883

#: bzrlib/errors.py:2791

5865

#: bzrlib/errors.py:2772

5884

5866

msgid "SMTP connection to %(host)s refused"

5885

5867

msgstr ""

5886

5868

5887

#: bzrlib/errors.py:2800

5869

#: bzrlib/errors.py:2781

5888

5870

msgid "Please specify smtp_server. No server at default %(host)s."

5889

5871

msgstr ""

5890

5872

5891

#: bzrlib/errors.py:2814

5873

#: bzrlib/errors.py:2795

5892

5874

msgid ""

5893

5875

"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"

5894

5876

"reconfigure."

5895

5877

msgstr ""

5896

5878

5897

#: bzrlib/errors.py:2826

5879

#: bzrlib/errors.py:2807

5898

5880

msgid "'%(display_url)s' is already a branch."

5899

5881

msgstr ""

5900

5882

5901

#: bzrlib/errors.py:2831

5883

#: bzrlib/errors.py:2812

5902

5884

msgid "'%(display_url)s' is already a tree."

5903

5885

msgstr ""

5904

5886

5905

#: bzrlib/errors.py:2836

5887

#: bzrlib/errors.py:2817

5906

5888

msgid "'%(display_url)s' is already a checkout."

5907

5889

msgstr ""

5908

5890

5909

#: bzrlib/errors.py:2841

5891

#: bzrlib/errors.py:2822

5910

5892

msgid "'%(display_url)s' is already a lightweight checkout."

5911

5893

msgstr ""

5912

5894

5913

#: bzrlib/errors.py:2846

5895

#: bzrlib/errors.py:2827

5914

5896

msgid "'%(display_url)s' is already using a shared repository."

5915

5897

msgstr ""

5916

5898

5917

#: bzrlib/errors.py:2851

5899

#: bzrlib/errors.py:2832

5918

5900

msgid "'%(display_url)s' is already standalone."

5919

5901

msgstr ""

5920

5902

5921

#: bzrlib/errors.py:2856

5903

#: bzrlib/errors.py:2837

5922

5904

msgid "Shared repository '%(display_url)s' already creates working trees."

5923

5905

msgstr ""

5924

5906

5925

#: bzrlib/errors.py:2862

5907

#: bzrlib/errors.py:2843

5926

5908

msgid ""

5927

5909

"Shared repository '%(display_url)s' already doesn't create working trees."

5928

5910

msgstr ""

5929

5911

5930

#: bzrlib/errors.py:2868

5912

#: bzrlib/errors.py:2849

5931

5913

msgid "Requested reconfiguration of '%(display_url)s' is not supported."

5932

5914

msgstr ""

5933

5915

5934

#: bzrlib/errors.py:2873

5916

#: bzrlib/errors.py:2854

5935

5917

msgid "No location could be found to bind to at %(display_url)s."

5936

5918

msgstr ""

5937

5919

5938

#: bzrlib/errors.py:2878

5920

#: bzrlib/errors.py:2859

5939

5921

msgid ""

5940

5922

"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "

5941

5923

"status).%(more)s"

5942

5924

msgstr ""

5943

5925

5944

#: bzrlib/errors.py:2897

5926

#: bzrlib/errors.py:2878

5945

5927

msgid ""

5946

5928

"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"

5947

5929

"list).%(more)s"

5948

5930

msgstr ""

5949

5931

5950

#: bzrlib/errors.py:2903

5932

#: bzrlib/errors.py:2884

5951

5933

msgid "Variable {%(name)s} is not available."

5952

5934

msgstr ""

5953

5935

5954

#: bzrlib/errors.py:2911

5936

#: bzrlib/errors.py:2892

5955

5937

msgid "No template specified."

5956

5938

msgstr ""

5957

5939

5958

#: bzrlib/errors.py:2916

5940

#: bzrlib/errors.py:2897

5959

5941

msgid "Unable to create symlink %(path_str)son this platform"

5960

5942

msgstr ""

5961

5943

5962

#: bzrlib/errors.py:2931

5944

#: bzrlib/errors.py:2912

5963

5945

msgid ""

5964

5946

"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "

5965

5947

"\"original\", \"local\"."

5966

5948

msgstr ""

5967

5949

5968

#: bzrlib/errors.py:2965

5950

#: bzrlib/errors.py:2946

5969

5951

msgid ""

5970

5952

"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"

5971

5953

msgstr ""

5972

5954

5973

#: bzrlib/errors.py:2977

5955

#: bzrlib/errors.py:2958

5974

5956

msgid "The \"%(config_id)s\" configuration does not exist."

5975

5957

msgstr ""

5976

5958

5977

#: bzrlib/errors.py:2985

5959

#: bzrlib/errors.py:2966

5978

5960

msgid "The \"%(option_name)s\" configuration option does not exist."

5979

5961

msgstr ""

5980

5962

5981

#: bzrlib/errors.py:2993

5963

#: bzrlib/errors.py:2974

5982

5964

msgid "The alias \"%(alias_name)s\" does not exist."

5983

5965

msgstr ""

5984

5966

5985

#: bzrlib/errors.py:3007

5967

#: bzrlib/errors.py:2988

5986

5968

msgid "\"%(alias_name)s\" is not a valid location alias."

5987

5969

msgstr ""

5988

5970

5989

#: bzrlib/errors.py:3015

5971

#: bzrlib/errors.py:2996

5990

5972

msgid "No %(alias_name)s location assigned."

5991

5973

msgstr ""

5992

5974

5993

#: bzrlib/errors.py:3023

5975

#: bzrlib/errors.py:3004

5994

5976

msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."

5995

5977

msgstr ""

5996

5978

5997

#: bzrlib/errors.py:3033

5979

#: bzrlib/errors.py:3014

5998

5980

msgid "Unknown rules detected: %(unknowns_str)s."

5999

5981

msgstr ""

6000

5982

6001

#: bzrlib/errors.py:3044

5983

#: bzrlib/errors.py:3025

6002

5984

msgid "Tip change rejected: %(msg)s"

6003

5985

msgstr ""

6004

5986

6005

#: bzrlib/errors.py:3052

5987

#: bzrlib/errors.py:3033

6006

5988

msgid "Shelf corrupt."

6007

5989

msgstr ""

6008

5990

6009

#: bzrlib/errors.py:3057

5991

#: bzrlib/errors.py:3038

6010

5992

msgid "Corruption while decompressing repository file%(orig_error)s"

6011

5993

msgstr ""

6012

5994

6013

#: bzrlib/errors.py:3069

5995

#: bzrlib/errors.py:3050

6014

5996

msgid "No changes are shelved with id \"%(shelf_id)d\"."

6015

5997

msgstr ""

6016

5998

6017

#: bzrlib/errors.py:3077

5999

#: bzrlib/errors.py:3058

6018

6000

msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."

6019

6001

msgstr ""

6020

6002

6021

#: bzrlib/errors.py:3085

6003

#: bzrlib/errors.py:3066

6022

6004

msgid ""

6023

6005

"An attempt to access a url outside the server jail was made: '%(url)s'."

6024

6006

msgstr ""

6025

6007

6026

#: bzrlib/errors.py:3093

6008

#: bzrlib/errors.py:3074

6027

6009

msgid "The user aborted the operation."

6028

6010

msgstr ""

6029

6011

6030

#: bzrlib/errors.py:3098

6012

#: bzrlib/errors.py:3079

6031

6013

msgid "Branching '%(url)s'(%(format)s) must create a working tree."

6032

6014

msgstr ""

6033

6015

6034

#: bzrlib/errors.py:3108

6016

#: bzrlib/errors.py:3089

6035

6017

msgid "No such view: %(view_name)s."

6036

6018

msgstr ""

6037

6019

6038

#: bzrlib/errors.py:3118

6020

#: bzrlib/errors.py:3099

6039

6021

msgid ""

6040

6022

"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "

6041

6023

"to a later format."

6042

6024

msgstr ""

6043

6025

6044

#: bzrlib/errors.py:3127

6026

#: bzrlib/errors.py:3108

6045

6027

msgid ""

6046

6028

"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"

6047

6029

msgstr ""

6048

6030

6049

#: bzrlib/errors.py:3194

6031

#: bzrlib/errors.py:3175

6050

6032

msgid "%(bzrdir)r does not support co-located branches."

6051

6033

msgstr ""

6052

6034

6053

#: bzrlib/errors.py:3200

6035

#: bzrlib/errors.py:3181

6054

6036

msgid ""

6055

6037

"Unable to determine your name.\n"

6056

6038

"Please, set your name with the 'whoami' command.\n"

6057

6039

"E.g. bzr whoami \"Your Name <name@example.com>\""

6058

6040

msgstr ""

6059

6041

6060

#: bzrlib/errors.py:3209

6042

#: bzrlib/errors.py:3190

6061

6043

msgid "Invalid pattern(s) found. %(msg)s"

6062

6044

msgstr ""

6063

6045

6064

#: bzrlib/errors.py:3217

6046

#: bzrlib/errors.py:3198

6065

6047

msgid ""

6066

6048

"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "

6067

6049

"unbind` to fix."

6068

6050

msgstr ""

6069

6051

6070

#: bzrlib/errors.py:3228

6052

#: bzrlib/errors.py:3209

6071

6053

msgid "Loop involving %(refs)r while expanding \"%(string)s\"."

6072

6054

msgstr ""

6073

6055

6074

#: bzrlib/errors.py:3237

6056

#: bzrlib/errors.py:3218

6075

6057

msgid "Option %(name)s is not defined while expanding \"%(string)s\"."

6076

6058

msgstr ""

6077

6059

6078

#: bzrlib/errors.py:3246

6060

#: bzrlib/errors.py:3227

6079

6061

msgid ""

6080

6062

"No compatible object available for operations from %(source)r to %(target)r."

6081

6063

msgstr ""

6082

6064

6083

#: bzrlib/errors.py:3256

6065

#: bzrlib/errors.py:3237

6084

6066

msgid ""

6085

6067

"VFS requests over the smart server are not allowed. Encountered: %(method)s, "

6086

6068

"%(arguments)s."

6087

6069

msgstr ""

6088

6070

6089

#: bzrlib/errors.py:3266

6071

#: bzrlib/errors.py:3247

6090

6072

msgid ""

6091

6073

"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "

6092

6074

"format %(format)r"

6093

6075

msgstr ""

6094

6076

6095

#: bzrlib/errors.py:3278

6077

#: bzrlib/errors.py:3259

6096

6078

msgid ""

6097

6079

"Missing feature %(feature)s not provided by this version of Bazaar or any "

6098

6080

"plugin."

6099

6081

msgstr ""

6100

6082

6101

#: bzrlib/errors.py:3291

6083

#: bzrlib/errors.py:3272

6102

6084

msgid "Binary files section encountered."

6103

6085

msgstr ""

6104

6086

6105

#: bzrlib/errors.py:3299

6087

#: bzrlib/errors.py:3280

6106

6088

msgid ""

6107

6089

"Malformed patch header. %(desc)s\n"

6108

6090

"%(line)r"

6109

6091

msgstr ""

6110

6092

6111

#: bzrlib/errors.py:3308

6093

#: bzrlib/errors.py:3289

6112

6094

msgid ""

6113

6095

"Malformed hunk header. %(desc)s\n"

6114

6096

"%(line)r"

6115

6097

msgstr ""

6116

6098

6117

#: bzrlib/errors.py:3317

6099

#: bzrlib/errors.py:3298

6118

6100

msgid ""

6119

6101

"Malformed line. %(desc)s\n"

6120

6102

"%(line)r"

6121

6103

msgstr ""

6122

6104

6123

#: bzrlib/errors.py:3327

6105

#: bzrlib/errors.py:3308

6124

6106

msgid ""

6125

6107

"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "

6126

6108

"but patch says it should be \"%(patch_line)s\""

6127

6109

msgstr ""

6128

6110

6129

#: bzrlib/errors.py:3338

6111

#: bzrlib/errors.py:3319

6130

6112

msgid "The feature %(feature)s has already been registered."

6131

6113

msgstr ""

6132

6114

6456

6438

msgid "lstat/stat of ({0!r}): {1!r}"

6457

6439

msgstr ""

6458

6440

6459

#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019

6441

#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008

6460

6442

#, python-format

6461

6443

msgid "sorry, %r not allowed in path"

6462

6444

msgstr ""

6463

6445

6464

#: bzrlib/osutils.py:1237

6446

#: bzrlib/osutils.py:1226

6465

6447

#, python-format

6466

6448

msgid "%r is too short to calculate a relative path"

6467

6449

msgstr ""

6905

6887

msgid "Created new branch."

6906

6888

msgstr ""

6907

6889

6908

#: bzrlib/push.py:97

6890

#: bzrlib/push.py:98

6909

6891

#, python-format

6910

6892

msgid ""

6911

6893

"Target directory %s already contains a .bzr directory, but it is not valid."

7032

7014

msgid "%s is now not stacked\n"

7033

7015

msgstr ""

7034

7016

7035

#: bzrlib/remote.py:1228 bzrlib/repository.py:289

7017

#: bzrlib/remote.py:1180 bzrlib/repository.py:289

7036

7018

#, python-format

7037

7019

msgid "bzr: ERROR (ignored): %s"

7038

7020

msgstr ""

7039

7021

7040

#: bzrlib/remote.py:2541

7022

#: bzrlib/remote.py:2493

7041

7023

msgid "Copying repository content as tarball..."

7042

7024

msgstr ""

7043

7025

7252

7234

msgid "listening on port: %s"

7253

7235

msgstr ""

7254

7236

7255

#: bzrlib/switch.py:73

7237

#: bzrlib/switch.py:69

7256

7238

msgid "Pending merges must be committed or reverted before using switch."

7257

7239

msgstr ""

7258

7240

7259

#: bzrlib/switch.py:100

7241

#: bzrlib/switch.py:96

7260

7242

msgid ""

7261

7243

"Cannot switch as local commits found in the checkout. Commit these to the "

7262

7244

"bound branch or use --force to throw them away."

7263

7245

msgstr ""

7264

7246

7265

#: bzrlib/switch.py:105

7247

#: bzrlib/switch.py:101

7266

7248

#, python-format

7267

7249

msgid ""

7268

7250

"Unable to connect to current master branch %(target)s: %(error)s To switch "

7269

7251

"anyway, use --force."

7270

7252

msgstr ""

7271

7253

7272

#: bzrlib/switch.py:125

7254

#: bzrlib/switch.py:110

7273

7255

msgid "Cannot switch a branch, only a checkout."

7274

7256

msgstr ""

7275

7257

7276

#: bzrlib/switch.py:163

7258

#: bzrlib/switch.py:146

7277

7259

#, python-format

7278

7260

msgid "Tree is up to date at revision %d."

7279

7261

msgstr ""

7280

7262

7281

#: bzrlib/switch.py:169

7263

#: bzrlib/switch.py:152

7282

7264

#, python-format

7283

7265

msgid "Updated to revision %d."

7284

7266

msgstr ""

7285

7267

7286

#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747

7268

#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743

7287

7269

msgid "Apply phase"

7288

7270

msgstr ""

7289

7271

7290

#: bzrlib/transform.py:1773 bzrlib/transform.py:1841

7272

#: bzrlib/transform.py:1769 bzrlib/transform.py:1837

7291

7273

msgid "removing file"

7292

7274

msgstr ""

7293

7275

7294

#: bzrlib/transform.py:1791 bzrlib/transform.py:1876

7276

#: bzrlib/transform.py:1787 bzrlib/transform.py:1872

7295

7277

msgid "adding file"

7296

7278

msgstr ""

7297

7279

7298

#: bzrlib/transform.py:2591

7280

#: bzrlib/transform.py:2587

7299

7281

msgid "Building tree"

7300

7282

msgstr ""

7301

7283

7302

#: bzrlib/transform.py:2681 bzrlib/transform.py:2708

7284

#: bzrlib/transform.py:2677 bzrlib/transform.py:2704

7303

7285

msgid "Adding file contents"

7304

7286

msgstr ""

7305

7287

7306

#: bzrlib/transform.py:3028

7288

#: bzrlib/transform.py:3024

7307

7289

msgid "Resolution pass"

7308

7290

msgstr ""

7309

7291

7452

7434

7453

7435

#: dummy/help_topics/basic/detail.txt:1

7454

7436

msgid ""

7455

"Bazaar 2.5b6 -- a free distributed version-control tool\n"

7437

"Bazaar 2.5b5 -- a free distributed version-control tool\n"

7456

7438

"http://bazaar.canonical.com/"

7457

7439

msgstr ""

7458

7440

11718

11700

"~~~~~~~~~~~~~~~~~~~~~~"

11719

11701

msgstr ""

11720

11702

11721

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418

11703

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402

11722

11704

msgid "Introduced in: 1.4"

11723

11705

msgstr ""

11724

11706

11910

11892

msgstr ""

11911

11893

11912

11894

#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196

11913

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464

11895

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448

11914

11896

msgid "Introduced in: 1.17"

11915

11897

msgstr ""

11916

11898

11966

11948

#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226

11967

11949

#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241

11968

11950

#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370

11969

#: en/help_topics/hooks.txt:443

11951

#: en/help_topics/hooks.txt:427

11970

11952

msgid "Introduced in: 2.4"

11971

11953

msgstr ""

11972

11954

12067

12049

msgstr ""

12068

12050

12069

12051

#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297

12070

#: en/help_topics/hooks.txt:521

12052

#: en/help_topics/hooks.txt:505

12071

12053

msgid "Introduced in: 1.15"

12072

12054

msgstr ""

12073

12055

12149

12131

msgstr ""

12150

12132

12151

12133

#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334

12152

#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402

12153

#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509

12134

#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493

12154

12135

msgid "Introduced in: 2.5"

12155

12136

msgstr ""

12156

12137

12269

12250

12270

12251

#: en/help_topics/hooks.txt:399

12271

12252

msgid ""

12272

"post_transform\n"

12273

"~~~~~~~~~~~~~~"

12253

"start_commit\n"

12254

"~~~~~~~~~~~~"

12274

12255

msgstr ""

12275

12256

12276

12257

#: en/help_topics/hooks.txt:404

12277

12258

msgid ""

12278

"Called after a tree transform has been performed on a tree. The hook\n"

12279

"is called with the tree that is being transformed and the transform."

12280

msgstr ""

12281

12282

#: en/help_topics/hooks.txt:407

12283

msgid ""

12284

"pre_transform\n"

12285

"~~~~~~~~~~~~~"

12286

msgstr ""

12287

12288

#: en/help_topics/hooks.txt:412

12289

msgid ""

12290

"Called before a tree transform on this tree. The hook is called with\n"

12291

"the tree that is being transformed and the transform."

12292

msgstr ""

12293

12294

#: en/help_topics/hooks.txt:415

12295

msgid ""

12296

"start_commit\n"

12297

"~~~~~~~~~~~~"

12298

msgstr ""

12299

12300

#: en/help_topics/hooks.txt:420

12301

msgid ""

12302

12259

"Called before a commit is performed on a tree. The start commit hook\n"

12303

12260

"is able to change the tree before the commit takes place. start_commit\n"

12304

12261

"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"

12305

12262

"being performed on."

12306

12263

msgstr ""

12307

12264

12308

#: en/help_topics/hooks.txt:425

12265

#: en/help_topics/hooks.txt:409

12309

12266

msgid ""

12310

12267

"SmartClientHooks\n"

12311

12268

"----------------"

12312

12269

msgstr ""

12313

12270

12314

#: en/help_topics/hooks.txt:428

12271

#: en/help_topics/hooks.txt:412

12315

12272

msgid ""

12316

12273

"call\n"

12317

12274

"~~~~"

12318

12275

msgstr ""

12319

12276

12320

#: en/help_topics/hooks.txt:431

12277

#: en/help_topics/hooks.txt:415

12321

12278

msgid "Introduced in: unknown"

12322

12279

msgstr ""

12323

12280

12324

#: en/help_topics/hooks.txt:433

12281

#: en/help_topics/hooks.txt:417

12325

12282

msgid ""

12326

12283

"Called when the smart client is submitting a request to the smart\n"

12327

12284

"server. Called with a bzrlib.smart.client.CallHookParams object.\n"

12328

12285

"Streaming request bodies, and responses, are not accessible."

12329

12286

msgstr ""

12330

12287

12331

#: en/help_topics/hooks.txt:437

12288

#: en/help_topics/hooks.txt:421

12332

12289

msgid ""

12333

12290

"SmartServerHooks\n"

12334

12291

"----------------"

12335

12292

msgstr ""

12336

12293

12337

#: en/help_topics/hooks.txt:440

12294

#: en/help_topics/hooks.txt:424

12338

12295

msgid ""

12339

12296

"server_exception\n"

12340

12297

"~~~~~~~~~~~~~~~~"

12341

12298

msgstr ""

12342

12299

12343

#: en/help_topics/hooks.txt:445

12300

#: en/help_topics/hooks.txt:429

12344

12301

msgid ""

12345

12302

"Called by the bzr server when an exception occurs. server_exception is\n"

12346

12303

"called with the sys.exc_info() tuple return true for the hook if the\n"

12348

12305

"normally."

12349

12306

msgstr ""

12350

12307

12351

#: en/help_topics/hooks.txt:450

12308

#: en/help_topics/hooks.txt:434

12352

12309

msgid ""

12353

12310

"server_started\n"

12354

12311

"~~~~~~~~~~~~~~"

12355

12312

msgstr ""

12356

12313

12357

#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472

12314

#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456

12358

12315

msgid "Introduced in: 0.16"

12359

12316

msgstr ""

12360

12317

12361

#: en/help_topics/hooks.txt:455

12318

#: en/help_topics/hooks.txt:439

12362

12319

msgid ""

12363

12320

"Called by the bzr server when it starts serving a directory.\n"

12364

12321

"server_started is called with (backing urls, public url), where\n"

12367

12324

"served."

12368

12325

msgstr ""

12369

12326

12370

#: en/help_topics/hooks.txt:461

12327

#: en/help_topics/hooks.txt:445

12371

12328

msgid ""

12372

12329

"server_started_ex\n"

12373

12330

"~~~~~~~~~~~~~~~~~"

12374

12331

msgstr ""

12375

12332

12376

#: en/help_topics/hooks.txt:466

12333

#: en/help_topics/hooks.txt:450

12377

12334

msgid ""

12378

12335

"Called by the bzr server when it starts serving a directory.\n"

12379

12336

"server_started is called with (backing_urls, server_obj)."

12380

12337

msgstr ""

12381

12338

12382

#: en/help_topics/hooks.txt:469

12339

#: en/help_topics/hooks.txt:453

12383

12340

msgid ""

12384

12341

"server_stopped\n"

12385

12342

"~~~~~~~~~~~~~~"

12386

12343

msgstr ""

12387

12344

12388

#: en/help_topics/hooks.txt:474

12345

#: en/help_topics/hooks.txt:458

12389

12346

msgid ""

12390

12347

"Called by the bzr server when it stops serving a directory.\n"

12391

12348

"server_stopped is called with the same parameters as the\n"

12392

12349

"server_started hook: (backing_urls, public_url)."

12393

12350

msgstr ""

12394

12351

12395

#: en/help_topics/hooks.txt:478

12352

#: en/help_topics/hooks.txt:462

12396

12353

msgid ""

12397

12354

"StatusHooks\n"

12398

12355

"-----------"

12399

12356

msgstr ""

12400

12357

12401

#: en/help_topics/hooks.txt:481

12358

#: en/help_topics/hooks.txt:465

12402

12359

msgid ""

12403

12360

"post_status\n"

12404

12361

"~~~~~~~~~~~"

12405

12362

msgstr ""

12406

12363

12407

#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495

12364

#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479

12408

12365

msgid "Introduced in: 2.3"

12409

12366

msgstr ""

12410

12367

12411

#: en/help_topics/hooks.txt:486

12368

#: en/help_topics/hooks.txt:470

12412

12369

msgid ""

12413

12370

"Called with argument StatusHookParams after Bazaar has displayed the\n"

12414

12371

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12417

12374

"status command. to_file is the output stream for writing."

12418

12375

msgstr ""

12419

12376

12420

#: en/help_topics/hooks.txt:492

12377

#: en/help_topics/hooks.txt:476

12421

12378

msgid ""

12422

12379

"pre_status\n"

12423

12380

"~~~~~~~~~~"

12424

12381

msgstr ""

12425

12382

12426

#: en/help_topics/hooks.txt:497

12383

#: en/help_topics/hooks.txt:481

12427

12384

msgid ""

12428

12385

"Called with argument StatusHookParams before Bazaar displays the\n"

12429

12386

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12432

12389

"status command. to_file is the output stream for writing."

12433

12390

msgstr ""

12434

12391

12435

#: en/help_topics/hooks.txt:503

12392

#: en/help_topics/hooks.txt:487

12436

12393

msgid ""

12437

12394

"TransportHooks\n"

12438

12395

"--------------"

12439

12396

msgstr ""

12440

12397

12441

#: en/help_topics/hooks.txt:506

12398

#: en/help_topics/hooks.txt:490

12442

12399

msgid ""

12443

12400

"post_connect\n"

12444

12401

"~~~~~~~~~~~~"

12445

12402

msgstr ""

12446

12403

12447

#: en/help_topics/hooks.txt:511

12404

#: en/help_topics/hooks.txt:495

12448

12405

msgid ""

12449

12406

"Called after a new connection is established or a reconnect occurs.\n"

12450

12407

"The sole argument passed is either the connected transport or smart\n"

12451

12408

"medium instance."

12452

12409

msgstr ""

12453

12410

12454

#: en/help_topics/hooks.txt:515

12411

#: en/help_topics/hooks.txt:499

12455

12412

msgid ""

12456

12413

"RioVersionInfoBuilderHooks\n"

12457

12414

"--------------------------"

12458

12415

msgstr ""

12459

12416

12460

#: en/help_topics/hooks.txt:518

12417

#: en/help_topics/hooks.txt:502

12461

12418

msgid ""

12462

12419

"revision\n"

12463

12420

"~~~~~~~~"

12464

12421

msgstr ""

12465

12422

12466

#: en/help_topics/hooks.txt:523

12423

#: en/help_topics/hooks.txt:507

12467

12424

msgid ""

12468

12425

"Invoked when adding information about a revision to the RIO stanza\n"

12469

12426

"that is printed. revision is called with a revision object and a RIO\n"