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

8

msgstr ""

9

"Project-Id-Version: bzr\n"

10

"Report-Msgid-Bugs-To: <bazaar@canonical.com>\n"

11

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

11

"POT-Creation-Date: 2013-07-27 12:45+0200\n"

12

"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13

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

14

"Language-Team: LANGUAGE <LL@li.org>\n"

18

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

19

"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"

20

21

#: bzrlib/add.py:95

21

#: bzrlib/add.py:93

22

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

23

msgstr ""

24

26

msgid "Unstacking"

27

msgstr ""

28

29

#: bzrlib/branch.py:3183

29

#: bzrlib/branch.py:3012

30

#, python-format

31

msgid "Pushed up to revision %d."

32

msgstr ""

33

34

#: bzrlib/branch.py:3185

34

#: bzrlib/branch.py:3014

35

#, python-format

36

msgid "%d tag updated."

37

msgid_plural "%d tags updated."

38

msgstr[0] ""

39

msgstr[1] ""

40

41

#: bzrlib/branch.py:3188

41

#: bzrlib/branch.py:3017

42

msgid "No new revisions or tags to push."

43

msgstr ""

44

45

#: bzrlib/branch.py:3190

45

#: bzrlib/branch.py:3019

46

msgid "No new revisions to push."

47

msgstr ""

48

49

#: bzrlib/branch.py:3210

49

#: bzrlib/branch.py:3039

50

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

51

msgstr ""

52

53

#: bzrlib/branch.py:3213

53

#: bzrlib/branch.py:3042

54

#, python-format

55

msgid "found error:%s"

56

msgstr ""

57

58

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

58

#: bzrlib/builtins.py:251 bzrlib/builtins.py:3043 bzrlib/workingtree.py:324

59

#, python-format

60

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

61

msgstr ""

62

63

#: bzrlib/builtins.py:130

63

#: bzrlib/builtins.py:260

64

#, python-format

65

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

66

msgstr ""

67

68

#: bzrlib/builtins.py:215

68

#: bzrlib/builtins.py:315

69

msgid "Display status summary."

70

msgstr ""

71

72

#: bzrlib/builtins.py:217

72

#: bzrlib/builtins.py:317

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

78

#: bzrlib/builtins.py:320

79

msgid ""

80

"added\n"

81

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

82

msgstr ""

83

84

#: bzrlib/builtins.py:223

84

#: bzrlib/builtins.py:323

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

91

#: bzrlib/builtins.py:327

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

99

#: bzrlib/builtins.py:332

100

msgid ""

101

"modified\n"

102

" Text has changed since the previous revision."

103

msgstr ""

104

105

#: bzrlib/builtins.py:235

105

#: bzrlib/builtins.py:335

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

111

#: bzrlib/builtins.py:338

112

msgid ""

113

"unknown\n"

114

" Not versioned and not matching an ignore pattern."

115

msgstr ""

116

117

#: bzrlib/builtins.py:241

117

#: bzrlib/builtins.py:341

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

125

#: bzrlib/builtins.py:346

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

131

#: bzrlib/builtins.py:349

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

138

#: bzrlib/builtins.py:353

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

146

#: bzrlib/builtins.py:358

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

154

#: bzrlib/builtins.py:363

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

160

#: bzrlib/builtins.py:366

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"

165

msgstr ""

166

167

# help of 'short' option of 'status' command

168

#: bzrlib/builtins.py:275

168

#: bzrlib/builtins.py:375

169

msgid "Use short status indicators."

170

msgstr ""

171

172

# help of 'versioned' option of 'status' command

173

#: bzrlib/builtins.py:277

173

#: bzrlib/builtins.py:377

174

msgid "Only show versioned files."

175

msgstr ""

176

177

# help of 'no-pending' option of 'status' command

178

#: bzrlib/builtins.py:279

178

#: bzrlib/builtins.py:379

179

msgid "Don't show pending merges."

180

msgstr ""

181

182

# help of 'no-classify' option of 'status' command

183

#: bzrlib/builtins.py:282

183

#: bzrlib/builtins.py:382

184

msgid "Do not mark object type using indicator."

185

msgstr ""

186

187

#: bzrlib/builtins.py:297

187

#: bzrlib/builtins.py:397

188

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

189

msgstr ""

190

191

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

191

#: bzrlib/builtins.py:441 bzrlib/builtins.py:5229

192

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

193

msgstr ""

194

195

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

195

#: bzrlib/builtins.py:444 bzrlib/builtins.py:5231

196

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

197

msgstr ""

198

199

#: bzrlib/builtins.py:351

199

#: bzrlib/builtins.py:451

200

#, python-format

201

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

202

msgstr ""

203

204

#: bzrlib/builtins.py:362

204

#: bzrlib/builtins.py:462

205

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

206

msgstr ""

207

208

#: bzrlib/builtins.py:369

208

#: bzrlib/builtins.py:469

209

msgid "You cannot specify a NULL revision."

210

msgstr ""

211

212

#: bzrlib/builtins.py:461

212

#: bzrlib/builtins.py:561

213

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

214

msgstr ""

215

216

#: bzrlib/builtins.py:463

216

#: bzrlib/builtins.py:563

217

msgid ""

218

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

219

"this will refuse to run against one."

220

msgstr ""

221

222

#: bzrlib/builtins.py:466

222

#: bzrlib/builtins.py:566

223

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

224

msgstr ""

225

226

# help of 'force' option of 'remove-tree' command

227

#: bzrlib/builtins.py:472

227

#: bzrlib/builtins.py:572

228

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

229

msgstr ""

230

231

#: bzrlib/builtins.py:486

231

#: bzrlib/builtins.py:586

232

msgid "No working tree to remove"

233

msgstr ""

234

235

#: bzrlib/builtins.py:488

235

#: bzrlib/builtins.py:588

236

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

237

msgstr ""

238

239

#: bzrlib/builtins.py:497

239

#: bzrlib/builtins.py:597

240

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

241

msgstr ""

242

243

#: bzrlib/builtins.py:537

243

#: bzrlib/builtins.py:637

244

msgid ""

245

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

246

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

247

msgstr ""

248

249

#: bzrlib/builtins.py:548

249

#: bzrlib/builtins.py:648

250

msgid ""

251

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

252

"commit"

253

msgstr ""

254

255

#: bzrlib/builtins.py:552

255

#: bzrlib/builtins.py:652

256

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

257

msgstr ""

258

259

#: bzrlib/builtins.py:556

259

#: bzrlib/builtins.py:656

260

msgid "Show current revision number."

261

msgstr ""

262

263

#: bzrlib/builtins.py:558

263

#: bzrlib/builtins.py:658

264

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

265

msgstr ""

266

267

#: bzrlib/builtins.py:571

267

#: bzrlib/builtins.py:671

268

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

269

msgstr ""

270

271

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

272

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

271

#: bzrlib/builtins.py:688

272

msgid "Revision numbers only make sense for single revisions, not ranges"

273

msgstr ""

274

275

# help of 'tree' option of 'revno' command

276

#: bzrlib/builtins.py:612

276

#: bzrlib/builtins.py:712

277

msgid "Show revno of working tree."

278

msgstr ""

279

280

#: bzrlib/builtins.py:660

280

#: bzrlib/builtins.py:760

281

msgid "Add specified files or directories."

282

msgstr ""

283

284

#: bzrlib/builtins.py:662

284

#: bzrlib/builtins.py:762

285

msgid ""

286

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

287

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

288

"any of the named files are already versioned."

289

msgstr ""

290

291

#: bzrlib/builtins.py:666

291

#: bzrlib/builtins.py:766

292

msgid ""

293

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

294

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

299

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

300

msgstr ""

301

302

#: bzrlib/builtins.py:674

302

#: bzrlib/builtins.py:774

303

msgid ""

304

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

305

"unless they are explicitly ignored."

306

msgstr ""

307

308

#: bzrlib/builtins.py:677

308

#: bzrlib/builtins.py:777

309

msgid ""

310

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

311

"are currently unknown."

312

msgstr ""

313

314

#: bzrlib/builtins.py:680

314

#: bzrlib/builtins.py:780

315

msgid ""

316

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

317

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

319

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

320

msgstr ""

321

322

#: bzrlib/builtins.py:685

322

#: bzrlib/builtins.py:785

323

msgid ""

324

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

325

"add them."

326

msgstr ""

327

328

#: bzrlib/builtins.py:688

328

#: bzrlib/builtins.py:788

329

msgid ""

330

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

331

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

336

"into a subdirectory of this one."

337

msgstr ""

338

339

#: bzrlib/builtins.py:696

339

#: bzrlib/builtins.py:796

340

msgid ""

341

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

342

"unless they are explicitly mentioned."

343

msgstr ""

344

345

#: bzrlib/builtins.py:699

345

#: bzrlib/builtins.py:799

346

msgid ""

347

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

348

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

350

msgstr ""

351

352

# help of 'no-recurse' option of 'add' command

353

#: bzrlib/builtins.py:706

353

#: bzrlib/builtins.py:806

354

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

355

msgstr ""

356

357

# help of 'file-ids-from' option of 'add' command

358

#: bzrlib/builtins.py:712

358

#: bzrlib/builtins.py:813

359

msgid "Lookup file ids from this tree."

360

msgstr ""

361

362

#: bzrlib/builtins.py:748

362

#: bzrlib/builtins.py:849

363

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

364

msgstr ""

365

366

#: bzrlib/builtins.py:753

366

#: bzrlib/builtins.py:854

367

msgid "Create a new versioned directory."

368

msgstr ""

369

370

#: bzrlib/builtins.py:755

370

#: bzrlib/builtins.py:856

371

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

372

msgstr ""

373

374

# help of 'parents' option of 'mkdir' command

375

#: bzrlib/builtins.py:762

375

#: bzrlib/builtins.py:863

376

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

377

msgstr ""

378

379

#: bzrlib/builtins.py:796

379

#: bzrlib/builtins.py:897

380

#, python-format

381

msgid "added %s\n"

382

msgstr ""

383

384

#: bzrlib/builtins.py:838

384

#: bzrlib/builtins.py:939

385

#, python-format

386

msgid "invalid kind %r specified"

387

msgstr ""

388

389

#: bzrlib/builtins.py:875

389

#: bzrlib/builtins.py:976

390

msgid "Move or rename a file."

391

msgstr ""

392

393

#: bzrlib/builtins.py:877

393

#: bzrlib/builtins.py:978

394

msgid " bzr mv SOURCE... DESTINATION"

395

msgstr ""

396

397

#: bzrlib/builtins.py:879

397

#: bzrlib/builtins.py:980

398

msgid ""

399

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

400

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

401

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

402

msgstr ""

403

404

#: bzrlib/builtins.py:883

404

#: bzrlib/builtins.py:984

405

msgid ""

406

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

407

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

410

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

411

msgstr ""

412

413

#: bzrlib/builtins.py:889

413

#: bzrlib/builtins.py:990

414

msgid "Files cannot be moved between branches."

415

msgstr ""

416

417

# help of 'after' option of 'mv' command

418

#: bzrlib/builtins.py:896

418

#: bzrlib/builtins.py:997

419

msgid ""

420

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

421

"moved."

422

msgstr ""

423

424

# help of 'auto' option of 'mv' command

425

#: bzrlib/builtins.py:898

425

#: bzrlib/builtins.py:999

426

msgid "Automatically guess renames."

427

msgstr ""

428

429

# help of 'dry-run' option of 'mv' command

430

#: bzrlib/builtins.py:899

430

#: bzrlib/builtins.py:1000

431

msgid "Avoid making changes when guessing renames."

432

msgstr ""

433

434

#: bzrlib/builtins.py:908

434

#: bzrlib/builtins.py:1009

435

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

436

msgstr ""

437

438

#: bzrlib/builtins.py:912

438

#: bzrlib/builtins.py:1013

439

msgid "missing file argument"

440

msgstr ""

441

442

#: bzrlib/builtins.py:916

442

#: bzrlib/builtins.py:1017

443

msgid "can not move root of branch"

444

msgstr ""

445

446

#: bzrlib/builtins.py:922

446

#: bzrlib/builtins.py:1023

447

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

448

msgstr ""

449

450

#: bzrlib/builtins.py:925

450

#: bzrlib/builtins.py:1026

451

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

452

msgstr ""

453

454

#: bzrlib/builtins.py:962

454

#: bzrlib/builtins.py:1062

455

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

456

msgstr ""

457

458

#: bzrlib/builtins.py:1014

458

#: bzrlib/builtins.py:1114

459

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

460

msgstr ""

461

462

#: bzrlib/builtins.py:1016

462

#: bzrlib/builtins.py:1116

463

msgid ""

464

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

465

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

467

"parent."

468

msgstr ""

469

470

#: bzrlib/builtins.py:1021

470

#: bzrlib/builtins.py:1121

471

msgid ""

472

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

473

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

474

"be able to pull it again."

475

msgstr ""

476

477

#: bzrlib/builtins.py:1025

477

#: bzrlib/builtins.py:1125

478

msgid ""

479

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

480

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

481

"branches have diverged."

482

msgstr ""

483

484

#: bzrlib/builtins.py:1029

484

#: bzrlib/builtins.py:1129

485

msgid ""

486

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

487

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

489

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

490

msgstr ""

491

492

#: bzrlib/builtins.py:1034

492

#: bzrlib/builtins.py:1134

493

msgid ""

494

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

495

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

496

"-Olog_format=<other_format>."

497

msgstr ""

498

499

#: bzrlib/builtins.py:1038

499

#: bzrlib/builtins.py:1138

500

msgid ""

501

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

502

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

504

msgstr ""

505

506

# help of 'verbose' option of 'pull' command

507

#: bzrlib/builtins.py:1046

507

#: bzrlib/builtins.py:1146

508

msgid "Show logs of pulled revisions."

509

msgstr ""

510

511

# help of 'directory' option of 'pull' command

512

#: bzrlib/builtins.py:1048

512

#: bzrlib/builtins.py:1148

513

msgid ""

514

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

515

msgstr ""

516

517

# help of 'local' option of 'pull' command

518

#: bzrlib/builtins.py:1051

518

#: bzrlib/builtins.py:1151

519

msgid ""

520

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

521

"master branch."

522

msgstr ""

523

524

#: bzrlib/builtins.py:1080

525

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

524

#: bzrlib/builtins.py:1188

525

msgid "No working tree, ignoring --show-base"

526

msgstr ""

527

528

#: bzrlib/builtins.py:1096

528

#: bzrlib/builtins.py:1204

529

msgid "No pull location known or specified."

530

msgstr ""

531

532

#: bzrlib/builtins.py:1102

532

#: bzrlib/builtins.py:1210

533

#, python-format

534

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

535

msgstr ""

536

537

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

537

#: bzrlib/builtins.py:1217 bzrlib/builtins.py:4423

538

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

539

msgstr ""

540

541

#: bzrlib/builtins.py:1150

541

#: bzrlib/builtins.py:1260

542

msgid "Update a mirror of this branch."

543

msgstr ""

544

545

#: bzrlib/builtins.py:1152

545

#: bzrlib/builtins.py:1262

546

msgid ""

547

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

548

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

549

msgstr ""

550

551

#: bzrlib/builtins.py:1155

551

#: bzrlib/builtins.py:1265

552

msgid ""

553

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

554

"the future."

555

msgstr ""

556

557

#: bzrlib/builtins.py:1158

557

#: bzrlib/builtins.py:1268

558

msgid ""

559

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

560

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

561

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

562

msgstr ""

563

564

#: bzrlib/builtins.py:1162

564

#: bzrlib/builtins.py:1272

565

msgid ""

566

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

567

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

568

msgstr ""

569

570

#: bzrlib/builtins.py:1165

570

#: bzrlib/builtins.py:1275

571

msgid ""

572

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

573

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

574

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

575

msgstr ""

576

577

#: bzrlib/builtins.py:1169

577

#: bzrlib/builtins.py:1279

578

msgid ""

579

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

580

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

582

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

583

msgstr ""

584

585

#: bzrlib/builtins.py:1174

585

#: bzrlib/builtins.py:1284

586

msgid ""

587

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

588

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

591

592

# help of 'directory' option of 'dpush' command

593

# help of 'directory' option of 'push' command

594

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

594

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

595

msgid ""

596

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

597

msgstr ""

598

599

# help of 'use-existing-dir' option of 'push' command

600

#: bzrlib/builtins.py:1188

600

#: bzrlib/builtins.py:1298

601

msgid ""

602

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

603

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

604

msgstr ""

605

606

# help of 'stacked' option of 'push' command

607

#: bzrlib/builtins.py:1193

607

#: bzrlib/builtins.py:1303

608

msgid ""

609

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

610

"branch."

611

msgstr ""

612

613

# help of 'stacked-on' option of 'push' command

614

#: bzrlib/builtins.py:1196

614

#: bzrlib/builtins.py:1306

615

msgid ""

616

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

617

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

620

621

# help of 'strict' option of 'dpush' command

622

# help of 'strict' option of 'push' command

623

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

623

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

624

msgid ""

625

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

626

"strict disables the check."

627

msgstr ""

628

629

# help of 'no-tree' option of 'push' command

630

#: bzrlib/builtins.py:1204

630

#: bzrlib/builtins.py:1314

631

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

632

msgstr ""

633

634

#: bzrlib/builtins.py:1248

634

# help of 'overwrite-tags' option of 'pull' command

635

# help of 'overwrite-tags' option of 'push' command

636

#: bzrlib/builtins.py:1317

637

msgid "Overwrite tags only."

638

msgstr ""

639

640

#: bzrlib/builtins.py:1368

635

641

msgid "Could not determine branch to refer to."

636

642

msgstr ""

637

643

638

#: bzrlib/builtins.py:1257

644

#: bzrlib/builtins.py:1377

639

645

#, python-format

640

646

msgid ""

641

647

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

642

648

"use 'bzr push :parent'."

643

649

msgstr ""

644

650

645

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

651

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

646

652

msgid "No push location known or specified."

647

653

msgstr ""

648

654

649

#: bzrlib/builtins.py:1267

655

#: bzrlib/builtins.py:1387

650

656

#, python-format

651

657

msgid "Using saved push location: %s"

652

658

msgstr ""

653

659

654

#: bzrlib/builtins.py:1277

660

#: bzrlib/builtins.py:1397

655

661

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

656

662

msgstr ""

657

663

658

#: bzrlib/builtins.py:1279

664

#: bzrlib/builtins.py:1399

659

665

msgid ""

660

666

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

661

667

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

666

672

"create ./foo-bar."

667

673

msgstr ""

668

674

669

#: bzrlib/builtins.py:1286

675

#: bzrlib/builtins.py:1406

670

676

msgid ""

671

677

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

672

678

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

673

679

msgstr ""

674

680

675

#: bzrlib/builtins.py:1289

681

#: bzrlib/builtins.py:1409

676

682

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

677

683

msgstr ""

678

684

679

685

# help of 'no-tree' option of 'branch' command

680

#: bzrlib/builtins.py:1299

686

#: bzrlib/builtins.py:1419

681

687

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

682

688

msgstr ""

683

689

684

690

# help of 'switch' option of 'branch' command

685

#: bzrlib/builtins.py:1301

691

#: bzrlib/builtins.py:1421

686

692

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

687

693

msgstr ""

688

694

689

695

# help of 'stacked' option of 'branch' command

690

#: bzrlib/builtins.py:1304

696

#: bzrlib/builtins.py:1424

691

697

msgid ""

692

698

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

693

699

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

694

700

msgstr ""

695

701

696

702

# help of 'standalone' option of 'branch' command

697

#: bzrlib/builtins.py:1308

703

#: bzrlib/builtins.py:1428

698

704

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

699

705

msgstr ""

700

706

701

707

# help of 'use-existing-dir' option of 'branch' command

702

#: bzrlib/builtins.py:1310

708

#: bzrlib/builtins.py:1430

703

709

msgid ""

704

710

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

705

711

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

706

712

msgstr ""

707

713

708

714

# help of 'bind' option of 'branch' command

709

#: bzrlib/builtins.py:1315

715

#: bzrlib/builtins.py:1435

710

716

msgid "Bind new branch to from location."

711

717

msgstr ""

712

718

713

#: bzrlib/builtins.py:1362

719

#: bzrlib/builtins.py:1482

714

720

#, python-format

715

721

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

716

722

msgstr ""

717

723

718

#: bzrlib/builtins.py:1374

724

#: bzrlib/builtins.py:1494

719

725

#, python-format

720

726

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

721

727

msgstr ""

722

728

723

#: bzrlib/builtins.py:1393

729

#: bzrlib/builtins.py:1513

724

730

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

725

731

msgstr ""

726

732

727

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

733

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

728

734

#, python-format

729

735

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

730

736

msgstr ""

731

737

732

#: bzrlib/builtins.py:1407

738

#: bzrlib/builtins.py:1532

733

739

#, python-format

734

740

msgid "Branched %d revision."

735

741

msgid_plural "Branched %d revisions."

736

742

msgstr[0] ""

737

743

msgstr[1] ""

738

744

739

#: bzrlib/builtins.py:1412

745

#: bzrlib/builtins.py:1537

740

746

#, python-format

741

747

msgid "New branch bound to %s"

742

748

msgstr ""

743

749

744

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

750

#: bzrlib/builtins.py:1542 bzrlib/builtins.py:6283

745

751

#, python-format

746

752

msgid "Switched to branch: %s"

747

753

msgstr ""

748

754

749

#: bzrlib/builtins.py:1422

755

#: bzrlib/builtins.py:1547

750

756

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

751

757

msgstr ""

752

758

753

#: bzrlib/builtins.py:1424

759

#: bzrlib/builtins.py:1549

754

760

msgid ""

755

761

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

756

762

"location."

757

763

msgstr ""

758

764

759

765

# help of 'recursive' option of 'branches' command

760

#: bzrlib/builtins.py:1431

766

#: bzrlib/builtins.py:1556

761

767

msgid ""

762

768

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

763

769

"location."

764

770

msgstr ""

765

771

766

#: bzrlib/builtins.py:1461

772

#: bzrlib/builtins.py:1585

767

773

msgid "(default)"

768

774

msgstr ""

769

775

770

#: bzrlib/builtins.py:1473

776

#: bzrlib/builtins.py:1597

771

777

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

772

778

msgstr ""

773

779

774

#: bzrlib/builtins.py:1475

780

#: bzrlib/builtins.py:1599

775

781

msgid ""

776

782

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

777

783

"for\n"

781

787

"location using SFTP."

782

788

msgstr ""

783

789

784

#: bzrlib/builtins.py:1480

790

#: bzrlib/builtins.py:1604

785

791

msgid ""

786

792

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

787

793

"will\n"

793

799

"create ./foo-bar."

794

800

msgstr ""

795

801

796

#: bzrlib/builtins.py:1487

802

#: bzrlib/builtins.py:1611

797

803

msgid ""

798

804

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

799

805

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

804

810

msgstr ""

805

811

806

812

# help of 'lightweight' option of 'checkout' command

807

#: bzrlib/builtins.py:1497

813

#: bzrlib/builtins.py:1621

808

814

msgid ""

809

815

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

810

816

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

814

820

815

821

# help of 'files-from' option of 'branch' command

816

822

# help of 'files-from' option of 'checkout' command

817

#: bzrlib/builtins.py:1504

823

#: bzrlib/builtins.py:1628

818

824

msgid "Get file contents from this tree."

819

825

msgstr ""

820

826

821

827

# help of 'hardlink' option of 'branch' command

822

828

# help of 'hardlink' option of 'checkout' command

823

#: bzrlib/builtins.py:1506

829

#: bzrlib/builtins.py:1630

824

830

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

825

831

msgstr ""

826

832

827

#: bzrlib/builtins.py:1547

833

#: bzrlib/builtins.py:1671

828

834

msgid ""

829

835

"Show list of renamed files.\n"

830

836

" "

831

837

msgstr ""

832

838

833

#: bzrlib/builtins.py:1577

839

#: bzrlib/builtins.py:1699

834

840

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

835

841

msgstr ""

836

842

837

#: bzrlib/builtins.py:1579

843

#: bzrlib/builtins.py:1701

838

844

msgid ""

839

845

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

840

846

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

841

847

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

842

848

msgstr ""

843

849

844

#: bzrlib/builtins.py:1583

850

#: bzrlib/builtins.py:1705

845

851

msgid ""

846

852

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

847

853

"that is out of date from its branch."

848

854

msgstr ""

849

855

850

#: bzrlib/builtins.py:1586

856

#: bzrlib/builtins.py:1708

851

857

msgid ""

852

858

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

853

859

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

855

861

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

856

862

msgstr ""

857

863

858

#: bzrlib/builtins.py:1591

864

#: bzrlib/builtins.py:1713

859

865

msgid ""

860

866

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

861

867

"the branch from the master."

862

868

msgstr ""

863

869

864

#: bzrlib/builtins.py:1594

870

#: bzrlib/builtins.py:1716

865

871

msgid ""

866

872

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

867

873

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

871

877

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

872

878

msgstr ""

873

879

874

#: bzrlib/builtins.py:1601

880

#: bzrlib/builtins.py:1723

875

881

msgid ""

876

882

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

877

883

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

878

884

"current working directory is used."

879

885

msgstr ""

880

886

881

#: bzrlib/builtins.py:1617

887

#: bzrlib/builtins.py:1739

882

888

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

883

889

msgstr ""

884

890

885

#: bzrlib/builtins.py:1625

891

#: bzrlib/builtins.py:1747

886

892

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

887

893

msgstr ""

888

894

889

#: bzrlib/builtins.py:1656

895

#: bzrlib/builtins.py:1778

890

896

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

891

897

msgstr ""

892

898

893

#: bzrlib/builtins.py:1672

899

#: bzrlib/builtins.py:1794

894

900

#, python-format

895

901

msgid ""

896

902

"branch has no revision %s\n"

897

903

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

898

904

msgstr ""

899

905

900

#: bzrlib/builtins.py:1678

906

#: bzrlib/builtins.py:1800

901

907

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

902

908

msgstr ""

903

909

904

#: bzrlib/builtins.py:1682

910

#: bzrlib/builtins.py:1804

905

911

msgid ""

906

912

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

907

913

"can be committed with 'bzr commit'."

908

914

msgstr ""

909

915

910

#: bzrlib/builtins.py:1691

916

#: bzrlib/builtins.py:1813

911

917

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

912

918

msgstr ""

913

919

914

#: bzrlib/builtins.py:1693

920

#: bzrlib/builtins.py:1815

915

921

msgid ""

916

922

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

917

923

"tree, branch or repository."

918

924

msgstr ""

919

925

920

#: bzrlib/builtins.py:1696

926

#: bzrlib/builtins.py:1818

921

927

msgid ""

922

928

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

923

929

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

924

930

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

925

931

msgstr ""

926

932

927

#: bzrlib/builtins.py:1700

933

#: bzrlib/builtins.py:1822

928

934

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

929

935

msgstr ""

930

936

931

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

932

#: bzrlib/builtins.py:6389

937

#: bzrlib/builtins.py:1824 bzrlib/builtins.py:3742 bzrlib/builtins.py:4883

938

#: bzrlib/builtins.py:6469

933

939

msgid ":Examples:"

934

940

msgstr ""

935

941

936

#: bzrlib/builtins.py:1704

942

#: bzrlib/builtins.py:1826

937

943

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

938

944

msgstr ""

939

945

940

#: bzrlib/builtins.py:1706

946

#: bzrlib/builtins.py:1828

941

947

msgid " bzr info"

942

948

msgstr ""

943

949

944

#: bzrlib/builtins.py:1708

950

#: bzrlib/builtins.py:1830

945

951

msgid ""

946

952

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

947

953

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

948

954

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

949

955

msgstr ""

950

956

951

#: bzrlib/builtins.py:1712

957

#: bzrlib/builtins.py:1834

952

958

msgid " bzr info -v"

953

959

msgstr ""

954

960

955

#: bzrlib/builtins.py:1714

961

#: bzrlib/builtins.py:1836

956

962

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

957

963

msgstr ""

958

964

959

#: bzrlib/builtins.py:1716

965

#: bzrlib/builtins.py:1838

960

966

msgid " bzr info -vv"

961

967

msgstr ""

962

968

963

#: bzrlib/builtins.py:1735

969

#: bzrlib/builtins.py:1857

964

970

msgid "Remove files or directories."

965

971

msgstr ""

966

972

967

#: bzrlib/builtins.py:1737

973

#: bzrlib/builtins.py:1859

968

974

msgid ""

969

975

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

970

976

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

971

"will be backed up (adding an extention of the form .~#~). If no options or\n"

977

"will be backed up (adding an extension of the form .~#~). If no options or\n"

972

978

"parameters are given Bazaar will scan for files that are being tracked by\n"

973

979

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

974

980

msgstr ""

975

981

976

982

# help of 'new' option of 'remove' command

977

#: bzrlib/builtins.py:1745

983

#: bzrlib/builtins.py:1867

978

984

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

979

985

msgstr ""

980

986

981

987

# help of 'file-deletion-strategy' option of 'remove' command

982

#: bzrlib/builtins.py:1747

988

#: bzrlib/builtins.py:1869

983

989

msgid "The file deletion mode to be used."

984

990

msgstr ""

985

991

986

992

# title of 'file-deletion-strategy' option of 'remove' command

987

#: bzrlib/builtins.py:1748

993

#: bzrlib/builtins.py:1870

988

994

msgid "Deletion Strategy"

989

995

msgstr ""

990

996

991

997

# help of 'file-deletion-strategy=safe' option of 'remove' command

992

#: bzrlib/builtins.py:1749

998

#: bzrlib/builtins.py:1871

993

999

msgid "Backup changed files (default)."

994

1000

msgstr ""

995

1001

996

1002

# help of 'file-deletion-strategy=keep' option of 'remove' command

997

#: bzrlib/builtins.py:1750

1003

#: bzrlib/builtins.py:1872

998

1004

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

999

1005

msgstr ""

1000

1006

1001

1007

# help of 'file-deletion-strategy=no-backup' option of 'remove' command

1002

#: bzrlib/builtins.py:1751

1008

#: bzrlib/builtins.py:1873

1003

1009

msgid "Don't backup changed files."

1004

1010

msgstr ""

1005

1011

1006

# help of 'file-deletion-strategy=force' option of 'remove' command

1007

#: bzrlib/builtins.py:1752

1008

msgid ""

1009

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

1010

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

1011

msgstr ""

1012

1013

#: bzrlib/builtins.py:1761

1014

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

1015

msgstr ""

1016

1017

#: bzrlib/builtins.py:1778

1012

#: bzrlib/builtins.py:1894

1018

1013

msgid "No matching files."

1019

1014

msgstr ""

1020

1015

1021

#: bzrlib/builtins.py:1839

1016

#: bzrlib/builtins.py:1955

1022

1017

msgid "Reconcile bzr metadata in a branch."

1023

1018

msgstr ""

1024

1019

1025

#: bzrlib/builtins.py:1841

1020

#: bzrlib/builtins.py:1957

1026

1021

msgid ""

1027

1022

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

1028

1023

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

1030

1025

"advises you to run it."

1031

1026

msgstr ""

1032

1027

1033

#: bzrlib/builtins.py:1846

1028

#: bzrlib/builtins.py:1962

1034

1029

msgid ""

1035

1030

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

1036

1031

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

1038

1033

"correctly in both branches."

1039

1034

msgstr ""

1040

1035

1041

#: bzrlib/builtins.py:1851

1036

#: bzrlib/builtins.py:1967

1042

1037

msgid ""

1043

1038

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

1044

1039

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

1045

1040

msgstr ""

1046

1041

1047

#: bzrlib/builtins.py:1854

1042

#: bzrlib/builtins.py:1970

1048

1043

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

1049

1044

msgstr ""

1050

1045

1054

1049

# help of 'format=default' option of 'init-repository' command

1055

1050

# help of 'format=2a' option of 'upgrade' command

1056

1051

# help of 'format=default' option of 'upgrade' command

1057

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

1052

#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777

1058

1053

msgid ""

1059

1054

"Format for the bzr 2.0 series.\n"

1060

1055

"Uses group-compress storage.\n"

1064

1059

# help of 'format=pack-0.92' option of 'init' command

1065

1060

# help of 'format=pack-0.92' option of 'init-repository' command

1066

1061

# help of 'format=pack-0.92' option of 'upgrade' command

1067

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

1062

#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777

1068

1063

msgid ""

1069

1064

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

1070

1065

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

1073

1068

# help of 'format=development-colo' option of 'init' command

1074

1069

# help of 'format=development-colo' option of 'init-repository' command

1075

1070

# help of 'format=development-colo' option of 'upgrade' command

1076

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

1071

#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777

1077

1072

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

1078

1073

msgstr ""

1079

1074

1080

#: bzrlib/builtins.py:1922

1075

#: bzrlib/builtins.py:2038

1081

1076

msgid "Make a directory into a versioned branch."

1082

1077

msgstr ""

1083

1078

1084

#: bzrlib/builtins.py:1924

1079

#: bzrlib/builtins.py:2040

1085

1080

msgid ""

1086

1081

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

1087

1082

"existing project."

1088

1083

msgstr ""

1089

1084

1090

#: bzrlib/builtins.py:1927

1085

#: bzrlib/builtins.py:2043

1091

1086

msgid ""

1092

1087

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

1093

1088

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

1095

1090

"in the .bzr directory."

1096

1091

msgstr ""

1097

1092

1098

#: bzrlib/builtins.py:1932

1093

#: bzrlib/builtins.py:2048

1099

1094

msgid ""

1100

1095

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

1101

1096

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

1102

1097

msgstr ""

1103

1098

1104

#: bzrlib/builtins.py:1935

1099

#: bzrlib/builtins.py:2051

1105

1100

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

1106

1101

msgstr ""

1107

1102

1108

#: bzrlib/builtins.py:1937

1103

#: bzrlib/builtins.py:2053

1109

1104

msgid ""

1110

1105

" cd ~/project\n"

1111

1106

" bzr init\n"

1116

1111

1117

1112

# help of 'create-prefix' option of 'init' command

1118

1113

# help of 'create-prefix' option of 'push' command

1119

#: bzrlib/builtins.py:1948

1114

#: bzrlib/builtins.py:2064

1120

1115

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

1121

1116

msgstr ""

1122

1117

1123

1118

# help of 'format' option of 'init' command

1124

#: bzrlib/builtins.py:1951

1119

#: bzrlib/builtins.py:2067

1125

1120

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

1126

1121

msgstr ""

1127

1122

1128

1123

# help of 'append-revisions-only' option of 'init' command

1129

#: bzrlib/builtins.py:1959

1124

#: bzrlib/builtins.py:2075

1130

1125

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

1131

1126

msgstr ""

1132

1127

1133

1128

# help of 'no-tree' option of 'init' command

1134

#: bzrlib/builtins.py:1962

1129

#: bzrlib/builtins.py:2078

1135

1130

msgid "Create a branch without a working tree."

1136

1131

msgstr ""

1137

1132

1138

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

1133

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

1139

1134

#, python-format

1140

1135

msgid ""

1141

1136

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

1142

1137

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

1143

1138

msgstr ""

1144

1139

1145

#: bzrlib/builtins.py:2016

1140

#: bzrlib/builtins.py:2132

1146

1141

msgid ""

1147

1142

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

1148

1143

msgstr ""

1149

1144

1150

#: bzrlib/builtins.py:2027

1145

#: bzrlib/builtins.py:2143

1151

1146

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

1152

1147

msgstr ""

1153

1148

1154

#: bzrlib/builtins.py:2036

1149

#: bzrlib/builtins.py:2152

1155

1150

#, python-format

1156

1151

msgid "Using shared repository: %s\n"

1157

1152

msgstr ""

1158

1153

1159

#: bzrlib/builtins.py:2040

1154

#: bzrlib/builtins.py:2156

1160

1155

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

1161

1156

msgstr ""

1162

1157

1163

#: bzrlib/builtins.py:2042

1158

#: bzrlib/builtins.py:2158

1164

1159

msgid ""

1165

1160

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

1166

1161

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

1168

1163

"speeds up the creation of new branches."

1169

1164

msgstr ""

1170

1165

1171

#: bzrlib/builtins.py:2047

1166

#: bzrlib/builtins.py:2163

1172

1167

msgid ""

1173

1168

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

1174

1169

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

1178

1173

"branches, such as on a server."

1179

1174

msgstr ""

1180

1175

1181

#: bzrlib/builtins.py:2054

1176

#: bzrlib/builtins.py:2170

1182

1177

msgid ""

1183

1178

":Examples:\n"

1184

1179

" Create a shared repository holding just branches::"

1185

1180

msgstr ""

1186

1181

1187

#: bzrlib/builtins.py:2057

1182

#: bzrlib/builtins.py:2173

1188

1183

msgid ""

1189

1184

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

1190

1185

" bzr init repo/trunk"

1191

1186

msgstr ""

1192

1187

1193

#: bzrlib/builtins.py:2060

1188

#: bzrlib/builtins.py:2176

1194

1189

msgid " Make a lightweight checkout elsewhere::"

1195

1190

msgstr ""

1196

1191

1197

#: bzrlib/builtins.py:2062

1192

#: bzrlib/builtins.py:2178

1198

1193

msgid ""

1199

1194

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

1200

1195

" cd trunk-checkout\n"

1202

1197

msgstr ""

1203

1198

1204

1199

# help of 'format' option of 'init-repository' command

1205

#: bzrlib/builtins.py:2070

1200

#: bzrlib/builtins.py:2186

1206

1201

msgid ""

1207

1202

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

1208

1203

msgstr ""

1209

1204

1210

1205

# title of 'format' option of 'init-repository' command

1211

#: bzrlib/builtins.py:2074

1206

#: bzrlib/builtins.py:2190

1212

1207

msgid "Repository format"

1213

1208

msgstr ""

1214

1209

1215

1210

# help of 'no-trees' option of 'init-repository' command

1216

#: bzrlib/builtins.py:2076

1211

#: bzrlib/builtins.py:2192

1217

1212

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

1218

1213

msgstr ""

1219

1214

1220

#: bzrlib/builtins.py:2102

1215

#: bzrlib/builtins.py:2218

1221

1216

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

1222

1217

msgstr ""

1223

1218

1224

#: bzrlib/builtins.py:2104

1219

#: bzrlib/builtins.py:2220

1225

1220

msgid ""

1226

1221

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

1227

1222

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

1231

1226

"given."

1232

1227

msgstr ""

1233

1228

1234

#: bzrlib/builtins.py:2111

1229

#: bzrlib/builtins.py:2227

1235

1230

msgid ""

1236

1231

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

1237

1232

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

1238

1233

msgstr ""

1239

1234

1240

#: bzrlib/builtins.py:2114

1235

#: bzrlib/builtins.py:2230

1241

1236

msgid ""

1242

1237

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

1243

1238

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

1247

1242

"in the range."

1248

1243

msgstr ""

1249

1244

1250

#: bzrlib/builtins.py:2121

1245

#: bzrlib/builtins.py:2237

1251

1246

msgid ""

1252

1247

":Exit values:\n"

1253

1248

" 1 - changed\n"

1256

1251

" 0 - no change"

1257

1252

msgstr ""

1258

1253

1259

#: bzrlib/builtins.py:2127

1254

#: bzrlib/builtins.py:2243

1260

1255

msgid ""

1261

1256

":Examples:\n"

1262

1257

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

1263

1258

msgstr ""

1264

1259

1265

#: bzrlib/builtins.py:2130

1260

#: bzrlib/builtins.py:2246

1266

1261

msgid " bzr diff"

1267

1262

msgstr ""

1268

1263

1269

#: bzrlib/builtins.py:2132

1264

#: bzrlib/builtins.py:2248

1270

1265

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

1271

1266

msgstr ""

1272

1267

1273

#: bzrlib/builtins.py:2134

1268

#: bzrlib/builtins.py:2250

1274

1269

msgid " bzr diff -r1"

1275

1270

msgstr ""

1276

1271

1277

#: bzrlib/builtins.py:2136

1272

#: bzrlib/builtins.py:2252

1278

1273

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

1279

1274

msgstr ""

1280

1275

1281

#: bzrlib/builtins.py:2138

1276

#: bzrlib/builtins.py:2254

1282

1277

msgid " bzr diff -r1..3"

1283

1278

msgstr ""

1284

1279

1285

#: bzrlib/builtins.py:2140

1280

#: bzrlib/builtins.py:2256

1286

1281

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

1287

1282

msgstr ""

1288

1283

1289

#: bzrlib/builtins.py:2142

1284

#: bzrlib/builtins.py:2258

1290

1285

msgid " bzr diff -r1..3 xxx"

1291

1286

msgstr ""

1292

1287

1293

#: bzrlib/builtins.py:2144

1288

#: bzrlib/builtins.py:2260

1294

1289

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

1295

1290

msgstr ""

1296

1291

1297

#: bzrlib/builtins.py:2146

1292

#: bzrlib/builtins.py:2262

1298

1293

msgid " bzr diff -c2"

1299

1294

msgstr ""

1300

1295

1301

#: bzrlib/builtins.py:2148

1296

#: bzrlib/builtins.py:2264

1302

1297

msgid ""

1303

1298

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

1304

1299

" \n"

1305

1300

" bzr diff -cX"

1306

1301

msgstr ""

1307

1302

1308

#: bzrlib/builtins.py:2152

1303

#: bzrlib/builtins.py:2268

1309

1304

msgid ""

1310

1305

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

1311

1306

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

1312

1307

" another parent, use::"

1313

1308

msgstr ""

1314

1309

1315

#: bzrlib/builtins.py:2156

1310

#: bzrlib/builtins.py:2272

1316

1311

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

1317

1312

msgstr ""

1318

1313

1319

#: bzrlib/builtins.py:2158

1314

#: bzrlib/builtins.py:2274

1320

1315

msgid ""

1321

1316

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

1322

1317

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

1323

1318

msgstr ""

1324

1319

1325

#: bzrlib/builtins.py:2161

1320

#: bzrlib/builtins.py:2277

1326

1321

msgid " bzr diff -r-2.."

1327

1322

msgstr ""

1328

1323

1329

#: bzrlib/builtins.py:2163

1324

#: bzrlib/builtins.py:2279

1330

1325

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

1331

1326

msgstr ""

1332

1327

1333

#: bzrlib/builtins.py:2165

1328

#: bzrlib/builtins.py:2281

1334

1329

msgid " bzr diff NEWS"

1335

1330

msgstr ""

1336

1331

1337

#: bzrlib/builtins.py:2167

1332

#: bzrlib/builtins.py:2283

1338

1333

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

1339

1334

msgstr ""

1340

1335

1341

#: bzrlib/builtins.py:2169

1336

#: bzrlib/builtins.py:2285

1342

1337

msgid " bzr diff xxx/NEWS"

1343

1338

msgstr ""

1344

1339

1345

#: bzrlib/builtins.py:2171

1340

#: bzrlib/builtins.py:2287

1346

1341

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

1347

1342

msgstr ""

1348

1343

1349

#: bzrlib/builtins.py:2173

1344

#: bzrlib/builtins.py:2289

1350

1345

msgid " bzr diff --old xxx"

1351

1346

msgstr ""

1352

1347

1353

#: bzrlib/builtins.py:2175

1348

#: bzrlib/builtins.py:2291

1354

1349

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

1355

1350

msgstr ""

1356

1351

1357

#: bzrlib/builtins.py:2177

1352

#: bzrlib/builtins.py:2293

1358

1353

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

1359

1354

msgstr ""

1360

1355

1361

#: bzrlib/builtins.py:2179

1356

#: bzrlib/builtins.py:2295

1362

1357

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

1363

1358

msgstr ""

1364

1359

1365

#: bzrlib/builtins.py:2181

1360

#: bzrlib/builtins.py:2297

1366

1361

msgid ""

1367

1362

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

1368

1363

" \n"

1372

1367

msgstr ""

1373

1368

1374

1369

# help of 'diff-options' option of 'diff' command

1375

#: bzrlib/builtins.py:2191

1370

#: bzrlib/builtins.py:2307

1376

1371

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

1377

1372

msgstr ""

1378

1373

1379

1374

# help of 'prefix' option of 'diff' command

1380

#: bzrlib/builtins.py:2194

1375

#: bzrlib/builtins.py:2310

1381

1376

msgid ""

1382

1377

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

1383

1378

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

1384

1379

msgstr ""

1385

1380

1386

1381

# help of 'old' option of 'diff' command

1387

#: bzrlib/builtins.py:2197

1382

#: bzrlib/builtins.py:2313

1388

1383

msgid "Branch/tree to compare from."

1389

1384

msgstr ""

1390

1385

1391

1386

# help of 'new' option of 'diff' command

1392

#: bzrlib/builtins.py:2201

1387

#: bzrlib/builtins.py:2317

1393

1388

msgid "Branch/tree to compare to."

1394

1389

msgstr ""

1395

1390

1396

1391

# help of 'using' option of 'diff' command

1397

#: bzrlib/builtins.py:2207

1392

#: bzrlib/builtins.py:2323

1398

1393

msgid "Use this command to compare files."

1399

1394

msgstr ""

1400

1395

1401

1396

# help of 'format' option of 'diff' command

1402

#: bzrlib/builtins.py:2212

1397

#: bzrlib/builtins.py:2328

1403

1398

msgid "Diff format to use."

1404

1399

msgstr ""

1405

1400

1406

1401

# title of 'format' option of 'diff' command

1407

#: bzrlib/builtins.py:2214

1402

#: bzrlib/builtins.py:2330

1408

1403

msgid "Diff format"

1409

1404

msgstr ""

1410

1405

1411

#: bzrlib/builtins.py:2236

1406

# help of 'context' option of 'diff' command

1407

#: bzrlib/builtins.py:2332

1408

msgid "How many lines of context to show."

1409

msgstr ""

1410

1411

#: bzrlib/builtins.py:2357

1412

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

1413

msgstr ""

1414

1415

#: bzrlib/builtins.py:2240

1415

#: bzrlib/builtins.py:2361

1416

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

1417

msgstr ""

1418

1419

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

1420

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

1419

#: bzrlib/builtins.py:2366 bzrlib/builtins.py:2763 bzrlib/builtins.py:2776

1420

#: bzrlib/builtins.py:2784 bzrlib/builtins.py:4957

1421

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

1422

msgstr ""

1423

1424

#: bzrlib/builtins.py:2265

1424

#: bzrlib/builtins.py:2386

1425

msgid ""

1426

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

1427

" "

1428

msgstr ""

1429

1430

#: bzrlib/builtins.py:2343

1430

#: bzrlib/builtins.py:2463

1431

msgid "Show the tree root directory."

1432

msgstr ""

1433

1434

#: bzrlib/builtins.py:2345

1434

#: bzrlib/builtins.py:2465

1435

msgid ""

1436

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

1437

"directory."

1438

msgstr ""

1439

1440

#: bzrlib/builtins.py:2360

1440

#: bzrlib/builtins.py:2480

1441

msgid "The limit argument must be an integer."

1442

msgstr ""

1443

1444

#: bzrlib/builtins.py:2368

1444

#: bzrlib/builtins.py:2488

1445

msgid "The levels argument must be an integer."

1446

msgstr ""

1447

1448

#: bzrlib/builtins.py:2373

1448

#: bzrlib/builtins.py:2493

1449

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

1450

msgstr ""

1451

1452

#: bzrlib/builtins.py:2375

1452

#: bzrlib/builtins.py:2495

1453

msgid ""

1454

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

1455

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

1457

"Here are some simple examples::"

1458

msgstr ""

1459

1460

#: bzrlib/builtins.py:2380

1460

#: bzrlib/builtins.py:2500

1461

msgid ""

1462

" bzr log log the current branch\n"

1463

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

1464

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

1465

msgstr ""

1466

1467

#: bzrlib/builtins.py:2384

1467

#: bzrlib/builtins.py:2504

1468

msgid ""

1469

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

1470

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

1474

"were merged."

1475

msgstr ""

1476

1477

#: bzrlib/builtins.py:2391

1477

#: bzrlib/builtins.py:2511

1478

msgid ":Output control:"

1479

msgstr ""

1480

1481

#: bzrlib/builtins.py:2393

1481

#: bzrlib/builtins.py:2513

1482

msgid ""

1483

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

1484

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

1486

" for more details on log formats."

1487

msgstr ""

1488

1489

#: bzrlib/builtins.py:2398

1489

#: bzrlib/builtins.py:2518

1490

msgid ""

1491

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

1492

" displayed::"

1493

msgstr ""

1494

1495

#: bzrlib/builtins.py:2401

1495

#: bzrlib/builtins.py:2521

1496

msgid ""

1497

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

1498

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

1501

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

1502

msgstr ""

1503

1504

#: bzrlib/builtins.py:2407

1504

#: bzrlib/builtins.py:2527

1505

msgid ""

1506

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

1507

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

1508

" just the top level (mainline)."

1509

msgstr ""

1510

1511

#: bzrlib/builtins.py:2411

1511

#: bzrlib/builtins.py:2531

1512

msgid ""

1513

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

1514

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

1515

" instead, use the -vv option."

1516

msgstr ""

1517

1518

#: bzrlib/builtins.py:2415

1518

#: bzrlib/builtins.py:2535

1519

msgid ":Ordering control:"

1520

msgstr ""

1521

1522

#: bzrlib/builtins.py:2417

1522

#: bzrlib/builtins.py:2537

1523

msgid ""

1524

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

1525

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

1527

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

1528

msgstr ""

1529

1530

#: bzrlib/builtins.py:2422

1530

#: bzrlib/builtins.py:2542

1531

msgid ":Revision filtering:"

1532

msgstr ""

1533

1534

#: bzrlib/builtins.py:2424

1534

#: bzrlib/builtins.py:2544

1535

msgid ""

1536

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

1537

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

1538

msgstr ""

1539

1540

#: bzrlib/builtins.py:2427

1540

#: bzrlib/builtins.py:2547

1541

msgid ""

1542

" -rX display revision X\n"

1543

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

1545

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

1546

msgstr ""

1547

1548

#: bzrlib/builtins.py:2432

1548

#: bzrlib/builtins.py:2552

1549

msgid ""

1550

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

1551

" Some common examples are given below::"

1552

msgstr ""

1553

1554

#: bzrlib/builtins.py:2435

1554

#: bzrlib/builtins.py:2555

1555

msgid ""

1556

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

1557

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

1561

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

1562

msgstr ""

1563

1564

#: bzrlib/builtins.py:2442

1564

#: bzrlib/builtins.py:2562

1565

msgid ""

1566

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

1567

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

1571

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

1572

msgstr ""

1573

1574

#: bzrlib/builtins.py:2449

1574

#: bzrlib/builtins.py:2569

1575

msgid ":Path filtering:"

1576

msgstr ""

1577

1578

#: bzrlib/builtins.py:2451

1578

#: bzrlib/builtins.py:2571

1579

msgid ""

1580

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

1581

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

1582

" nominated files or directories."

1583

msgstr ""

1584

1585

#: bzrlib/builtins.py:2455

1585

#: bzrlib/builtins.py:2575

1586

msgid ""

1587

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

1588

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

1589

" the end or start of the range."

1590

msgstr ""

1591

1592

#: bzrlib/builtins.py:2459

1592

#: bzrlib/builtins.py:2579

1593

msgid ""

1594

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

1595

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

1596

msgstr ""

1597

1598

#: bzrlib/builtins.py:2462

1598

#: bzrlib/builtins.py:2582

1599

msgid ""

1600

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

1601

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

1602

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

1603

msgstr ""

1604

1605

#: bzrlib/builtins.py:2466

1605

#: bzrlib/builtins.py:2586

1606

msgid " In this case:"

1607

msgstr ""

1608

1609

#: bzrlib/builtins.py:2468

1609

#: bzrlib/builtins.py:2588

1610

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

1611

msgstr ""

1612

1613

#: bzrlib/builtins.py:2470

1613

#: bzrlib/builtins.py:2590

1614

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

1615

msgstr ""

1616

1617

#: bzrlib/builtins.py:2472

1617

#: bzrlib/builtins.py:2592

1618

msgid ""

1619

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

1620

" the original file in revision 2."

1621

msgstr ""

1622

1623

#: bzrlib/builtins.py:2475

1623

#: bzrlib/builtins.py:2595

1624

msgid ""

1625

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

1626

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

1627

msgstr ""

1628

1629

#: bzrlib/builtins.py:2478

1629

#: bzrlib/builtins.py:2598

1630

msgid ""

1631

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

1632

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

1633

" until it was last renamed)."

1634

msgstr ""

1635

1636

#: bzrlib/builtins.py:2482

1636

#: bzrlib/builtins.py:2602

1637

msgid ":Other filtering:"

1638

msgstr ""

1639

1640

#: bzrlib/builtins.py:2484

1640

#: bzrlib/builtins.py:2604

1641

msgid ""

1642

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

1643

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

1646

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

1647

msgstr ""

1648

1649

#: bzrlib/builtins.py:2490

1649

#: bzrlib/builtins.py:2610

1650

msgid ":Tips & tricks:"

1651

msgstr ""

1652

1653

#: bzrlib/builtins.py:2492

1653

#: bzrlib/builtins.py:2612

1654

msgid ""

1655

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

1656

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

1659

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

1660

msgstr ""

1661

1662

#: bzrlib/builtins.py:2498

1662

#: bzrlib/builtins.py:2618

1663

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

1664

msgstr ""

1665

1666

#: bzrlib/builtins.py:2500

1666

#: bzrlib/builtins.py:2620

1667

msgid ""

1668

" [ALIASES]\n"

1669

" tip = log -r-1\n"

1671

" show = log -v -p"

1672

msgstr ""

1673

1674

#: bzrlib/builtins.py:2505

1674

#: bzrlib/builtins.py:2625

1675

msgid ""

1676

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

1677

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

1678

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

1679

msgstr ""

1680

1681

#: bzrlib/builtins.py:2509

1681

#: bzrlib/builtins.py:2629

1682

msgid ""

1683

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

1684

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

1685

msgstr ""

1686

1687

#: bzrlib/builtins.py:2512

1687

#: bzrlib/builtins.py:2632

1688

msgid ""

1689

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

1690

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

1692

" be given when using the -v option."

1693

msgstr ""

1694

1695

#: bzrlib/builtins.py:2517

1695

#: bzrlib/builtins.py:2637

1696

msgid ""

1697

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

1698

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

1700

" a list of words but not others."

1701

msgstr ""

1702

1703

#: bzrlib/builtins.py:2522

1703

#: bzrlib/builtins.py:2642

1704

msgid ""

1705

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

1706

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

1709

msgstr ""

1710

1711

# help of 'forward' option of 'log' command

1712

#: bzrlib/builtins.py:2531

1712

#: bzrlib/builtins.py:2651

1713

msgid "Show from oldest to newest."

1714

msgstr ""

1715

1716

# help of 'verbose' option of 'log' command

1717

#: bzrlib/builtins.py:2534

1717

#: bzrlib/builtins.py:2654

1718

msgid "Show files changed in each revision."

1719

msgstr ""

1720

1721

# help of 'change' option of 'log' command

1722

#: bzrlib/builtins.py:2540

1722

#: bzrlib/builtins.py:2660

1723

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

1724

msgstr ""

1725

1726

# help of 'authors' option of 'log' command

1727

#: bzrlib/builtins.py:2544

1727

#: bzrlib/builtins.py:2664

1728

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

1729

msgstr ""

1730

1731

# title of 'authors' option of 'log' command

1732

#: bzrlib/builtins.py:2545

1732

#: bzrlib/builtins.py:2665

1733

msgid "Authors"

1734

msgstr ""

1735

1736

# help of 'levels' option of 'log' command

1737

#: bzrlib/builtins.py:2550

1737

#: bzrlib/builtins.py:2670

1738

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

1739

msgstr ""

1740

1741

# help of 'limit' option of 'log' command

1742

#: bzrlib/builtins.py:2560

1742

#: bzrlib/builtins.py:2680

1743

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

1744

msgstr ""

1745

1746

# help of 'show-diff' option of 'log' command

1747

#: bzrlib/builtins.py:2565

1747

#: bzrlib/builtins.py:2685

1748

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

1749

msgstr ""

1750

1751

# help of 'include-merged' option of 'log' command

1752

#: bzrlib/builtins.py:2567

1752

#: bzrlib/builtins.py:2687

1753

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

1754

msgstr ""

1755

1756

# help of 'omit-merges' option of 'log' command

1757

#: bzrlib/builtins.py:2571

1757

#: bzrlib/builtins.py:2691

1758

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

1759

msgstr ""

1760

1761

# help of 'exclude-common-ancestry' option of 'log' command

1762

#: bzrlib/builtins.py:2573

1762

#: bzrlib/builtins.py:2693

1763

msgid ""

1764

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

1765

"rX..Y)."

1766

msgstr ""

1767

1768

# help of 'signatures' option of 'log' command

1769

#: bzrlib/builtins.py:2577

1769

#: bzrlib/builtins.py:2697

1770

msgid "Show digital signature validity."

1771

msgstr ""

1772

1773

# help of 'match' option of 'log' command

1774

#: bzrlib/builtins.py:2580

1774

#: bzrlib/builtins.py:2700

1775

msgid "Show revisions whose properties match this expression."

1776

msgstr ""

1777

1778

# help of 'match-message' option of 'log' command

1779

#: bzrlib/builtins.py:2584

1779

#: bzrlib/builtins.py:2704

1780

msgid "Show revisions whose message matches this expression."

1781

msgstr ""

1782

1783

# help of 'match-committer' option of 'log' command

1784

#: bzrlib/builtins.py:2588

1784

#: bzrlib/builtins.py:2708

1785

msgid "Show revisions whose committer matches this expression."

1786

msgstr ""

1787

1788

# help of 'match-author' option of 'log' command

1789

#: bzrlib/builtins.py:2592

1789

#: bzrlib/builtins.py:2712

1790

msgid "Show revisions whose authors match this expression."

1791

msgstr ""

1792

1793

# help of 'match-bugs' option of 'log' command

1794

#: bzrlib/builtins.py:2596

1794

#: bzrlib/builtins.py:2716

1795

msgid "Show revisions whose bugs match this expression."

1796

msgstr ""

1797

1798

#: bzrlib/builtins.py:2650

1798

#: bzrlib/builtins.py:2770

1799

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

1800

msgstr ""

1801

1802

#: bzrlib/builtins.py:2678

1802

#: bzrlib/builtins.py:2798

1803

#, python-format

1804

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

1805

msgstr ""

1806

1807

#: bzrlib/builtins.py:2795

1807

#: bzrlib/builtins.py:2915

1808

#, python-format

1809

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

1810

msgstr ""

1811

1812

#: bzrlib/builtins.py:2811

1812

#: bzrlib/builtins.py:2931

1813

#, python-format

1814

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

1815

msgstr ""

1816

1817

#: bzrlib/builtins.py:2856

1817

#: bzrlib/builtins.py:2976

1818

msgid ""

1819

"List files in a tree.\n"

1820

" "

1821

msgstr ""

1822

1823

# help of 'recursive' option of 'ls' command

1824

#: bzrlib/builtins.py:2865

1824

#: bzrlib/builtins.py:2985

1825

msgid "Recurse into subdirectories."

1826

msgstr ""

1827

1828

# help of 'from-root' option of 'ls' command

1829

#: bzrlib/builtins.py:2867

1829

#: bzrlib/builtins.py:2987

1830

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

1831

msgstr ""

1832

1833

# help of 'unknown' option of 'ls' command

1834

#: bzrlib/builtins.py:2869

1834

#: bzrlib/builtins.py:2989

1835

msgid "Print unknown files."

1836

msgstr ""

1837

1838

# help of 'versioned' option of 'ls' command

1839

#: bzrlib/builtins.py:2870

1839

#: bzrlib/builtins.py:2990

1840

msgid "Print versioned files."

1841

msgstr ""

1842

1843

# help of 'ignored' option of 'ls' command

1844

#: bzrlib/builtins.py:2873

1844

#: bzrlib/builtins.py:2993

1845

msgid "Print ignored files."

1846

msgstr ""

1847

1848

# help of 'kind' option of 'ls' command

1849

#: bzrlib/builtins.py:2875

1849

#: bzrlib/builtins.py:2995

1850

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

1851

msgstr ""

1852

1853

#: bzrlib/builtins.py:2888

1853

#: bzrlib/builtins.py:3008

1854

msgid "invalid kind specified"

1855

msgstr ""

1856

1857

#: bzrlib/builtins.py:2891

1857

#: bzrlib/builtins.py:3011

1858

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

1859

msgstr ""

1860

1861

#: bzrlib/builtins.py:2900

1861

#: bzrlib/builtins.py:3020

1862

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

1863

msgstr ""

1864

1865

#: bzrlib/builtins.py:2987

1865

#: bzrlib/builtins.py:3107

1866

msgid "Ignore specified files or patterns."

1867

msgstr ""

1868

1869

#: bzrlib/builtins.py:2989

1869

#: bzrlib/builtins.py:3109

1870

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

1871

msgstr ""

1872

1873

#: bzrlib/builtins.py:2991

1873

#: bzrlib/builtins.py:3111

1874

msgid ""

1875

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

1876

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

1879

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

1880

msgstr ""

1881

1882

#: bzrlib/builtins.py:2997

1882

#: bzrlib/builtins.py:3117

1883

msgid ""

1884

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

1885

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

1887

"it."

1888

msgstr ""

1889

1890

#: bzrlib/builtins.py:3002

1890

#: bzrlib/builtins.py:3122

1891

msgid ""

1892

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

1893

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

1896

"can be edited directly using an editor."

1897

msgstr ""

1898

1899

#: bzrlib/builtins.py:3008

1899

#: bzrlib/builtins.py:3128

1900

msgid ""

1901

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

1902

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

1903

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

1904

msgstr ""

1905

1906

#: bzrlib/builtins.py:3012

1906

#: bzrlib/builtins.py:3132

1907

msgid ""

1908

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

1909

"precedence over the '!' exception patterns."

1910

msgstr ""

1911

1912

#: bzrlib/builtins.py:3015

1912

#: bzrlib/builtins.py:3135

1913

msgid ""

1914

":Notes: \n"

1915

" \n"

1917

" the shell on Unix."

1918

msgstr ""

1919

1920

#: bzrlib/builtins.py:3020

1920

#: bzrlib/builtins.py:3140

1921

msgid ""

1922

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

1923

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

1924

msgstr ""

1925

1926

#: bzrlib/builtins.py:3023

1926

#: bzrlib/builtins.py:3143

1927

msgid ""

1928

":Examples:\n"

1929

" Ignore the top level Makefile::"

1930

msgstr ""

1931

1932

#: bzrlib/builtins.py:3026

1932

#: bzrlib/builtins.py:3146

1933

msgid " bzr ignore ./Makefile"

1934

msgstr ""

1935

1936

#: bzrlib/builtins.py:3028

1936

#: bzrlib/builtins.py:3148

1937

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

1938

msgstr ""

1939

1940

#: bzrlib/builtins.py:3030

1940

#: bzrlib/builtins.py:3150

1941

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

1942

msgstr ""

1943

1944

#: bzrlib/builtins.py:3032

1944

#: bzrlib/builtins.py:3152

1945

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

1946

msgstr ""

1947

1948

#: bzrlib/builtins.py:3034

1948

#: bzrlib/builtins.py:3154

1949

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

1950

msgstr ""

1951

1952

#: bzrlib/builtins.py:3036

1952

#: bzrlib/builtins.py:3156

1953

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

1954

msgstr ""

1955

1956

#: bzrlib/builtins.py:3038

1956

#: bzrlib/builtins.py:3158

1957

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

1958

msgstr ""

1959

1960

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

1960

#: bzrlib/builtins.py:3160 bzrlib/builtins.py:3164

1961

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

1962

msgstr ""

1963

1964

#: bzrlib/builtins.py:3042

1964

#: bzrlib/builtins.py:3162

1965

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

1966

msgstr ""

1967

1968

#: bzrlib/builtins.py:3046

1968

#: bzrlib/builtins.py:3166

1969

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

1970

msgstr ""

1971

1972

#: bzrlib/builtins.py:3048

1972

#: bzrlib/builtins.py:3168

1973

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

1974

msgstr ""

1975

1976

#: bzrlib/builtins.py:3050

1976

#: bzrlib/builtins.py:3170

1977

msgid ""

1978

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

1979

" \n"

1986

msgstr ""

1987

1988

# help of 'default-rules' option of 'ignore' command

1989

#: bzrlib/builtins.py:3064

1989

#: bzrlib/builtins.py:3184

1990

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

1991

msgstr ""

1992

1993

#: bzrlib/builtins.py:3076

1993

#: bzrlib/builtins.py:3196

1994

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

1995

msgstr ""

1996

1997

#: bzrlib/builtins.py:3087

1997

#: bzrlib/builtins.py:3207

1998

#, python-format

1999

msgid "Invalid ignore pattern found. %s"

2000

msgid_plural "Invalid ignore patterns found. %s"

2001

msgstr[0] ""

2002

msgstr[1] ""

2003

2004

#: bzrlib/builtins.py:3096

2004

#: bzrlib/builtins.py:3216

2005

msgid "NAME_PATTERN should not be an absolute path"

2006

msgstr ""

2007

2008

#: bzrlib/builtins.py:3109

2008

#: bzrlib/builtins.py:3229

2009

#, python-format

2010

msgid ""

2011

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

2015

"them.\n"

2016

msgstr ""

2017

2018

#: bzrlib/builtins.py:3116

2018

#: bzrlib/builtins.py:3236

2019

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

2020

msgstr ""

2021

2022

#: bzrlib/builtins.py:3118

2022

#: bzrlib/builtins.py:3238

2023

msgid ""

2024

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

2025

"be ignored."

2026

msgstr ""

2027

2028

#: bzrlib/builtins.py:3121

2028

#: bzrlib/builtins.py:3241

2029

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

2030

msgstr ""

2031

2032

#: bzrlib/builtins.py:3123

2032

#: bzrlib/builtins.py:3243

2033

msgid " bzr ls --ignored"

2034

msgstr ""

2035

2036

#: bzrlib/builtins.py:3157

2036

#: bzrlib/builtins.py:3277

2037

#, python-format

2038

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

2039

msgstr ""

2040

2041

#: bzrlib/builtins.py:3164

2041

#: bzrlib/builtins.py:3284

2042

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

2043

msgstr ""

2044

2045

#: bzrlib/builtins.py:3166

2045

#: bzrlib/builtins.py:3286

2046

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

2047

msgstr ""

2048

2049

#: bzrlib/builtins.py:3168

2049

#: bzrlib/builtins.py:3288

2050

msgid ""

2051

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

2052

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

2053

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

2054

msgstr ""

2055

2056

#: bzrlib/builtins.py:3172

2056

#: bzrlib/builtins.py:3292

2057

msgid ""

2058

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

2059

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

2060

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

2061

msgstr ""

2062

2063

#: bzrlib/builtins.py:3176

2063

#: bzrlib/builtins.py:3296

2064

msgid ""

2065

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

2066

"directory will be used."

2067

msgstr ""

2068

2069

#: bzrlib/builtins.py:3179

2069

#: bzrlib/builtins.py:3299

2070

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

2071

msgstr ""

2072

2073

#: bzrlib/builtins.py:3181

2073

#: bzrlib/builtins.py:3301

2074

msgid ""

2075

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

2076

" Supported formats Autodetected by extension\n"

2084

msgstr ""

2085

2086

# help of 'format' option of 'export' command

2087

#: bzrlib/builtins.py:3195

2087

#: bzrlib/builtins.py:3315

2088

msgid "Type of file to export to."

2089

msgstr ""

2090

2091

# help of 'filters' option of 'export' command

2092

#: bzrlib/builtins.py:3198

2092

#: bzrlib/builtins.py:3318

2093

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

2094

msgstr ""

2095

2096

# help of 'root' option of 'export' command

2097

#: bzrlib/builtins.py:3202

2097

#: bzrlib/builtins.py:3322

2098

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

2099

msgstr ""

2100

2101

# help of 'per-file-timestamps' option of 'export' command

2102

#: bzrlib/builtins.py:3204

2102

#: bzrlib/builtins.py:3324

2103

msgid ""

2104

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

2105

"changed."

2106

msgstr ""

2107

2108

# help of 'uncommitted' option of 'export' command

2109

#: bzrlib/builtins.py:3207

2109

#: bzrlib/builtins.py:3327

2110

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

2111

msgstr ""

2112

2113

#: bzrlib/builtins.py:3226

2113

#: bzrlib/builtins.py:3346

2114

msgid "--uncommitted requires a working tree"

2115

msgstr ""

2116

2117

#: bzrlib/builtins.py:3235

2117

#: bzrlib/builtins.py:3355

2118

#, python-format

2119

msgid "Unsupported export format: %s"

2120

msgstr ""

2121

2122

#: bzrlib/builtins.py:3239

2122

#: bzrlib/builtins.py:3359

2123

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

2124

msgstr ""

2125

2126

#: bzrlib/builtins.py:3241

2126

#: bzrlib/builtins.py:3361

2127

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

2128

msgstr ""

2129

2130

#: bzrlib/builtins.py:3243

2130

#: bzrlib/builtins.py:3363

2131

msgid ""

2132

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

2133

"binary file."

2134

msgstr ""

2135

2136

# help of 'name-from-revision' option of 'cat' command

2137

#: bzrlib/builtins.py:3249

2137

#: bzrlib/builtins.py:3369

2138

msgid "The path name in the old tree."

2139

msgstr ""

2140

2141

# help of 'filters' option of 'cat' command

2142

#: bzrlib/builtins.py:3250

2142

#: bzrlib/builtins.py:3370

2143

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

2144

msgstr ""

2145

2146

#: bzrlib/builtins.py:3261

2146

#: bzrlib/builtins.py:3381

2147

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

2148

msgstr ""

2149

2150

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

2150

#: bzrlib/builtins.py:3406 bzrlib/builtins.py:3418

2151

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

2152

msgstr ""

2153

2154

#: bzrlib/builtins.py:3321

2154

#: bzrlib/builtins.py:3441

2155

msgid "Commit changes into a new revision."

2156

msgstr ""

2157

2158

#: bzrlib/builtins.py:3323

2158

#: bzrlib/builtins.py:3443

2159

msgid ""

2160

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

2161

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

2165

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

2166

msgstr ""

2167

2168

#: bzrlib/builtins.py:3330

2168

#: bzrlib/builtins.py:3450

2169

msgid ""

2170

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

2171

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

2172

"as explained below."

2173

msgstr ""

2174

2175

#: bzrlib/builtins.py:3334

2175

#: bzrlib/builtins.py:3454

2176

msgid ":Selective commits:"

2177

msgstr ""

2178

2179

#: bzrlib/builtins.py:3336

2179

#: bzrlib/builtins.py:3456

2180

msgid ""

2181

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

2182

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

2183

" everything within it is committed."

2184

msgstr ""

2185

2186

#: bzrlib/builtins.py:3340

2186

#: bzrlib/builtins.py:3460

2187

msgid ""

2188

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

2189

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

2190

" within foo/bar::"

2191

msgstr ""

2192

2193

#: bzrlib/builtins.py:3344

2193

#: bzrlib/builtins.py:3464

2194

msgid " bzr commit foo -x foo/bar"

2195

msgstr ""

2196

2197

#: bzrlib/builtins.py:3346

2197

#: bzrlib/builtins.py:3466

2198

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

2199

msgstr ""

2200

2201

#: bzrlib/builtins.py:3348

2201

#: bzrlib/builtins.py:3468

2202

msgid ":Custom authors:"

2203

msgstr ""

2204

2205

#: bzrlib/builtins.py:3350

2205

#: bzrlib/builtins.py:3470

2206

msgid ""

2207

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

2208

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

2212

" author."

2213

msgstr ""

2214

2215

#: bzrlib/builtins.py:3357

2215

#: bzrlib/builtins.py:3477

2216

msgid ":Checks:"

2217

msgstr ""

2218

2219

#: bzrlib/builtins.py:3359

2219

#: bzrlib/builtins.py:3479

2220

msgid ""

2221

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

2222

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

2225

" for details."

2226

msgstr ""

2227

2228

#: bzrlib/builtins.py:3365

2228

#: bzrlib/builtins.py:3485

2229

msgid ":Things to note:"

2230

msgstr ""

2231

2232

#: bzrlib/builtins.py:3367

2232

#: bzrlib/builtins.py:3487

2233

msgid ""

2234

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

2235

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

2236

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

2237

msgstr ""

2238

2239

#: bzrlib/builtins.py:3371

2239

#: bzrlib/builtins.py:3491

2240

msgid ""

2241

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

2242

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

2245

msgstr ""

2246

2247

# help of 'exclude' option of 'commit' command

2248

#: bzrlib/builtins.py:3381

2248

#: bzrlib/builtins.py:3501

2249

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

2250

msgstr ""

2251

2252

# help of 'message' option of 'commit' command

2253

#: bzrlib/builtins.py:3384

2253

#: bzrlib/builtins.py:3504

2254

msgid "Description of the new revision."

2255

msgstr ""

2256

2257

# help of 'unchanged' option of 'commit' command

2258

#: bzrlib/builtins.py:3387

2258

#: bzrlib/builtins.py:3507

2259

msgid "Commit even if nothing has changed."

2260

msgstr ""

2261

2262

# help of 'file' option of 'commit' command

2263

#: bzrlib/builtins.py:3391

2263

#: bzrlib/builtins.py:3511

2264

msgid "Take commit message from this file."

2265

msgstr ""

2266

2267

# help of 'strict' option of 'commit' command

2268

#: bzrlib/builtins.py:3393

2268

#: bzrlib/builtins.py:3513

2269

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

2270

msgstr ""

2271

2272

# help of 'commit-time' option of 'commit' command

2273

#: bzrlib/builtins.py:3396

2273

#: bzrlib/builtins.py:3516

2274

msgid ""

2275

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

2276

"08:00:00 +0100'."

2277

msgstr ""

2278

2279

# help of 'fixes' option of 'commit' command

2280

#: bzrlib/builtins.py:3399

2280

#: bzrlib/builtins.py:3519

2281

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

2282

msgstr ""

2283

2284

# help of 'author' option of 'commit' command

2285

#: bzrlib/builtins.py:3402

2285

#: bzrlib/builtins.py:3522

2286

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

2287

msgstr ""

2288

2289

# help of 'local' option of 'commit' command

2290

#: bzrlib/builtins.py:3405

2290

#: bzrlib/builtins.py:3525

2291

msgid ""

2292

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

2293

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

2294

msgstr ""

2295

2296

# help of 'show-diff' option of 'commit' command

2297

#: bzrlib/builtins.py:3411

2297

#: bzrlib/builtins.py:3531

2298

msgid ""

2299

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

2300

"the message editor."

2301

msgstr ""

2302

2303

# help of 'lossy' option of 'commit' command

2304

#: bzrlib/builtins.py:3414

2304

#: bzrlib/builtins.py:3534

2305

msgid ""

2306

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

2307

"can not be natively represented."

2308

msgstr ""

2309

2310

#: bzrlib/builtins.py:3432

2310

#: bzrlib/builtins.py:3552

2311

#, python-format

2312

msgid ""

2313

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

2315

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

2316

msgstr ""

2317

2318

#: bzrlib/builtins.py:3441

2318

#: bzrlib/builtins.py:3561

2319

#, python-format

2320

msgid ""

2321

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

2323

"Commit refused."

2324

msgstr ""

2325

2326

#: bzrlib/builtins.py:3450

2326

#: bzrlib/builtins.py:3570

2327

#, python-format

2328

msgid "Unrecognized bug %s. Commit refused."

2329

msgstr ""

2330

2331

#: bzrlib/builtins.py:3453

2331

#: bzrlib/builtins.py:3573

2332

#, python-format

2333

msgid ""

2334

"%s\n"

2335

"Commit refused."

2336

msgstr ""

2337

2338

#: bzrlib/builtins.py:3477

2338

#: bzrlib/builtins.py:3597

2339

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

2340

msgstr ""

2341

2342

#: bzrlib/builtins.py:3517

2342

#: bzrlib/builtins.py:3637

2343

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

2344

msgstr ""

2345

2346

#: bzrlib/builtins.py:3546

2346

#: bzrlib/builtins.py:3666

2347

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

2348

msgstr ""

2349

2350

#: bzrlib/builtins.py:3549

2350

#: bzrlib/builtins.py:3669

2351

msgid ""

2352

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

2353

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

2354

msgstr ""

2355

2356

#: bzrlib/builtins.py:3569

2356

#: bzrlib/builtins.py:3689

2357

msgid ""

2358

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

2359

"--unchanged to force an empty commit."

2360

msgstr ""

2361

2362

#: bzrlib/builtins.py:3573

2362

#: bzrlib/builtins.py:3693

2363

msgid ""

2364

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

2365

"resolve FILE\" to resolve."

2366

msgstr ""

2367

2368

#: bzrlib/builtins.py:3577

2368

#: bzrlib/builtins.py:3697

2369

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

2370

msgstr ""

2371

2372

#: bzrlib/builtins.py:3580

2372

#: bzrlib/builtins.py:3700

2373

msgid ""

2374

"\n"

2375

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

2376

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

2377

msgstr ""

2378

2379

#: bzrlib/builtins.py:3588

2379

#: bzrlib/builtins.py:3708

2380

msgid ""

2381

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

2382

msgstr ""

2383

2384

#: bzrlib/builtins.py:3590

2384

#: bzrlib/builtins.py:3710

2385

msgid ""

2386

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

2387

"to detect data corruption or bzr bugs."

2388

msgstr ""

2389

2390

#: bzrlib/builtins.py:3593

2390

#: bzrlib/builtins.py:3713

2391

msgid ""

2392

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

2393

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

2394

msgstr ""

2395

2396

#: bzrlib/builtins.py:3596

2396

#: bzrlib/builtins.py:3716

2397

msgid ""

2398

"revisions\n"

2399

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

2400

" indicate a problem."

2401

msgstr ""

2402

2403

#: bzrlib/builtins.py:3600

2403

#: bzrlib/builtins.py:3720

2404

msgid ""

2405

"versionedfiles\n"

2406

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

2407

" doesn't indicate a problem."

2408

msgstr ""

2409

2410

#: bzrlib/builtins.py:3604

2410

#: bzrlib/builtins.py:3724

2411

msgid ""

2412

"unreferenced ancestors\n"

2413

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

2415

" subtle problem that Bazaar can work around."

2416

msgstr ""

2417

2418

#: bzrlib/builtins.py:3609

2418

#: bzrlib/builtins.py:3729

2419

msgid ""

2420

"unique file texts\n"

2421

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

2422

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

2423

msgstr ""

2424

2425

#: bzrlib/builtins.py:3613

2425

#: bzrlib/builtins.py:3733

2426

msgid ""

2427

"repeated file texts\n"

2428

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

2431

" indicate a problem."

2432

msgstr ""

2433

2434

#: bzrlib/builtins.py:3619

2434

#: bzrlib/builtins.py:3739

2435

msgid ""

2436

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

2437

"given\n"

2438

"location will be checked."

2439

msgstr ""

2440

2441

#: bzrlib/builtins.py:3624

2441

#: bzrlib/builtins.py:3744

2442

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

2443

msgstr ""

2444

2445

#: bzrlib/builtins.py:3626

2445

#: bzrlib/builtins.py:3746

2446

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

2447

msgstr ""

2448

2449

#: bzrlib/builtins.py:3628

2449

#: bzrlib/builtins.py:3748

2450

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

2451

msgstr ""

2452

2453

#: bzrlib/builtins.py:3630

2453

#: bzrlib/builtins.py:3750

2454

msgid " bzr check --repo bar"

2455

msgstr ""

2456

2457

#: bzrlib/builtins.py:3632

2457

#: bzrlib/builtins.py:3752

2458

msgid " Check everything at 'baz'::"

2459

msgstr ""

2460

2461

#: bzrlib/builtins.py:3634

2461

#: bzrlib/builtins.py:3754

2462

msgid " bzr check baz"

2463

msgstr ""

2464

2465

# help of 'branch' option of 'check' command

2466

#: bzrlib/builtins.py:3640

2466

#: bzrlib/builtins.py:3760

2467

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

2468

msgstr ""

2469

2470

# help of 'repo' option of 'check' command

2471

#: bzrlib/builtins.py:3642

2471

#: bzrlib/builtins.py:3762

2472

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

2473

msgstr ""

2474

2475

# help of 'tree' option of 'check' command

2476

#: bzrlib/builtins.py:3644

2476

#: bzrlib/builtins.py:3764

2477

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

2478

msgstr ""

2479

2480

#: bzrlib/builtins.py:3658

2480

#: bzrlib/builtins.py:3778

2481

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

2482

msgstr ""

2483

2484

#: bzrlib/builtins.py:3660

2484

#: bzrlib/builtins.py:3780

2485

msgid ""

2486

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

2487

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

2490

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

2491

msgstr ""

2492

2493

#: bzrlib/builtins.py:3666

2493

#: bzrlib/builtins.py:3786

2494

msgid ""

2495

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

2496

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

2500

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

2501

msgstr ""

2502

2503

#: bzrlib/builtins.py:3673

2503

#: bzrlib/builtins.py:3793

2504

msgid ""

2505

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

2506

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

2511

"afterwards."

2512

msgstr ""

2513

2514

#: bzrlib/builtins.py:3681

2514

#: bzrlib/builtins.py:3801

2515

msgid ""

2516

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

2517

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

2519

"tried."

2520

msgstr ""

2521

2522

#: bzrlib/builtins.py:3686

2522

#: bzrlib/builtins.py:3806

2523

msgid ""

2524

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

2525

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

2526

msgstr ""

2527

2528

# help of 'format' option of 'upgrade' command

2529

#: bzrlib/builtins.py:3694

2529

#: bzrlib/builtins.py:3814

2530

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

2531

msgstr ""

2532

2533

# title of 'format' option of 'init' command

2534

# title of 'format' option of 'upgrade' command

2535

#: bzrlib/builtins.py:3698

2535

#: bzrlib/builtins.py:3818

2536

msgid "Branch format"

2537

msgstr ""

2538

2539

# help of 'clean' option of 'upgrade' command

2540

#: bzrlib/builtins.py:3700

2540

#: bzrlib/builtins.py:3820

2541

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

2542

msgstr ""

2543

2544

# help of 'dry-run' option of 'add' command

2545

# help of 'dry-run' option of 'upgrade' command

2546

#: bzrlib/builtins.py:3702

2546

#: bzrlib/builtins.py:3822

2547

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

2548

msgstr ""

2549

2550

#: bzrlib/builtins.py:3717

2550

#: bzrlib/builtins.py:3837

2551

msgid "Show or set bzr user id."

2552

msgstr ""

2553

2554

#: bzrlib/builtins.py:3719

2554

#: bzrlib/builtins.py:3839

2555

msgid ""

2556

":Examples:\n"

2557

" Show the email of the current user::"

2558

msgstr ""

2559

2560

#: bzrlib/builtins.py:3722

2560

#: bzrlib/builtins.py:3842

2561

msgid " bzr whoami --email"

2562

msgstr ""

2563

2564

#: bzrlib/builtins.py:3724

2564

#: bzrlib/builtins.py:3844

2565

msgid " Set the current user::"

2566

msgstr ""

2567

2568

#: bzrlib/builtins.py:3726

2568

#: bzrlib/builtins.py:3846

2569

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

2570

msgstr ""

2571

2572

# help of 'email' option of 'whoami' command

2573

#: bzrlib/builtins.py:3730

2573

#: bzrlib/builtins.py:3850

2574

msgid "Display email address only."

2575

msgstr ""

2576

2577

# help of 'branch' option of 'whoami' command

2578

#: bzrlib/builtins.py:3732

2578

#: bzrlib/builtins.py:3852

2579

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

2580

msgstr ""

2581

2582

#: bzrlib/builtins.py:3758

2582

#: bzrlib/builtins.py:3878

2583

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

2584

msgstr ""

2585

2586

#: bzrlib/builtins.py:3780

2586

#: bzrlib/builtins.py:3902

2587

msgid "Print or set the branch nickname."

2588

msgstr ""

2589

2590

#: bzrlib/builtins.py:3782

2590

#: bzrlib/builtins.py:3904

2591

msgid ""

2592

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

2593

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

2592

"If unset, the colocated branch name is used for colocated branches, and\n"

2593

"the branch directory name is used for other branches. To print the\n"

2594

"current nickname, execute with no argument."

2594

2595

msgstr ""

2595

2596

#: bzrlib/builtins.py:3785

2597

#: bzrlib/builtins.py:3908

2597

2598

msgid ""

2598

2599

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

2599

2600

"locally."

2600

2601

msgstr ""

2601

2602

#: bzrlib/builtins.py:3805

2603

#: bzrlib/builtins.py:3928

2603

2604

msgid "Set/unset and display aliases."

2604

2605

msgstr ""

2605

2606

#: bzrlib/builtins.py:3807

2607

#: bzrlib/builtins.py:3930

2607

2608

msgid ""

2608

2609

":Examples:\n"

2609

2610

" Show the current aliases::"

2610

2611

msgstr ""

2611

2612

#: bzrlib/builtins.py:3810

2613

#: bzrlib/builtins.py:3933

2613

2614

msgid " bzr alias"

2614

2615

msgstr ""

2615

2616

#: bzrlib/builtins.py:3812

2617

#: bzrlib/builtins.py:3935

2617

2618

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

2618

2619

msgstr ""

2619

2620

#: bzrlib/builtins.py:3814

2621

#: bzrlib/builtins.py:3937

2621

2622

msgid " bzr alias ll"

2622

2623

msgstr ""

2623

2624

#: bzrlib/builtins.py:3816

2625

#: bzrlib/builtins.py:3939

2625

2626

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

2626

2627

msgstr ""

2627

2628

#: bzrlib/builtins.py:3818

2629

#: bzrlib/builtins.py:3941

2629

2630

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

2630

2631

msgstr ""

2631

2632

#: bzrlib/builtins.py:3820

2633

#: bzrlib/builtins.py:3943

2633

2634

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

2634

2635

msgstr ""

2635

2636

#: bzrlib/builtins.py:3822

2637

#: bzrlib/builtins.py:3945

2637

2638

msgid " bzr alias --remove ll"

2638

2639

msgstr ""

2639

2640

2641

# help of 'remove' option of 'alias' command

2641

#: bzrlib/builtins.py:3827

2642

#: bzrlib/builtins.py:3950

2642

2643

msgid "Remove the alias."

2643

2644

msgstr ""

2644

2645

#: bzrlib/builtins.py:3845

2646

#: bzrlib/builtins.py:3968

2646

2647

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

2647

2648

msgstr ""

2648

2649

#: bzrlib/builtins.py:4026

2650

#: bzrlib/builtins.py:4149

2650

2651

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

2651

2652

msgstr ""

2652

2653

#: bzrlib/builtins.py:4043

2654

#: bzrlib/builtins.py:4166

2654

2655

msgid ""

2655

2656

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

2656

2657

msgstr ""

2657

2658

#: bzrlib/builtins.py:4090

2659

#: bzrlib/builtins.py:4213

2659

2660

msgid "Show version of bzr."

2660

2661

msgstr ""

2661

2662

2663

# help of 'short' option of 'version' command

2663

#: bzrlib/builtins.py:4094

2664

#: bzrlib/builtins.py:4217

2664

2665

msgid "Print just the version number."

2665

2666

msgstr ""

2666

2667

#: bzrlib/builtins.py:4113

2668

#: bzrlib/builtins.py:4236

2668

2669

msgid "It sure does!\n"

2669

2670

msgstr ""

2670

2671

#: bzrlib/builtins.py:4137

2672

#: bzrlib/builtins.py:4260

2672

2673

#, python-format

2673

2674

msgid "merge base is revision %s\n"

2674

2675

msgstr ""

2675

2676

#: bzrlib/builtins.py:4141

2677

#: bzrlib/builtins.py:4264

2677

2678

msgid "Perform a three-way merge."

2678

2679

msgstr ""

2679

2680

#: bzrlib/builtins.py:4143

2681

#: bzrlib/builtins.py:4266

2681

2682

msgid ""

2682

2683

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

2683

2684

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

2688

2689

"the current working tree."

2689

2690

msgstr ""

2690

2691

#: bzrlib/builtins.py:4151

2692

#: bzrlib/builtins.py:4274

2692

2693

msgid ""

2693

2694

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

2694

2695

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

2695

2696

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

2696

2697

msgstr ""

2697

2698

#: bzrlib/builtins.py:4155

2699

#: bzrlib/builtins.py:4278

2699

2700

msgid ""

2700

2701

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

2701

2702

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

2702

2703

msgstr ""

2703

2704

#: bzrlib/builtins.py:4158

2705

#: bzrlib/builtins.py:4281

2705

2706

msgid ""

2706

2707

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

2707

2708

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

2712

2713

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

2713

2714

msgstr ""

2714

2715

#: bzrlib/builtins.py:4166

2716

#: bzrlib/builtins.py:4289

2716

2717

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

2717

2718

msgstr ""

2718

2719

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

2720

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

2720

2721

msgid ""

2721

2722

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

2722

2723

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

2723

2724

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

2724

"before you should commit."

2725

"before you can commit."

2725

2726

msgstr ""

2726

2727

#: bzrlib/builtins.py:4173

2728

#: bzrlib/builtins.py:4296

2728

2729

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

2729

2730

msgstr ""

2730

2731

#: bzrlib/builtins.py:4175

2732

#: bzrlib/builtins.py:4298

2732

2733

msgid ""

2733

2734

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

2734

2735

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

2736

2737

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

2737

2738

msgstr ""

2738

2739

#: bzrlib/builtins.py:4180

2740

#: bzrlib/builtins.py:4303

2740

2741

msgid ""

2741

2742

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

2742

2743

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

2743

2744

"committed to record the result of the merge."

2744

2745

msgstr ""

2745

2746

#: bzrlib/builtins.py:4184

2747

#: bzrlib/builtins.py:4307

2747

2748

msgid ""

2748

2749

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

2749

2750

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

2752

2753

"merge revision which has more than two parents."

2753

2754

msgstr ""

2754

2755

#: bzrlib/builtins.py:4190

2756

#: bzrlib/builtins.py:4313

2756

2757

msgid ""

2757

2758

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

2758

2759

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

2759

2760

"can be given."

2760

2761

msgstr ""

2761

2762

#: bzrlib/builtins.py:4194

2763

#: bzrlib/builtins.py:4317

2763

2764

msgid ""

2764

2765

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

2765

2766

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

2766

2767

msgstr ""

2767

2768

#: bzrlib/builtins.py:4197

2769

#: bzrlib/builtins.py:4320

2769

2770

msgid ""

2770

2771

":Examples:\n"

2771

2772

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

2772

2773

msgstr ""

2773

2774

#: bzrlib/builtins.py:4200

2775

#: bzrlib/builtins.py:4323

2775

2776

msgid " bzr merge ../bzr.dev"

2776

2777

msgstr ""

2777

2778

#: bzrlib/builtins.py:4202

2779

#: bzrlib/builtins.py:4325

2779

2780

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

2780

2781

msgstr ""

2781

2782

#: bzrlib/builtins.py:4204

2783

#: bzrlib/builtins.py:4327

2783

2784

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

2784

2785

msgstr ""

2785

2786

#: bzrlib/builtins.py:4206

2787

#: bzrlib/builtins.py:4329

2787

2788

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

2788

2789

msgstr ""

2789

2790

#: bzrlib/builtins.py:4208

2791

#: bzrlib/builtins.py:4331

2791

2792

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

2792

2793

msgstr ""

2793

2794

#: bzrlib/builtins.py:4210

2795

#: bzrlib/builtins.py:4333

2795

2796

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

2796

2797

msgstr ""

2797

2798

#: bzrlib/builtins.py:4212

2799

#: bzrlib/builtins.py:4335

2799

2800

msgid " bzr merge /tmp/merge"

2800

2801

msgstr ""

2801

2802

#: bzrlib/builtins.py:4214

2803

#: bzrlib/builtins.py:4337

2803

2804

msgid ""

2804

2805

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

2805

2806

" feature1a and feature1b:"

2806

2807

msgstr ""

2807

2808

#: bzrlib/builtins.py:4217

2809

#: bzrlib/builtins.py:4340

2809

2810

msgid ""

2810

2811

" bzr merge ../feature1a\n"

2811

2812

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

2813

2814

msgstr ""

2814

2815

2816

# help of 'force' option of 'merge' command

2816

#: bzrlib/builtins.py:4229

2817

#: bzrlib/builtins.py:4352

2817

2818

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

2818

2819

msgstr ""

2819

2820

2821

# help of 'uncommitted' option of 'merge' command

2821

#: bzrlib/builtins.py:4235

2822

#: bzrlib/builtins.py:4358

2822

2823

msgid ""

2823

2824

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

2824

2825

msgstr ""

2825

2826

2827

# help of 'pull' option of 'merge' command

2827

#: bzrlib/builtins.py:4237

2828

#: bzrlib/builtins.py:4360

2828

2829

msgid ""

2829

2830

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

2830

2831

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

2832

2833

msgstr ""

2833

2834

2835

# help of 'directory' option of 'merge' command

2835

#: bzrlib/builtins.py:4242

2836

#: bzrlib/builtins.py:4365

2836

2837

msgid ""

2837

2838

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

2838

2839

msgstr ""

2839

2840

2841

# help of 'preview' option of 'merge' command

2841

#: bzrlib/builtins.py:4244

2842

#: bzrlib/builtins.py:4367

2842

2843

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

2843

2844

msgstr ""

2844

2845

2846

# help of 'interactive' option of 'merge' command

2846

#: bzrlib/builtins.py:4246

2847

#: bzrlib/builtins.py:4369

2847

2848

msgid "Select changes interactively."

2848

2849

msgstr ""

2849

2850

#: bzrlib/builtins.py:4268

2851

#: bzrlib/builtins.py:4391

2851

2852

msgid ""

2852

2853

"Merging into empty branches not currently supported, https://bugs.launchpad."

2853

2854

"net/bzr/+bug/308562"

2854

2855

msgstr ""

2855

2856

#: bzrlib/builtins.py:4295

2857

#: bzrlib/builtins.py:4418

2857

2858

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

2858

2859

msgstr ""

2859

2860

#: bzrlib/builtins.py:4306

2861

#: bzrlib/builtins.py:4429

2861

2862

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

2862

2863

msgstr ""

2863

2864

#: bzrlib/builtins.py:4326

2865

#: bzrlib/builtins.py:4449

2865

2866

msgid "merger: "

2866

2867

msgstr ""

2867

2868

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

2869

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

2869

2870

msgid "Nothing to do."

2870

2871

msgstr ""

2871

2872

#: bzrlib/builtins.py:4332

2873

#: bzrlib/builtins.py:4455

2873

2874

msgid "Cannot pull individual files"

2874

2875

msgstr ""

2875

2876

#: bzrlib/builtins.py:4340

2877

#: bzrlib/builtins.py:4463

2877

2878

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

2878

2879

msgstr ""

2879

2880

#: bzrlib/builtins.py:4398

2881

#: bzrlib/builtins.py:4521

2881

2882

#, python-format

2882

2883

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

2883

2884

msgstr ""

2884

2885

#: bzrlib/builtins.py:4407

2886

#: bzrlib/builtins.py:4530

2886

2887

#, python-format

2887

2888

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

2888

2889

msgstr ""

2889

2890

#: bzrlib/builtins.py:4411

2891

#: bzrlib/builtins.py:4534

2891

2892

msgid "Cannot do conflict reduction and show base."

2892

2893

msgstr ""

2893

2894

#: bzrlib/builtins.py:4522

2895

#: bzrlib/builtins.py:4645

2895

2896

msgid "No location specified or remembered"

2896

2897

msgstr ""

2897

2898

#: bzrlib/builtins.py:4524

2899

#: bzrlib/builtins.py:4647

2899

2900

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

2900

2901

msgstr ""

2901

2902

#: bzrlib/builtins.py:4530

2903

#: bzrlib/builtins.py:4653

2903

2904

msgid "Redo a merge."

2904

2905

msgstr ""

2905

2906

#: bzrlib/builtins.py:4532

2907

#: bzrlib/builtins.py:4655

2907

2908

msgid ""

2908

2909

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

2909

2910

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

2910

2911

"lets you try different ones on different files."

2911

2912

msgstr ""

2912

2913

#: bzrlib/builtins.py:4536

2914

#: bzrlib/builtins.py:4659

2914

2915

msgid ""

2915

2916

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

2916

2917

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

2917

2918

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

2918

2919

msgstr ""

2919

2920

#: bzrlib/builtins.py:4540

2921

#: bzrlib/builtins.py:4663

2921

2922

msgid ""

2922

2923

":Examples:\n"

2923

2924

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

2924

2925

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

2925

2926

msgstr ""

2926

2927

#: bzrlib/builtins.py:4544

2928

#: bzrlib/builtins.py:4667

2928

2929

msgid " bzr remerge --show-base"

2929

2930

msgstr ""

2930

2931

#: bzrlib/builtins.py:4546

2932

#: bzrlib/builtins.py:4669

2932

2933

msgid ""

2933

2934

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

2934

2935

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

2935

2936

msgstr ""

2936

2937

#: bzrlib/builtins.py:4549

2938

#: bzrlib/builtins.py:4672

2938

2939

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

2939

2940

msgstr ""

2940

2941

2942

2943

# help of 'show-base' option of 'pull' command

2943

2944

# help of 'show-base' option of 'remerge' command

2944

2945

# help of 'show-base' option of 'update' command

2945

#: bzrlib/builtins.py:4556

2946

#: bzrlib/builtins.py:4679

2946

2947

msgid "Show base revision text in conflicts."

2947

2948

msgstr ""

2948

2949

#: bzrlib/builtins.py:4568

2950

#: bzrlib/builtins.py:4691

2950

2951

msgid ""

2951

2952

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

2952

2953

"merges."

2953

2954

msgstr ""

2954

2955

#: bzrlib/builtins.py:4624

2956

msgid "Revert files to a previous revision."

2956

#: bzrlib/builtins.py:4749

2957

msgid ""

2958

"Set files in the working tree back to the contents of a previous revision."

2957

2959

msgstr ""

2958

2960

2959

#: bzrlib/builtins.py:4626

2961

#: bzrlib/builtins.py:4751

2960

2962

msgid ""

2961

2963

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

2962

2964

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

2963

"last committed revision is used."

2965

"working tree basis revision is used. A revert operation affects only the\n"

2966

"working tree, not any revision history like the branch and repository or\n"

2967

"the working tree basis revision."

2964

2968

msgstr ""

2965

2969

2966

#: bzrlib/builtins.py:4630

2970

#: bzrlib/builtins.py:4757

2967

2971

msgid ""

2968

2972

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

2969

2973

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

2970

2974

"will remove the changes introduced by the second last commit (-2), without\n"

2971

2975

"affecting the changes introduced by the last commit (-1). To remove\n"

2972

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

2976

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

2977

"To update the branch to a specific revision or the latest revision and\n"

2978

"update the working tree accordingly while preserving local changes, see the\n"

2979

"update command."

2973

2980

msgstr ""

2974

2981

2975

#: bzrlib/builtins.py:4636

2982

#: bzrlib/builtins.py:4766

2976

2983

msgid ""

2977

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

2978

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

2979

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

2984

"Uncommitted changes to files that are reverted will be discarded.\n"

2985

"Howver, by default, any files that have been manually changed will be\n"

2986

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

2987

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

2980

2988

msgstr ""

2981

2989

2982

#: bzrlib/builtins.py:4640

2990

#: bzrlib/builtins.py:4771

2983

2991

msgid ""

2984

2992

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

2985

2993

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

2987

2995

"reverted."

2988

2996

msgstr ""

2989

2997

2990

#: bzrlib/builtins.py:4645

2998

#: bzrlib/builtins.py:4776

2991

2999

msgid ""

2992

3000

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

2993

3001

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

2995

3003

"deleted."

2996

3004

msgstr ""

2997

3005

2998

#: bzrlib/builtins.py:4650

3006

#: bzrlib/builtins.py:4781

2999

3007

msgid ""

3000

3008

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

3001

3009

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

3007

3015

"reverting any files."

3008

3016

msgstr ""

3009

3017

3010

#: bzrlib/builtins.py:4659

3018

#: bzrlib/builtins.py:4790

3011

3019

msgid ""

3012

3020

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

3013

3021

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

3022

3030

msgstr ""

3023

3031

3024

3032

# help of 'no-backup' option of 'revert' command

3025

#: bzrlib/builtins.py:4673

3033

#: bzrlib/builtins.py:4804

3026

3034

msgid "Do not save backups of reverted files."

3027

3035

msgstr ""

3028

3036

3029

3037

# help of 'forget-merges' option of 'revert' command

3030

#: bzrlib/builtins.py:4675

3038

#: bzrlib/builtins.py:4806

3031

3039

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

3032

3040

msgstr ""

3033

3041

3034

#: bzrlib/builtins.py:4706

3042

#: bzrlib/builtins.py:4837

3035

3043

msgid ""

3036

3044

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

3037

3045

" "

3038

3046

msgstr ""

3039

3047

3040

3048

# help of 'long' option of 'help' command

3041

#: bzrlib/builtins.py:4711

3049

#: bzrlib/builtins.py:4842

3042

3050

msgid "Show help on all commands."

3043

3051

msgstr ""

3044

3052

3045

#: bzrlib/builtins.py:4740

3053

#: bzrlib/builtins.py:4871

3046

3054

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

3047

3055

msgstr ""

3048

3056

3049

#: bzrlib/builtins.py:4742

3057

#: bzrlib/builtins.py:4873

3050

3058

msgid "OTHER_BRANCH may be local or remote."

3051

3059

msgstr ""

3052

3060

3053

#: bzrlib/builtins.py:4744

3061

#: bzrlib/builtins.py:4875

3054

3062

msgid ""

3055

3063

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

3056

3064

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

3061

3069

" 0 - no missing revisions"

3062

3070

msgstr ""

3063

3071

3064

#: bzrlib/builtins.py:4754

3072

#: bzrlib/builtins.py:4885

3065

3073

msgid ""

3066

3074

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

3067

3075

" remembered pull location::"

3068

3076

msgstr ""

3069

3077

3070

#: bzrlib/builtins.py:4757

3078

#: bzrlib/builtins.py:4888

3071

3079

msgid " bzr missing"

3072

3080

msgstr ""

3073

3081

3074

#: bzrlib/builtins.py:4759

3082

#: bzrlib/builtins.py:4890

3075

3083

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

3076

3084

msgstr ""

3077

3085

3078

#: bzrlib/builtins.py:4761

3086

#: bzrlib/builtins.py:4892

3079

3087

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

3080

3088

msgstr ""

3081

3089

3082

#: bzrlib/builtins.py:4763

3090

#: bzrlib/builtins.py:4894

3083

3091

msgid ""

3084

3092

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

3085

3093

" branch::"

3086

3094

msgstr ""

3087

3095

3088

#: bzrlib/builtins.py:4766

3096

#: bzrlib/builtins.py:4897

3089

3097

msgid " bzr missing -r ..-10"

3090

3098

msgstr ""

3091

3099

3092

#: bzrlib/builtins.py:4768

3100

#: bzrlib/builtins.py:4899

3093

3101

msgid ""

3094

3102

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

3095

3103

" branch::"

3096

3104

msgstr ""

3097

3105

3098

#: bzrlib/builtins.py:4771

3106

#: bzrlib/builtins.py:4902

3099

3107

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

3100

3108

msgstr ""

3101

3109

3102

3110

# help of 'reverse' option of 'missing' command

3103

#: bzrlib/builtins.py:4778

3111

#: bzrlib/builtins.py:4909

3104

3112

msgid "Reverse the order of revisions."

3105

3113

msgstr ""

3106

3114

3107

3115

# help of 'mine-only' option of 'missing' command

3108

#: bzrlib/builtins.py:4780

3116

#: bzrlib/builtins.py:4911

3109

3117

msgid "Display changes in the local branch only."

3110

3118

msgstr ""

3111

3119

3112

3120

# help of 'this' option of 'missing' command

3113

#: bzrlib/builtins.py:4781

3121

#: bzrlib/builtins.py:4912

3114

3122

msgid "Same as --mine-only."

3115

3123

msgstr ""

3116

3124

3117

3125

# help of 'theirs-only' option of 'missing' command

3118

#: bzrlib/builtins.py:4783

3126

#: bzrlib/builtins.py:4914

3119

3127

msgid "Display changes in the remote branch only."

3120

3128

msgstr ""

3121

3129

3122

3130

# help of 'other' option of 'missing' command

3123

#: bzrlib/builtins.py:4784

3131

#: bzrlib/builtins.py:4915

3124

3132

msgid "Same as --theirs-only."

3125

3133

msgstr ""

3126

3134

3127

3135

# help of 'revision' option of 'missing' command

3128

#: bzrlib/builtins.py:4789

3136

#: bzrlib/builtins.py:4920

3129

3137

msgid ""

3130

3138

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

3131

3139

"details."

3132

3140

msgstr ""

3133

3141

3134

3142

# help of 'my-revision' option of 'missing' command

3135

#: bzrlib/builtins.py:4793

3143

#: bzrlib/builtins.py:4924

3136

3144

msgid ""

3137

3145

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

3138

3146

"details."

3139

3147

msgstr ""

3140

3148

3141

3149

# help of 'include-merged' option of 'missing' command

3142

#: bzrlib/builtins.py:4796

3150

#: bzrlib/builtins.py:4927

3143

3151

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

3144

3152

msgstr ""

3145

3153

3146

#: bzrlib/builtins.py:4850

3154

#: bzrlib/builtins.py:4981

3147

3155

msgid "No peer location known or specified."

3148

3156

msgstr ""

3149

3157

3150

#: bzrlib/builtins.py:4854

3158

#: bzrlib/builtins.py:4985

3151

3159

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

3152

3160

msgstr ""

3153

3161

3154

#: bzrlib/builtins.py:4887

3162

#: bzrlib/builtins.py:5018

3155

3163

#, python-format

3156

3164

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

3157

3165

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

3158

3166

msgstr[0] ""

3159

3167

msgstr[1] ""

3160

3168

3161

#: bzrlib/builtins.py:4903

3169

#: bzrlib/builtins.py:5038

3162

3170

#, python-format

3163

3171

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

3164

3172

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

3165

3173

msgstr[0] ""

3166

3174

msgstr[1] ""

3167

3175

3168

#: bzrlib/builtins.py:4915

3176

#: bzrlib/builtins.py:5053

3169

3177

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

3170

3178

msgstr ""

3171

3179

3172

#: bzrlib/builtins.py:4918

3180

#: bzrlib/builtins.py:5056

3173

3181

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

3174

3182

msgstr ""

3175

3183

3176

#: bzrlib/builtins.py:4923

3184

#: bzrlib/builtins.py:5061

3177

3185

msgid "Branches are up to date.\n"

3178

3186

msgstr ""

3179

3187

3180

#: bzrlib/builtins.py:4934

3188

#: bzrlib/builtins.py:5072

3181

3189

msgid "Compress the data within a repository."

3182

3190

msgstr ""

3183

3191

3184

#: bzrlib/builtins.py:4936

3192

#: bzrlib/builtins.py:5074

3185

3193

msgid ""

3186

3194

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

3187

3195

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

3188

3196

"normally not required to be done manually."

3189

3197

msgstr ""

3190

3198

3191

#: bzrlib/builtins.py:4940

3199

#: bzrlib/builtins.py:5078

3192

3200

msgid ""

3193

3201

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

3194

3202

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

3197

3205

"used."

3198

3206

msgstr ""

3199

3207

3200

#: bzrlib/builtins.py:4946

3208

#: bzrlib/builtins.py:5084

3201

3209

msgid ""

3202

3210

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

3203

3211

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

3206

3214

msgstr ""

3207

3215

3208

3216

# help of 'clean-obsolete-packs' option of 'pack' command

3209

#: bzrlib/builtins.py:4955

3217

#: bzrlib/builtins.py:5093

3210

3218

msgid "Delete obsolete packs to save disk space."

3211

3219

msgstr ""

3212

3220

3213

#: bzrlib/builtins.py:4969

3221

#: bzrlib/builtins.py:5107

3214

3222

msgid "List the installed plugins."

3215

3223

msgstr ""

3216

3224

3217

#: bzrlib/builtins.py:4971

3225

#: bzrlib/builtins.py:5109

3218

3226

msgid ""

3219

3227

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

3220

3228

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

3221

3229

msgstr ""

3222

3230

3223

#: bzrlib/builtins.py:4974

3231

#: bzrlib/builtins.py:5112

3224

3232

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

3225

3233

msgstr ""

3226

3234

3227

#: bzrlib/builtins.py:4976

3235

#: bzrlib/builtins.py:5114

3228

3236

msgid ""

3229

3237

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

3230

3238

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

3233

3241

"customizing log output."

3234

3242

msgstr ""

3235

3243

3236

#: bzrlib/builtins.py:4982

3244

#: bzrlib/builtins.py:5120

3237

3245

msgid ""

3238

3246

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

3239

3247

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

3241

3249

"plugins using the Python programming language."

3242

3250

msgstr ""

3243

3251

3244

#: bzrlib/builtins.py:4998

3252

#: bzrlib/builtins.py:5136

3245

3253

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

3246

3254

msgstr ""

3247

3255

3248

3256

# help of 'long' option of 'testament' command

3249

#: bzrlib/builtins.py:5001

3257

#: bzrlib/builtins.py:5139

3250

3258

msgid "Produce long-format testament."

3251

3259

msgstr ""

3252

3260

3253

3261

# help of 'strict' option of 'testament' command

3254

#: bzrlib/builtins.py:5003

3262

#: bzrlib/builtins.py:5141

3255

3263

msgid "Produce a strict-format testament."

3256

3264

msgstr ""

3257

3265

3258

#: bzrlib/builtins.py:5029

3266

#: bzrlib/builtins.py:5168

3259

3267

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

3260

3268

msgstr ""

3261

3269

3262

#: bzrlib/builtins.py:5031

3270

#: bzrlib/builtins.py:5170

3263

3271

msgid ""

3264

3272

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

3265

3273

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

3266

3274

msgstr ""

3267

3275

3268

#: bzrlib/builtins.py:5034

3276

#: bzrlib/builtins.py:5173

3269

3277

msgid ""

3270

3278

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

3271

3279

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

3272

3280

msgstr ""

3273

3281

3274

3282

# help of 'all' option of 'annotate' command

3275

#: bzrlib/builtins.py:5042

3283

#: bzrlib/builtins.py:5181

3276

3284

msgid "Show annotations on all lines."

3277

3285

msgstr ""

3278

3286

3279

3287

# help of 'long' option of 'annotate' command

3280

#: bzrlib/builtins.py:5043

3288

#: bzrlib/builtins.py:5182

3281

3289

msgid "Show commit date in annotations."

3282

3290

msgstr ""

3283

3291

3284

#: bzrlib/builtins.py:5130

3292

#: bzrlib/builtins.py:5269

3285

3293

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

3286

3294

msgstr ""

3287

3295

3288

#: bzrlib/builtins.py:5142

3296

#: bzrlib/builtins.py:5281

3289

3297

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

3290

3298

msgstr ""

3291

3299

3292

#: bzrlib/builtins.py:5146

3300

#: bzrlib/builtins.py:5285

3293

3301

msgid ""

3294

3302

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

3295

3303

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

3296

3304

msgstr ""

3297

3305

3298

#: bzrlib/builtins.py:5149

3306

#: bzrlib/builtins.py:5288

3299

3307

msgid ""

3300

3308

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

3301

3309

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

3302

3310

msgstr ""

3303

3311

3304

#: bzrlib/builtins.py:5152

3312

#: bzrlib/builtins.py:5291

3305

3313

msgid ""

3306

3314

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

3307

3315

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

3308

3316

"that of the master."

3309

3317

msgstr ""

3310

3318

3311

#: bzrlib/builtins.py:5167

3319

#: bzrlib/builtins.py:5306

3312

3320

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

3313

3321

msgstr ""

3314

3322

3315

#: bzrlib/builtins.py:5172

3323

#: bzrlib/builtins.py:5312

3316

3324

msgid "Branch is already bound"

3317

3325

msgstr ""

3318

3326

3319

#: bzrlib/builtins.py:5174

3327

#: bzrlib/builtins.py:5315

3320

3328

msgid "No location supplied and no previous location known"

3321

3329

msgstr ""

3322

3330

3323

#: bzrlib/builtins.py:5180

3331

#: bzrlib/builtins.py:5321

3324

3332

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

3325

3333

msgstr ""

3326

3334

3327

#: bzrlib/builtins.py:5187

3335

#: bzrlib/builtins.py:5328

3328

3336

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

3329

3337

msgstr ""

3330

3338

3331

#: bzrlib/builtins.py:5189

3339

#: bzrlib/builtins.py:5330

3332

3340

msgid ""

3333

3341

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

3334

3342

"commits will be local only."

3335

3343

msgstr ""

3336

3344

3337

#: bzrlib/builtins.py:5200

3345

#: bzrlib/builtins.py:5341

3338

3346

msgid "Local branch is not bound"

3339

3347

msgstr ""

3340

3348

3341

#: bzrlib/builtins.py:5204

3349

#: bzrlib/builtins.py:5345

3342

3350

msgid "Remove the last committed revision."

3343

3351

msgstr ""

3344

3352

3345

#: bzrlib/builtins.py:5206

3353

#: bzrlib/builtins.py:5347

3346

3354

msgid ""

3347

3355

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

3348

3356

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

3349

3357

"remove anything."

3350

3358

msgstr ""

3351

3359

3352

#: bzrlib/builtins.py:5210

3360

#: bzrlib/builtins.py:5351

3353

3361

msgid ""

3354

3362

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

3355

3363

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

3356

3364

"branch at revision 15."

3357

3365

msgstr ""

3358

3366

3359

#: bzrlib/builtins.py:5214

3367

#: bzrlib/builtins.py:5355

3360

3368

msgid ""

3361

3369

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

3362

3370

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

3364

3372

msgstr ""

3365

3373

3366

3374

# help of 'dry-run' option of 'uncommit' command

3367

#: bzrlib/builtins.py:5225

3375

#: bzrlib/builtins.py:5366

3368

3376

msgid "Don't actually make changes."

3369

3377

msgstr ""

3370

3378

3371

3379

# help of 'force' option of 'uncommit' command

3372

#: bzrlib/builtins.py:5226

3380

#: bzrlib/builtins.py:5367

3373

3381

msgid "Say yes to all questions."

3374

3382

msgstr ""

3375

3383

3376

3384

# help of 'keep-tags' option of 'uncommit' command

3377

#: bzrlib/builtins.py:5228

3385

#: bzrlib/builtins.py:5369

3378

3386

msgid "Keep tags that point to removed revisions."

3379

3387

msgstr ""

3380

3388

3381

3389

# help of 'local' option of 'uncommit' command

3382

#: bzrlib/builtins.py:5230

3390

#: bzrlib/builtins.py:5371

3383

3391

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

3384

3392

msgstr ""

3385

3393

3386

#: bzrlib/builtins.py:5279

3394

#: bzrlib/builtins.py:5420

3387

3395

msgid "No revisions to uncommit.\n"

3388

3396

msgstr ""

3389

3397

3390

#: bzrlib/builtins.py:5294

3398

#: bzrlib/builtins.py:5435

3391

3399

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

3392

3400

msgstr ""

3393

3401

3394

#: bzrlib/builtins.py:5297

3402

#: bzrlib/builtins.py:5438

3395

3403

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

3396

3404

msgstr ""

3397

3405

3398

#: bzrlib/builtins.py:5301

3406

#: bzrlib/builtins.py:5442

3399

3407

msgid "Uncommit these revisions"

3400

3408

msgstr ""

3401

3409

3402

#: bzrlib/builtins.py:5304

3410

#: bzrlib/builtins.py:5445

3403

3411

msgid "Canceled\n"

3404

3412

msgstr ""

3405

3413

3406

#: bzrlib/builtins.py:5311

3414

#: bzrlib/builtins.py:5452

3407

3415

#, python-format

3408

3416

msgid ""

3409

3417

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

3410

3418

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

3411

3419

msgstr ""

3412

3420

3413

#: bzrlib/builtins.py:5316

3421

#: bzrlib/builtins.py:5457

3414

3422

msgid "Break a dead lock."

3415

3423

msgstr ""

3416

3424

3417

#: bzrlib/builtins.py:5318

3425

#: bzrlib/builtins.py:5459

3418

3426

msgid ""

3419

3427

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

3420

3428

"config file."

3421

3429

msgstr ""

3422

3430

3423

#: bzrlib/builtins.py:5321

3431

#: bzrlib/builtins.py:5462

3424

3432

msgid ""

3425

3433

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

3426

3434

"holding the lock has been stopped."

3427

3435

msgstr ""

3428

3436

3429

#: bzrlib/builtins.py:5324

3437

#: bzrlib/builtins.py:5465

3430

3438

msgid ""

3431

3439

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

3432

3440

"[location]' command."

3433

3441

msgstr ""

3434

3442

3435

#: bzrlib/builtins.py:5327

3443

#: bzrlib/builtins.py:5468

3436

3444

msgid ""

3437

3445

":Examples:\n"

3438

3446

" bzr break-lock\n"

3441

3449

msgstr ""

3442

3450

3443

3451

# help of 'config' option of 'break-lock' command

3444

#: bzrlib/builtins.py:5336

3452

#: bzrlib/builtins.py:5477

3445

3453

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

3446

3454

msgstr ""

3447

3455

3448

3456

# help of 'force' option of 'break-lock' command

3449

#: bzrlib/builtins.py:5338

3457

#: bzrlib/builtins.py:5479

3450

3458

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

3451

3459

msgstr ""

3452

3460

3453

3461

# help of 'protocol=bzr' option of 'serve' command

3454

#: bzrlib/builtins.py:5373

3462

#: bzrlib/builtins.py:5514

3455

3463

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

3456

3464

msgstr ""

3457

3465

3458

#: bzrlib/builtins.py:5374

3466

#: bzrlib/builtins.py:5515

3459

3467

msgid "Run the bzr server."

3460

3468

msgstr ""

3461

3469

3462

3470

# help of 'inet' option of 'serve' command

3463

#: bzrlib/builtins.py:5380

3471

#: bzrlib/builtins.py:5521

3464

3472

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

3465

3473

msgstr ""

3466

3474

3467

3475

# title of 'protocol' option of 'serve' command

3468

#: bzrlib/builtins.py:5381

3476

#: bzrlib/builtins.py:5522

3469

3477

msgid "protocol"

3470

3478

msgstr ""

3471

3479

3472

3480

# help of 'protocol' option of 'serve' command

3473

#: bzrlib/builtins.py:5382

3481

#: bzrlib/builtins.py:5523

3474

3482

msgid "Protocol to serve."

3475

3483

msgstr ""

3476

3484

3485

# help of 'listen' option of 'serve' command

3486

#: bzrlib/builtins.py:5527

3487

msgid "Listen for connections on nominated address."

3488

msgstr ""

3489

3477

3490

# help of 'port' option of 'serve' command

3478

#: bzrlib/builtins.py:5386

3491

#: bzrlib/builtins.py:5529

3479

3492

msgid ""

3480

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

3481

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

3482

"The default port depends on the protocol."

3493

"Listen for connections on nominated port. Passing 0 as the port number will "

3494

"result in a dynamically allocated port. The default port depends on the "

3495

"protocol."

3483

3496

msgstr ""

3484

3497

3485

3498

# help of 'directory' option of 'serve' command

3486

#: bzrlib/builtins.py:5392

3499

#: bzrlib/builtins.py:5534

3487

3500

msgid "Serve contents of this directory."

3488

3501

msgstr ""

3489

3502

3490

3503

# help of 'allow-writes' option of 'serve' command

3491

#: bzrlib/builtins.py:5394

3504

#: bzrlib/builtins.py:5536

3492

3505

msgid ""

3493

3506

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

3494

3507

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

3498

3511

msgstr ""

3499

3512

3500

3513

# help of 'client-timeout' option of 'serve' command

3501

#: bzrlib/builtins.py:5403

3514

#: bzrlib/builtins.py:5545

3502

3515

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

3503

3516

msgstr ""

3504

3517

3505

#: bzrlib/builtins.py:5453

3518

#: bzrlib/builtins.py:5563

3506

3519

msgid "Combine a tree into its containing tree."

3507

3520

msgstr ""

3508

3521

3509

#: bzrlib/builtins.py:5455

3522

#: bzrlib/builtins.py:5565

3510

3523

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

3511

3524

msgstr ""

3512

3525

3513

#: bzrlib/builtins.py:5457

3526

#: bzrlib/builtins.py:5567

3514

3527

msgid ""

3515

3528

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

3516

3529

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

3517

3530

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

3518

3531

msgstr ""

3519

3532

3520

#: bzrlib/builtins.py:5461

3533

#: bzrlib/builtins.py:5571

3521

3534

msgid ""

3522

3535

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

3523

3536

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

3524

3537

"and all history is preserved."

3525

3538

msgstr ""

3526

3539

3527

#: bzrlib/builtins.py:5479

3540

#: bzrlib/builtins.py:5589

3528

3541

#, python-format

3529

3542

msgid ""

3530

3543

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

3531

3544

"You can use bzr upgrade on the repository."

3532

3545

msgstr ""

3533

3546

3534

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

3547

#: bzrlib/builtins.py:5599 bzrlib/builtins.py:5605

3535

3548

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

3536

3549

msgstr ""

3537

3550

3538

#: bzrlib/builtins.py:5499

3551

#: bzrlib/builtins.py:5609

3539

3552

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

3540

3553

msgstr ""

3541

3554

3542

#: bzrlib/builtins.py:5501

3555

#: bzrlib/builtins.py:5611

3543

3556

msgid ""

3544

3557

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

3545

3558

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

3546

3559

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

3547

3560

msgstr ""

3548

3561

3549

#: bzrlib/builtins.py:5505

3562

#: bzrlib/builtins.py:5615

3550

3563

msgid ""

3551

3564

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

3552

3565

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

3553

3566

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

3554

3567

msgstr ""

3555

3568

3556

#: bzrlib/builtins.py:5585

3569

#: bzrlib/builtins.py:5695

3557

3570

msgid "No submit branch specified or known"

3558

3571

msgstr ""

3559

3572

3560

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

3573

#: bzrlib/builtins.py:5704 bzrlib/send.py:109

3561

3574

msgid "No public branch specified or known"

3562

3575

msgstr ""

3563

3576

3564

#: bzrlib/builtins.py:5598

3577

#: bzrlib/builtins.py:5709

3565

3578

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

3566

3579

msgstr ""

3567

3580

3568

#: bzrlib/builtins.py:5607

3581

#: bzrlib/builtins.py:5718

3569

3582

msgid "No revisions to bundle."

3570

3583

msgstr ""

3571

3584

3572

#: bzrlib/builtins.py:5626

3585

#: bzrlib/builtins.py:5737

3573

3586

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

3574

3587

msgstr ""

3575

3588

3576

#: bzrlib/builtins.py:5628

3589

#: bzrlib/builtins.py:5739

3577

3590

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

3578

3591

msgstr ""

3579

3592

3580

#: bzrlib/builtins.py:5630

3593

#: bzrlib/builtins.py:5741

3581

3594

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

3582

3595

msgstr ""

3583

3596

3584

#: bzrlib/builtins.py:5632

3597

#: bzrlib/builtins.py:5743

3585

3598

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

3586

3599

msgstr ""

3587

3600

3588

#: bzrlib/builtins.py:5634

3601

#: bzrlib/builtins.py:5745

3589

3602

msgid ""

3590

3603

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

3591

3604

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

3592

3605

" branch."

3593

3606

msgstr ""

3594

3607

3595

#: bzrlib/builtins.py:5638

3608

#: bzrlib/builtins.py:5749

3596

3609

msgid ""

3597

3610

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

3598

3611

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

3599

3612

msgstr ""

3600

3613

3601

#: bzrlib/builtins.py:5641

3614

#: bzrlib/builtins.py:5752

3602

3615

msgid ""

3603

3616

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

3604

3617

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

3605

3618

"the source branch."

3606

3619

msgstr ""

3607

3620

3608

#: bzrlib/builtins.py:5645

3621

#: bzrlib/builtins.py:5756

3609

3622

msgid ""

3610

3623

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

3611

3624

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

3614

3627

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

3615

3628

msgstr ""

3616

3629

3617

#: bzrlib/builtins.py:5651

3630

#: bzrlib/builtins.py:5762

3618

3631

msgid ""

3619

3632

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

3620

3633

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

3623

3636

"be changed using --from."

3624

3637

msgstr ""

3625

3638

3626

#: bzrlib/builtins.py:5657

3639

#: bzrlib/builtins.py:5768

3627

3640

msgid ""

3628

3641

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

3629

3642

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

3632

3645

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

3633

3646

msgstr ""

3634

3647

3635

#: bzrlib/builtins.py:5663

3648

#: bzrlib/builtins.py:5774

3636

3649

msgid ""

3637

3650

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

3638

3651

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

3640

3653

"in the merge directive."

3641

3654

msgstr ""

3642

3655

3643

#: bzrlib/builtins.py:5668

3656

#: bzrlib/builtins.py:5779

3644

3657

msgid ""

3645

3658

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

3646

3659

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

3647

3660

msgstr ""

3648

3661

3649

#: bzrlib/builtins.py:5671

3662

#: bzrlib/builtins.py:5782

3650

3663

msgid ""

3651

3664

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

3652

3665

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

3653

3666

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

3654

3667

msgstr ""

3655

3668

3656

#: bzrlib/builtins.py:5675

3669

#: bzrlib/builtins.py:5786

3657

3670

msgid ""

3658

3671

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

3659

3672

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

3665

3678

"supported clients."

3666

3679

msgstr ""

3667

3680

3668

#: bzrlib/builtins.py:5682

3681

#: bzrlib/builtins.py:5793

3669

3682

msgid ""

3670

3683

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

3671

3684

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

3673

3686

"in the submit branch."

3674

3687

msgstr ""

3675

3688

3676

#: bzrlib/builtins.py:5687

3689

#: bzrlib/builtins.py:5798

3677

3690

msgid ""

3678

3691

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

3679

3692

"and\n"

3683

3696

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

3684

3697

msgstr ""

3685

3698

3686

#: bzrlib/builtins.py:5693

3699

#: bzrlib/builtins.py:5804

3687

3700

msgid ""

3688

3701

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

3689

3702

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

3690

3703

msgstr ""

3691

3704

3692

#: bzrlib/builtins.py:5696

3705

#: bzrlib/builtins.py:5807

3693

3706

msgid ""

3694

3707

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

3695

3708

"into\n"

3698

3711

msgstr ""

3699

3712

3700

3713

# help of 'output' option of 'send' command

3701

#: bzrlib/builtins.py:5720

3714

#: bzrlib/builtins.py:5831

3702

3715

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

3703

3716

msgstr ""

3704

3717

3705

3718

# help of 'strict' option of 'send' command

3706

#: bzrlib/builtins.py:5724

3719

#: bzrlib/builtins.py:5835

3707

3720

msgid ""

3708

3721

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

3709

3722

"strict disables the check."

3710

3723

msgstr ""

3711

3724

3712

3725

# help of 'mail-to' option of 'send' command

3713

#: bzrlib/builtins.py:5726

3726

#: bzrlib/builtins.py:5837

3714

3727

msgid "Mail the request to this address."

3715

3728

msgstr ""

3716

3729

3717

3730

# help of 'body' option of 'send' command

3718

#: bzrlib/builtins.py:5730

3731

#: bzrlib/builtins.py:5841

3719

3732

msgid "Body for the email."

3720

3733

msgstr ""

3721

3734

3722

3735

# help of 'no-bundle' option of 'send' command

3723

#: bzrlib/builtins.py:5783

3736

#: bzrlib/builtins.py:5894

3724

3737

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

3725

3738

msgstr ""

3726

3739

3727

3740

# help of 'no-patch' option of 'send' command

3728

#: bzrlib/builtins.py:5784

3741

#: bzrlib/builtins.py:5895

3729

3742

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

3730

3743

msgstr ""

3731

3744

3732

3745

# help of 'remember' option of 'send' command

3733

#: bzrlib/builtins.py:5787

3746

#: bzrlib/builtins.py:5898

3734

3747

msgid "Remember submit and public branch."

3735

3748

msgstr ""

3736

3749

3737

3750

# help of 'from' option of 'send' command

3738

#: bzrlib/builtins.py:5789

3751

#: bzrlib/builtins.py:5900

3739

3752

msgid ""

3740

3753

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

3741

3754

"working directory."

3743

3756

3744

3757

# title of 'format' option of 'send' command

3745

3758

# title of 'format' option of 'version-info' command

3746

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

3759

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

3747

3760

msgid "format"

3748

3761

msgstr ""

3749

3762

3750

3763

# help of 'format' option of 'send' command

3751

#: bzrlib/builtins.py:5800

3764

#: bzrlib/builtins.py:5911

3752

3765

msgid "Use the specified output format."

3753

3766

msgstr ""

3754

3767

3755

#: bzrlib/builtins.py:5822

3768

#: bzrlib/builtins.py:5933

3756

3769

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

3757

3770

msgstr ""

3758

3771

3759

#: bzrlib/builtins.py:5824

3772

#: bzrlib/builtins.py:5935

3760

3773

msgid ""

3761

3774

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

3762

3775

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

3763

3776

"created tag."

3764

3777

msgstr ""

3765

3778

3766

#: bzrlib/builtins.py:5828

3779

#: bzrlib/builtins.py:5939

3767

3780

msgid ""

3768

3781

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

3769

3782

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

3770

3783

msgstr ""

3771

3784

3772

#: bzrlib/builtins.py:5831

3785

#: bzrlib/builtins.py:5942

3773

3786

msgid ""

3774

3787

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

3775

3788

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

3776

3789

msgstr ""

3777

3790

3778

#: bzrlib/builtins.py:5834

3791

#: bzrlib/builtins.py:5945

3779

3792

msgid ""

3780

3793

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

3781

3794

"``bzr\n"

3782

3795

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

3783

3796

msgstr ""

3784

3797

3785

#: bzrlib/builtins.py:5837

3798

#: bzrlib/builtins.py:5948

3786

3799

msgid ""

3787

3800

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

3788

3801

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

3791

3804

msgstr ""

3792

3805

3793

3806

# help of 'delete' option of 'tag' command

3794

#: bzrlib/builtins.py:5847

3807

#: bzrlib/builtins.py:5958

3795

3808

msgid "Delete this tag rather than placing it."

3796

3809

msgstr ""

3797

3810

3798

3811

# help of 'directory' option of 'tag' command

3799

#: bzrlib/builtins.py:5850

3812

#: bzrlib/builtins.py:5961

3800

3813

msgid "Branch in which to place the tag."

3801

3814

msgstr ""

3802

3815

3803

3816

# help of 'force' option of 'tag' command

3804

#: bzrlib/builtins.py:5852

3817

#: bzrlib/builtins.py:5963

3805

3818

msgid "Replace existing tags."

3806

3819

msgstr ""

3807

3820

3808

#: bzrlib/builtins.py:5867

3821

#: bzrlib/builtins.py:5978

3809

3822

msgid "No tag specified to delete."

3810

3823

msgstr ""

3811

3824

3812

#: bzrlib/builtins.py:5869

3825

#: bzrlib/builtins.py:5980

3813

3826

#, python-format

3814

3827

msgid "Deleted tag %s."

3815

3828

msgstr ""

3816

3829

3817

#: bzrlib/builtins.py:5883

3830

#: bzrlib/builtins.py:5985

3831

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

3832

msgstr ""

3833

3834

#: bzrlib/builtins.py:5994

3818

3835

msgid "Please specify a tag name."

3819

3836

msgstr ""

3820

3837

3821

#: bzrlib/builtins.py:5891

3838

#: bzrlib/builtins.py:6002

3822

3839

#, python-format

3823

3840

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

3824

3841

msgstr ""

3825

3842

3826

#: bzrlib/builtins.py:5895

3843

#: bzrlib/builtins.py:6006

3827

3844

#, python-format

3828

3845

msgid "Created tag %s."

3829

3846

msgstr ""

3830

3847

3831

#: bzrlib/builtins.py:5897

3848

#: bzrlib/builtins.py:6008

3832

3849

#, python-format

3833

3850

msgid "Updated tag %s."

3834

3851

msgstr ""

3835

3852

3836

#: bzrlib/builtins.py:5901

3853

#: bzrlib/builtins.py:6012

3837

3854

msgid "List tags."

3838

3855

msgstr ""

3839

3856

3840

#: bzrlib/builtins.py:5903

3857

#: bzrlib/builtins.py:6014

3841

3858

msgid ""

3842

3859

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

3843

3860

msgstr ""

3844

3861

3845

3862

# help of 'directory' option of 'tags' command

3846

#: bzrlib/builtins.py:5909

3863

#: bzrlib/builtins.py:6020

3847

3864

msgid "Branch whose tags should be displayed."

3848

3865

msgstr ""

3849

3866

3850

3867

# help of 'sort' option of 'tags' command

3851

#: bzrlib/builtins.py:5911

3868

#: bzrlib/builtins.py:6022

3852

3869

msgid "Sort tags by different criteria."

3853

3870

msgstr ""

3854

3871

3855

3872

# title of 'sort' option of 'tags' command

3856

#: bzrlib/builtins.py:5911

3873

#: bzrlib/builtins.py:6022

3857

3874

msgid "Sorting"

3858

3875

msgstr ""

3859

3876

3860

#: bzrlib/builtins.py:5980

3877

#: bzrlib/builtins.py:6091

3861

3878

msgid "Reconfigure the type of a bzr directory."

3862

3879

msgstr ""

3863

3880

3864

#: bzrlib/builtins.py:5982

3881

#: bzrlib/builtins.py:6093

3865

3882

msgid "A target configuration must be specified."

3866

3883

msgstr ""

3867

3884

3868

#: bzrlib/builtins.py:5984

3885

#: bzrlib/builtins.py:6095

3869

3886

msgid ""

3870

3887

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

3871

3888

"The order of preference is\n"

3877

3894

msgstr ""

3878

3895

3879

3896

# title of 'tree_type' option of 'reconfigure' command

3880

#: bzrlib/builtins.py:5998

3897

#: bzrlib/builtins.py:6109

3881

3898

msgid "Tree type"

3882

3899

msgstr ""

3883

3900

3884

3901

# help of 'tree_type' option of 'reconfigure' command

3885

#: bzrlib/builtins.py:5999

3902

#: bzrlib/builtins.py:6110

3886

3903

msgid "The relation between branch and tree."

3887

3904

msgstr ""

3888

3905

3889

3906

# help of 'tree_type=branch' option of 'reconfigure' command

3890

#: bzrlib/builtins.py:6001

3907

#: bzrlib/builtins.py:6112

3891

3908

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

3892

3909

msgstr ""

3893

3910

3894

3911

# help of 'tree_type=tree' option of 'reconfigure' command

3895

#: bzrlib/builtins.py:6002

3912

#: bzrlib/builtins.py:6113

3896

3913

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

3897

3914

msgstr ""

3898

3915

3899

3916

# help of 'tree_type=checkout' option of 'reconfigure' command

3900

#: bzrlib/builtins.py:6003

3917

#: bzrlib/builtins.py:6114

3901

3918

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

3902

3919

msgstr ""

3903

3920

3904

3921

# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command

3905

#: bzrlib/builtins.py:6004

3922

#: bzrlib/builtins.py:6115

3906

3923

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

3907

3924

msgstr ""

3908

3925

3909

3926

# title of 'repository_type' option of 'reconfigure' command

3910

#: bzrlib/builtins.py:6009

3927

#: bzrlib/builtins.py:6120

3911

3928

msgid "Repository type"

3912

3929

msgstr ""

3913

3930

3914

3931

# help of 'repository_type' option of 'reconfigure' command

3915

#: bzrlib/builtins.py:6010

3932

#: bzrlib/builtins.py:6121

3916

3933

msgid "Location fo the repository."

3917

3934

msgstr ""

3918

3935

3919

3936

# help of 'repository_type=standalone' option of 'reconfigure' command

3920

#: bzrlib/builtins.py:6012

3937

#: bzrlib/builtins.py:6123

3921

3938

msgid ""

3922

3939

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

3923

3940

msgstr ""

3924

3941

3925

3942

# help of 'repository_type=use-shared' option of 'reconfigure' command

3926

#: bzrlib/builtins.py:6014

3943

#: bzrlib/builtins.py:6125

3927

3944

msgid "Reconfigure to use a shared repository."

3928

3945

msgstr ""

3929

3946

3930

3947

# title of 'repository_trees' option of 'reconfigure' command

3931

#: bzrlib/builtins.py:6018

3948

#: bzrlib/builtins.py:6129

3932

3949

msgid "Trees in Repository"

3933

3950

msgstr ""

3934

3951

3935

3952

# help of 'repository_trees' option of 'reconfigure' command

3936

#: bzrlib/builtins.py:6019

3953

#: bzrlib/builtins.py:6130

3937

3954

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

3938

3955

msgstr ""

3939

3956

3940

3957

# help of 'repository_trees=with-trees' option of 'reconfigure' command

3941

#: bzrlib/builtins.py:6021

3958

#: bzrlib/builtins.py:6132

3942

3959

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

3943

3960

msgstr ""

3944

3961

3945

3962

# help of 'repository_trees=with-no-trees' option of 'reconfigure' command

3946

#: bzrlib/builtins.py:6023

3963

#: bzrlib/builtins.py:6134

3947

3964

msgid ""

3948

3965

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

3949

3966

msgstr ""

3950

3967

3951

3968

# help of 'bind-to' option of 'reconfigure' command

3952

#: bzrlib/builtins.py:6026

3969

#: bzrlib/builtins.py:6137

3953

3970

msgid "Branch to bind checkout to."

3954

3971

msgstr ""

3955

3972

3956

3973

# help of 'force' option of 'reconfigure' command

3957

#: bzrlib/builtins.py:6028

3974

#: bzrlib/builtins.py:6139

3958

3975

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

3959

3976

msgstr ""

3960

3977

3961

3978

# help of 'stacked-on' option of 'reconfigure' command

3962

#: bzrlib/builtins.py:6031

3979

#: bzrlib/builtins.py:6142

3963

3980

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

3964

3981

msgstr ""

3965

3982

3966

3983

# help of 'unstacked' option of 'reconfigure' command

3967

#: bzrlib/builtins.py:6035

3984

#: bzrlib/builtins.py:6146

3968

3985

msgid ""

3969

3986

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

3970

3987

"data into it."

3971

3988

msgstr ""

3972

3989

3973

#: bzrlib/builtins.py:6045

3990

#: bzrlib/builtins.py:6156

3974

3991

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

3975

3992

msgstr ""

3976

3993

3977

#: bzrlib/builtins.py:6059

3994

#: bzrlib/builtins.py:6170

3978

3995

msgid "No target configuration specified"

3979

3996

msgstr ""

3980

3997

3981

#: bzrlib/builtins.py:6094

3998

#: bzrlib/builtins.py:6205

3982

3999

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

3983

4000

msgstr ""

3984

4001

3985

#: bzrlib/builtins.py:6096

4002

#: bzrlib/builtins.py:6207

3986

4003

msgid ""

3987

4004

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

3988

4005

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

3990

4007

"of the new location and binds to it."

3991

4008

msgstr ""

3992

4009

3993

#: bzrlib/builtins.py:6101

4010

#: bzrlib/builtins.py:6212

3994

4011

msgid ""

3995

4012

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

3996

4013

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

3997

4014

msgstr ""

3998

4015

3999

#: bzrlib/builtins.py:6104

4016

#: bzrlib/builtins.py:6215

4000

4017

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

4001

4018

msgstr ""

4002

4019

4003

#: bzrlib/builtins.py:6106

4020

#: bzrlib/builtins.py:6217

4004

4021

msgid ""

4005

4022

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

4006

4023

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

4008

4025

"/path/to/newbranch."

4009

4026

msgstr ""

4010

4027

4011

#: bzrlib/builtins.py:6111

4028

#: bzrlib/builtins.py:6222

4012

4029

msgid ""

4013

4030

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

4014

4031

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

4016

4033

msgstr ""

4017

4034

4018

4035

# help of 'force' option of 'switch' command

4019

#: bzrlib/builtins.py:6119

4036

#: bzrlib/builtins.py:6230

4020

4037

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

4021

4038

msgstr ""

4022

4039

4023

4040

# help of 'create-branch' option of 'switch' command

4024

#: bzrlib/builtins.py:6122

4041

#: bzrlib/builtins.py:6233

4025

4042

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

4026

4043

msgstr ""

4027

4044

4028

#: bzrlib/builtins.py:6134

4045

# help of 'store' option of 'switch' command

4046

#: bzrlib/builtins.py:6236

4047

msgid "Store and restore uncommitted changes in the branch."

4048

msgstr ""

4049

4050

#: bzrlib/builtins.py:6250

4029

4051

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

4030

4052

msgstr ""

4031

4053

4032

#: bzrlib/builtins.py:6145

4054

#: bzrlib/builtins.py:6263

4033

4055

msgid "cannot create branch without source branch"

4034

4056

msgstr ""

4035

4057

4036

#: bzrlib/builtins.py:6209

4058

#: bzrlib/builtins.py:6289

4037

4059

msgid "Manage filtered views."

4038

4060

msgstr ""

4039

4061

4040

#: bzrlib/builtins.py:6211

4062

#: bzrlib/builtins.py:6291

4041

4063

msgid ""

4042

4064

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

4043

4065

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

4047

4069

"must be within the current view."

4048

4070

msgstr ""

4049

4071

4050

#: bzrlib/builtins.py:6218

4072

#: bzrlib/builtins.py:6298

4051

4073

msgid ""

4052

4074

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

4053

4075

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

4055

4077

"and switch between them."

4056

4078

msgstr ""

4057

4079

4058

#: bzrlib/builtins.py:6223

4080

#: bzrlib/builtins.py:6303

4059

4081

msgid ""

4060

4082

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

4061

4083

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

4063

4085

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

4064

4086

msgstr ""

4065

4087

4066

#: bzrlib/builtins.py:6228

4088

#: bzrlib/builtins.py:6308

4067

4089

msgid ""

4068

4090

":Examples:\n"

4069

4091

" To define the current view::"

4070

4092

msgstr ""

4071

4093

4072

#: bzrlib/builtins.py:6231

4094

#: bzrlib/builtins.py:6311

4073

4095

msgid " bzr view file1 dir1 ..."

4074

4096

msgstr ""

4075

4097

4076

#: bzrlib/builtins.py:6233

4098

#: bzrlib/builtins.py:6313

4077

4099

msgid " To list the current view::"

4078

4100

msgstr ""

4079

4101

4080

#: bzrlib/builtins.py:6235

4102

#: bzrlib/builtins.py:6315

4081

4103

msgid " bzr view"

4082

4104

msgstr ""

4083

4105

4084

#: bzrlib/builtins.py:6237

4106

#: bzrlib/builtins.py:6317

4085

4107

msgid " To delete the current view::"

4086

4108

msgstr ""

4087

4109

4088

#: bzrlib/builtins.py:6239

4110

#: bzrlib/builtins.py:6319

4089

4111

msgid " bzr view --delete"

4090

4112

msgstr ""

4091

4113

4092

#: bzrlib/builtins.py:6241

4114

#: bzrlib/builtins.py:6321

4093

4115

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

4094

4116

msgstr ""

4095

4117

4096

#: bzrlib/builtins.py:6243

4118

#: bzrlib/builtins.py:6323

4097

4119

msgid " bzr view --switch off"

4098

4120

msgstr ""

4099

4121

4100

#: bzrlib/builtins.py:6245

4122

#: bzrlib/builtins.py:6325

4101

4123

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

4102

4124

msgstr ""

4103

4125

4104

#: bzrlib/builtins.py:6247

4126

#: bzrlib/builtins.py:6327

4105

4127

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

4106

4128

msgstr ""

4107

4129

4108

#: bzrlib/builtins.py:6249

4130

#: bzrlib/builtins.py:6329

4109

4131

msgid " To list a named view::"

4110

4132

msgstr ""

4111

4133

4112

#: bzrlib/builtins.py:6251

4134

#: bzrlib/builtins.py:6331

4113

4135

msgid " bzr view --name view-name"

4114

4136

msgstr ""

4115

4137

4116

#: bzrlib/builtins.py:6253

4138

#: bzrlib/builtins.py:6333

4117

4139

msgid " To delete a named view::"

4118

4140

msgstr ""

4119

4141

4120

#: bzrlib/builtins.py:6255

4142

#: bzrlib/builtins.py:6335

4121

4143

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

4122

4144

msgstr ""

4123

4145

4124

#: bzrlib/builtins.py:6257

4146

#: bzrlib/builtins.py:6337

4125

4147

msgid " To switch to a named view::"

4126

4148

msgstr ""

4127

4149

4128

#: bzrlib/builtins.py:6259

4150

#: bzrlib/builtins.py:6339

4129

4151

msgid " bzr view --switch view-name"

4130

4152

msgstr ""

4131

4153

4132

#: bzrlib/builtins.py:6261

4154

#: bzrlib/builtins.py:6341

4133

4155

msgid " To list all views defined::"

4134

4156

msgstr ""

4135

4157

4136

#: bzrlib/builtins.py:6263

4158

#: bzrlib/builtins.py:6343

4137

4159

msgid " bzr view --all"

4138

4160

msgstr ""

4139

4161

4140

#: bzrlib/builtins.py:6265

4162

#: bzrlib/builtins.py:6345

4141

4163

msgid " To delete all views::"

4142

4164

msgstr ""

4143

4165

4144

#: bzrlib/builtins.py:6267

4166

#: bzrlib/builtins.py:6347

4145

4167

msgid " bzr view --delete --all"

4146

4168

msgstr ""

4147

4169

4148

4170

# help of 'all' option of 'view' command

4149

#: bzrlib/builtins.py:6274

4171

#: bzrlib/builtins.py:6354

4150

4172

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

4151

4173

msgstr ""

4152

4174

4153

4175

# help of 'delete' option of 'view' command

4154

#: bzrlib/builtins.py:6277

4176

#: bzrlib/builtins.py:6357

4155

4177

msgid "Delete the view."

4156

4178

msgstr ""

4157

4179

4158

4180

# help of 'name' option of 'view' command

4159

#: bzrlib/builtins.py:6280

4181

#: bzrlib/builtins.py:6360

4160

4182

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

4161

4183

msgstr ""

4162

4184

4163

4185

# help of 'switch' option of 'view' command

4164

#: bzrlib/builtins.py:6284

4186

#: bzrlib/builtins.py:6364

4165

4187

msgid "Name of the view to switch to."

4166

4188

msgstr ""

4167

4189

4168

#: bzrlib/builtins.py:6303

4190

#: bzrlib/builtins.py:6383

4169

4191

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

4170

4192

msgstr ""

4171

4193

4172

#: bzrlib/builtins.py:6306

4194

#: bzrlib/builtins.py:6386

4173

4195

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

4174

4196

msgstr ""

4175

4197

4176

#: bzrlib/builtins.py:6309

4198

#: bzrlib/builtins.py:6389

4177

4199

msgid "Deleted all views.\n"

4178

4200

msgstr ""

4179

4201

4180

#: bzrlib/builtins.py:6311

4202

#: bzrlib/builtins.py:6391

4181

4203

msgid "No current view to delete"

4182

4204

msgstr ""

4183

4205

4184

#: bzrlib/builtins.py:6314

4206

#: bzrlib/builtins.py:6394

4185

4207

#, python-format

4186

4208

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

4187

4209

msgstr ""

4188

4210

4189

#: bzrlib/builtins.py:6318

4211

#: bzrlib/builtins.py:6398

4190

4212

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

4191

4213

msgstr ""

4192

4214

4193

#: bzrlib/builtins.py:6321

4215

#: bzrlib/builtins.py:6401

4194

4216

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

4195

4217

msgstr ""

4196

4218

4197

#: bzrlib/builtins.py:6324

4219

#: bzrlib/builtins.py:6404

4198

4220

msgid "No current view to disable"

4199

4221

msgstr ""

4200

4222

4201

#: bzrlib/builtins.py:6326

4223

#: bzrlib/builtins.py:6406

4202

4224

#, python-format

4203

4225

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

4204

4226

msgstr ""

4205

4227

4206

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

4228

#: bzrlib/builtins.py:6410 bzrlib/builtins.py:6432

4207

4229

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

4208

4230

msgstr ""

4209

4231

4210

#: bzrlib/builtins.py:6333

4232

#: bzrlib/builtins.py:6413

4211

4233

msgid "Views defined:\n"

4212

4234

msgstr ""

4213

4235

4214

#: bzrlib/builtins.py:6342

4236

#: bzrlib/builtins.py:6422

4215

4237

msgid "No views defined.\n"

4216

4238

msgstr ""

4217

4239

4218

#: bzrlib/builtins.py:6349

4240

#: bzrlib/builtins.py:6429

4219

4241

msgid "Cannot change the 'off' pseudo view"

4220

4242

msgstr ""

4221

4243

4222

#: bzrlib/builtins.py:6357

4244

#: bzrlib/builtins.py:6437

4223

4245

msgid "No current view.\n"

4224

4246

msgstr ""

4225

4247

4226

#: bzrlib/builtins.py:6360

4248

#: bzrlib/builtins.py:6440

4227

4249

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

4228

4250

msgstr ""

4229

4251

4230

#: bzrlib/builtins.py:6380

4252

#: bzrlib/builtins.py:6460

4231

4253

msgid " <no hooks installed>\n"

4232

4254

msgstr ""

4233

4255

4234

#: bzrlib/builtins.py:6384

4256

#: bzrlib/builtins.py:6464

4235

4257

msgid "Remove a branch."

4236

4258

msgstr ""

4237

4259

4238

#: bzrlib/builtins.py:6386

4260

#: bzrlib/builtins.py:6466

4239

4261

msgid ""

4240

4262

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

4241

4263

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

4242

4264

msgstr ""

4243

4265

4244

#: bzrlib/builtins.py:6391

4266

#: bzrlib/builtins.py:6471

4245

4267

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

4246

4268

msgstr ""

4247

4269

4248

#: bzrlib/builtins.py:6393

4270

#: bzrlib/builtins.py:6473

4249

4271

msgid " bzr remove-branch repo/trunk"

4250

4272

msgstr ""

4251

4273

4274

# help of 'force' option of 'remove-branch' command

4275

#: bzrlib/builtins.py:6480

4276

msgid "Remove branch even if it is the active branch."

4277

msgstr ""

4278

4279

#: bzrlib/builtins.py:6494

4280

msgid "Branch is active. Use --force to remove it."

4281

msgstr ""

4282

4252

4283

# help of 'writer=plain' option of 'shelve' command

4253

#: bzrlib/builtins.py:6408

4284

#: bzrlib/builtins.py:6498

4254

4285

msgid "Plaintext diff output."

4255

4286

msgstr ""

4256

4287

4257

#: bzrlib/builtins.py:6409

4288

#: bzrlib/builtins.py:6499

4258

4289

msgid "Temporarily set aside some changes from the current tree."

4259

4290

msgstr ""

4260

4291

4261

#: bzrlib/builtins.py:6411

4292

#: bzrlib/builtins.py:6501

4262

4293

msgid ""

4263

4294

"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"

4264

4295

"ie. out of the way, until a later time when you can bring them back from\n"

4267

4298

"will they survive its deletion."

4268

4299

msgstr ""

4269

4300

4270

#: bzrlib/builtins.py:6417

4301

#: bzrlib/builtins.py:6507

4271

4302

msgid "If shelve --list is specified, previously-shelved changes are listed."

4272

4303

msgstr ""

4273

4304

4274

#: bzrlib/builtins.py:6419

4305

#: bzrlib/builtins.py:6509

4275

4306

msgid ""

4276

4307

"Shelve is intended to help separate several sets of changes that have\n"

4277

4308

"been inappropriately mingled. If you just want to get rid of all changes\n"

4279

4310

"shelve all text changes at once, use shelve --all."

4280

4311

msgstr ""

4281

4312

4282

#: bzrlib/builtins.py:6424

4313

#: bzrlib/builtins.py:6514

4283

4314

msgid ""

4284

4315

"If filenames are specified, only the changes to those files will be\n"

4285

4316

"shelved. Other files will be left untouched."

4286

4317

msgstr ""

4287

4318

4288

#: bzrlib/builtins.py:6427

4319

#: bzrlib/builtins.py:6517

4289

4320

msgid ""

4290

4321

"If a revision is specified, changes since that revision will be shelved."

4291

4322

msgstr ""

4292

4323

4293

#: bzrlib/builtins.py:6429

4324

#: bzrlib/builtins.py:6519

4294

4325

msgid ""

4295

4326

"You can put multiple items on the shelf, and by default, 'unshelve' will\n"

4296

4327

"restore the most recently shelved changes."

4297

4328

msgstr ""

4298

4329

4299

#: bzrlib/builtins.py:6432

4330

#: bzrlib/builtins.py:6522

4300

4331

msgid ""

4301

4332

"For complicated changes, it is possible to edit the changes in a separate\n"

4302

4333

"editor program to decide what the file remaining in the working copy\n"

4303

4334

"should look like. To do this, add the configuration option"

4304

4335

msgstr ""

4305

4336

4306

#: bzrlib/builtins.py:6436

4337

#: bzrlib/builtins.py:6526

4307

4338

msgid " change_editor = PROGRAM @new_path @old_path"

4308

4339

msgstr ""

4309

4340

4310

#: bzrlib/builtins.py:6438

4341

#: bzrlib/builtins.py:6528

4311

4342

msgid ""

4312

4343

"where @new_path is replaced with the path of the new version of the \n"

4313

4344

"file and @old_path is replaced with the path of the old version of \n"

4317

4348

msgstr ""

4318

4349

4319

4350

# help of 'all' option of 'shelve' command

4320

#: bzrlib/builtins.py:6450

4351

#: bzrlib/builtins.py:6540

4321

4352

msgid "Shelve all changes."

4322

4353

msgstr ""

4323

4354

4324

4355

# help of 'writer' option of 'shelve' command

4325

#: bzrlib/builtins.py:6452

4356

#: bzrlib/builtins.py:6542

4326

4357

msgid "Method to use for writing diffs."

4327

4358

msgstr ""

4328

4359

4329

4360

# title of 'writer' option of 'shelve' command

4330

#: bzrlib/builtins.py:6452

4361

#: bzrlib/builtins.py:6542

4331

4362

msgid "writer"

4332

4363

msgstr ""

4333

4364

4334

4365

# help of 'list' option of 'shelve' command

4335

#: bzrlib/builtins.py:6456

4366

#: bzrlib/builtins.py:6546

4336

4367

msgid "List shelved changes."

4337

4368

msgstr ""

4338

4369

4339

4370

# help of 'destroy' option of 'shelve' command

4340

#: bzrlib/builtins.py:6458

4371

#: bzrlib/builtins.py:6548

4341

4372

msgid "Destroy removed changes instead of shelving them."

4342

4373

msgstr ""

4343

4374

4344

#: bzrlib/builtins.py:6487

4375

#: bzrlib/builtins.py:6577

4345

4376

msgid "No shelved changes."

4346

4377

msgstr ""

4347

4378

4348

#: bzrlib/builtins.py:6498

4379

#: bzrlib/builtins.py:6588

4349

4380

msgid "Restore shelved changes."

4350

4381

msgstr ""

4351

4382

4352

#: bzrlib/builtins.py:6500

4383

#: bzrlib/builtins.py:6590

4353

4384

msgid ""

4354

4385

"By default, the most recently shelved changes are restored. However if you\n"

4355

4386

"specify a shelf by id those changes will be restored instead. This works\n"

4357

4388

msgstr ""

4358

4389

4359

4390

# help of 'action' option of 'unshelve' command

4360

#: bzrlib/builtins.py:6509

4391

#: bzrlib/builtins.py:6599

4361

4392

msgid "The action to perform."

4362

4393

msgstr ""

4363

4394

4364

4395

# title of 'action' option of 'resolve' command

4365

4396

# title of 'action' option of 'unshelve' command

4366

#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694

4397

#: bzrlib/builtins.py:6599 bzrlib/conflicts.py:694

4367

4398

msgid "action"

4368

4399

msgstr ""

4369

4400

4370

4401

# help of 'action=apply' option of 'unshelve' command

4371

#: bzrlib/builtins.py:6511

4402

#: bzrlib/builtins.py:6601

4372

4403

msgid "Apply changes and remove from the shelf."

4373

4404

msgstr ""

4374

4405

4375

4406

# help of 'action=dry-run' option of 'unshelve' command

4376

#: bzrlib/builtins.py:6512

4407

#: bzrlib/builtins.py:6602

4377

4408

msgid "Show changes, but do not apply or remove them."

4378

4409

msgstr ""

4379

4410

4380

4411

# help of 'action=preview' option of 'unshelve' command

4381

#: bzrlib/builtins.py:6513

4412

#: bzrlib/builtins.py:6603

4382

4413

msgid ""

4383

4414

"Instead of unshelving the changes, show the diff that would result from "

4384

4415

"unshelving."

4385

4416

msgstr ""

4386

4417

4387

4418

# help of 'action=delete-only' option of 'unshelve' command

4388

#: bzrlib/builtins.py:6515

4419

#: bzrlib/builtins.py:6605

4389

4420

msgid "Delete changes without applying them."

4390

4421

msgstr ""

4391

4422

4392

4423

# help of 'action=keep' option of 'unshelve' command

4393

#: bzrlib/builtins.py:6516

4424

#: bzrlib/builtins.py:6606

4394

4425

msgid "Apply changes but don't delete them."

4395

4426

msgstr ""

4396

4427

4397

#: bzrlib/builtins.py:6531

4428

#: bzrlib/builtins.py:6621

4398

4429

msgid "Remove unwanted files from working tree."

4399

4430

msgstr ""

4400

4431

4401

#: bzrlib/builtins.py:6533

4432

#: bzrlib/builtins.py:6623

4402

4433

msgid ""

4403

4434

"By default, only unknown files, not ignored files, are deleted. Versioned\n"

4404

4435

"files are never deleted."

4405

4436

msgstr ""

4406

4437

4407

#: bzrlib/builtins.py:6536

4438

#: bzrlib/builtins.py:6626

4408

4439

msgid ""

4409

4440

"Another class is 'detritus', which includes files emitted by bzr during\n"

4410

4441

"normal operations and selftests. (The value of these files decreases with\n"

4411

4442

"time.)"

4412

4443

msgstr ""

4413

4444

4414

#: bzrlib/builtins.py:6540

4445

#: bzrlib/builtins.py:6630

4415

4446

msgid ""

4416

4447

"If no options are specified, unknown files are deleted. Otherwise, option\n"

4417

4448

"flags are respected, and may be combined."

4418

4449

msgstr ""

4419

4450

4420

#: bzrlib/builtins.py:6543

4451

#: bzrlib/builtins.py:6633

4421

4452

msgid "To check what clean-tree will do, use --dry-run."

4422

4453

msgstr ""

4423

4454

4424

4455

# help of 'ignored' option of 'clean-tree' command

4425

#: bzrlib/builtins.py:6546

4456

#: bzrlib/builtins.py:6636

4426

4457

msgid "Delete all ignored files."

4427

4458

msgstr ""

4428

4459

4429

4460

# help of 'detritus' option of 'clean-tree' command

4430

#: bzrlib/builtins.py:6547

4461

#: bzrlib/builtins.py:6637

4431

4462

msgid ""

4432

4463

"Delete conflict files, merge and revert backups, and failed selftest dirs."

4433

4464

msgstr ""

4434

4465

4435

4466

# help of 'unknown' option of 'clean-tree' command

4436

#: bzrlib/builtins.py:6550

4467

#: bzrlib/builtins.py:6640

4437

4468

msgid "Delete files unknown to bzr (default)."

4438

4469

msgstr ""

4439

4470

4440

4471

# help of 'dry-run' option of 'clean-tree' command

4441

#: bzrlib/builtins.py:6551

4472

#: bzrlib/builtins.py:6641

4442

4473

msgid "Show files to delete instead of deleting them."

4443

4474

msgstr ""

4444

4475

4445

4476

# help of 'force' option of 'clean-tree' command

4446

#: bzrlib/builtins.py:6553

4477

#: bzrlib/builtins.py:6643

4447

4478

msgid "Do not prompt before deleting."

4448

4479

msgstr ""

4449

4480

4503

4534

msgstr[0] ""

4504

4535

msgstr[1] ""

4505

4536

4506

#: bzrlib/bzrdir.py:489

4537

#: bzrlib/bzrdir.py:487

4507

4538

msgid ""

4508

4539

"making backup of {0}\n"

4509

4540

" to {1}"

4510

4541

msgstr ""

4511

4542

4512

#: bzrlib/bzrdir.py:512

4543

#: bzrlib/bzrdir.py:510

4513

4544

msgid "renamed {0} to {1}"

4514

4545

msgstr ""

4515

4546

4516

#: bzrlib/bzrdir.py:1663

4547

#: bzrlib/bzrdir.py:1639

4517

4548

#, python-format

4518

4549

msgid ""

4519

4550

"Source repository format does not support stacking, using format:\n"

4520

4551

" %s"

4521

4552

msgstr ""

4522

4553

4523

#: bzrlib/bzrdir.py:1683

4554

#: bzrlib/bzrdir.py:1659

4524

4555

#, python-format

4525

4556

msgid ""

4526

4557

"Source branch format does not support stacking, using format:\n"

4527

4558

" %s"

4528

4559

msgstr ""

4529

4560

4530

#: bzrlib/bzrdir.py:1829

4561

#: bzrlib/bzrdir.py:1805

4531

4562

msgid "starting repository conversion"

4532

4563

msgstr ""

4533

4564

4534

#: bzrlib/bzrdir.py:2058

4565

#: bzrlib/bzrdir.py:2026

4535

4566

msgid "Using default stacking branch {0} at {1}"

4536

4567

msgstr ""

4537

4568

4717

4748

"supported formats or in a custom format based on a template."

4718

4749

msgstr ""

4719

4750

4720

#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700

4721

#: en/help_topics/configuration.txt:710

4751

#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712

4752

#: en/help_topics/configuration.txt:738

4722

4753

msgid "For example::"

4723

4754

msgstr ""

4724

4755

4779

4810

msgid "bzr version-info --revision takes exactly one revision specifier"

4780

4811

msgstr ""

4781

4812

4782

#: bzrlib/commands.py:228

4813

#: bzrlib/commands.py:229

4783

4814

#, python-format

4784

4815

msgid "unknown command \"%s\""

4785

4816

msgstr ""

4786

4817

4787

#: bzrlib/commands.py:475

4818

#: bzrlib/commands.py:476

4788

4819

msgid "No help for this command."

4789

4820

msgstr ""

4790

4821

4791

#: bzrlib/commands.py:488

4822

#: bzrlib/commands.py:489

4792

4823

#, python-format

4793

4824

msgid ":Purpose: %s\n"

4794

4825

msgstr ""

4795

4826

4796

#: bzrlib/commands.py:490

4827

#: bzrlib/commands.py:491

4797

4828

#, python-format

4798

4829

msgid ""

4799

4830

":Usage:\n"

4800

4831

"%s\n"

4801

4832

msgstr ""

4802

4833

4803

#: bzrlib/commands.py:492

4834

#: bzrlib/commands.py:493

4804

4835

#, python-format

4805

4836

msgid ":Usage: %s\n"

4806

4837

msgstr ""

4807

4838

4808

#: bzrlib/commands.py:511

4839

#: bzrlib/commands.py:512

4809

4840

#, python-format

4810

4841

msgid ":Options:%s"

4811

4842

msgstr ""

4812

4843

4813

#: bzrlib/commands.py:522

4844

#: bzrlib/commands.py:523

4814

4845

#, python-format

4815

4846

msgid ""

4816

4847

":Description:\n"

4818

4849

"\n"

4819

4850

msgstr ""

4820

4851

4821

#: bzrlib/commands.py:532

4852

#: bzrlib/commands.py:533

4822

4853

#, python-format

4823

4854

msgid ""

4824

4855

"See bzr help %s for more details and examples.\n"

4825

4856

"\n"

4826

4857

msgstr ""

4827

4858

4828

#: bzrlib/commands.py:537

4859

#: bzrlib/commands.py:538

4829

4860

msgid ":Aliases: "

4830

4861

msgstr ""

4831

4862

4832

#: bzrlib/commands.py:541

4863

#: bzrlib/commands.py:542

4833

4864

#, python-format

4834

4865

msgid ":From: plugin \"%s\"\n"

4835

4866

msgstr ""

4836

4867

4837

#: bzrlib/commands.py:553

4868

#: bzrlib/commands.py:554

4838

4869

msgid ":doc:`{0} <{1}-help>`"

4839

4870

msgstr ""

4840

4871

4841

#: bzrlib/commands.py:557

4872

#: bzrlib/commands.py:558

4842

4873

#, python-format

4843

4874

msgid ":See also: %s"

4844

4875

msgstr ""

4845

4876

4846

#: bzrlib/commands.py:815 bzrlib/gpg.py:324

4877

#: bzrlib/commands.py:826 bzrlib/gpg.py:347

4847

4878

msgid "Only ASCII permitted in option names"

4848

4879

msgstr ""

4849

4880

4850

#: bzrlib/commands.py:840 bzrlib/commands.py:848

4881

#: bzrlib/commands.py:851 bzrlib/commands.py:859

4851

4882

msgid "command {0!r} needs one or more {1}"

4852

4883

msgstr ""

4853

4884

4854

#: bzrlib/commands.py:857

4885

#: bzrlib/commands.py:868

4855

4886

msgid "command {0!r} requires argument {1}"

4856

4887

msgstr ""

4857

4888

4858

#: bzrlib/commands.py:864

4889

#: bzrlib/commands.py:875

4859

4890

msgid "extra argument to command {0}: {1}"

4860

4891

msgstr ""

4861

4892

4862

#: bzrlib/commands.py:961

4893

#: bzrlib/commands.py:952

4863

4894

#, python-format

4864

4895

msgid "Profile data written to \"%s\"."

4865

4896

msgstr ""

4902

4933

msgid "renamed"

4903

4934

msgstr ""

4904

4935

4905

#: bzrlib/commit.py:977

4936

#: bzrlib/commit.py:976

4906

4937

msgid "unchanged"

4907

4938

msgstr ""

4908

4939

4909

#: bzrlib/commit.py:999

4940

#: bzrlib/commit.py:998

4910

4941

msgid "{0} [{1}] - Stage"

4911

4942

msgstr ""

4912

4943

4913

#: bzrlib/commit.py:1002

4944

#: bzrlib/commit.py:1001

4914

4945

#, python-format

4915

4946

msgid "%s - Stage"

4916

4947

msgstr ""

4917

4948

4949

#: bzrlib/commit_signature_commands.py:34

4950

msgid "Sign all commits by a given committer."

4951

msgstr ""

4952

4918

4953

#: bzrlib/commit_signature_commands.py:36

4919

msgid "Sign all commits by a given committer."

4920

msgstr ""

4921

4922

#: bzrlib/commit_signature_commands.py:38

4923

4954

msgid ""

4924

4955

"If location is not specified the local tree is used.\n"

4925

4956

"If committer is not specified the default committer is used."

4926

4957

msgstr ""

4927

4958

4928

#: bzrlib/commit_signature_commands.py:41

4959

#: bzrlib/commit_signature_commands.py:39

4929

4960

msgid "This does not sign commits that already have signatures."

4930

4961

msgstr ""

4931

4962

4932

4963

# help of 'dry-run' option of 'sign-my-commits' command

4933

#: bzrlib/commit_signature_commands.py:49

4964

#: bzrlib/commit_signature_commands.py:47

4934

4965

msgid ""

4935

4966

"Don't actually sign anything, just print the revisions that would be signed."

4936

4967

msgstr ""

4937

4968

4969

#: bzrlib/commit_signature_commands.py:98

4970

#, python-format

4971

msgid "Signed %d revision.\n"

4972

msgid_plural "Signed %d revisions.\n"

4973

msgstr[0] ""

4974

msgstr[1] ""

4975

4938

4976

#: bzrlib/commit_signature_commands.py:103

4939

4977

msgid "Verify all commit signatures."

4940

4978

msgstr ""

4950

4988

"verification."

4951

4989

msgstr ""

4952

4990

4953

#: bzrlib/commit_signature_commands.py:147

4991

#: bzrlib/commit_signature_commands.py:148

4954

4992

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

4955

4993

msgstr ""

4956

4994

4957

#: bzrlib/commit_signature_commands.py:168

4995

#: bzrlib/commit_signature_commands.py:166

4958

4996

msgid "All commits signed with verifiable keys"

4959

4997

msgstr ""

4960

4998

4961

#: bzrlib/config.py:475

4999

#: bzrlib/config.py:438

4962

5000

msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."

4963

5001

msgstr ""

4964

5002

4965

#: bzrlib/config.py:2499

5003

#: bzrlib/config.py:2468

4966

5004

msgid "{0} is not an SI unit."

4967

5005

msgstr ""

4968

5006

4969

#: bzrlib/config.py:2956

5007

#: bzrlib/config.py:2989

4970

5008

msgid ""

4971

5009

"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "

4972

5010

"will be saved."

4973

5011

msgstr ""

4974

5012

4975

#: bzrlib/config.py:3100

5013

#: bzrlib/config.py:3134

4976

5014

#, python-format

4977

5015

msgid "Invalid '%s', should be of the form 'name=value'"

4978

5016

msgstr ""

4979

5017

4980

#: bzrlib/config.py:3969

5018

#: bzrlib/config.py:4089

4981

5019

msgid "Display, set or remove a configuration option."

4982

5020

msgstr ""

4983

5021

4984

#: bzrlib/config.py:3971

4985

msgid "Display the active value for a given option."

5022

#: bzrlib/config.py:4091

5023

msgid "Display the active value for option NAME."

4986

5024

msgstr ""

4987

5025

4988

#: bzrlib/config.py:3973

5026

#: bzrlib/config.py:4093

4989

5027

msgid ""

4990

5028

"If --all is specified, NAME is interpreted as a regular expression and all\n"

4991

"matching options are displayed mentioning their scope. The active value\n"

4992

"that bzr will take into account is the first one displayed for each option."

4993

msgstr ""

4994

4995

#: bzrlib/config.py:3977

4996

msgid "If no NAME is given, --all .* is implied."

4997

msgstr ""

4998

4999

#: bzrlib/config.py:3979

5000

msgid ""

5001

"Setting a value is achieved by using name=value without spaces. The value\n"

5029

"matching options are displayed mentioning their scope and without resolving\n"

5030

"option references in the value). The active value that bzr will take into\n"

5031

"account is the first one displayed for each option."

5032

msgstr ""

5033

5034

#: bzrlib/config.py:4098

5035

msgid ""

5036

"If NAME is not given, --all .* is implied (all options are displayed for "

5037

"the\n"

5038

"current scope)."

5039

msgstr ""

5040

5041

#: bzrlib/config.py:4101

5042

msgid ""

5043

"Setting a value is achieved by using NAME=value without spaces. The value\n"

5002

5044

"is set in the most relevant scope and can be checked by displaying the\n"

5003

5045

"option again."

5004

5046

msgstr ""

5005

5047

5048

#: bzrlib/config.py:4105

5049

msgid "Removing a value is achieved by using --remove NAME."

5050

msgstr ""

5051

5006

5052

# help of 'scope' option of 'config' command

5007

#: bzrlib/config.py:3991

5053

#: bzrlib/config.py:4115

5008

5054

msgid "Reduce the scope to the specified configuration file."

5009

5055

msgstr ""

5010

5056

5011

5057

# help of 'all' option of 'config' command

5012

#: bzrlib/config.py:3995

5058

#: bzrlib/config.py:4119

5013

5059

msgid "Display all the defined values for the matching options."

5014

5060

msgstr ""

5015

5061

5016

5062

# help of 'remove' option of 'config' command

5017

#: bzrlib/config.py:3997

5063

#: bzrlib/config.py:4121

5018

5064

msgid "Remove the option from the configuration file."

5019

5065

msgstr ""

5020

5066

5100

5146

msgstr[0] ""

5101

5147

msgstr[1] ""

5102

5148

5103

#: bzrlib/controldir.py:698

5149

#: bzrlib/controldir.py:712

5104

5150

msgid "{0} is{1} redirected to {2}"

5105

5151

msgstr ""

5106

5152

5107

#: bzrlib/diff.py:399

5153

#: bzrlib/diff.py:400

5108

5154

#, python-format

5109

5155

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

5110

5156

msgstr ""

5206

5252

msgid "The value '%(value)s' is not a valid value."

5207

5253

msgstr ""

5208

5254

5255

#: bzrlib/errors.py:424

5256

msgid "Bad value \"%(value)s\" for option \"%(name)s\"."

5257

msgstr ""

5258

5209

5259

#: bzrlib/errors.py:443

5210

5260

msgid "Generic path error: %(path)r%(extra)s)"

5211

5261

msgstr ""

5305

5355

msgstr ""

5306

5356

5307

5357

#: bzrlib/errors.py:705

5358

msgid "A control directory already exists: \"%(path)s\"."

5359

msgstr ""

5360

5361

#: bzrlib/errors.py:710

5308

5362

msgid "Already a branch: \"%(path)s\"."

5309

5363

msgstr ""

5310

5364

5311

#: bzrlib/errors.py:711

5365

#: bzrlib/errors.py:715

5366

msgid "Invalid branch name: %(name)s"

5367

msgstr ""

5368

5369

#: bzrlib/errors.py:724

5370

msgid "Parent branch already exists: \"%(path)s\"."

5371

msgstr ""

5372

5373

#: bzrlib/errors.py:730

5312

5374

msgid ""

5313

5375

"Directory contains a branch, but no working tree (use bzr checkout if you "

5314

5376

"wish to build a working tree): \"%(path)s\""

5315

5377

msgstr ""

5316

5378

5317

#: bzrlib/errors.py:716

5379

#: bzrlib/errors.py:735

5318

5380

msgid ""

5319

5381

"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""

5320

5382

msgstr ""

5321

5383

5322

#: bzrlib/errors.py:726

5384

#: bzrlib/errors.py:745

5323

5385

msgid ""

5324

5386

"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""

5325

5387

msgstr ""

5326

5388

5327

#: bzrlib/errors.py:736

5389

#: bzrlib/errors.py:755

5328

5390

msgid "No repository present: \"%(path)s\""

5329

5391

msgstr ""

5330

5392

5331

#: bzrlib/errors.py:743

5393

#: bzrlib/errors.py:762

5332

5394

msgid ""

5333

5395

"Unsupported branch format: %(format)s\n"

5334

5396

"Please run 'bzr upgrade'"

5335

5397

msgstr ""

5336

5398

5337

#: bzrlib/errors.py:749

5399

#: bzrlib/errors.py:768

5338

5400

msgid "Unknown %(kind)s format: %(format)r"

5339

5401

msgstr ""

5340

5402

5341

#: bzrlib/errors.py:758

5403

#: bzrlib/errors.py:777

5342

5404

msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."

5343

5405

msgstr ""

5344

5406

5345

#: bzrlib/errors.py:768

5407

#: bzrlib/errors.py:787

5346

5408

msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"

5347

5409

msgstr ""

5348

5410

5349

#: bzrlib/errors.py:783

5411

#: bzrlib/errors.py:802

5350

5412

msgid ""

5351

5413

"%(target)s\n"

5352

5414

"is not compatible with\n"

5354

5416

"%(details)s"

5355

5417

msgstr ""

5356

5418

5357

#: bzrlib/errors.py:799

5419

#: bzrlib/errors.py:818

5358

5420

msgid "Revision is not compatible with %(repo_format)s"

5359

5421

msgstr ""

5360

5422

5361

#: bzrlib/errors.py:809

5423

#: bzrlib/errors.py:828

5362

5424

msgid "%(context_info)s%(path)s is already versioned."

5363

5425

msgstr ""

5364

5426

5365

#: bzrlib/errors.py:830

5427

#: bzrlib/errors.py:849

5366

5428

msgid "%(context_info)s%(path)s is not versioned."

5367

5429

msgstr ""

5368

5430

5369

#: bzrlib/errors.py:851

5431

#: bzrlib/errors.py:870

5370

5432

msgid "Path(s) are not versioned: %(paths_as_string)s"

5371

5433

msgstr ""

5372

5434

5373

#: bzrlib/errors.py:862

5435

#: bzrlib/errors.py:881

5374

5436

msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"

5375

5437

msgstr ""

5376

5438

5377

#: bzrlib/errors.py:881

5439

#: bzrlib/errors.py:900

5378

5440

msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""

5379

5441

msgstr ""

5380

5442

5381

#: bzrlib/errors.py:889

5443

#: bzrlib/errors.py:908

5382

5444

msgid ""

5383

5445

"Filename %(filename)r is not valid in your current filesystem encoding "

5384

5446

"%(fs_encoding)s"

5385

5447

msgstr ""

5386

5448

5387

#: bzrlib/errors.py:900

5449

#: bzrlib/errors.py:919

5388

5450

msgid "Cannot operate on \"%(filename)s\" because it is a control file"

5389

5451

msgstr ""

5390

5452

5391

#: bzrlib/errors.py:918

5453

#: bzrlib/errors.py:937

5392

5454

msgid "The lock for '%(lock_description)s' is in use and cannot be broken."

5393

5455

msgstr ""

5394

5456

5395

#: bzrlib/errors.py:957

5457

#: bzrlib/errors.py:976

5396

5458

msgid "Cannot lock %(lock)s: %(why)s"

5397

5459

msgstr ""

5398

5460

5399

#: bzrlib/errors.py:967

5461

#: bzrlib/errors.py:986

5400

5462

msgid ""

5401

5463

"A transaction related operation was attempted after the transaction finished."

5402

5464

msgstr ""

5403

5465

5404

#: bzrlib/errors.py:994

5466

#: bzrlib/errors.py:1013

5405

5467

msgid "Cannot lock: transport is read only: %(transport)s"

5406

5468

msgstr ""

5407

5469

5408

#: bzrlib/errors.py:1002

5470

#: bzrlib/errors.py:1021

5409

5471

msgid "Could not acquire lock \"%(lock)s\": %(msg)s"

5410

5472

msgstr ""

5411

5473

5412

#: bzrlib/errors.py:1013

5474

#: bzrlib/errors.py:1032

5413

5475

msgid "Lock was broken while still open: %(lock)s - check storage consistency!"

5414

5476

msgstr ""

5415

5477

5416

#: bzrlib/errors.py:1024

5478

#: bzrlib/errors.py:1043

5417

5479

msgid ""

5418

5480

"Lock was released and re-acquired before being broken: %(lock)s: held by "

5419

5481

"%(holder)r, wanted to break %(target)r"

5420

5482

msgstr ""

5421

5483

5422

#: bzrlib/errors.py:1036

5484

#: bzrlib/errors.py:1055

5423

5485

msgid ""

5424

5486

"Lock is apparently held, but corrupted: %(corruption_info)s\n"

5425

5487

"Use 'bzr break-lock' to clear it"

5426

5488

msgstr ""

5427

5489

5428

#: bzrlib/errors.py:1049

5490

#: bzrlib/errors.py:1068

5429

5491

msgid "Lock not held: %(lock)s"

5430

5492

msgstr ""

5431

5493

5432

#: bzrlib/errors.py:1078

5494

#: bzrlib/errors.py:1097

5433

5495

msgid "No changes to commit"

5434

5496

msgstr ""

5435

5497

5436

#: bzrlib/errors.py:1083

5498

#: bzrlib/errors.py:1102

5437

5499

msgid ""

5438

5500

"Selected-file commit of merges is not supported yet: files %(files_str)s"

5439

5501

msgstr ""

5440

5502

5441

#: bzrlib/errors.py:1093

5503

#: bzrlib/errors.py:1112

5442

5504

msgid ""

5443

5505

"Excluding paths during commit is not supported by repository at %(repository)"

5444

5506

"r."

5445

5507

msgstr ""

5446

5508

5447

#: bzrlib/errors.py:1102

5509

#: bzrlib/errors.py:1121

5448

5510

msgid ""

5449

5511

"The specified commit message contains characters unsupported by the current "

5450

5512

"encoding."

5451

5513

msgstr ""

5452

5514

5453

#: bzrlib/errors.py:1108

5515

#: bzrlib/errors.py:1127

5454

5516

msgid "Upgrade URL cannot work with readonly URLs."

5455

5517

msgstr ""

5456

5518

5457

#: bzrlib/errors.py:1113

5519

#: bzrlib/errors.py:1132

5458

5520

msgid "The branch format %(format)s is already at the most recent format."

5459

5521

msgstr ""

5460

5522

5461

#: bzrlib/errors.py:1136

5523

#: bzrlib/errors.py:1155

5462

5524

msgid "Option --change does not accept revision ranges"

5463

5525

msgstr ""

5464

5526

5465

#: bzrlib/errors.py:1141

5527

#: bzrlib/errors.py:1160

5466

5528

msgid "No namespace registered for string: %(spec)r"

5467

5529

msgstr ""

5468

5530

5469

#: bzrlib/errors.py:1160

5531

#: bzrlib/errors.py:1179

5470

5532

msgid ""

5471

5533

"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"

5472

5534

"%(extra)s"

5473

5535

msgstr ""

5474

5536

5475

#: bzrlib/errors.py:1174

5537

#: bzrlib/errors.py:1193

5476

5538

msgid ""

5477

5539

"Operation denied because it would change the main history, which is not "

5478

5540

"permitted by the append_revisions_only setting on branch \"%(location)s\"."

5479

5541

msgstr ""

5480

5542

5481

#: bzrlib/errors.py:1185

5543

#: bzrlib/errors.py:1204

5482

5544

msgid ""

5483

5545

"These branches have diverged. Use the missing command to see how.\n"

5484

5546

"Use the merge command to reconcile them."

5485

5547

msgstr ""

5486

5548

5487

#: bzrlib/errors.py:1205

5549

#: bzrlib/errors.py:1224

5488

5550

msgid ""

5489

5551

"Branches have no common ancestor, and no merge base revision was specified."

5490

5552

msgstr ""

5491

5553

5492

#: bzrlib/errors.py:1211

5554

#: bzrlib/errors.py:1230

5493

5555

msgid ""

5494

5556

"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."

5495

5557

msgstr ""

5496

5558

5497

#: bzrlib/errors.py:1217

5559

#: bzrlib/errors.py:1236

5498

5560

msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"

5499

5561

msgstr ""

5500

5562

5501

#: bzrlib/errors.py:1226

5563

#: bzrlib/errors.py:1245

5502

5564

msgid ""

5503

5565

"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."

5504

5566

msgstr ""

5505

5567

5506

#: bzrlib/errors.py:1235

5568

#: bzrlib/errors.py:1254

5507

5569

msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"

5508

5570

msgstr ""

5509

5571

5510

#: bzrlib/errors.py:1244

5572

#: bzrlib/errors.py:1263

5511

5573

msgid "Branch %(branch)s has no commits."

5512

5574

msgstr ""

5513

5575

5514

#: bzrlib/errors.py:1262

5576

#: bzrlib/errors.py:1281

5515

5577

msgid ""

5516

5578

"Bound branch %(branch)s is out of date with master branch %(master)s."

5517

5579

"%(extra_help)s"

5518

5580

msgstr ""

5519

5581

5520

#: bzrlib/errors.py:1274

5582

#: bzrlib/errors.py:1293

5521

5583

msgid ""

5522

5584

"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "

5523

5585

"bound to %(remote)s."

5524

5586

msgstr ""

5525

5587

5526

#: bzrlib/errors.py:1286

5588

#: bzrlib/errors.py:1305

5527

5589

msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"

5528

5590

msgstr ""

5529

5591

5530

#: bzrlib/errors.py:1295

5592

#: bzrlib/errors.py:1314

5531

5593

msgid ""

5532

5594

"Unable to connect to target of bound branch %(branch)s => %(target)s: "

5533

5595

"%(error)s"

5534

5596

msgstr ""

5535

5597

5536

#: bzrlib/errors.py:1307

5598

#: bzrlib/errors.py:1326

5537

5599

msgid "Error in processing weave: %(msg)s"

5538

5600

msgstr ""

5539

5601

5540

#: bzrlib/errors.py:1316

5602

#: bzrlib/errors.py:1335

5541

5603

msgid "Revision {%(revision_id)s} already present in %(weave)s"

5542

5604

msgstr ""

5543

5605

5544

#: bzrlib/errors.py:1327

5606

#: bzrlib/errors.py:1346

5545

5607

msgid "Revision {%(revision_id)s} not present in %(weave)s"

5546

5608

msgstr ""

5547

5609

5548

#: bzrlib/errors.py:1337

5610

#: bzrlib/errors.py:1356

5549

5611

msgid "Weave invariant violated: %(what)s"

5550

5612

msgstr ""

5551

5613

5552

#: bzrlib/errors.py:1346

5614

#: bzrlib/errors.py:1365

5553

5615

msgid "Parents are mismatched between two revisions. %(msg)s"

5554

5616

msgstr ""

5555

5617

5556

#: bzrlib/errors.py:1368

5618

#: bzrlib/errors.py:1387

5557

5619

msgid ""

5558

5620

"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "

5559

5621

"%(weave_b)s"

5560

5622

msgstr ""

5561

5623

5562

#: bzrlib/errors.py:1380

5624

#: bzrlib/errors.py:1399

5563

5625

msgid "Versioned file error"

5564

5626

msgstr ""

5565

5627

5566

#: bzrlib/errors.py:1385

5628

#: bzrlib/errors.py:1404

5567

5629

msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."

5568

5630

msgstr ""

5569

5631

5570

#: bzrlib/errors.py:1395

5632

#: bzrlib/errors.py:1414

5571

5633

msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."

5572

5634

msgstr ""

5573

5635

5574

#: bzrlib/errors.py:1405

5636

#: bzrlib/errors.py:1424

5575

5637

msgid "Text did not match its checksum: %(msg)s"

5576

5638

msgstr ""

5577

5639

5578

#: bzrlib/errors.py:1531

5640

#: bzrlib/errors.py:1550

5579

5641

msgid "Export format %(format)r not supported"

5580

5642

msgstr ""

5581

5643

5582

#: bzrlib/errors.py:1540

5644

#: bzrlib/errors.py:1559

5583

5645

msgid "Transport error: %(msg)s %(orig_error)s"

5584

5646

msgstr ""

5585

5647

5586

#: bzrlib/errors.py:1566

5648

#: bzrlib/errors.py:1585

5587

5649

msgid "Generic bzr smart protocol error: %(details)s"

5588

5650

msgstr ""

5589

5651

5590

#: bzrlib/errors.py:1574

5652

#: bzrlib/errors.py:1593

5591

5653

msgid "Received bad protocol version marker: %(marker)r"

5592

5654

msgstr ""

5593

5655

5594

#: bzrlib/errors.py:1606

5656

#: bzrlib/errors.py:1625

5595

5657

msgid "Transport operation not possible: %(msg)s %(orig_error)s"

5596

5658

msgstr ""

5597

5659

5598

#: bzrlib/errors.py:1611

5660

#: bzrlib/errors.py:1630

5599

5661

msgid "Connection error: %(msg)s %(orig_error)s"

5600

5662

msgstr ""

5601

5663

5602

#: bzrlib/errors.py:1616

5664

#: bzrlib/errors.py:1635

5603

5665

msgid "%(msg)s %(host)s%(port)s%(orig_error)s"

5604

5666

msgstr ""

5605

5667

5606

#: bzrlib/errors.py:1637

5668

#: bzrlib/errors.py:1656

5607

5669

msgid "Connection closed: %(msg)s %(orig_error)s"

5608

5670

msgstr ""

5609

5671

5610

#: bzrlib/errors.py:1642

5672

#: bzrlib/errors.py:1661

5611

5673

msgid "Connection Timeout: %(msg)s%(orig_error)s"

5612

5674

msgstr ""

5613

5675

5614

#: bzrlib/errors.py:1647

5676

#: bzrlib/errors.py:1666

5615

5677

msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"

5616

5678

msgstr ""

5617

5679

5618

#: bzrlib/errors.py:1657

5680

#: bzrlib/errors.py:1676

5619

5681

msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"

5620

5682

msgstr ""

5621

5683

5622

#: bzrlib/errors.py:1672

5684

#: bzrlib/errors.py:1691

5685

msgid "Certificate error: %(error)s"

5686

msgstr ""

5687

5688

#: bzrlib/errors.py:1699

5623

5689

msgid "Invalid http range %(range)r for %(path)s: %(msg)s"

5624

5690

msgstr ""

5625

5691

5626

#: bzrlib/errors.py:1686

5692

#: bzrlib/errors.py:1713

5627

5693

msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"

5628

5694

msgstr ""

5629

5695

5630

#: bzrlib/errors.py:1694

5696

#: bzrlib/errors.py:1721

5631

5697

msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"

5632

5698

msgstr ""

5633

5699

5634

#: bzrlib/errors.py:1703

5700

#: bzrlib/errors.py:1730

5635

5701

msgid "%(source)s is%(permanently)s redirected to %(target)s"

5636

5702

msgstr ""

5637

5703

5638

#: bzrlib/errors.py:1717

5704

#: bzrlib/errors.py:1744

5639

5705

msgid "Too many redirections"

5640

5706

msgstr ""

5641

5707

5642

#: bzrlib/errors.py:1722

5708

#: bzrlib/errors.py:1749

5643

5709

msgid "Working tree has conflicts."

5644

5710

msgstr ""

5645

5711

5646

#: bzrlib/errors.py:1726

5712

#: bzrlib/errors.py:1753

5647

5713

msgid "Config file %(filename)s is not UTF-8 encoded\n"

5648

5714

msgstr ""

5649

5715

5650

#: bzrlib/errors.py:1735

5716

#: bzrlib/errors.py:1762

5651

5717

msgid ""

5652

5718

"Error(s) parsing config file %(filename)s:\n"

5653

5719

"%(errors)s"

5654

5720

msgstr ""

5655

5721

5656

#: bzrlib/errors.py:1746

5657

msgid "Bad value \"%(value)s\" for option \"%(name)s\"."

5722

#: bzrlib/errors.py:1772

5723

msgid ""

5724

"Bad value \"%(value)s\" for option \"%(name)s\".\n"

5725

"See ``bzr help %(name)s``"

5658

5726

msgstr ""

5659

5727

5660

#: bzrlib/errors.py:1754

5728

#: bzrlib/errors.py:1782

5661

5729

msgid "%(username)r does not seem to contain a reasonable email address"

5662

5730

msgstr ""

5663

5731

5664

#: bzrlib/errors.py:1763

5732

#: bzrlib/errors.py:1791

5665

5733

msgid "Failed to GPG sign data with command \"%(command_line)s\""

5666

5734

msgstr ""

5667

5735

5668

#: bzrlib/errors.py:1771

5736

#: bzrlib/errors.py:1799

5669

5737

msgid "Failed to verify GPG signature data with error \"%(error)s\""

5670

5738

msgstr ""

5671

5739

5672

#: bzrlib/errors.py:1779

5740

#: bzrlib/errors.py:1807

5673

5741

msgid "Unable to import library \"%(library)s\": %(error)s"

5674

5742

msgstr ""

5675

5743

5676

#: bzrlib/errors.py:1787

5744

#: bzrlib/errors.py:1815

5677

5745

msgid "python-gpgme is not installed, it is needed to verify signatures"

5678

5746

msgstr ""

5679

5747

5680

#: bzrlib/errors.py:1795

5748

#: bzrlib/errors.py:1823

5681

5749

msgid ""

5682

5750

"The working tree for %(basedir)s has changed since the last commit, but "

5683

5751

"weave merge requires that it be unchanged"

5684

5752

msgstr ""

5685

5753

5686

#: bzrlib/errors.py:1805

5754

#: bzrlib/errors.py:1833

5687

5755

msgid ""

5688

5756

"Can't reprocess and show base, because reprocessing obscures the "

5689

5757

"relationship of conflicting lines to the base"

5690

5758

msgstr ""

5691

5759

5692

#: bzrlib/errors.py:1811

5760

#: bzrlib/errors.py:1839

5693

5761

msgid "Cycle in graph %(graph)r"

5694

5762

msgstr ""

5695

5763

5696

#: bzrlib/errors.py:1839

5764

#: bzrlib/errors.py:1867

5697

5765

msgid "File %(filename)s is not conflicted."

5698

5766

msgstr ""

5699

5767

5700

#: bzrlib/errors.py:1861

5768

#: bzrlib/errors.py:1889

5701

5769

msgid "No bundle was found in \"%(filename)s\"."

5702

5770

msgstr ""

5703

5771

5704

#: bzrlib/errors.py:1870

5772

#: bzrlib/errors.py:1898

5705

5773

msgid "Unable to handle bundle version %(version)s: %(msg)s"

5706

5774

msgstr ""

5707

5775

5708

#: bzrlib/errors.py:1880

5776

#: bzrlib/errors.py:1908

5709

5777

msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"

5710

5778

msgstr ""

5711

5779

5712

#: bzrlib/errors.py:1893

5780

#: bzrlib/errors.py:1921

5713

5781

msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"

5714

5782

msgstr ""

5715

5783

5716

#: bzrlib/errors.py:1903

5784

#: bzrlib/errors.py:1931

5717

5785

msgid "Key %(key)s is already present in map"

5718

5786

msgstr ""

5719

5787

5720

#: bzrlib/errors.py:1908

5788

#: bzrlib/errors.py:1936

5721

5789

msgid "The prefix %(prefix)s is in the help search path twice."

5722

5790

msgstr ""

5723

5791

5724

#: bzrlib/errors.py:1918

5792

#: bzrlib/errors.py:1946

5725

5793

msgid ""

5726

5794

"No final name for trans_id %(trans_id)r\n"

5727

5795

"file-id: %(file_id)r\n"

5728

5796

"root trans-id: %(root_trans_id)r\n"

5729

5797

msgstr ""

5730

5798

5731

#: bzrlib/errors.py:1950

5799

#: bzrlib/errors.py:1978

5732

5800

msgid "Attempt to reuse a transform that has already been applied."

5733

5801

msgstr ""

5734

5802

5735

#: bzrlib/errors.py:1955

5803

#: bzrlib/errors.py:1983

5736

5804

msgid "Moving the root directory is not supported at this time"

5737

5805

msgstr ""

5738

5806

5739

#: bzrlib/errors.py:1960

5807

#: bzrlib/errors.py:1988

5740

5808

msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"

5741

5809

msgstr ""

5742

5810

5743

#: bzrlib/errors.py:1971

5811

#: bzrlib/errors.py:1999

5744

5812

msgid ""

5745

5813

"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5746

5814

msgstr ""

5747

5815

5748

#: bzrlib/errors.py:2007

5816

#: bzrlib/errors.py:2035

5749

5817

msgid ""

5750

5818

"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5751

5819

msgstr ""

5752

5820

5753

#: bzrlib/errors.py:2037

5821

#: bzrlib/errors.py:2065

5754

5822

msgid "Unable to import paramiko (required for sftp support): %(error)s"

5755

5823

msgstr ""

5756

5824

5757

#: bzrlib/errors.py:2045

5825

#: bzrlib/errors.py:2073

5758

5826

msgid "Nothing to merge."

5759

5827

msgstr ""

5760

5828

5761

#: bzrlib/errors.py:2050

5829

#: bzrlib/errors.py:2078

5762

5830

msgid "Format %(format)s cannot be initialised by this version of bzr."

5763

5831

msgstr ""

5764

5832

5765

#: bzrlib/errors.py:2059

5833

#: bzrlib/errors.py:2087

5766

5834

msgid ""

5767

5835

"Cannot convert from format %(from_format)s to format %(format)s. "

5768

5836

"%(problem)s"

5769

5837

msgstr ""

5770

5838

5771

#: bzrlib/errors.py:2071

5839

#: bzrlib/errors.py:2099

5772

5840

msgid "Could not find an appropriate Differ for file \"%(path)s\""

5773

5841

msgstr ""

5774

5842

5775

#: bzrlib/errors.py:2079

5843

#: bzrlib/errors.py:2107

5776

5844

msgid "%(exe_name)s could not be found on this machine"

5777

5845

msgstr ""

5778

5846

5779

#: bzrlib/errors.py:2087

5847

#: bzrlib/errors.py:2115

5780

5848

msgid "Diff is not installed on this machine: %(msg)s"

5781

5849

msgstr ""

5782

5850

5783

#: bzrlib/errors.py:2095

5851

#: bzrlib/errors.py:2123

5784

5852

msgid "Diff3 is not installed on this machine."

5785

5853

msgstr ""

5786

5854

5787

#: bzrlib/errors.py:2101

5855

#: bzrlib/errors.py:2129

5788

5856

msgid "The content being inserted is already present."

5789

5857

msgstr ""

5790

5858

5791

#: bzrlib/errors.py:2106

5859

#: bzrlib/errors.py:2134

5792

5860

msgid ""

5793

5861

"This tree contains left-over files from a failed operation.\n"

5794

5862

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5796

5864

" keep, and delete it when you are done."

5797

5865

msgstr ""

5798

5866

5799

#: bzrlib/errors.py:2117

5867

#: bzrlib/errors.py:2145

5800

5868

msgid ""

5801

5869

"This tree contains left-over files from a failed operation.\n"

5802

5870

" Please examine %(pending_deletion)s to see if it contains any files you\n"

5803

5871

" wish to keep, and delete it when you are done."

5804

5872

msgstr ""

5805

5873

5806

#: bzrlib/errors.py:2127

5874

#: bzrlib/errors.py:2155

5807

5875

msgid ""

5808

5876

"Unable to delete transform temporary directory %(limbo_dir)s.\n"

5809

5877

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5811

5879

" keep, and delete it when you are done."

5812

5880

msgstr ""

5813

5881

5814

#: bzrlib/errors.py:2138

5882

#: bzrlib/errors.py:2166

5815

5883

msgid ""

5816

5884

"Unable to delete transform temporary directory %(pending_deletion)s. Please "

5817

5885

"examine %(pending_deletion)s to see if it contains any files you wish to "

5818

5886

"keep, and delete it when you are done."

5819

5887

msgstr ""

5820

5888

5821

#: bzrlib/errors.py:2148

5889

#: bzrlib/errors.py:2176

5822

5890

msgid "Working tree is out of date, please run 'bzr update'.%(more)s"

5823

5891

msgstr ""

5824

5892

5825

#: bzrlib/errors.py:2162

5893

#: bzrlib/errors.py:2190

5826

5894

msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."

5827

5895

msgstr ""

5828

5896

5829

#: bzrlib/errors.py:2175

5897

#: bzrlib/errors.py:2203

5830

5898

msgid "Error in merge modified format"

5831

5899

msgstr ""

5832

5900

5833

#: bzrlib/errors.py:2180

5901

#: bzrlib/errors.py:2208

5834

5902

msgid "Format error in conflict listings"

5835

5903

msgstr ""

5836

5904

5837

#: bzrlib/errors.py:2184

5905

#: bzrlib/errors.py:2212

5838

5906

msgid ""

5839

5907

"Inconsistency in dirstate file %(dirstate_path)s.\n"

5840

5908

"Error: %(description)s"

5841

5909

msgstr ""

5842

5910

5843

#: bzrlib/errors.py:2195

5911

#: bzrlib/errors.py:2223

5844

5912

msgid ""

5845

5913

"An error has been detected in the repository %(repo_path)s.\n"

5846

5914

"Please run bzr reconcile on this repository."

5847

5915

msgstr ""

5848

5916

5849

#: bzrlib/errors.py:2206

5917

#: bzrlib/errors.py:2234

5850

5918

msgid ""

5851

5919

"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"

5852

5920

"reason: %(reason)s"

5853

5921

msgstr ""

5854

5922

5855

#: bzrlib/errors.py:2219

5923

#: bzrlib/errors.py:2247

5856

5924

msgid ""

5857

5925

"An inconsistent delta was supplied: %(delta)r\n"

5858

5926

"reason: %(reason)s"

5859

5927

msgstr ""

5860

5928

5861

#: bzrlib/errors.py:2231

5929

#: bzrlib/errors.py:2259

5862

5930

msgid "To use this feature you must upgrade your branch at %(path)s."

5863

5931

msgstr ""

5864

5932

5865

#: bzrlib/errors.py:2240

5933

#: bzrlib/errors.py:2268

5866

5934

msgid "To use this feature you must upgrade your repository at %(path)s."

5867

5935

msgstr ""

5868

5936

5869

#: bzrlib/errors.py:2245

5937

#: bzrlib/errors.py:2273

5870

5938

msgid ""

5871

5939

"To use this feature you must upgrade your branch at %(path)s to a format "

5872

5940

"which supports rich roots."

5873

5941

msgstr ""

5874

5942

5875

#: bzrlib/errors.py:2251

5943

#: bzrlib/errors.py:2279

5876

5944

msgid "Cannot perform local-only commits on unbound branches."

5877

5945

msgstr ""

5878

5946

5879

#: bzrlib/errors.py:2256

5947

#: bzrlib/errors.py:2284

5880

5948

msgid "The method %(mname)s is not supported on objects of type %(tname)s."

5881

5949

msgstr ""

5882

5950

5883

#: bzrlib/errors.py:2277

5951

#: bzrlib/errors.py:2305

5884

5952

msgid "Ghost tags not supported by format %(format)r."

5885

5953

msgstr ""

5886

5954

5887

#: bzrlib/errors.py:2285

5955

#: bzrlib/errors.py:2313

5888

5956

msgid "File is binary but should be text."

5889

5957

msgstr ""

5890

5958

5891

#: bzrlib/errors.py:2290

5959

#: bzrlib/errors.py:2318

5892

5960

msgid "The path %(path)s is not permitted on this platform"

5893

5961

msgstr ""

5894

5962

5895

#: bzrlib/errors.py:2299

5963

#: bzrlib/errors.py:2327

5896

5964

msgid ""

5897

5965

"Testament did not match expected value.\n"

5898

5966

" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"

5899

5967

" {%(measured)s}"

5900

5968

msgstr ""

5901

5969

5902

#: bzrlib/errors.py:2311

5970

#: bzrlib/errors.py:2339

5903

5971

msgid "Not a bzr revision-bundle: %(text)r"

5904

5972

msgstr ""

5905

5973

5906

#: bzrlib/errors.py:2320

5974

#: bzrlib/errors.py:2348

5907

5975

msgid "Bad bzr revision-bundle: %(text)r"

5908

5976

msgstr ""

5909

5977

5910

#: bzrlib/errors.py:2329

5978

#: bzrlib/errors.py:2357

5911

5979

msgid "Malformed bzr revision-bundle header: %(text)r"

5912

5980

msgstr ""

5913

5981

5914

#: bzrlib/errors.py:2334

5982

#: bzrlib/errors.py:2362

5915

5983

msgid "Malformed patches in bzr revision-bundle: %(text)r"

5916

5984

msgstr ""

5917

5985

5918

#: bzrlib/errors.py:2339

5986

#: bzrlib/errors.py:2367

5919

5987

msgid "Malformed footer in bzr revision-bundle: %(text)r"

5920

5988

msgstr ""

5921

5989

5922

#: bzrlib/errors.py:2344

5990

#: bzrlib/errors.py:2372

5923

5991

msgid "End of line marker was not \\n in bzr revision-bundle"

5924

5992

msgstr ""

5925

5993

5926

#: bzrlib/errors.py:2354

5994

#: bzrlib/errors.py:2382

5927

5995

msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"

5928

5996

msgstr ""

5929

5997

5930

#: bzrlib/errors.py:2364

5998

#: bzrlib/errors.py:2392

5931

5999

msgid "Root class for inventory serialization errors"

5932

6000

msgstr ""

5933

6001

5934

#: bzrlib/errors.py:2368

6002

#: bzrlib/errors.py:2396

5935

6003

msgid ""

5936

6004

"The inventory was not in the expected format:\n"

5937

6005

" %(msg)s"

5938

6006

msgstr ""

5939

6007

5940

#: bzrlib/errors.py:2377

6008

#: bzrlib/errors.py:2405

5941

6009

msgid "This operation requires rich root data storage"

5942

6010

msgstr ""

5943

6011

5944

#: bzrlib/errors.py:2390

6012

#: bzrlib/errors.py:2418

5945

6013

msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"

5946

6014

msgstr ""

5947

6015

5948

#: bzrlib/errors.py:2399

6016

#: bzrlib/errors.py:2427

5949

6017

msgid ""

5950

6018

"Don't know how to handle SSH connections. Please set BZR_SSH environment "

5951

6019

"variable."

5952

6020

msgstr ""

5953

6021

5954

#: bzrlib/errors.py:2406

6022

#: bzrlib/errors.py:2434

5955

6023

msgid ""

5956

6024

"Could not determine revno for {%(revision_id)s} because its ancestry shows a "

5957

6025

"ghost at {%(ghost_revision_id)s}"

5958

6026

msgstr ""

5959

6027

5960

#: bzrlib/errors.py:2416

6028

#: bzrlib/errors.py:2444

5961

6029

msgid "Ghost revision {%(revision_id)s} cannot be used here."

5962

6030

msgstr ""

5963

6031

5964

#: bzrlib/errors.py:2467

6032

#: bzrlib/errors.py:2495

5965

6033

msgid ""

5966

6034

"A merge directive must provide either a bundle or a public branch location."

5967

6035

msgstr ""

5968

6036

5969

#: bzrlib/errors.py:2474

6037

#: bzrlib/errors.py:2502

5970

6038

msgid "Bad merge directive payload %(start)r"

5971

6039

msgstr ""

5972

6040

5973

#: bzrlib/errors.py:2484

6041

#: bzrlib/errors.py:2512

5974

6042

msgid "Preview patch does not match requested changes."

5975

6043

msgstr ""

5976

6044

5977

#: bzrlib/errors.py:2490

6045

#: bzrlib/errors.py:2518

5978

6046

msgid "Patch_type was %(patch_type)s, but no patch was supplied."

5979

6047

msgstr ""

5980

6048

5981

#: bzrlib/errors.py:2500

6049

#: bzrlib/errors.py:2528

5982

6050

msgid ""

5983

6051

"Your branch does not have all of the revisions required in order to merge "

5984

6052

"this merge directive and the target location specified in the merge "

5985

6053

"directive is not a branch: %(location)s."

5986

6054

msgstr ""

5987

6055

5988

#: bzrlib/errors.py:2512

6056

#: bzrlib/errors.py:2540

5989

6057

msgid "Unsupported entry kind %(kind)s"

5990

6058

msgstr ""

5991

6059

5992

#: bzrlib/errors.py:2520

6060

#: bzrlib/errors.py:2548

5993

6061

msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"

5994

6062

msgstr ""

5995

6063

5996

#: bzrlib/errors.py:2530

6064

#: bzrlib/errors.py:2558

5997

6065

msgid "Subsume target %(other_tree)s needs to be upgraded."

5998

6066

msgstr ""

5999

6067

6000

#: bzrlib/errors.py:2549

6068

#: bzrlib/errors.py:2577

6001

6069

msgid "No such tag: %(tag_name)s"

6002

6070

msgstr ""

6003

6071

6004

#: bzrlib/errors.py:2557

6072

#: bzrlib/errors.py:2585

6005

6073

msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."

6006

6074

msgstr ""

6007

6075

6008

#: bzrlib/errors.py:2566

6076

#: bzrlib/errors.py:2594

6009

6077

msgid "Tag %(tag_name)s already exists."

6010

6078

msgstr ""

6011

6079

6012

#: bzrlib/errors.py:2574

6080

#: bzrlib/errors.py:2602

6013

6081

msgid ""

6014

6082

"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"

6015

6083

"\" for more information on this feature."

6016

6084

msgstr ""

6017

6085

6018

#: bzrlib/errors.py:2584

6086

#: bzrlib/errors.py:2612

6019

6087

msgid ""

6020

6088

"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"

6021

6089

msgstr ""

6022

6090

6023

#: bzrlib/errors.py:2594

6091

#: bzrlib/errors.py:2622

6024

6092

msgid ""

6025

6093

"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"

6026

6094

msgstr ""

6027

6095

6028

#: bzrlib/errors.py:2604

6096

#: bzrlib/errors.py:2632

6029

6097

msgid "Invalid line in bugs property: '%(line)s'"

6030

6098

msgstr ""

6031

6099

6032

#: bzrlib/errors.py:2612

6100

#: bzrlib/errors.py:2640

6033

6101

msgid "Invalid bug status: '%(status)s'"

6034

6102

msgstr ""

6035

6103

6036

#: bzrlib/errors.py:2620

6104

#: bzrlib/errors.py:2648

6037

6105

msgid "Could not understand response from smart server: %(response_tuple)r"

6038

6106

msgstr ""

6039

6107

6040

#: bzrlib/errors.py:2659

6108

#: bzrlib/errors.py:2687

6041

6109

msgid "Server sent an unexpected error: %(error_tuple)r"

6042

6110

msgstr ""

6043

6111

6044

#: bzrlib/errors.py:2678

6112

#: bzrlib/errors.py:2706

6045

6113

msgid "Unrecognised container format: %(container_format)r"

6046

6114

msgstr ""

6047

6115

6048

#: bzrlib/errors.py:2686

6116

#: bzrlib/errors.py:2714

6049

6117

msgid "Unexpected end of container stream"

6050

6118

msgstr ""

6051

6119

6052

#: bzrlib/errors.py:2691

6120

#: bzrlib/errors.py:2719

6053

6121

msgid "Unknown record type: %(record_type)r"

6054

6122

msgstr ""

6055

6123

6056

#: bzrlib/errors.py:2699

6124

#: bzrlib/errors.py:2727

6057

6125

msgid "Invalid record: %(reason)s"

6058

6126

msgstr ""

6059

6127

6060

#: bzrlib/errors.py:2707

6128

#: bzrlib/errors.py:2735

6061

6129

msgid "Container has data after end marker: %(excess)r"

6062

6130

msgstr ""

6063

6131

6064

#: bzrlib/errors.py:2715

6132

#: bzrlib/errors.py:2743

6065

6133

msgid "Container has multiple records with the same name: %(name)s"

6066

6134

msgstr ""

6067

6135

6068

#: bzrlib/errors.py:2728

6136

#: bzrlib/errors.py:2756

6069

6137

msgid "Corrupt or incompatible data stream: %(reason)s"

6070

6138

msgstr ""

6071

6139

6072

#: bzrlib/errors.py:2736

6140

#: bzrlib/errors.py:2764

6073

6141

msgid "SMTP error: %(error)s"

6074

6142

msgstr ""

6075

6143

6076

#: bzrlib/errors.py:2744

6144

#: bzrlib/errors.py:2772

6077

6145

msgid "No message supplied."

6078

6146

msgstr ""

6079

6147

6080

#: bzrlib/errors.py:2749

6148

#: bzrlib/errors.py:2777

6081

6149

msgid "No mail-to address (--mail-to) or output (-o) specified."

6082

6150

msgstr ""

6083

6151

6084

#: bzrlib/errors.py:2754

6085

msgid "Unknown mail client: %(mail_client)s"

6086

msgstr ""

6087

6088

#: bzrlib/errors.py:2762

6152

#: bzrlib/errors.py:2782

6089

6153

msgid ""

6090

6154

"Unable to find mail client with the following names: "

6091

6155

"%(mail_command_list_string)s"

6092

6156

msgstr ""

6093

6157

6094

#: bzrlib/errors.py:2772

6158

#: bzrlib/errors.py:2792

6095

6159

msgid "SMTP connection to %(host)s refused"

6096

6160

msgstr ""

6097

6161

6098

#: bzrlib/errors.py:2781

6162

#: bzrlib/errors.py:2801

6099

6163

msgid "Please specify smtp_server. No server at default %(host)s."

6100

6164

msgstr ""

6101

6165

6102

#: bzrlib/errors.py:2795

6166

#: bzrlib/errors.py:2815

6103

6167

msgid ""

6104

6168

"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"

6105

6169

"reconfigure."

6106

6170

msgstr ""

6107

6171

6108

#: bzrlib/errors.py:2807

6172

#: bzrlib/errors.py:2827

6109

6173

msgid "'%(display_url)s' is already a branch."

6110

6174

msgstr ""

6111

6175

6112

#: bzrlib/errors.py:2812

6176

#: bzrlib/errors.py:2832

6113

6177

msgid "'%(display_url)s' is already a tree."

6114

6178

msgstr ""

6115

6179

6116

#: bzrlib/errors.py:2817

6180

#: bzrlib/errors.py:2837

6117

6181

msgid "'%(display_url)s' is already a checkout."

6118

6182

msgstr ""

6119

6183

6120

#: bzrlib/errors.py:2822

6184

#: bzrlib/errors.py:2842

6121

6185

msgid "'%(display_url)s' is already a lightweight checkout."

6122

6186

msgstr ""

6123

6187

6124

#: bzrlib/errors.py:2827

6188

#: bzrlib/errors.py:2847

6125

6189

msgid "'%(display_url)s' is already using a shared repository."

6126

6190

msgstr ""

6127

6191

6128

#: bzrlib/errors.py:2832

6192

#: bzrlib/errors.py:2852

6129

6193

msgid "'%(display_url)s' is already standalone."

6130

6194

msgstr ""

6131

6195

6132

#: bzrlib/errors.py:2837

6196

#: bzrlib/errors.py:2857

6133

6197

msgid "Shared repository '%(display_url)s' already creates working trees."

6134

6198

msgstr ""

6135

6199

6136

#: bzrlib/errors.py:2843

6200

#: bzrlib/errors.py:2863

6137

6201

msgid ""

6138

6202

"Shared repository '%(display_url)s' already doesn't create working trees."

6139

6203

msgstr ""

6140

6204

6141

#: bzrlib/errors.py:2849

6205

#: bzrlib/errors.py:2869

6142

6206

msgid "Requested reconfiguration of '%(display_url)s' is not supported."

6143

6207

msgstr ""

6144

6208

6145

#: bzrlib/errors.py:2854

6209

#: bzrlib/errors.py:2874

6146

6210

msgid "No location could be found to bind to at %(display_url)s."

6147

6211

msgstr ""

6148

6212

6149

#: bzrlib/errors.py:2859

6213

#: bzrlib/errors.py:2879

6150

6214

msgid ""

6151

6215

"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."

6152

6216

"%(more)s"

6153

6217

msgstr ""

6154

6218

6155

#: bzrlib/errors.py:2878

6219

#: bzrlib/errors.py:2898

6220

msgid ""

6221

"Branch \"%(display_url)s\" does not support storing uncommitted changes."

6222

msgstr ""

6223

6224

#: bzrlib/errors.py:2913

6156

6225

msgid ""

6157

6226

"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."

6158

6227

"%(more)s"

6159

6228

msgstr ""

6160

6229

6161

#: bzrlib/errors.py:2884

6230

#: bzrlib/errors.py:2919

6162

6231

msgid "Variable {%(name)s} is not available."

6163

6232

msgstr ""

6164

6233

6165

#: bzrlib/errors.py:2892

6234

#: bzrlib/errors.py:2927

6166

6235

msgid "No template specified."

6167

6236

msgstr ""

6168

6237

6169

#: bzrlib/errors.py:2897

6238

#: bzrlib/errors.py:2932

6170

6239

msgid "Unable to create symlink %(path_str)son this platform"

6171

6240

msgstr ""

6172

6241

6173

#: bzrlib/errors.py:2912

6242

#: bzrlib/errors.py:2947

6174

6243

msgid ""

6175

6244

"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"

6176

6245

"\", \"local\"."

6177

6246

msgstr ""

6178

6247

6179

#: bzrlib/errors.py:2946

6248

#: bzrlib/errors.py:2981

6180

6249

msgid ""

6181

6250

"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"

6182

6251

msgstr ""

6183

6252

6184

#: bzrlib/errors.py:2958

6253

#: bzrlib/errors.py:2993

6185

6254

msgid "The \"%(config_id)s\" configuration does not exist."

6186

6255

msgstr ""

6187

6256

6188

#: bzrlib/errors.py:2966

6257

#: bzrlib/errors.py:3001

6189

6258

msgid "The \"%(option_name)s\" configuration option does not exist."

6190

6259

msgstr ""

6191

6260

6192

#: bzrlib/errors.py:2974

6261

#: bzrlib/errors.py:3009

6193

6262

msgid "The alias \"%(alias_name)s\" does not exist."

6194

6263

msgstr ""

6195

6264

6196

#: bzrlib/errors.py:2988

6265

#: bzrlib/errors.py:3023

6197

6266

msgid "\"%(alias_name)s\" is not a valid location alias."

6198

6267

msgstr ""

6199

6268

6200

#: bzrlib/errors.py:2996

6269

#: bzrlib/errors.py:3031

6201

6270

msgid "No %(alias_name)s location assigned."

6202

6271

msgstr ""

6203

6272

6204

#: bzrlib/errors.py:3004

6273

#: bzrlib/errors.py:3039

6205

6274

msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."

6206

6275

msgstr ""

6207

6276

6208

#: bzrlib/errors.py:3014

6277

#: bzrlib/errors.py:3049

6209

6278

msgid "Unknown rules detected: %(unknowns_str)s."

6210

6279

msgstr ""

6211

6280

6212

#: bzrlib/errors.py:3025

6281

#: bzrlib/errors.py:3060

6213

6282

msgid "Tip change rejected: %(msg)s"

6214

6283

msgstr ""

6215

6284

6216

#: bzrlib/errors.py:3033

6285

#: bzrlib/errors.py:3068

6217

6286

msgid "Shelf corrupt."

6218

6287

msgstr ""

6219

6288

6220

#: bzrlib/errors.py:3038

6289

#: bzrlib/errors.py:3073

6221

6290

msgid "Corruption while decompressing repository file%(orig_error)s"

6222

6291

msgstr ""

6223

6292

6224

#: bzrlib/errors.py:3050

6293

#: bzrlib/errors.py:3085

6225

6294

msgid "No changes are shelved with id \"%(shelf_id)d\"."

6226

6295

msgstr ""

6227

6296

6228

#: bzrlib/errors.py:3058

6297

#: bzrlib/errors.py:3093

6229

6298

msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."

6230

6299

msgstr ""

6231

6300

6232

#: bzrlib/errors.py:3066

6301

#: bzrlib/errors.py:3101

6233

6302

msgid "An attempt to access a url outside the server jail was made: '%(url)s'."

6234

6303

msgstr ""

6235

6304

6236

#: bzrlib/errors.py:3074

6305

#: bzrlib/errors.py:3109

6237

6306

msgid "The user aborted the operation."

6238

6307

msgstr ""

6239

6308

6240

#: bzrlib/errors.py:3079

6309

#: bzrlib/errors.py:3114

6241

6310

msgid "Branching '%(url)s'(%(format)s) must create a working tree."

6242

6311

msgstr ""

6243

6312

6244

#: bzrlib/errors.py:3089

6313

#: bzrlib/errors.py:3124

6245

6314

msgid "No such view: %(view_name)s."

6246

6315

msgstr ""

6247

6316

6248

#: bzrlib/errors.py:3099

6317

#: bzrlib/errors.py:3134

6249

6318

msgid ""

6250

6319

"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "

6251

6320

"to a later format."

6252

6321

msgstr ""

6253

6322

6254

#: bzrlib/errors.py:3108

6323

#: bzrlib/errors.py:3143

6255

6324

msgid ""

6256

6325

"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"

6257

6326

msgstr ""

6258

6327

6259

#: bzrlib/errors.py:3175

6328

#: bzrlib/errors.py:3210

6260

6329

msgid "%(bzrdir)r does not support co-located branches."

6261

6330

msgstr ""

6262

6331

6263

#: bzrlib/errors.py:3181

6332

#: bzrlib/errors.py:3216

6264

6333

msgid ""

6265

6334

"Unable to determine your name.\n"

6266

6335

"Please, set your name with the 'whoami' command.\n"

6267

6336

"E.g. bzr whoami \"Your Name <name@example.com>\""

6268

6337

msgstr ""

6269

6338

6270

#: bzrlib/errors.py:3190

6339

#: bzrlib/errors.py:3225

6271

6340

msgid "Invalid pattern(s) found. %(msg)s"

6272

6341

msgstr ""

6273

6342

6274

#: bzrlib/errors.py:3198

6343

#: bzrlib/errors.py:3233

6275

6344

msgid ""

6276

6345

"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "

6277

6346

"unbind` to fix."

6278

6347

msgstr ""

6279

6348

6280

#: bzrlib/errors.py:3209

6349

#: bzrlib/errors.py:3244

6281

6350

msgid "Loop involving %(refs)r while expanding \"%(string)s\"."

6282

6351

msgstr ""

6283

6352

6284

#: bzrlib/errors.py:3218

6353

#: bzrlib/errors.py:3253

6285

6354

msgid "Option %(name)s is not defined while expanding \"%(string)s\"."

6286

6355

msgstr ""

6287

6356

6288

#: bzrlib/errors.py:3227

6357

#: bzrlib/errors.py:3262

6289

6358

msgid ""

6290

6359

"No compatible object available for operations from %(source)r to %(target)r."

6291

6360

msgstr ""

6292

6361

6293

#: bzrlib/errors.py:3237

6362

#: bzrlib/errors.py:3272

6294

6363

msgid ""

6295

6364

"VFS requests over the smart server are not allowed. Encountered: %(method)s, "

6296

6365

"%(arguments)s."

6297

6366

msgstr ""

6298

6367

6299

#: bzrlib/errors.py:3247

6368

#: bzrlib/errors.py:3282

6300

6369

msgid ""

6301

6370

"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "

6302

6371

"format %(format)r"

6303

6372

msgstr ""

6304

6373

6305

#: bzrlib/errors.py:3259

6374

#: bzrlib/errors.py:3294

6306

6375

msgid ""

6307

6376

"Missing feature %(feature)s not provided by this version of Bazaar or any "

6308

6377

"plugin."

6309

6378

msgstr ""

6310

6379

6311

#: bzrlib/errors.py:3272

6380

#: bzrlib/errors.py:3307

6312

6381

msgid "Binary files section encountered."

6313

6382

msgstr ""

6314

6383

6315

#: bzrlib/errors.py:3280

6384

#: bzrlib/errors.py:3315

6316

6385

msgid ""

6317

6386

"Malformed patch header. %(desc)s\n"

6318

6387

"%(line)r"

6319

6388

msgstr ""

6320

6389

6321

#: bzrlib/errors.py:3289

6390

#: bzrlib/errors.py:3324

6322

6391

msgid ""

6323

6392

"Malformed hunk header. %(desc)s\n"

6324

6393

"%(line)r"

6325

6394

msgstr ""

6326

6395

6327

#: bzrlib/errors.py:3298

6396

#: bzrlib/errors.py:3333

6328

6397

msgid ""

6329

6398

"Malformed line. %(desc)s\n"

6330

6399

"%(line)r"

6331

6400

msgstr ""

6332

6401

6333

#: bzrlib/errors.py:3308

6402

#: bzrlib/errors.py:3343

6334

6403

msgid ""

6335

6404

"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "

6336

6405

"but patch says it should be \"%(patch_line)s\""

6337

6406

msgstr ""

6338

6407

6339

#: bzrlib/errors.py:3319

6408

#: bzrlib/errors.py:3354

6340

6409

msgid "The feature %(feature)s has already been registered."

6341

6410

msgstr ""

6342

6411

6412

#: bzrlib/errors.py:3362

6413

msgid ""

6414

"Cannot store uncommitted changes because this branch already stores "

6415

"uncommitted changes."

6416

msgstr ""

6417

6343

6418

#: bzrlib/export_pot.py:252

6344

6419

#, python-format

6345

6420

msgid "Exporting messages from builtin command: %s"

6389

6464

"regular push."

6390

6465

msgstr ""

6391

6466

6392

#: bzrlib/gpg.py:119 bzrlib/gpg.py:460

6467

#: bzrlib/gpg.py:366

6468

msgid "No GnuPG key results for pattern: {0}"

6469

msgstr ""

6470

6471

#: bzrlib/gpg.py:439

6393

6472

msgid "{0} commits with valid signatures"

6394

6473

msgstr ""

6395

6474

6396

#: bzrlib/gpg.py:123 bzrlib/gpg.py:465

6475

#: bzrlib/gpg.py:445

6397

6476

msgid "{0} commit with unknown key"

6398

6477

msgid_plural "{0} commits with unknown keys"

6399

6478

msgstr[0] ""

6400

6479

msgstr[1] ""

6401

6480

6402

#: bzrlib/gpg.py:129 bzrlib/gpg.py:472

6481

#: bzrlib/gpg.py:453

6403

6482

msgid "{0} commit not valid"

6404

6483

msgid_plural "{0} commits not valid"

6405

6484

msgstr[0] ""

6406

6485

msgstr[1] ""

6407

6486

6408

#: bzrlib/gpg.py:135 bzrlib/gpg.py:479

6487

#: bzrlib/gpg.py:461

6409

6488

msgid "{0} commit not signed"

6410

6489

msgid_plural "{0} commits not signed"

6411

6490

msgstr[0] ""

6412

6491

msgstr[1] ""

6413

6492

6414

#: bzrlib/gpg.py:141 bzrlib/gpg.py:486

6493

#: bzrlib/gpg.py:469

6415

6494

msgid "{0} commit with key now expired"

6416

6495

msgid_plural "{0} commits with key now expired"

6417

6496

msgstr[0] ""

6418

6497

msgstr[1] ""

6419

6498

6420

#: bzrlib/gpg.py:343

6421

msgid "No GnuPG key results for pattern: {0}"

6422

msgstr ""

6499

#: bzrlib/gpg.py:489

6500

msgid "{0} commit by author {1} with key {2} now expired"

6501

msgid_plural "{0} commits by author {1} with key {2} now expired"

6502

msgstr[0] ""

6503

msgstr[1] ""

6423

6504

6424

#: bzrlib/gpg.py:386

6505

#: bzrlib/gpg.py:505

6425

6506

msgid "{0} signed {1} commit"

6426

6507

msgid_plural "{0} signed {1} commits"

6427

6508

msgstr[0] ""

6428

6509

msgstr[1] ""

6429

6510

6430

#: bzrlib/gpg.py:403 bzrlib/gpg.py:419

6511

#: bzrlib/gpg.py:522 bzrlib/gpg.py:539

6431

6512

msgid "{0} commit by author {1}"

6432

6513

msgid_plural "{0} commits by author {1}"

6433

6514

msgstr[0] ""

6434

6515

msgstr[1] ""

6435

6516

6436

#: bzrlib/gpg.py:433

6517

#: bzrlib/gpg.py:554

6437

6518

msgid "Unknown key {0} signed {1} commit"

6438

6519

msgid_plural "Unknown key {0} signed {1} commits"

6439

6520

msgstr[0] ""

6440

6521

msgstr[1] ""

6441

6522

6442

#: bzrlib/gpg.py:452

6443

msgid "{0} commit by author {1} with key {2} now expired"

6444

msgid_plural "{0} commits by author {1} with key {2} now expired"

6445

msgstr[0] ""

6446

msgstr[1] ""

6447

6448

6523

#: bzrlib/groupcompress.py:1739

6449

6524

#, python-format

6450

6525

msgid "Insert claimed random_id=True, but then inserted %r two times"

6451

6526

msgstr ""

6452

6527

6453

#: bzrlib/hooks.py:331

6528

#: bzrlib/hooks.py:313

6454

6529

#, python-format

6455

6530

msgid "Introduced in: %s"

6456

6531

msgstr ""

6457

6532

6458

#: bzrlib/hooks.py:334

6533

#: bzrlib/hooks.py:316

6459

6534

#, python-format

6460

6535

msgid "Deprecated in: %s"

6461

6536

msgstr ""

6468

6543

msgid "annotating"

6469

6544

msgstr ""

6470

6545

6471

#: bzrlib/lock.py:548

6546

#: bzrlib/lock.py:549

6472

6547

msgid "{0!r} was {1} locked again"

6473

6548

msgstr ""

6474

6549

6504

6579

"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"

6505

6580

msgstr ""

6506

6581

6507

#: bzrlib/log.py:572

6582

#: bzrlib/log.py:563

6508

6583

msgid "--exclude-common-ancestry requires two different revisions"

6509

6584

msgstr ""

6510

6585

6511

#: bzrlib/log.py:574

6586

#: bzrlib/log.py:565

6512

6587

#, python-format

6513

6588

msgid "invalid direction %r"

6514

6589

msgstr ""

6515

6590

6516

#: bzrlib/log.py:662

6591

#: bzrlib/log.py:653

6517

6592

msgid "Start revision not found in history of end revision."

6518

6593

msgstr ""

6519

6594

6520

#: bzrlib/log.py:1080 bzrlib/log.py:1138

6595

#: bzrlib/log.py:1071 bzrlib/log.py:1129

6521

6596

msgid "Logging revision 0 is invalid."

6522

6597

msgstr ""

6523

6598

6524

#: bzrlib/log.py:1082 bzrlib/log.py:1140

6599

#: bzrlib/log.py:1073 bzrlib/log.py:1131

6525

6600

msgid "Start revision must be older than the end revision."

6526

6601

msgstr ""

6527

6602

6528

#: bzrlib/log.py:1827

6603

#: bzrlib/log.py:1818

6529

6604

#, python-format

6530

6605

msgid "unknown log formatter: %r"

6531

6606

msgstr ""

6532

6607

6533

#: bzrlib/log.py:2123

6608

#: bzrlib/log.py:2114

6534

6609

msgid "fixes bug"

6535

6610

msgid_plural "fixes bugs"

6536

6611

msgstr[0] ""

6545

6620

msgid "%d conflicts encountered."

6546

6621

msgstr ""

6547

6622

6548

#: bzrlib/merge.py:845 bzrlib/merge.py:1933

6623

#: bzrlib/merge.py:845 bzrlib/merge.py:1868

6549

6624

msgid "Preparing file merge"

6550

6625

msgstr ""

6551

6626

6693

6768

msgid "lstat/stat of ({0!r}): {1!r}"

6694

6769

msgstr ""

6695

6770

6696

#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008

6771

#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041

6697

6772

#, python-format

6698

6773

msgid "sorry, %r not allowed in path"

6699

6774

msgstr ""

6700

6775

6701

#: bzrlib/osutils.py:1226

6776

#: bzrlib/osutils.py:1259

6702

6777

#, python-format

6703

6778

msgid "%r is too short to calculate a relative path"

6704

6779

msgstr ""

6740

6815

msgid "Generate only the shell function, don't enable it"

6741

6816

msgstr ""

6742

6817

6743

#: bzrlib/plugins/launchpad/__init__.py:81

6818

#: bzrlib/plugins/grep/cmds.py:77

6819

msgid "Print lines matching PATTERN for specified files and revisions."

6820

msgstr ""

6821

6822

#: bzrlib/plugins/grep/cmds.py:79

6823

msgid ""

6824

"This command searches the specified files and revisions for a given\n"

6825

"pattern. The pattern is specified as a Python regular expressions[1]."

6826

msgstr ""

6827

6828

#: bzrlib/plugins/grep/cmds.py:82

6829

msgid ""

6830

"If the file name is not specified, the revisions starting with the\n"

6831

"current directory are searched recursively. If the revision number is\n"

6832

"not specified, the working copy is searched. To search the last committed\n"

6833

"revision, use the '-r -1' or '-r last:1' option."

6834

msgstr ""

6835

6836

#: bzrlib/plugins/grep/cmds.py:87

6837

msgid ""

6838

"Unversioned files are not searched unless explicitly specified on the\n"

6839

"command line. Unversioned directores are not searched."

6840

msgstr ""

6841

6842

#: bzrlib/plugins/grep/cmds.py:90

6843

msgid ""

6844

"When searching a pattern, the output is shown in the 'filepath:string'\n"

6845

"format. If a revision is explicitly searched, the output is shown as\n"

6846

"'filepath~N:string', where N is the revision number."

6847

msgstr ""

6848

6849

#: bzrlib/plugins/grep/cmds.py:94

6850

msgid ""

6851

"--include and --exclude options can be used to search only (or exclude\n"

6852

"from search) files with base name matches the specified Unix style GLOB\n"

6853

"pattern. The GLOB pattern an use *, ?, and [...] as wildcards, and \\\n"

6854

"to quote wildcard or backslash character literally. Note that the glob\n"

6855

"pattern is not a regular expression."

6856

msgstr ""

6857

6858

#: bzrlib/plugins/grep/cmds.py:100

6859

msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"

6860

msgstr ""

6861

6862

# help of 'color' option of 'grep' command

6863

#: bzrlib/plugins/grep/cmds.py:109

6864

msgid "Show match in color. WHEN is never, always or auto."

6865

msgstr ""

6866

6867

# help of 'diff' option of 'grep' command

6868

#: bzrlib/plugins/grep/cmds.py:111

6869

msgid "Grep for pattern in changeset for each revision."

6870

msgstr ""

6871

6872

# help of 'exclude' option of 'grep' command

6873

#: bzrlib/plugins/grep/cmds.py:113

6874

msgid "Skip files whose base name matches GLOB."

6875

msgstr ""

6876

6877

# help of 'include' option of 'grep' command

6878

#: bzrlib/plugins/grep/cmds.py:115

6879

msgid "Search only files whose base name matches GLOB."

6880

msgstr ""

6881

6882

# help of 'files-with-matches' option of 'grep' command

6883

#: bzrlib/plugins/grep/cmds.py:117

6884

msgid "Print only the name of each input file in which PATTERN is found."

6885

msgstr ""

6886

6887

# help of 'files-without-match' option of 'grep' command

6888

#: bzrlib/plugins/grep/cmds.py:120

6889

msgid "Print only the name of each input file in which PATTERN is not found."

6890

msgstr ""

6891

6892

# help of 'fixed-string' option of 'grep' command

6893

#: bzrlib/plugins/grep/cmds.py:123

6894

msgid "Interpret PATTERN is a single fixed string (not regex)."

6895

msgstr ""

6896

6897

# help of 'from-root' option of 'grep' command

6898

#: bzrlib/plugins/grep/cmds.py:125

6899

msgid ""

6900

"Search for pattern starting from the root of the branch. (implies --"

6901

"recursive)"

6902

msgstr ""

6903

6904

# help of 'ignore-case' option of 'grep' command

6905

#: bzrlib/plugins/grep/cmds.py:128

6906

msgid "ignore case distinctions while matching."

6907

msgstr ""

6908

6909

# help of 'levels' option of 'grep' command

6910

#: bzrlib/plugins/grep/cmds.py:130

6911

msgid ""

6912

"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."

6913

msgstr ""

6914

6915

# help of 'line-number' option of 'grep' command

6916

#: bzrlib/plugins/grep/cmds.py:135

6917

msgid "show 1-based line number."

6918

msgstr ""

6919

6920

# help of 'no-recursive' option of 'grep' command

6921

#: bzrlib/plugins/grep/cmds.py:137

6922

msgid "Don't recurse into subdirectories. (default is --recursive)"

6923

msgstr ""

6924

6925

# help of 'null' option of 'grep' command

6926

#: bzrlib/plugins/grep/cmds.py:139

6927

msgid ""

6928

"Write an ASCII NUL (\\0) separator between output lines rather than a "

6929

"newline."

6930

msgstr ""

6931

6932

#: bzrlib/plugins/launchpad/account.py:66

6933

msgid "Setting ssh/sftp usernames for launchpad.net."

6934

msgstr ""

6935

6936

#: bzrlib/plugins/launchpad/cmds.py:43

6744

6937

msgid "Register a branch with launchpad.net."

6745

6938

msgstr ""

6746

6939

6747

#: bzrlib/plugins/launchpad/__init__.py:83

6940

#: bzrlib/plugins/launchpad/cmds.py:45

6748

6941

msgid ""

6749

6942

"This command lists a bzr branch in the directory of branches on\n"

6750

6943

"launchpad.net. Registration allows the branch to be associated with\n"

6751

6944

"bugs or specifications."

6752

6945

msgstr ""

6753

6946

6754

#: bzrlib/plugins/launchpad/__init__.py:87

6947

#: bzrlib/plugins/launchpad/cmds.py:49

6755

6948

msgid ""

6756

6949

"Before using this command you must register the project to which the\n"

6757

6950

"branch belongs, and create an account for yourself on launchpad.net."

6758

6951

msgstr ""

6759

6952

6760

#: bzrlib/plugins/launchpad/__init__.py:90

6953

#: bzrlib/plugins/launchpad/cmds.py:52

6761

6954

msgid ""

6762

6955

"arguments:\n"

6763

6956

" public_url: The publicly visible url for the branch to register.\n"

6769

6962

" otherwise error."

6770

6963

msgstr ""

6771

6964

6772

#: bzrlib/plugins/launchpad/__init__.py:99

6965

#: bzrlib/plugins/launchpad/cmds.py:61

6773

6966

msgid ""

6774

6967

"example:\n"

6775

6968

" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"

6777

6970

msgstr ""

6778

6971

6779

6972

# help of 'project' option of 'register-branch' command

6780

#: bzrlib/plugins/launchpad/__init__.py:106

6973

#: bzrlib/plugins/launchpad/cmds.py:68

6781

6974

msgid "Launchpad project short name to associate with the branch."

6782

6975

msgstr ""

6783

6976

6784

6977

# help of 'branch-name' option of 'register-branch' command

6785

#: bzrlib/plugins/launchpad/__init__.py:113

6978

#: bzrlib/plugins/launchpad/cmds.py:75

6786

6979

msgid ""

6787

6980

"Short name for the branch; by default taken from the last component of the "

6788

6981

"url."

6789

6982

msgstr ""

6790

6983

6791

6984

# help of 'branch-title' option of 'register-branch' command

6792

#: bzrlib/plugins/launchpad/__init__.py:117

6985

#: bzrlib/plugins/launchpad/cmds.py:79

6793

6986

msgid "One-sentence description of the branch."

6794

6987

msgstr ""

6795

6988

6796

6989

# help of 'branch-description' option of 'register-branch' command

6797

#: bzrlib/plugins/launchpad/__init__.py:120

6990

#: bzrlib/plugins/launchpad/cmds.py:82

6798

6991

msgid "Longer description of the purpose or contents of the branch."

6799

6992

msgstr ""

6800

6993

6801

6994

# help of 'author' option of 'register-branch' command

6802

#: bzrlib/plugins/launchpad/__init__.py:123

6995

#: bzrlib/plugins/launchpad/cmds.py:85

6803

6996

msgid "Branch author's email address, if not yourself."

6804

6997

msgstr ""

6805

6998

6806

6999

# help of 'link-bug' option of 'register-branch' command

6807

#: bzrlib/plugins/launchpad/__init__.py:126

7000

#: bzrlib/plugins/launchpad/cmds.py:88

6808

7001

msgid "The bug this branch fixes."

6809

7002

msgstr ""

6810

7003

6811

7004

# help of 'dry-run' option of 'register-branch' command

6812

#: bzrlib/plugins/launchpad/__init__.py:129

7005

#: bzrlib/plugins/launchpad/cmds.py:91

6813

7006

msgid "Prepare the request but don't actually send it."

6814

7007

msgstr ""

6815

7008

6816

#: bzrlib/plugins/launchpad/__init__.py:151

7009

#: bzrlib/plugins/launchpad/cmds.py:113

6817

7010

msgid ""

6818

7011

"register-branch requires a public branch url - see bzr help register-branch."

6819

7012

msgstr ""

6820

7013

6821

#: bzrlib/plugins/launchpad/__init__.py:159

7014

#: bzrlib/plugins/launchpad/cmds.py:121

6822

7015

msgid "--product is deprecated; please use --project."

6823

7016

msgstr ""

6824

7017

6825

#: bzrlib/plugins/launchpad/__init__.py:191

7018

#: bzrlib/plugins/launchpad/cmds.py:151

6826

7019

msgid "Open a Launchpad branch page in your web browser."

6827

7020

msgstr ""

6828

7021

6829

7022

# help of 'dry-run' option of 'launchpad-open' command

6830

#: bzrlib/plugins/launchpad/__init__.py:196

7023

#: bzrlib/plugins/launchpad/cmds.py:156

6831

7024

msgid "Do not actually open the browser. Just say the URL we would use."

6832

7025

msgstr ""

6833

7026

6834

#: bzrlib/plugins/launchpad/__init__.py:231

7027

#: bzrlib/plugins/launchpad/cmds.py:191

6835

7028

#, python-format

6836

7029

msgid "Opening %s in web browser"

6837

7030

msgstr ""

6838

7031

6839

#: bzrlib/plugins/launchpad/__init__.py:241

7032

#: bzrlib/plugins/launchpad/cmds.py:199

6840

7033

msgid "Show or set the Launchpad user ID."

6841

7034

msgstr ""

6842

7035

6843

#: bzrlib/plugins/launchpad/__init__.py:243

7036

#: bzrlib/plugins/launchpad/cmds.py:201

6844

7037

msgid ""

6845

7038

"When communicating with Launchpad, some commands need to know your\n"

6846

7039

"Launchpad user ID. This command can be used to set or show the\n"

6847

7040

"user ID that Bazaar will use for such communication."

6848

7041

msgstr ""

6849

7042

6850

#: bzrlib/plugins/launchpad/__init__.py:247

7043

#: bzrlib/plugins/launchpad/cmds.py:205

6851

7044

msgid ""

6852

7045

":Examples:\n"

6853

7046

" Show the Launchpad ID of the current user::"

6854

7047

msgstr ""

6855

7048

6856

#: bzrlib/plugins/launchpad/__init__.py:250

7049

#: bzrlib/plugins/launchpad/cmds.py:208

6857

7050

msgid " bzr launchpad-login"

6858

7051

msgstr ""

6859

7052

6860

#: bzrlib/plugins/launchpad/__init__.py:252

7053

#: bzrlib/plugins/launchpad/cmds.py:210

6861

7054

msgid " Set the Launchpad ID of the current user to 'bob'::"

6862

7055

msgstr ""

6863

7056

6864

#: bzrlib/plugins/launchpad/__init__.py:254

7057

#: bzrlib/plugins/launchpad/cmds.py:212

6865

7058

msgid " bzr launchpad-login bob"

6866

7059

msgstr ""

6867

7060

6868

7061

# help of 'no-check' option of 'launchpad-login' command

6869

#: bzrlib/plugins/launchpad/__init__.py:261

7062

#: bzrlib/plugins/launchpad/cmds.py:219

6870

7063

msgid "Don't check that the user name is valid."

6871

7064

msgstr ""

6872

7065

6873

#: bzrlib/plugins/launchpad/__init__.py:276

6874

#: bzrlib/plugins/launchpad/__init__.py:287

7066

#: bzrlib/plugins/launchpad/cmds.py:234 bzrlib/plugins/launchpad/cmds.py:245

6875

7067

msgid "Launchpad user ID exists and has SSH keys.\n"

6876

7068

msgstr ""

6877

7069

6878

#: bzrlib/plugins/launchpad/__init__.py:279

7070

#: bzrlib/plugins/launchpad/cmds.py:237

6879

7071

msgid "No Launchpad user ID configured.\n"

6880

7072

msgstr ""

6881

7073

6882

#: bzrlib/plugins/launchpad/__init__.py:290

7074

#: bzrlib/plugins/launchpad/cmds.py:248

6883

7075

#, python-format

6884

7076

msgid "Launchpad user ID set to '%s'.\n"

6885

7077

msgstr ""

6886

7078

6887

#: bzrlib/plugins/launchpad/__init__.py:298

7079

#: bzrlib/plugins/launchpad/cmds.py:254

6888

7080

msgid "Ask Launchpad to mirror a branch now."

6889

7081

msgstr ""

6890

7082

6891

#: bzrlib/plugins/launchpad/__init__.py:318

7083

#: bzrlib/plugins/launchpad/cmds.py:271

6892

7084

msgid "Propose merging a branch on Launchpad."

6893

7085

msgstr ""

6894

7086

6895

#: bzrlib/plugins/launchpad/__init__.py:320

7087

#: bzrlib/plugins/launchpad/cmds.py:273

6896

7088

msgid ""

6897

7089

"This will open your usual editor to provide the initial comment. When it\n"

6898

7090

"has created the proposal, it will open it in your default web browser."

6899

7091

msgstr ""

6900

7092

6901

#: bzrlib/plugins/launchpad/__init__.py:323

7093

#: bzrlib/plugins/launchpad/cmds.py:276

6902

7094

msgid ""

6903

7095

"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"

6904

7096

"is not supplied, the remembered submit branch will be used. If no submit\n"

6905

7097

"branch is remembered, the development focus will be used."

6906

7098

msgstr ""

6907

7099

6908

#: bzrlib/plugins/launchpad/__init__.py:327

7100

#: bzrlib/plugins/launchpad/cmds.py:280

6909

7101

msgid ""

6910

7102

"By default, the SUBMIT_BRANCH's review team will be requested to review\n"

6911

7103

"the merge proposal. This can be overriden by specifying --review (-R).\n"

6913

7105

"may optionally be followed by '=' and the review type. For example:"

6914

7106

msgstr ""

6915

7107

6916

#: bzrlib/plugins/launchpad/__init__.py:332

7108

#: bzrlib/plugins/launchpad/cmds.py:285

6917

7109

msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"

6918

7110

msgstr ""

6919

7111

6920

#: bzrlib/plugins/launchpad/__init__.py:334

7112

#: bzrlib/plugins/launchpad/cmds.py:287

6921

7113

msgid ""

6922

7114

"This will propose a merge, request \"jrandom\" to perform a review of\n"

6923

7115

"unspecified type, and request \"review-team\" to perform a \"qa\" review."

6924

7116

msgstr ""

6925

7117

6926

7118

# help of 'staging' option of 'lp-propose-merge' command

6927

#: bzrlib/plugins/launchpad/__init__.py:339

7119

#: bzrlib/plugins/launchpad/cmds.py:292

6928

7120

msgid "Propose the merge on staging."

6929

7121

msgstr ""

6930

7122

6931

7123

# help of 'message' option of 'lp-propose-merge' command

6932

#: bzrlib/plugins/launchpad/__init__.py:341

7124

#: bzrlib/plugins/launchpad/cmds.py:294

6933

7125

msgid "Commit message."

6934

7126

msgstr ""

6935

7127

6936

7128

# help of 'approve' option of 'lp-propose-merge' command

6937

#: bzrlib/plugins/launchpad/__init__.py:343

6938

msgid "Mark the proposal as approved immediately."

7129

#: bzrlib/plugins/launchpad/cmds.py:296

7130

msgid ""

7131

"Mark the proposal as approved immediately, setting the approved revision to "

7132

"tip."

7133

msgstr ""

7134

7135

# help of 'fixes' option of 'lp-propose-merge' command

7136

#: bzrlib/plugins/launchpad/cmds.py:298

7137

msgid "The bug this proposal fixes."

6939

7138

msgstr ""

6940

7139

6941

7140

# help of 'review' option of 'lp-propose-merge' command

6942

#: bzrlib/plugins/launchpad/__init__.py:345

7141

#: bzrlib/plugins/launchpad/cmds.py:300

6943

7142

msgid "Requested reviewer and optional type."

6944

7143

msgstr ""

6945

7144

6946

#: bzrlib/plugins/launchpad/__init__.py:382

7145

#: bzrlib/plugins/launchpad/cmds.py:335

6947

7146

msgid "Find the proposal to merge this revision."

6948

7147

msgstr ""

6949

7148

6950

#: bzrlib/plugins/launchpad/__init__.py:384

7149

#: bzrlib/plugins/launchpad/cmds.py:337

6951

7150

msgid ""

6952

7151

"Finds the merge proposal(s) that discussed landing the specified revision.\n"

6953

"This works only if the selected branch was the merge proposal target, and\n"

6954

"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"

6955

"are opened in a web browser."

7152

"This works only if the if the merged_revno was recorded for the merge\n"

7153

"proposal. The proposal(s) are opened in a web browser."

6956

7154

msgstr ""

6957

7155

6958

#: bzrlib/plugins/launchpad/__init__.py:389

7156

#: bzrlib/plugins/launchpad/cmds.py:341

6959

7157

msgid ""

6960

"Any revision involved in the merge may be specified-- the revision in\n"

6961

"which the merge was performed, or one of the revisions that was merged."

7158

"Only the revision specified is searched for. To find the mainline\n"

7159

"revision that merged it into mainline, use the \"mainline\" revision spec."

6962

7160

msgstr ""

6963

7161

6964

#: bzrlib/plugins/launchpad/__init__.py:392

7162

#: bzrlib/plugins/launchpad/cmds.py:344

6965

7163

msgid "So, to find the merge proposal that reviewed line 1 of README::"

6966

7164

msgstr ""

6967

7165

6968

#: bzrlib/plugins/launchpad/__init__.py:394

6969

msgid " bzr lp-find-proposal -r annotate:README:1"

7166

#: bzrlib/plugins/launchpad/cmds.py:346

7167

msgid " bzr lp-find-proposal -r mainline:annotate:README:1"

6970

7168

msgstr ""

6971

7169

6972

#: bzrlib/plugins/launchpad/__init__.py:409

7170

#: bzrlib/plugins/launchpad/cmds.py:365

6973

7171

msgid "No review found."

6974

7172

msgstr ""

6975

7173

6976

#: bzrlib/plugins/launchpad/__init__.py:410

7174

#: bzrlib/plugins/launchpad/cmds.py:366

6977

7175

#, python-format

6978

7176

msgid "%d proposals(s) found."

6979

7177

msgstr ""

6980

7178

6981

#: bzrlib/plugins/launchpad/__init__.py:420

6982

msgid "Finding revision-id"

6983

msgstr ""

6984

6985

#: bzrlib/plugins/launchpad/__init__.py:427

6986

msgid "Finding merge"

6987

msgstr ""

6988

6989

#: bzrlib/plugins/launchpad/__init__.py:432

6990

msgid "Finding revno"

6991

msgstr ""

6992

6993

#: bzrlib/plugins/launchpad/__init__.py:437

6994

msgid "Finding Launchpad branch"

6995

msgstr ""

6996

6997

#: bzrlib/plugins/launchpad/__init__.py:440

7179

#: bzrlib/plugins/launchpad/cmds.py:378

6998

7180

msgid "Finding proposals"

6999

7181

msgstr ""

7000

7182

7001

#: bzrlib/plugins/launchpad/account.py:66

7002

msgid "Setting ssh/sftp usernames for launchpad.net."

7003

msgstr ""

7004

7005

#: bzrlib/plugins/launchpad/lp_api.py:241

7006

#: bzrlib/plugins/launchpad/lp_api.py:246

7183

#: bzrlib/plugins/launchpad/lp_api.py:228

7184

#: bzrlib/plugins/launchpad/lp_api.py:233

7007

7185

#, python-format

7008

7186

msgid "%s is not registered on Launchpad"

7009

7187

msgstr ""

7010

7188

7011

#: bzrlib/plugins/launchpad/lp_api.py:256

7189

#: bzrlib/plugins/launchpad/lp_api.py:243

7012

7190

#, python-format

7013

7191

msgid "%s has no development focus."

7014

7192

msgstr ""

7015

7193

7016

#: bzrlib/plugins/launchpad/lp_api.py:261

7194

#: bzrlib/plugins/launchpad/lp_api.py:248

7017

7195

#, python-format

7018

7196

msgid "development focus %s has no branch."

7019

7197

msgstr ""

7020

7198

7021

#: bzrlib/plugins/launchpad/lp_api.py:266

7199

#: bzrlib/plugins/launchpad/lp_api.py:253

7022

7200

#, python-format

7023

7201

msgid "source package %s has no branch."

7024

7202

msgstr ""

7025

7203

7026

#: bzrlib/plugins/launchpad/lp_api.py:270

7204

#: bzrlib/plugins/launchpad/lp_api.py:257

7027

7205

#, python-format

7028

7206

msgid "%s has no associated product or source package."

7029

7207

msgstr ""

7030

7208

7031

#: bzrlib/plugins/launchpad/lp_api.py:282

7209

#: bzrlib/plugins/launchpad/lp_api.py:269

7032

7210

#, python-format

7033

7211

msgid "%s is already up-to-date."

7034

7212

msgstr ""

7035

7213

7036

#: bzrlib/plugins/launchpad/lp_api.py:289

7214

#: bzrlib/plugins/launchpad/lp_api.py:276

7037

7215

#, python-format

7038

7216

msgid "Pushing to %s"

7039

7217

msgstr ""

7045

7223

" remote: {2}"

7046

7224

msgstr ""

7047

7225

7048

#: bzrlib/plugins/launchpad/lp_propose.py:149

7226

#: bzrlib/plugins/launchpad/lp_propose.py:159

7049

7227

#, python-format

7050

7228

msgid "There is already a branch merge proposal: %s"

7051

7229

msgstr ""

7052

7230

7053

#: bzrlib/plugins/weave_fmt/bzrdir.py:236

7231

#: bzrlib/plugins/weave_fmt/bzrdir.py:237

7054

7232

msgid "pb parameter to convert() is deprecated"

7055

7233

msgstr ""

7056

7234

7057

#: bzrlib/plugins/weave_fmt/bzrdir.py:239

7235

#: bzrlib/plugins/weave_fmt/bzrdir.py:240

7058

7236

msgid "starting upgrade from format 4 to 5"

7059

7237

msgstr ""

7060

7238

7061

#: bzrlib/plugins/weave_fmt/bzrdir.py:249

7239

#: bzrlib/plugins/weave_fmt/bzrdir.py:250

7062

7240

msgid "note: upgrade may be faster if all store files are ungzipped first"

7063

7241

msgstr ""

7064

7242

7065

#: bzrlib/plugins/weave_fmt/bzrdir.py:278

7243

#: bzrlib/plugins/weave_fmt/bzrdir.py:279

7066

7244

msgid "converting revision"

7067

7245

msgstr ""

7068

7246

7069

#: bzrlib/plugins/weave_fmt/bzrdir.py:283

7247

#: bzrlib/plugins/weave_fmt/bzrdir.py:284

7070

7248

msgid "upgraded to weaves:"

7071

7249

msgstr ""

7072

7250

7073

#: bzrlib/plugins/weave_fmt/bzrdir.py:284

7251

#: bzrlib/plugins/weave_fmt/bzrdir.py:285

7074

7252

#, python-format

7075

7253

msgid "%6d revisions and inventories"

7076

7254

msgstr ""

7077

7255

7078

#: bzrlib/plugins/weave_fmt/bzrdir.py:286

7256

#: bzrlib/plugins/weave_fmt/bzrdir.py:287

7079

7257

#, python-format

7080

7258

msgid "%6d revisions not present"

7081

7259

msgstr ""

7082

7260

7083

#: bzrlib/plugins/weave_fmt/bzrdir.py:288

7261

#: bzrlib/plugins/weave_fmt/bzrdir.py:289

7084

7262

#, python-format

7085

7263

msgid "%6d texts"

7086

7264

msgstr ""

7087

7265

7088

#: bzrlib/plugins/weave_fmt/bzrdir.py:324

7266

#: bzrlib/plugins/weave_fmt/bzrdir.py:325

7089

7267

msgid "writing weave"

7090

7268

msgstr ""

7091

7269

7092

#: bzrlib/plugins/weave_fmt/bzrdir.py:328

7093

#: bzrlib/plugins/weave_fmt/bzrdir.py:330

7270

#: bzrlib/plugins/weave_fmt/bzrdir.py:329

7271

#: bzrlib/plugins/weave_fmt/bzrdir.py:331

7094

7272

msgid "inventory"

7095

7273

msgstr ""

7096

7274

7097

#: bzrlib/plugins/weave_fmt/bzrdir.py:347

7275

#: bzrlib/plugins/weave_fmt/bzrdir.py:348

7098

7276

msgid "write revision"

7099

7277

msgstr ""

7100

7278

7101

#: bzrlib/plugins/weave_fmt/bzrdir.py:361

7279

#: bzrlib/plugins/weave_fmt/bzrdir.py:362

7102

7280

msgid "loading revision"

7103

7281

msgstr ""

7104

7282

7105

#: bzrlib/plugins/weave_fmt/bzrdir.py:366

7283

#: bzrlib/plugins/weave_fmt/bzrdir.py:367

7106

7284

#, python-format

7107

7285

msgid "revision {%s} not present in branch; will be converted as a ghost"

7108

7286

msgstr ""

7109

7287

7110

#: bzrlib/plugins/weave_fmt/bzrdir.py:506

7288

#: bzrlib/plugins/weave_fmt/bzrdir.py:507

7111

7289

msgid "starting upgrade from format 5 to 6"

7112

7290

msgstr ""

7113

7291

7114

#: bzrlib/plugins/weave_fmt/bzrdir.py:516

7292

#: bzrlib/plugins/weave_fmt/bzrdir.py:517

7115

7293

#, python-format

7116

7294

msgid "adding prefixes to %s"

7117

7295

msgstr ""

7118

7296

7119

#: bzrlib/plugins/weave_fmt/bzrdir.py:556

7297

#: bzrlib/plugins/weave_fmt/bzrdir.py:557

7120

7298

msgid "starting upgrade from format 6 to metadir"

7121

7299

msgstr ""

7122

7300

7123

#: bzrlib/plugins/weave_fmt/bzrdir.py:564

7301

#: bzrlib/plugins/weave_fmt/bzrdir.py:565

7124

7302

msgid "Removing ancestry.weave"

7125

7303

msgstr ""

7126

7304

7127

#: bzrlib/plugins/weave_fmt/bzrdir.py:569

7305

#: bzrlib/plugins/weave_fmt/bzrdir.py:570

7128

7306

msgid "Finding branch files"

7129

7307

msgstr ""

7130

7308

7131

#: bzrlib/plugins/weave_fmt/bzrdir.py:579

7309

#: bzrlib/plugins/weave_fmt/bzrdir.py:580

7132

7310

msgid "Upgrading repository"

7133

7311

msgstr ""

7134

7312

7135

#: bzrlib/plugins/weave_fmt/bzrdir.py:589

7313

#: bzrlib/plugins/weave_fmt/bzrdir.py:590

7136

7314

msgid "Upgrading branch"

7137

7315

msgstr ""

7138

7316

7139

#: bzrlib/plugins/weave_fmt/bzrdir.py:612

7317

#: bzrlib/plugins/weave_fmt/bzrdir.py:613

7140

7318

msgid "No working tree."

7141

7319

msgstr ""

7142

7320

7143

#: bzrlib/plugins/weave_fmt/bzrdir.py:619

7321

#: bzrlib/plugins/weave_fmt/bzrdir.py:620

7144

7322

msgid "Upgrading working tree"

7145

7323

msgstr ""

7146

7324

7147

#: bzrlib/plugins/weave_fmt/bzrdir.py:640

7325

#: bzrlib/plugins/weave_fmt/bzrdir.py:641

7148

7326

#, python-format

7149

7327

msgid "Make %s lock"

7150

7328

msgstr ""

7151

7329

7152

#: bzrlib/plugins/weave_fmt/bzrdir.py:651

7330

#: bzrlib/plugins/weave_fmt/bzrdir.py:652

7153

7331

#, python-format

7154

7332

msgid "Moving %s"

7155

7333

msgstr ""

7158

7336

msgid "Created new branch."

7159

7337

msgstr ""

7160

7338

7161

#: bzrlib/push.py:98

7339

#: bzrlib/push.py:97

7162

7340

#, python-format

7163

7341

msgid ""

7164

7342

"Target directory %s already contains a .bzr directory, but it is not valid."

7176

7354

msgid "Too many redirections trying to make %s."

7177

7355

msgstr ""

7178

7356

7179

#: bzrlib/push.py:147

7357

#: bzrlib/push.py:148

7180

7358

msgid ""

7181

7359

"These branches have diverged. See \"bzr help diverged-branches\" for more "

7182

7360

"information."

7183

7361

msgstr ""

7184

7362

7185

#: bzrlib/push.py:151

7363

#: bzrlib/push.py:152

7186

7364

#, python-format

7187

7365

msgid ""

7188

7366

"It is not possible to losslessly push to %s. You may want to use dpush "

7189

7367

"instead."

7190

7368

msgstr ""

7191

7369

7192

#: bzrlib/push.py:157

7370

#: bzrlib/push.py:158

7193

7371

#, python-format

7194

7372

msgid ""

7195

7373

"At %s you have a valid .bzr control directory, but not a branch or "

7285

7463

msgid "%s is now not stacked\n"

7286

7464

msgstr ""

7287

7465

7288

#: bzrlib/remote.py:1180 bzrlib/repository.py:289

7466

#: bzrlib/remote.py:1228 bzrlib/repository.py:289

7289

7467

#, python-format

7290

7468

msgid "bzr: ERROR (ignored): %s"

7291

7469

msgstr ""

7292

7470

7293

#: bzrlib/remote.py:2493

7471

#: bzrlib/remote.py:2534

7294

7472

msgid "Copying repository content as tarball..."

7295

7473

msgstr ""

7296

7474

7306

7484

msgid "{0} => {1}"

7307

7485

msgstr ""

7308

7486

7309

#: bzrlib/repository.py:1787

7487

#: bzrlib/repository.py:1738

7310

7488

msgid "Moving repository to repository.backup"

7311

7489

msgstr ""

7312

7490

7313

#: bzrlib/repository.py:1794

7491

#: bzrlib/repository.py:1745

7314

7492

msgid "Creating new repository"

7315

7493

msgstr ""

7316

7494

7317

#: bzrlib/repository.py:1799

7495

#: bzrlib/repository.py:1750

7318

7496

msgid "Copying content"

7319

7497

msgstr ""

7320

7498

7321

#: bzrlib/repository.py:1803

7499

#: bzrlib/repository.py:1754

7322

7500

msgid "Deleting old repository content"

7323

7501

msgstr ""

7324

7502

7325

#: bzrlib/repository.py:1805

7503

#: bzrlib/repository.py:1756

7326

7504

msgid "repository converted"

7327

7505

msgstr ""

7328

7506

7330

7508

msgid "Using {0} {1}"

7331

7509

msgstr ""

7332

7510

7333

#: bzrlib/send.py:58

7511

#: bzrlib/send.py:59

7334

7512

#, python-format

7335

7513

msgid "Mail client \"%s\" does not support specifying body"

7336

7514

msgstr ""

7337

7515

7338

#: bzrlib/send.py:62

7516

#: bzrlib/send.py:63

7339

7517

msgid "--remember requires a branch to be specified."

7340

7518

msgstr ""

7341

7519

7342

#: bzrlib/send.py:77

7520

#: bzrlib/send.py:78

7343

7521

msgid "No submit branch known or specified"

7344

7522

msgstr ""

7345

7523

7346

#: bzrlib/send.py:80

7524

#: bzrlib/send.py:81

7347

7525

msgid "Using saved {0} location \"{1}\" to determine what changes to submit."

7348

7526

msgstr ""

7349

7527

7350

#: bzrlib/send.py:98

7528

#: bzrlib/send.py:99

7351

7529

#, python-format

7352

7530

msgid "No such send format '%s'."

7353

7531

msgstr ""

7354

7532

7355

#: bzrlib/send.py:114

7533

#: bzrlib/send.py:115

7356

7534

msgid "bzr send takes at most two one revision identifiers"

7357

7535

msgstr ""

7358

7536

7359

#: bzrlib/send.py:127

7537

#: bzrlib/send.py:128

7360

7538

msgid "No revisions to submit."

7361

7539

msgstr ""

7362

7540

7363

#: bzrlib/send.py:139

7541

#: bzrlib/send.py:140

7364

7542

msgid ""

7365

7543

"- not supported for merge directives that use more than one output file."

7366

7544

msgstr ""

7367

7545

7368

#: bzrlib/send.py:185

7546

#: bzrlib/send.py:186

7369

7547

msgid "Format 0.9 does not permit bundle with no patch"

7370

7548

msgstr ""

7371

7549

7481

7659

msgid "HPSS calls: {0} ({1} vfs) {2}"

7482

7660

msgstr ""

7483

7661

7662

#: bzrlib/smart/ping.py:32

7663

msgid "Pings a Bazaar smart server."

7664

msgstr ""

7665

7666

#: bzrlib/smart/ping.py:34

7667

msgid ""

7668

"This command sends a 'hello' request to the given location using the bzr\n"

7669

"smart protocol, and reports the response."

7670

msgstr ""

7671

7484

7672

#: bzrlib/smart/server.py:169

7485

7673

msgid "Requested to stop gracefully"

7486

7674

msgstr ""

7505

7693

msgid "listening on port: %s"

7506

7694

msgstr ""

7507

7695

7508

#: bzrlib/switch.py:69

7696

#: bzrlib/switch.py:84

7509

7697

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

7510

7698

msgstr ""

7511

7699

7512

#: bzrlib/switch.py:96

7700

#: bzrlib/switch.py:111

7513

7701

msgid ""

7514

7702

"Cannot switch as local commits found in the checkout. Commit these to the "

7515

7703

"bound branch or use --force to throw them away."

7516

7704

msgstr ""

7517

7705

7518

#: bzrlib/switch.py:101

7706

#: bzrlib/switch.py:116

7519

7707

#, python-format

7520

7708

msgid ""

7521

7709

"Unable to connect to current master branch %(target)s: %(error)s To switch "

7522

7710

"anyway, use --force."

7523

7711

msgstr ""

7524

7712

7525

#: bzrlib/switch.py:110

7713

#: bzrlib/switch.py:140

7526

7714

msgid "Cannot switch a branch, only a checkout."

7527

7715

msgstr ""

7528

7716

7529

#: bzrlib/switch.py:146

7717

#: bzrlib/switch.py:183

7530

7718

#, python-format

7531

7719

msgid "Tree is up to date at revision %d."

7532

7720

msgstr ""

7533

7721

7534

#: bzrlib/switch.py:152

7722

#: bzrlib/switch.py:190

7535

7723

#, python-format

7536

7724

msgid "Updated to revision %d."

7537

7725

msgstr ""

7538

7726

7539

#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743

7727

#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736

7540

7728

msgid "Apply phase"

7541

7729

msgstr ""

7542

7730

7543

#: bzrlib/transform.py:1769 bzrlib/transform.py:1837

7731

#: bzrlib/transform.py:1762 bzrlib/transform.py:1830

7544

7732

msgid "removing file"

7545

7733

msgstr ""

7546

7734

7547

#: bzrlib/transform.py:1787 bzrlib/transform.py:1872

7735

#: bzrlib/transform.py:1780 bzrlib/transform.py:1865

7548

7736

msgid "adding file"

7549

7737

msgstr ""

7550

7738

7551

#: bzrlib/transform.py:2587

7739

#: bzrlib/transform.py:2598

7552

7740

msgid "Building tree"

7553

7741

msgstr ""

7554

7742

7555

#: bzrlib/transform.py:2677 bzrlib/transform.py:2704

7743

#: bzrlib/transform.py:2688 bzrlib/transform.py:2715

7556

7744

msgid "Adding file contents"

7557

7745

msgstr ""

7558

7746

7559

#: bzrlib/transform.py:3024

7747

#: bzrlib/transform.py:3017

7560

7748

msgid "Resolution pass"

7561

7749

msgstr ""

7562

7750

7565

7753

msgid "Authenticated as %s"

7566

7754

msgstr ""

7567

7755

7568

#: bzrlib/tree.py:634

7756

#: bzrlib/tree.py:647

7569

7757

msgid "*** {0} content-filter: {1} => {2!r}"

7570

7758

msgstr ""

7571

7759

7624

7812

msgid "failed to clean-up {0}: {1}"

7625

7813

msgstr ""

7626

7814

7627

#: bzrlib/vf_repository.py:1090

7815

#: bzrlib/vf_repository.py:1091

7628

7816

msgid "inventories"

7629

7817

msgstr ""

7630

7818

7631

#: bzrlib/vf_repository.py:1116

7819

#: bzrlib/vf_repository.py:1117

7632

7820

msgid "texts"

7633

7821

msgstr ""

7634

7822

7635

#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630

7823

#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631

7636

7824

msgid "Calculating text parents"

7637

7825

msgstr ""

7638

7826

7639

#: bzrlib/vf_repository.py:1706

7827

#: bzrlib/vf_repository.py:1707

7640

7828

msgid "Fetch texts"

7641

7829

msgstr ""

7642

7830

7643

#: bzrlib/vf_repository.py:2535

7831

#: bzrlib/vf_repository.py:2536

7644

7832

msgid "loading text store"

7645

7833

msgstr ""

7646

7834

7647

#: bzrlib/vf_repository.py:2541

7835

#: bzrlib/vf_repository.py:2542

7648

7836

msgid "checking text graph"

7649

7837

msgstr ""

7650

7838

7651

#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009

7652

#: bzrlib/vf_repository.py:3124

7839

#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012

7840

#: bzrlib/vf_repository.py:3127

7653

7841

msgid "Transferring revisions"

7654

7842

msgstr ""

7655

7843

7695

7883

msgid "PageFaultCount %8d"

7696

7884

msgstr ""

7697

7885

7698

#: bzrlib/workingtree.py:1478

7886

#: bzrlib/workingtree.py:1516

7699

7887

msgid "Rerun update after fixing the conflicts."

7700

7888

msgstr ""

7701

7889

7705

7893

7706

7894

#: dummy/help_topics/basic/detail.txt:1

7707

7895

msgid ""

7708

"Bazaar 2.5b5 -- a free distributed version-control tool\n"

7896

"Bazaar 2.6.0 -- a free distributed version-control tool\n"

7709

7897

"http://bazaar.canonical.com/"

7710

7898

msgstr ""

7711

7899

8023

8211

msgid "How to fix diverged branches"

8024

8212

msgstr ""

8025

8213

8026

#: dummy/help_topics/env-variables/detail.txt:1

8027

msgid "Environment Variables"

8028

msgstr ""

8029

8030

#: dummy/help_topics/env-variables/detail.txt:3

8031

msgid ""

8032

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

8033

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

8034

"BZRPATH Path where bzr is to look for shell plugin external\n"

8035

" commands.\n"

8036

"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"

8037

"EMAIL E-Mail address of the user.\n"

8038

"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"

8039

"EDITOR Editor for editing commit messages.\n"

8040

"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"

8041

"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"

8042

"BZR_PLUGINS_AT Plugins to load from a directory not in "

8043

"BZR_PLUGIN_PATH.\n"

8044

"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"

8045

"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "

8046

"and\n"

8047

" HOME.\n"

8048

"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "

8049

"URLs).\n"

8050

"BZR_SSH Path to SSH client, or one of paramiko, openssh, "

8051

"sshcorp,\n"

8052

" plink or lsh.\n"

8053

"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"

8054

"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"

8055

"BZR_COLUMNS Override implicit terminal width.\n"

8056

"BZR_CONCURRENCY Number of processes that can be run concurrently "

8057

"(selftest)\n"

8058

"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "

8059

"'text'.\n"

8060

"BZR_PDB Control whether to launch a debugger on error.\n"

8061

"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"

8062

" breakin debugger.\n"

8063

"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "

8064

"(instead\n"

8065

" of char-based).\n"

8066

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

8067

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

8068

msgstr ""

8069

8070

8214

#: dummy/help_topics/env-variables/summary.txt:1

8071

8215

msgid "Environment variable names and values"

8072

8216

msgstr ""

9066

9210

msgid " bzr commit --fixes <tracker>:<id>"

9067

9211

msgstr ""

9068

9212

9069

#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398

9213

#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410

9070

9214

msgid "or::"

9071

9215

msgstr ""

9072

9216

9265

9409

"export Export current or past revision to a destination directory "

9266

9410

"or\n"

9267

9411

" archive.\n"

9412

"grep Print lines matching PATTERN for specified files and\n"

9413

" revisions. [grep]\n"

9268

9414

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

9269

9415

"ignore Ignore specified files or patterns.\n"

9270

9416

"ignored List ignored files and the patterns that matched them.\n"

9288

9434

"mv Move or rename a file.\n"

9289

9435

"nick Print or set the branch nickname.\n"

9290

9436

"pack Compress the data within a repository.\n"

9437

"ping Pings a Bazaar smart server.\n"

9291

9438

"plugins List the installed plugins.\n"

9292

9439

"pull Turn this branch into a mirror of another branch.\n"

9293

9440

"push Update a mirror of this branch.\n"

9300

9447

"remove-tree Remove the working tree from a given branch/checkout.\n"

9301

9448

"renames Show list of renamed files.\n"

9302

9449

"resolve Mark a conflict as resolved.\n"

9303

"revert Revert files to a previous revision.\n"

9450

"revert Set files in the working tree back to the contents of a\n"

9451

" previous revision.\n"

9304

9452

"revno Show current revision number.\n"

9305

9453

"root Show the tree root directory.\n"

9306

9454

"send Mail or create a merge-directive for submitting changes.\n"

9956

10104

9957

10105

#: en/help_topics/configuration.txt:336

9958

10106

msgid ""

10107

"Another such option is ``branchname``, which refers to the name of a "

10108

"colocated\n"

10109

"branch. For non-colocated branches, it behaves like basename. It can be "

10110

"used\n"

10111

"like this::"

10112

msgstr ""

10113

10114

#: en/help_topics/configuration.txt:340

10115

msgid ""

10116

" [/home/vila/src/bzr/bugs]\n"

10117

" mypush = lp:~vila/bzr/{branchname}"

10118

msgstr ""

10119

10120

#: en/help_topics/configuration.txt:343

10121

msgid ""

10122

"When used with a colocated branch named ``832013-expand-in-stack``, we'll "

10123

"get::"

10124

msgstr ""

10125

10126

#: en/help_topics/configuration.txt:345

10127

msgid ""

10128

" bzr config mypush\n"

10129

" lp:~vila/bzr/832013-expand-in-stack"

10130

msgstr ""

10131

10132

#: en/help_topics/configuration.txt:348

10133

msgid ""

9959

10134

"When an option is local to a Section, it cannot be referred to from option\n"

9960

10135

"values in any other section from the same ``Store`` nor from any other\n"

9961

10136

"``Store``."

9962

10137

msgstr ""

9963

10138

9964

#: en/help_topics/configuration.txt:340

10139

#: en/help_topics/configuration.txt:352

9965

10140

msgid ""

9966

10141

"\n"

9967

10142

"The main configuration file, bazaar.conf\n"

9968

10143

"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"

9969

10144

msgstr ""

9970

10145

9971

#: en/help_topics/configuration.txt:344

10146

#: en/help_topics/configuration.txt:356

9972

10147

msgid ""

9973

10148

"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"

9974

10149

"The default section contains the default\n"

9976

10151

"overriden by providing a branch-specific section in ``locations.conf``."

9977

10152

msgstr ""

9978

10153

9979

#: en/help_topics/configuration.txt:349

10154

#: en/help_topics/configuration.txt:361

9980

10155

msgid "A typical ``bazaar.conf`` section often looks like the following::"

9981

10156

msgstr ""

9982

10157

9983

#: en/help_topics/configuration.txt:351

10158

#: en/help_topics/configuration.txt:363

9984

10159

msgid ""

9985

10160

" [DEFAULT]\n"

9986

10161

" email = John Doe <jdoe@isp.com>\n"

9988

10163

" create_signatures = when-required"

9989

10164

msgstr ""

9990

10165

9991

#: en/help_topics/configuration.txt:356

10166

#: en/help_topics/configuration.txt:368

9992

10167

msgid ""

9993

10168

"\n"

9994

10169

"The branch location configuration file, locations.conf\n"

9995

10170

"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"

9996

10171

msgstr ""

9997

10172

9998

#: en/help_topics/configuration.txt:360

10173

#: en/help_topics/configuration.txt:372

9999

10174

msgid ""

10000

10175

"``locations.conf`` allows one to specify overriding settings for\n"

10001

10176

"a specific branch. The format is almost identical to the default section in\n"

10005

10180

"for. The '?' and '*' wildcards are supported::"

10006

10181

msgstr ""

10007

10182

10008

#: en/help_topics/configuration.txt:366

10183

#: en/help_topics/configuration.txt:378

10009

10184

msgid ""

10010

10185

" [/home/jdoe/branches/nethack]\n"

10011

10186

" email = Nethack Admin <nethack@nethack.com>"

10012

10187

msgstr ""

10013

10188

10014

#: en/help_topics/configuration.txt:369

10189

#: en/help_topics/configuration.txt:381

10015

10190

msgid ""

10016

10191

" [http://hypothetical.site.com/branches/devel-branch]\n"

10017

10192

" create_signatures = always"

10018

10193

msgstr ""

10019

10194

10020

#: en/help_topics/configuration.txt:372

10195

#: en/help_topics/configuration.txt:384

10021

10196

msgid ""

10022

10197

"The authentication configuration file, authentication.conf\n"

10023

10198

"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"

10024

10199

msgstr ""

10025

10200

10026

#: en/help_topics/configuration.txt:375

10201

#: en/help_topics/configuration.txt:387

10027

10202

msgid ""

10028

10203

"``authentication.conf`` allows one to specify credentials for\n"

10029

10204

"remote servers. This can be used for all the supported transports and any "

10031

10206

"of bzr that requires authentication (smtp for example)."

10032

10207

msgstr ""

10033

10208

10034

#: en/help_topics/configuration.txt:379

10209

#: en/help_topics/configuration.txt:391

10035

10210

msgid ""

10036

10211

"The syntax of the file obeys the same rules as the others except for the\n"

10037

10212

"option policies which don't apply."

10038

10213

msgstr ""

10039

10214

10040

#: en/help_topics/configuration.txt:382

10215

#: en/help_topics/configuration.txt:394

10041

10216

msgid ""

10042

10217

"For more information on the possible uses of the authentication "

10043

10218

"configuration\n"

10044

10219

"file see :doc:`authentication-help`."

10045

10220

msgstr ""

10046

10221

10047

#: en/help_topics/configuration.txt:385

10222

#: en/help_topics/configuration.txt:397

10048

10223

msgid ""

10049

10224

"\n"

10050

10225

"Common options\n"

10051

10226

"--------------"

10052

10227

msgstr ""

10053

10228

10054

#: en/help_topics/configuration.txt:389

10229

#: en/help_topics/configuration.txt:401

10055

10230

msgid ""

10056

10231

"debug_flags\n"

10057

10232

"~~~~~~~~~~~"

10058

10233

msgstr ""

10059

10234

10060

#: en/help_topics/configuration.txt:392

10235

#: en/help_topics/configuration.txt:404

10061

10236

msgid ""

10062

10237

"A comma-separated list of debugging options to turn on. The same values\n"

10063

10238

"can be used as with the -D command-line option (see `help global-options`).\n"

10064

10239

"For example::"

10065

10240

msgstr ""

10066

10241

10067

#: en/help_topics/configuration.txt:396

10242

#: en/help_topics/configuration.txt:408

10068

10243

msgid " debug_flags = hpss"

10069

10244

msgstr ""

10070

10245

10071

#: en/help_topics/configuration.txt:400

10246

#: en/help_topics/configuration.txt:412

10072

10247

msgid " debug_flags = hpss,evil"

10073

10248

msgstr ""

10074

10249

10075

#: en/help_topics/configuration.txt:402

10250

#: en/help_topics/configuration.txt:414

10076

10251

msgid ""

10077

10252

"email\n"

10078

10253

"~~~~~"

10079

10254

msgstr ""

10080

10255

10081

#: en/help_topics/configuration.txt:405

10256

#: en/help_topics/configuration.txt:417

10082

10257

msgid ""

10083

10258

"The email address to use when committing a branch. Typically takes the form\n"

10084

10259

"of::"

10085

10260

msgstr ""

10086

10261

10087

#: en/help_topics/configuration.txt:408

10262

#: en/help_topics/configuration.txt:420

10088

10263

msgid " email = Full Name <account@hostname.tld>"

10089

10264

msgstr ""

10090

10265

10091

#: en/help_topics/configuration.txt:410

10266

#: en/help_topics/configuration.txt:422

10092

10267

msgid ""

10093

10268

"editor\n"

10094

10269

"~~~~~~"

10095

10270

msgstr ""

10096

10271

10097

#: en/help_topics/configuration.txt:413

10272

#: en/help_topics/configuration.txt:425

10098

10273

msgid ""

10099

10274

"The path of the editor that you wish to use if *bzr commit* is run without\n"

10100

10275

"a commit message. This setting is trumped by the environment variable\n"

10102

10277

"variables."

10103

10278

msgstr ""

10104

10279

10105

#: en/help_topics/configuration.txt:418

10280

#: en/help_topics/configuration.txt:430

10106

10281

msgid ""

10107

10282

"log_format\n"

10108

10283

"~~~~~~~~~~"

10109

10284

msgstr ""

10110

10285

10111

#: en/help_topics/configuration.txt:421

10286

#: en/help_topics/configuration.txt:433

10112

10287

msgid ""

10113

10288

"The default log format to use. Standard log formats are ``long``, ``short``\n"

10114

10289

"and ``line``. Additional formats may be provided by plugins. The default\n"

10115

10290

"value is ``long``."

10116

10291

msgstr ""

10117

10292

10118

#: en/help_topics/configuration.txt:425

10293

#: en/help_topics/configuration.txt:437

10119

10294

msgid ""

10120

10295

"check_signatures\n"

10121

10296

"~~~~~~~~~~~~~~~~"

10122

10297

msgstr ""

10123

10298

10124

#: en/help_topics/configuration.txt:428

10299

#: en/help_topics/configuration.txt:440

10125

10300

msgid ""

10126

10301

"Reserved for future use. These options will allow a policy for branches to\n"

10127

10302

"require signatures."

10128

10303

msgstr ""

10129

10304

10130

#: en/help_topics/configuration.txt:431

10305

#: en/help_topics/configuration.txt:443

10131

10306

msgid ""

10132

10307

"require\n"

10133

10308

" The gnupg signature for revisions must be present and must be valid."

10134

10309

msgstr ""

10135

10310

10136

#: en/help_topics/configuration.txt:434

10311

#: en/help_topics/configuration.txt:446

10137

10312

msgid ""

10138

10313

"ignore\n"

10139

10314

" Do not check gnupg signatures of revisions."

10140

10315

msgstr ""

10141

10316

10142

#: en/help_topics/configuration.txt:437

10317

#: en/help_topics/configuration.txt:449

10143

10318

msgid ""

10144

10319

"check-available\n"

10145

10320

" (default) If gnupg signatures for revisions are present, check them.\n"

10147

10322

" no signature is present."

10148

10323

msgstr ""

10149

10324

10150

#: en/help_topics/configuration.txt:442

10325

#: en/help_topics/configuration.txt:454

10151

10326

msgid ""

10152

10327

"create_signatures\n"

10153

10328

"~~~~~~~~~~~~~~~~~"

10154

10329

msgstr ""

10155

10330

10156

#: en/help_topics/configuration.txt:445

10331

#: en/help_topics/configuration.txt:457

10157

10332

msgid ""

10158

10333

"Defines the behaviour of signing revisions on commits. By default bzr will "

10159

10334

"not\n"

10160

10335

"sign new commits."

10161

10336

msgstr ""

10162

10337

10163

#: en/help_topics/configuration.txt:448

10338

#: en/help_topics/configuration.txt:460

10164

10339

msgid ""

10165

10340

"always\n"

10166

10341

" Sign every new revision that is committed. If the signing fails then "

10168

10343

" commit will not be made."

10169

10344

msgstr ""

10170

10345

10171

#: en/help_topics/configuration.txt:452

10346

#: en/help_topics/configuration.txt:464

10172

10347

msgid ""

10173

10348

"when-required\n"

10174

10349

" Reserved for future use."

10175

10350

msgstr ""

10176

10351

10177

#: en/help_topics/configuration.txt:455

10352

#: en/help_topics/configuration.txt:467

10178

10353

msgid ""

10179

10354

"never\n"

10180

10355

" Reserved for future use."

10181

10356

msgstr ""

10182

10357

10183

#: en/help_topics/configuration.txt:458

10358

#: en/help_topics/configuration.txt:470

10184

10359

msgid ""

10185

10360

"In future it is planned that ``when-required`` will sign newly\n"

10186

10361

"committed revisions only when the branch requires them. ``never`` will "

10188

10363

"to sign newly committed revisions, even if the branch requires signatures."

10189

10364

msgstr ""

10190

10365

10191

#: en/help_topics/configuration.txt:462

10366

#: en/help_topics/configuration.txt:474

10192

10367

msgid ""

10193

10368

"dirstate.fdatasync\n"

10194

10369

"~~~~~~~~~~~~~~~~~~"

10195

10370

msgstr ""

10196

10371

10197

#: en/help_topics/configuration.txt:465

10372

#: en/help_topics/configuration.txt:477

10198

10373

msgid ""

10199

10374

"If true (default), working tree metadata changes are flushed through the\n"

10200

10375

"OS buffers to physical disk. This is somewhat slower, but means data\n"

10201

10376

"should not be lost if the machine crashes. See also repository.fdatasync."

10202

10377

msgstr ""

10203

10378

10204

#: en/help_topics/configuration.txt:469

10379

#: en/help_topics/configuration.txt:481

10205

10380

msgid ""

10206

10381

"gpg_signing_key\n"

10207

10382

"~~~~~~~~~~~~~~~"

10208

10383

msgstr ""

10209

10384

10210

#: en/help_topics/configuration.txt:472

10385

#: en/help_topics/configuration.txt:484

10211

10386

msgid ""

10212

10387

"The GnuPG user identity to use when signing commits. Can be an e-mail\n"

10213

10388

"address, key fingerprint or full key ID. When unset or when set to\n"

10214

10389

"\"default\" Bazaar will use the user e-mail set with ``whoami``."

10215

10390

msgstr ""

10216

10391

10217

#: en/help_topics/configuration.txt:476

10392

#: en/help_topics/configuration.txt:488

10218

10393

msgid ""

10219

10394

"recurse\n"

10220

10395

"~~~~~~~"

10221

10396

msgstr ""

10222

10397

10223

#: en/help_topics/configuration.txt:479

10398

#: en/help_topics/configuration.txt:491

10224

10399

msgid ""

10225

10400

"Only useful in ``locations.conf``. Defines whether or not the\n"

10226

10401

"configuration for this section applies to subdirectories:"

10227

10402

msgstr ""

10228

10403

10229

#: en/help_topics/configuration.txt:482

10404

#: en/help_topics/configuration.txt:494

10230

10405

msgid ""

10231

10406

"true\n"

10232

10407

" (default) This section applies to subdirectories as well."

10233

10408

msgstr ""

10234

10409

10235

#: en/help_topics/configuration.txt:485

10410

#: en/help_topics/configuration.txt:497

10236

10411

msgid ""

10237

10412

"false\n"

10238

10413

" This section only applies to the branch at this directory and not\n"

10239

10414

" branches below it."

10240

10415

msgstr ""

10241

10416

10242

#: en/help_topics/configuration.txt:489

10417

#: en/help_topics/configuration.txt:501

10243

10418

msgid ""

10244

10419

"gpg_signing_command\n"

10245

10420

"~~~~~~~~~~~~~~~~~~~"

10246

10421

msgstr ""

10247

10422

10248

#: en/help_topics/configuration.txt:492

10423

#: en/help_topics/configuration.txt:504

10249

10424

msgid ""

10250

10425

"(Default: \"gpg\"). Which program should be used to sign and check "

10251

10426

"revisions.\n"

10252

10427

"For example::"

10253

10428

msgstr ""

10254

10429

10255

#: en/help_topics/configuration.txt:495

10430

#: en/help_topics/configuration.txt:507

10256

10431

msgid " gpg_signing_command = /usr/bin/gnpg"

10257

10432

msgstr ""

10258

10433

10259

#: en/help_topics/configuration.txt:497

10434

#: en/help_topics/configuration.txt:509

10260

10435

msgid ""

10261

10436

"The specified command must accept the options \"--clearsign\" and \"-u "

10262

10437

"<email>\"."

10263

10438

msgstr ""

10264

10439

10265

#: en/help_topics/configuration.txt:499

10440

#: en/help_topics/configuration.txt:511

10266

10441

msgid ""

10267

10442

"bzr_remote_path\n"

10268

10443

"~~~~~~~~~~~~~~~"

10269

10444

msgstr ""

10270

10445

10271

#: en/help_topics/configuration.txt:502

10446

#: en/help_topics/configuration.txt:514

10272

10447

msgid ""

10273

10448

"(Default: \"bzr\"). The path to the command that should be used to run the "

10274

10449

"smart\n"

10275

10450

"server for bzr. This value may only be specified in locations.conf, because:"

10276

10451

msgstr ""

10277

10452

10278

#: en/help_topics/configuration.txt:505

10453

#: en/help_topics/configuration.txt:517

10279

10454

msgid ""

10280

10455

"- it's needed before branch.conf is accessible\n"

10281

10456

"- allowing remote branch.conf files to specify commands would be a security\n"

10282

10457

" risk"

10283

10458

msgstr ""

10284

10459

10285

#: en/help_topics/configuration.txt:509

10460

#: en/help_topics/configuration.txt:521

10286

10461

msgid "It is overridden by the BZR_REMOTE_PATH environment variable."

10287

10462

msgstr ""

10288

10463

10289

#: en/help_topics/configuration.txt:511

10464

#: en/help_topics/configuration.txt:523

10290

10465

msgid ""

10291

10466

"smtp_server\n"

10292

10467

"~~~~~~~~~~~"

10293

10468

msgstr ""

10294

10469

10295

#: en/help_topics/configuration.txt:514

10470

#: en/help_topics/configuration.txt:526

10296

10471

msgid ""

10297

10472

"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"

10298

10473

"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."

10299

10474

msgstr ""

10300

10475

10301

#: en/help_topics/configuration.txt:517

10476

#: en/help_topics/configuration.txt:529

10302

10477

msgid ""

10303

10478

"smtp_username, smtp_password\n"

10304

10479

"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"

10305

10480

msgstr ""

10306

10481

10307

#: en/help_topics/configuration.txt:520

10482

#: en/help_topics/configuration.txt:532

10308

10483

msgid ""

10309

10484

"User and password to authenticate to the SMTP server. If smtp_username\n"

10310

10485

"is set, and smtp_password is not, Bazaar will prompt for a password.\n"

10312

10487

"to send mail."

10313

10488

msgstr ""

10314

10489

10315

#: en/help_topics/configuration.txt:525

10490

#: en/help_topics/configuration.txt:537

10316

10491

msgid ""

10317

10492

"locks.steal_dead\n"

10318

10493

"~~~~~~~~~~~~~~~~"

10319

10494

msgstr ""

10320

10495

10321

#: en/help_topics/configuration.txt:528

10496

#: en/help_topics/configuration.txt:540

10322

10497

msgid ""

10323

10498

"If set to true, bzr will automatically break locks held by processes from\n"

10324

10499

"the same machine and user that are no longer alive. Otherwise, it will\n"

10326

10501

"the object is no longer in use."

10327

10502

msgstr ""

10328

10503

10329

#: en/help_topics/configuration.txt:533

10504

#: en/help_topics/configuration.txt:545

10330

10505

msgid ""

10331

10506

"mail_client\n"

10332

10507

"~~~~~~~~~~~"

10333

10508

msgstr ""

10334

10509

10335

#: en/help_topics/configuration.txt:536

10510

#: en/help_topics/configuration.txt:548

10336

10511

msgid ""

10337

10512

"A mail client to use for sending merge requests.\n"

10338

10513

"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "

10341

10516

"``editor``."

10342

10517

msgstr ""

10343

10518

10344

#: en/help_topics/configuration.txt:541

10519

#: en/help_topics/configuration.txt:553

10345

10520

msgid "Supported values for specific clients:"

10346

10521

msgstr ""

10347

10522

10348

#: en/help_topics/configuration.txt:543

10523

#: en/help_topics/configuration.txt:555

10349

10524

msgid ""

10350

10525

":claws: Use Claws. This skips a dialog for attaching files.\n"

10351

10526

":evolution: Use Evolution.\n"

10356

10531

" this works around some bugs that xdg-email doesn't handle."

10357

10532

msgstr ""

10358

10533

10359

#: en/help_topics/configuration.txt:550

10534

#: en/help_topics/configuration.txt:562

10360

10535

msgid "Supported generic values are:"

10361

10536

msgstr ""

10362

10537

10363

#: en/help_topics/configuration.txt:552

10538

#: en/help_topics/configuration.txt:564

10364

10539

msgid ""

10365

10540

":default: See above.\n"

10366

10541

":editor: Use your editor to compose the merge request. This also uses\n"

10370

10545

":xdg-email: Use xdg-email to run your preferred mail program"

10371

10546

msgstr ""

10372

10547

10373

#: en/help_topics/configuration.txt:559

10548

#: en/help_topics/configuration.txt:571

10374

10549

msgid ""

10375

10550

"repository.fdatasync\n"

10376

10551

"~~~~~~~~~~~~~~~~~~~~"

10377

10552

msgstr ""

10378

10553

10379

#: en/help_topics/configuration.txt:562

10554

#: en/help_topics/configuration.txt:574

10380

10555

msgid ""

10381

10556

"If true (default), repository changes are flushed through the OS buffers\n"

10382

10557

"to physical disk. This is somewhat slower, but means data should not be\n"

10383

10558

"lost if the machine crashes. See also dirstate.fdatasync."

10384

10559

msgstr ""

10385

10560

10386

#: en/help_topics/configuration.txt:566

10561

#: en/help_topics/configuration.txt:578

10387

10562

msgid ""

10388

10563

"submit_branch\n"

10389

10564

"~~~~~~~~~~~~~"

10390

10565

msgstr ""

10391

10566

10392

#: en/help_topics/configuration.txt:569

10567

#: en/help_topics/configuration.txt:581

10393

10568

msgid ""

10394

10569

"The branch you intend to submit your current work to. This is "

10395

10570

"automatically\n"

10398

10573

"should usually be set on a per-branch or per-location basis."

10399

10574

msgstr ""

10400

10575

10401

#: en/help_topics/configuration.txt:573

10576

#: en/help_topics/configuration.txt:585

10402

10577

msgid ""

10403

10578

"public_branch\n"

10404

10579

"~~~~~~~~~~~~~"

10405

10580

msgstr ""

10406

10581

10407

#: en/help_topics/configuration.txt:576

10582

#: en/help_topics/configuration.txt:588

10408

10583

msgid ""

10409

10584

"A publically-accessible version of this branch (implying that this version "

10410

10585

"is\n"

10411

10586

"not publically-accessible). Used (and set) by ``bzr send``."

10412

10587

msgstr ""

10413

10588

10414

#: en/help_topics/configuration.txt:579

10589

#: en/help_topics/configuration.txt:591

10415

10590

msgid ""

10416

10591

"suppress_warnings\n"

10417

10592

"~~~~~~~~~~~~~~~~~"

10418

10593

msgstr ""

10419

10594

10420

#: en/help_topics/configuration.txt:582

10595

#: en/help_topics/configuration.txt:594

10421

10596

msgid ""

10422

10597

"A list of strings, each string represent a warning that can be emitted by\n"

10423

10598

"bzr. Mentioning a warning in this list tells bzr to not emit it."

10424

10599

msgstr ""

10425

10600

10426

#: en/help_topics/configuration.txt:585

10601

#: en/help_topics/configuration.txt:597

10427

10602

msgid "Valid values:"

10428

10603

msgstr ""

10429

10604

10430

#: en/help_topics/configuration.txt:587

10605

#: en/help_topics/configuration.txt:599

10431

10606

msgid ""

10432

10607

"* ``format_deprecation``:\n"

10433

10608

" whether the format deprecation warning is shown on repositories that "

10435

10610

" using deprecated formats."

10436

10611

msgstr ""

10437

10612

10438

#: en/help_topics/configuration.txt:591

10613

#: en/help_topics/configuration.txt:603

10439

10614

msgid ""

10440

10615

"default_format\n"

10441

10616

"~~~~~~~~~~~~~~"

10442

10617

msgstr ""

10443

10618

10444

#: en/help_topics/configuration.txt:594

10619

#: en/help_topics/configuration.txt:606

10445

10620

msgid ""

10446

10621

"A format name for the default format used when creating branches. See "

10447

10622

"``bzr\n"

10448

10623

"help formats`` for possible values."

10449

10624

msgstr ""

10450

10625

10451

#: en/help_topics/configuration.txt:597

10626

#: en/help_topics/configuration.txt:609

10452

10627

msgid ""

10453

10628

"\n"

10454

10629

"Unicode options\n"

10455

10630

"---------------"

10456

10631

msgstr ""

10457

10632

10458

#: en/help_topics/configuration.txt:601

10633

#: en/help_topics/configuration.txt:613

10459

10634

msgid ""

10460

10635

"output_encoding\n"

10461

10636

"~~~~~~~~~~~~~~~"

10462

10637

msgstr ""

10463

10638

10464

#: en/help_topics/configuration.txt:604

10639

#: en/help_topics/configuration.txt:616

10465

10640

msgid ""

10466

10641

"A Python unicode encoding name for text output from bzr, such as log\n"

10467

10642

"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"

10468

10643

"is the terminal encoding prefered by the operating system."

10469

10644

msgstr ""

10470

10645

10471

#: en/help_topics/configuration.txt:608

10646

#: en/help_topics/configuration.txt:620

10472

10647

msgid ""

10473

10648

"\n"

10474

10649

"Branch type specific options\n"

10475

10650

"----------------------------"

10476

10651

msgstr ""

10477

10652

10478

#: en/help_topics/configuration.txt:612

10653

#: en/help_topics/configuration.txt:624

10479

10654

msgid ""

10480

10655

"These options apply only to branches that use the ``dirstate-tags`` or\n"

10481

10656

"later format. They\n"

10483

10658

"manually set in ``locations.conf`` or ``bazaar.conf``."

10484

10659

msgstr ""

10485

10660

10486

#: en/help_topics/configuration.txt:617

10661

#: en/help_topics/configuration.txt:629

10487

10662

msgid ""

10488

10663

"append_revisions_only\n"

10489

10664

"~~~~~~~~~~~~~~~~~~~~~"

10490

10665

msgstr ""

10491

10666

10492

#: en/help_topics/configuration.txt:620

10667

#: en/help_topics/configuration.txt:632

10493

10668

msgid ""

10494

10669

"If set to \"True\" then revisions can only be appended to the log, not\n"

10495

10670

"removed. A branch with this setting enabled can only pull from another\n"

10499

10674

"compatibility with previous bzr versions (older than 2.2)."

10500

10675

msgstr ""

10501

10676

10502

#: en/help_topics/configuration.txt:627

10677

#: en/help_topics/configuration.txt:639

10503

10678

msgid ""

10504

10679

"parent_location\n"

10505

10680

"~~~~~~~~~~~~~~~"

10506

10681

msgstr ""

10507

10682

10508

#: en/help_topics/configuration.txt:630

10683

#: en/help_topics/configuration.txt:642

10509

10684

msgid ""

10510

10685

"If present, the location of the default branch for pull or merge. This "

10511

10686

"option\n"

10513

10688

"--remember``."

10514

10689

msgstr ""

10515

10690

10516

#: en/help_topics/configuration.txt:634

10691

#: en/help_topics/configuration.txt:646

10517

10692

msgid ""

10518

10693

"push_location\n"

10519

10694

"~~~~~~~~~~~~~"

10520

10695

msgstr ""

10521

10696

10522

#: en/help_topics/configuration.txt:637

10697

#: en/help_topics/configuration.txt:649

10523

10698

msgid ""

10524

10699

"If present, the location of the default branch for push. This option\n"

10525

10700

"is normally set by the first ``push`` or ``push --remember``."

10526

10701

msgstr ""

10527

10702

10528

#: en/help_topics/configuration.txt:640

10703

#: en/help_topics/configuration.txt:652

10529

10704

msgid ""

10530

10705

"push_strict\n"

10531

10706

"~~~~~~~~~~~"

10532

10707

msgstr ""

10533

10708

10534

#: en/help_topics/configuration.txt:643

10709

#: en/help_topics/configuration.txt:655

10535

10710

msgid ""

10536

10711

"If present, defines the ``--strict`` option default value for checking\n"

10537

10712

"uncommitted changes before pushing."

10538

10713

msgstr ""

10539

10714

10540

#: en/help_topics/configuration.txt:646

10715

#: en/help_topics/configuration.txt:658

10541

10716

msgid ""

10542

10717

"dpush_strict\n"

10543

10718

"~~~~~~~~~~~~"

10544

10719

msgstr ""

10545

10720

10546

#: en/help_topics/configuration.txt:649

10721

#: en/help_topics/configuration.txt:661

10547

10722

msgid ""

10548

10723

"If present, defines the ``--strict`` option default value for checking\n"

10549

10724

"uncommitted changes before pushing into a different VCS without any\n"

10550

10725

"custom bzr metadata."

10551

10726

msgstr ""

10552

10727

10553

#: en/help_topics/configuration.txt:653

10728

#: en/help_topics/configuration.txt:665

10554

10729

msgid ""

10555

10730

"bound_location\n"

10556

10731

"~~~~~~~~~~~~~~"

10557

10732

msgstr ""

10558

10733

10559

#: en/help_topics/configuration.txt:656

10734

#: en/help_topics/configuration.txt:668

10560

10735

msgid ""

10561

10736

"The location that commits should go to when acting as a checkout.\n"

10562

10737

"This option is normally set by ``bind``."

10563

10738

msgstr ""

10564

10739

10565

#: en/help_topics/configuration.txt:659

10740

#: en/help_topics/configuration.txt:671

10566

10741

msgid ""

10567

10742

"bound\n"

10568

10743

"~~~~~"

10569

10744

msgstr ""

10570

10745

10571

#: en/help_topics/configuration.txt:662

10746

#: en/help_topics/configuration.txt:674

10572

10747

msgid ""

10573

10748

"If set to \"True\", the branch should act as a checkout, and push each "

10574

10749

"commit to\n"

10575

10750

"the bound_location. This option is normally set by ``bind``/``unbind``."

10576

10751

msgstr ""

10577

10752

10578

#: en/help_topics/configuration.txt:665

10753

#: en/help_topics/configuration.txt:677

10579

10754

msgid ""

10580

10755

"send_strict\n"

10581

10756

"~~~~~~~~~~~"

10582

10757

msgstr ""

10583

10758

10584

#: en/help_topics/configuration.txt:668

10759

#: en/help_topics/configuration.txt:680

10585

10760

msgid ""

10586

10761

"If present, defines the ``--strict`` option default value for checking\n"

10587

10762

"uncommitted changes before sending a merge directive."

10588

10763

msgstr ""

10589

10764

10590

#: en/help_topics/configuration.txt:671

10765

#: en/help_topics/configuration.txt:683

10591

10766

msgid ""

10592

10767

"add.maximum_file_size\n"

10593

10768

"~~~~~~~~~~~~~~~~~~~~~"

10594

10769

msgstr ""

10595

10770

10596

#: en/help_topics/configuration.txt:674

10771

#: en/help_topics/configuration.txt:686

10597

10772

msgid ""

10598

10773

"Defines the maximum file size the command line \"add\" operation will allow\n"

10599

10774

"in recursive mode, with files larger than this value being skipped. You "

10605

10780

"will disable skipping."

10606

10781

msgstr ""

10607

10782

10608

#: en/help_topics/configuration.txt:680

10783

#: en/help_topics/configuration.txt:692

10609

10784

msgid ""

10610

10785

"External Merge Tools\n"

10611

10786

"--------------------"

10612

10787

msgstr ""

10613

10788

10614

#: en/help_topics/configuration.txt:683

10789

#: en/help_topics/configuration.txt:695

10615

10790

msgid ""

10616

10791

"bzr.mergetool.<name>\n"

10617

10792

"~~~~~~~~~~~~~~~~~~~~"

10618

10793

msgstr ""

10619

10794

10620

#: en/help_topics/configuration.txt:686

10795

#: en/help_topics/configuration.txt:698

10621

10796

msgid ""

10622

10797

"Defines an external merge tool called <name> with the given command-line.\n"

10623

10798

"Arguments containing spaces should be quoted using single or double quotes. "

10625

10800

"executable may omit its path if it can be found on the PATH."

10626

10801

msgstr ""

10627

10802

10628

#: en/help_topics/configuration.txt:690

10803

#: en/help_topics/configuration.txt:702

10629

10804

msgid ""

10630

10805

"The following markers can be used in the command-line to substitute "

10631

10806

"filenames\n"

10632

10807

"involved in the merge conflict::"

10633

10808

msgstr ""

10634

10809

10635

#: en/help_topics/configuration.txt:693

10810

#: en/help_topics/configuration.txt:705

10636

10811

msgid ""

10637

10812

" {base} file.BASE\n"

10638

10813

" {this} file.THIS\n"

10643

10818

" succeeds."

10644

10819

msgstr ""

10645

10820

10646

#: en/help_topics/configuration.txt:702

10821

#: en/help_topics/configuration.txt:714

10647

10822

msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"

10648

10823

msgstr ""

10649

10824

10650

#: en/help_topics/configuration.txt:704

10651

msgid ""

10825

#: en/help_topics/configuration.txt:716

10826

msgid ""

10827

"Because ``mergetool`` and ``config`` itself both use curly braces as\n"

10828

"interpolation markers, trying to display the mergetool line results in the\n"

10829

"following problem::"

10830

msgstr ""

10831

10832

#: en/help_topics/configuration.txt:720

10833

msgid ""

10834

"\n"

10835

" $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o "

10836

"{result}'\n"

10837

" $ bzr config bzr.mergetool.kdiff3\n"

10838

" bzr: ERROR: Option base is not defined while expanding \"kdiff3 {base} "

10839

"{this} {other} -o {result}\"."

10840

msgstr ""

10841

10842

#: en/help_topics/configuration.txt:725

10843

msgid ""

10844

"To avoid this, ``config`` can be instructed not to try expanding variables::"

10845

msgstr ""

10846

10847

#: en/help_topics/configuration.txt:727

10848

msgid ""

10849

" $ bzr config --all bzr.mergetool.kdiff3\n"

10850

" branch:\n"

10851

" bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"

10852

msgstr ""

10853

10854

#: en/help_topics/configuration.txt:731

10855

msgid ""

10856

"\n"

10652

10857

"bzr.default_mergetool\n"

10653

10858

"~~~~~~~~~~~~~~~~~~~~~"

10654

10859

msgstr ""

10655

10860

10656

#: en/help_topics/configuration.txt:707

10861

#: en/help_topics/configuration.txt:735

10657

10862

msgid ""

10658

10863

"Specifies which external merge tool (as defined above) should be selected "

10659

10864

"by\n"

10660

10865

"default in tools such as ``bzr qconflicts``."

10661

10866

msgstr ""

10662

10867

10663

#: en/help_topics/configuration.txt:712

10868

#: en/help_topics/configuration.txt:740

10664

10869

msgid " bzr.default_mergetool = kdiff3\n"

10665

10870

msgstr ""

10666

10871

11610

11815

"branch can now be pushed to the mainline.\n"

11611

11816

msgstr ""

11612

11817

11818

#: en/help_topics/env-variables.txt:1

11819

msgid "Environment Variables"

11820

msgstr ""

11821

11822

#: en/help_topics/env-variables.txt:3

11823

msgid "See bzr help configuration for more details."

11824

msgstr ""

11825

11826

#: en/help_topics/env-variables.txt:5

11827

msgid ""

11828

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

11829

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

11830

"BZRPATH Path where bzr is to look for shell plugin external\n"

11831

" commands.\n"

11832

"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"

11833

"EMAIL E-Mail address of the user.\n"

11834

"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"

11835

"EDITOR Editor for editing commit messages.\n"

11836

"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"

11837

"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"

11838

"BZR_PLUGINS_AT Plugins to load from a directory not in "

11839

"BZR_PLUGIN_PATH.\n"

11840

"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"

11841

"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "

11842

"and\n"

11843

" HOME.\n"

11844

"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "

11845

"URLs).\n"

11846

"BZR_SSH Path to SSH client, or one of paramiko, openssh, "

11847

"sshcorp,\n"

11848

" plink or lsh.\n"

11849

"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"

11850

"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"

11851

"BZR_COLUMNS Override implicit terminal width.\n"

11852

"BZR_CONCURRENCY Number of processes that can be run concurrently "

11853

"(selftest)\n"

11854

"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "

11855

"'text'.\n"

11856

"BZR_PDB Control whether to launch a debugger on error.\n"

11857

"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"

11858

" breakin debugger.\n"

11859

"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "

11860

"(instead\n"

11861

" of char-based).\n"

11862

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

11863

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

11864

msgstr ""

11865

11613

11866

#: en/help_topics/eol.txt:1

11614

11867

msgid ""

11615

11868

"End of Line Conversion\n"

11917

12170

msgstr ""

11918

12171

11919

12172

#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56

11920

#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259

12173

#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262

11921

12174

msgid "Introduced in: 2.2"

11922

12175

msgstr ""

11923

12176

11935

12188

"~~~~"

11936

12189

msgstr ""

11937

12190

11938

#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290

11939

#: en/help_topics/hooks.txt:304

12191

#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293

12192

#: en/help_topics/hooks.txt:307

11940

12193

msgid "Introduced in: 1.8"

11941

12194

msgstr ""

11942

12195

11966

12219

"~~~~~~~~~~~~~~~~~~~~~~"

11967

12220

msgstr ""

11968

12221

11969

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402

12222

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421

11970

12223

msgid "Introduced in: 1.4"

11971

12224

msgstr ""

11972

12225

11978

12231

"uncommit will all trigger this hook."

11979

12232

msgstr ""

11980

12233

11981

#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389

12234

#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392

11982

12235

msgid ""

11983

12236

"post_commit\n"

11984

12237

"~~~~~~~~~~~"

11986

12239

11987

12240

#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86

11988

12241

#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110

11989

#: en/help_topics/hooks.txt:145

11990

12242

msgid "Introduced in: 0.15"

11991

12243

msgstr ""

11992

12244

12091

12343

12092

12344

#: en/help_topics/hooks.txt:142

12093

12345

msgid ""

12094

"set_rh\n"

12095

"~~~~~~"

12096

msgstr ""

12097

12098

#: en/help_topics/hooks.txt:147

12099

msgid ""

12100

"Invoked whenever the revision history has been set via\n"

12101

"set_revision_history. The api signature is (branch, revision_history),\n"

12102

"and the branch will be write-locked. The set_rh hook can be expensive\n"

12103

"for bzr to trigger, a better hook to use is\n"

12104

"Branch.post_change_branch_tip."

12105

msgstr ""

12106

12107

#: en/help_topics/hooks.txt:153

12108

msgid ""

12109

12346

"transform_fallback_location\n"

12110

12347

"~~~~~~~~~~~~~~~~~~~~~~~~~~~"

12111

12348

msgstr ""

12112

12349

12113

#: en/help_topics/hooks.txt:156

12350

#: en/help_topics/hooks.txt:145

12114

12351

msgid "Introduced in: 1.9"

12115

12352

msgstr ""

12116

12353

12117

#: en/help_topics/hooks.txt:158

12354

#: en/help_topics/hooks.txt:147

12118

12355

msgid ""

12119

12356

"Called when a stacked branch is activating its fallback locations.\n"

12120

12357

"transform_fallback_location is called with (branch, url), and should\n"

12128

12365

"however undefined."

12129

12366

msgstr ""

12130

12367

12131

#: en/help_topics/hooks.txt:169

12368

#: en/help_topics/hooks.txt:158

12132

12369

msgid ""

12133

12370

"CommandHooks\n"

12134

12371

"------------"

12135

12372

msgstr ""

12136

12373

12137

#: en/help_topics/hooks.txt:172

12374

#: en/help_topics/hooks.txt:161

12138

12375

msgid ""

12139

12376

"extend_command\n"

12140

12377

"~~~~~~~~~~~~~~"

12141

12378

msgstr ""

12142

12379

12143

#: en/help_topics/hooks.txt:175

12380

#: en/help_topics/hooks.txt:164

12144

12381

msgid "Introduced in: 1.13"

12145

12382

msgstr ""

12146

12383

12147

#: en/help_topics/hooks.txt:177

12384

#: en/help_topics/hooks.txt:166

12148

12385

msgid ""

12149

12386

"Called after creating a command object to allow modifications such as\n"

12150

12387

"adding or removing options, docs etc. Called with the new\n"

12151

12388

"bzrlib.commands.Command object."

12152

12389

msgstr ""

12153

12390

12154

#: en/help_topics/hooks.txt:181

12391

#: en/help_topics/hooks.txt:170

12155

12392

msgid ""

12156

12393

"get_command\n"

12157

12394

"~~~~~~~~~~~"

12158

12395

msgstr ""

12159

12396

12160

#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196

12161

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448

12397

#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185

12398

#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467

12162

12399

msgid "Introduced in: 1.17"

12163

12400

msgstr ""

12164

12401

12165

#: en/help_topics/hooks.txt:186

12402

#: en/help_topics/hooks.txt:175

12166

12403

msgid ""

12167

12404

"Called when creating a single command. Called with (cmd_or_None,\n"

12168

12405

"command_name). get_command should either return the cmd_or_None\n"

12172

12409

"plugin_cmds.register_lazy."

12173

12410

msgstr ""

12174

12411

12175

#: en/help_topics/hooks.txt:193

12412

#: en/help_topics/hooks.txt:182

12176

12413

msgid ""

12177

12414

"get_missing_command\n"

12178

12415

"~~~~~~~~~~~~~~~~~~~"

12179

12416

msgstr ""

12180

12417

12181

#: en/help_topics/hooks.txt:198

12418

#: en/help_topics/hooks.txt:187

12182

12419

msgid ""

12183

12420

"Called when creating a single command if no command could be found.\n"

12184

12421

"Called with (command_name). get_missing_command should either return\n"

12185

12422

"None, or a Command object to be used for the command."

12186

12423

msgstr ""

12187

12424

12188

#: en/help_topics/hooks.txt:202

12425

#: en/help_topics/hooks.txt:191

12189

12426

msgid ""

12190

12427

"list_commands\n"

12191

12428

"~~~~~~~~~~~~~"

12192

12429

msgstr ""

12193

12430

12194

#: en/help_topics/hooks.txt:207

12431

#: en/help_topics/hooks.txt:196

12195

12432

msgid ""

12196

12433

"Called when enumerating commands. Called with a set of cmd_name\n"

12197

12434

"strings for all the commands found so far. This set is safe to mutate\n"

12199

12436

"set of command names."

12200

12437

msgstr ""

12201

12438

12202

#: en/help_topics/hooks.txt:212

12439

#: en/help_topics/hooks.txt:201

12440

msgid ""

12441

"post_command\n"

12442

"~~~~~~~~~~~~"

12443

msgstr ""

12444

12445

#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211

12446

msgid "Introduced in: 2.6"

12447

msgstr ""

12448

12449

#: en/help_topics/hooks.txt:206

12450

msgid "Called after executing a command. Called with the command object."

12451

msgstr ""

12452

12453

#: en/help_topics/hooks.txt:208

12454

msgid ""

12455

"pre_command\n"

12456

"~~~~~~~~~~~"

12457

msgstr ""

12458

12459

#: en/help_topics/hooks.txt:213

12460

msgid "Called prior to executing a command. Called with the command object."

12461

msgstr ""

12462

12463

#: en/help_topics/hooks.txt:215

12203

12464

msgid ""

12204

12465

"_ConfigHooks\n"

12205

12466

"------------"

12206

12467

msgstr ""

12207

12468

12208

#: en/help_topics/hooks.txt:215

12469

#: en/help_topics/hooks.txt:218

12209

12470

msgid ""

12210

12471

"get\n"

12211

12472

"~~~"

12212

12473

msgstr ""

12213

12474

12214

#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226

12215

#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241

12216

#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370

12217

#: en/help_topics/hooks.txt:427

12475

#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229

12476

#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244

12477

#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373

12478

#: en/help_topics/hooks.txt:446

12218

12479

msgid "Introduced in: 2.4"

12219

12480

msgstr ""

12220

12481

12221

#: en/help_topics/hooks.txt:220

12482

#: en/help_topics/hooks.txt:223

12222

12483

msgid ""

12223

12484

"Invoked when a config option is read. The signature is (stack, name,\n"

12224

12485

"value)."

12225

12486

msgstr ""

12226

12487

12227

#: en/help_topics/hooks.txt:223

12488

#: en/help_topics/hooks.txt:226

12228

12489

msgid ""

12229

12490

"load\n"

12230

12491

"~~~~"

12231

12492

msgstr ""

12232

12493

12233

#: en/help_topics/hooks.txt:228

12494

#: en/help_topics/hooks.txt:231

12234

12495

msgid "Invoked when a config store is loaded. The signature is (store)."

12235

12496

msgstr ""

12236

12497

12237

#: en/help_topics/hooks.txt:230

12498

#: en/help_topics/hooks.txt:233

12238

12499

msgid ""

12239

12500

"remove\n"

12240

12501

"~~~~~~"

12241

12502

msgstr ""

12242

12503

12243

#: en/help_topics/hooks.txt:235

12504

#: en/help_topics/hooks.txt:238

12244

12505

msgid ""

12245

12506

"Invoked when a config option is removed. The signature is (stack,\n"

12246

12507

"name)."

12247

12508

msgstr ""

12248

12509

12249

#: en/help_topics/hooks.txt:238

12510

#: en/help_topics/hooks.txt:241

12250

12511

msgid ""

12251

12512

"save\n"

12252

12513

"~~~~"

12253

12514

msgstr ""

12254

12515

12255

#: en/help_topics/hooks.txt:243

12516

#: en/help_topics/hooks.txt:246

12256

12517

msgid "Invoked when a config store is saved. The signature is (store)."

12257

12518

msgstr ""

12258

12519

12259

#: en/help_topics/hooks.txt:245

12520

#: en/help_topics/hooks.txt:248

12260

12521

msgid ""

12261

12522

"set\n"

12262

12523

"~~~"

12263

12524

msgstr ""

12264

12525

12265

#: en/help_topics/hooks.txt:250

12526

#: en/help_topics/hooks.txt:253

12266

12527

msgid ""

12267

12528

"Invoked when a config option is set. The signature is (stack, name,\n"

12268

12529

"value)."

12269

12530

msgstr ""

12270

12531

12271

#: en/help_topics/hooks.txt:253

12532

#: en/help_topics/hooks.txt:256

12272

12533

msgid ""

12273

12534

"ControlDirHooks\n"

12274

12535

"---------------"

12275

12536

msgstr ""

12276

12537

12277

#: en/help_topics/hooks.txt:256

12538

#: en/help_topics/hooks.txt:259

12278

12539

msgid ""

12279

12540

"post_repo_init\n"

12280

12541

"~~~~~~~~~~~~~~"

12281

12542

msgstr ""

12282

12543

12283

#: en/help_topics/hooks.txt:261

12544

#: en/help_topics/hooks.txt:264

12284

12545

msgid ""

12285

12546

"Invoked after a repository has been initialized. post_repo_init is\n"

12286

12547

"called with a bzrlib.controldir.RepoInitHookParams."

12287

12548

msgstr ""

12288

12549

12289

#: en/help_topics/hooks.txt:264

12550

#: en/help_topics/hooks.txt:267

12290

12551

msgid ""

12291

12552

"pre_open\n"

12292

12553

"~~~~~~~~"

12293

12554

msgstr ""

12294

12555

12295

#: en/help_topics/hooks.txt:267

12556

#: en/help_topics/hooks.txt:270

12296

12557

msgid "Introduced in: 1.14"

12297

12558

msgstr ""

12298

12559

12299

#: en/help_topics/hooks.txt:269

12560

#: en/help_topics/hooks.txt:272

12300

12561

msgid ""

12301

12562

"Invoked before attempting to open a ControlDir with the transport that\n"

12302

12563

"the open will use."

12303

12564

msgstr ""

12304

12565

12305

#: en/help_topics/hooks.txt:272

12566

#: en/help_topics/hooks.txt:275

12306

12567

msgid ""

12307

12568

"InfoHooks\n"

12308

12569

"---------"

12309

12570

msgstr ""

12310

12571

12311

#: en/help_topics/hooks.txt:275

12572

#: en/help_topics/hooks.txt:278

12312

12573

msgid ""

12313

12574

"repository\n"

12314

12575

"~~~~~~~~~~"

12315

12576

msgstr ""

12316

12577

12317

#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297

12318

#: en/help_topics/hooks.txt:505

12578

#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300

12579

#: en/help_topics/hooks.txt:524

12319

12580

msgid "Introduced in: 1.15"

12320

12581

msgstr ""

12321

12582

12322

#: en/help_topics/hooks.txt:280

12583

#: en/help_topics/hooks.txt:283

12323

12584

msgid ""

12324

12585

"Invoked when displaying the statistics for a repository. repository is\n"

12325

12586

"called with a statistics dictionary as returned by the repository and\n"

12326

12587

"a file-like object to write to."

12327

12588

msgstr ""

12328

12589

12329

#: en/help_topics/hooks.txt:284

12590

#: en/help_topics/hooks.txt:287

12330

12591

msgid ""

12331

12592

"LockHooks\n"

12332

12593

"---------"

12333

12594

msgstr ""

12334

12595

12335

#: en/help_topics/hooks.txt:287

12596

#: en/help_topics/hooks.txt:290

12336

12597

msgid ""

12337

12598

"lock_acquired\n"

12338

12599

"~~~~~~~~~~~~~"

12339

12600

msgstr ""

12340

12601

12341

#: en/help_topics/hooks.txt:292

12602

#: en/help_topics/hooks.txt:295

12342

12603

msgid "Called with a bzrlib.lock.LockResult when a physical lock is acquired."

12343

12604

msgstr ""

12344

12605

12345

#: en/help_topics/hooks.txt:294

12606

#: en/help_topics/hooks.txt:297

12346

12607

msgid ""

12347

12608

"lock_broken\n"

12348

12609

"~~~~~~~~~~~"

12349

12610

msgstr ""

12350

12611

12351

#: en/help_topics/hooks.txt:299

12612

#: en/help_topics/hooks.txt:302

12352

12613

msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."

12353

12614

msgstr ""

12354

12615

12355

#: en/help_topics/hooks.txt:301

12616

#: en/help_topics/hooks.txt:304

12356

12617

msgid ""

12357

12618

"lock_released\n"

12358

12619

"~~~~~~~~~~~~~"

12359

12620

msgstr ""

12360

12621

12361

#: en/help_topics/hooks.txt:306

12622

#: en/help_topics/hooks.txt:309

12362

12623

msgid "Called with a bzrlib.lock.LockResult when a physical lock is released."

12363

12624

msgstr ""

12364

12625

12365

#: en/help_topics/hooks.txt:308

12626

#: en/help_topics/hooks.txt:311

12366

12627

msgid ""

12367

12628

"MergeHooks\n"

12368

12629

"----------"

12369

12630

msgstr ""

12370

12631

12371

#: en/help_topics/hooks.txt:311

12632

#: en/help_topics/hooks.txt:314

12372

12633

msgid ""

12373

12634

"merge_file_content\n"

12374

12635

"~~~~~~~~~~~~~~~~~~"

12375

12636

msgstr ""

12376

12637

12377

#: en/help_topics/hooks.txt:314

12638

#: en/help_topics/hooks.txt:317

12378

12639

msgid "Introduced in: 2.1"

12379

12640

msgstr ""

12380

12641

12381

#: en/help_topics/hooks.txt:316

12642

#: en/help_topics/hooks.txt:319

12382

12643

msgid ""

12383

12644

"Called with a bzrlib.merge.Merger object to create a per file merge\n"

12384

12645

"object when starting a merge. Should return either None or a subclass\n"

12388

12649

"AbstractPerFileMerger API docs for details on how it is used by merge."

12389

12650

msgstr ""

12390

12651

12391

#: en/help_topics/hooks.txt:323

12652

#: en/help_topics/hooks.txt:326

12392

12653

msgid ""

12393

12654

"post_merge\n"

12394

12655

"~~~~~~~~~~"

12395

12656

msgstr ""

12396

12657

12397

#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334

12398

#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493

12658

#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337

12659

#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405

12660

#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512

12399

12661

msgid "Introduced in: 2.5"

12400

12662

msgstr ""

12401

12663

12402

#: en/help_topics/hooks.txt:328

12664

#: en/help_topics/hooks.txt:331

12403

12665

msgid ""

12404

12666

"Called after a merge. Receives a Merger object as the single argument.\n"

12405

12667

"The return value is ignored."

12406

12668

msgstr ""

12407

12669

12408

#: en/help_topics/hooks.txt:331

12670

#: en/help_topics/hooks.txt:334

12409

12671

msgid ""

12410

12672

"pre_merge\n"

12411

12673

"~~~~~~~~~"

12412

12674

msgstr ""

12413

12675

12414

#: en/help_topics/hooks.txt:336

12676

#: en/help_topics/hooks.txt:339

12415

12677

msgid ""

12416

12678

"Called before a merge. Receives a Merger object as the single\n"

12417

12679

"argument."

12418

12680

msgstr ""

12419

12681

12420

#: en/help_topics/hooks.txt:339

12682

#: en/help_topics/hooks.txt:342

12421

12683

msgid ""

12422

12684

"MergeDirectiveHooks\n"

12423

12685

"-------------------"

12424

12686

msgstr ""

12425

12687

12426

#: en/help_topics/hooks.txt:342

12688

#: en/help_topics/hooks.txt:345

12427

12689

msgid ""

12428

12690

"merge_request_body\n"

12429

12691

"~~~~~~~~~~~~~~~~~~"

12430

12692

msgstr ""

12431

12693

12432

#: en/help_topics/hooks.txt:345

12694

#: en/help_topics/hooks.txt:348

12433

12695

msgid "Introduced in: 1.15.0"

12434

12696

msgstr ""

12435

12697

12436

#: en/help_topics/hooks.txt:347

12698

#: en/help_topics/hooks.txt:350

12437

12699

msgid ""

12438

12700

"Called with a MergeRequestBodyParams when a body is needed for a merge\n"

12439

12701

"request. Callbacks must return a body. If more than one callback is\n"

12440

12702

"registered, the output of one callback is provided to the next."

12441

12703

msgstr ""

12442

12704

12443

#: en/help_topics/hooks.txt:351

12705

#: en/help_topics/hooks.txt:354

12444

12706

msgid ""

12445

12707

"MessageEditorHooks\n"

12446

12708

"------------------"

12447

12709

msgstr ""

12448

12710

12449

#: en/help_topics/hooks.txt:354

12711

#: en/help_topics/hooks.txt:357

12450

12712

msgid ""

12451

12713

"commit_message_template\n"

12452

12714

"~~~~~~~~~~~~~~~~~~~~~~~"

12453

12715

msgstr ""

12454

12716

12455

#: en/help_topics/hooks.txt:357

12717

#: en/help_topics/hooks.txt:360

12456

12718

msgid "Introduced in: 1.10"

12457

12719

msgstr ""

12458

12720

12459

#: en/help_topics/hooks.txt:359

12721

#: en/help_topics/hooks.txt:362

12460

12722

msgid ""

12461

12723

"Called when a commit message is being generated.\n"

12462

12724

"commit_message_template is called with the bzrlib.commit.Commit object\n"

12467

12729

"second, and so on."

12468

12730

msgstr ""

12469

12731

12470

#: en/help_topics/hooks.txt:367

12732

#: en/help_topics/hooks.txt:370

12471

12733

msgid ""

12472

12734

"set_commit_message\n"

12473

12735

"~~~~~~~~~~~~~~~~~~"

12474

12736

msgstr ""

12475

12737

12476

#: en/help_topics/hooks.txt:372

12738

#: en/help_topics/hooks.txt:375

12477

12739

msgid ""

12478

12740

"Set a fixed commit message. set_commit_message is called with the\n"

12479

12741

"bzrlib.commit.Commit object (so you can also change e.g. revision\n"

12482

12744

"should use the message editor as normal."

12483

12745

msgstr ""

12484

12746

12485

#: en/help_topics/hooks.txt:378

12747

#: en/help_topics/hooks.txt:381

12486

12748

msgid ""

12487

12749

"MutableTreeHooks\n"

12488

12750

"----------------"

12489

12751

msgstr ""

12490

12752

12491

#: en/help_topics/hooks.txt:381

12753

#: en/help_topics/hooks.txt:384

12492

12754

msgid ""

12493

12755

"post_build_tree\n"

12494

12756

"~~~~~~~~~~~~~~~"

12495

12757

msgstr ""

12496

12758

12497

#: en/help_topics/hooks.txt:386

12759

#: en/help_topics/hooks.txt:389

12498

12760

msgid ""

12499

12761

"Called after a completely new tree is built. The hook is called with\n"

12500

12762

"the tree as its only argument."

12501

12763

msgstr ""

12502

12764

12503

#: en/help_topics/hooks.txt:392

12765

#: en/help_topics/hooks.txt:395

12504

12766

msgid "Introduced in: 2.0"

12505

12767

msgstr ""

12506

12768

12507

#: en/help_topics/hooks.txt:394

12769

#: en/help_topics/hooks.txt:397

12508

12770

msgid ""

12509

12771

"Called after a commit is performed on a tree. The hook is called with\n"

12510

12772

"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"

12512

12774

"that object."

12513

12775

msgstr ""

12514

12776

12515

#: en/help_topics/hooks.txt:399

12777

#: en/help_topics/hooks.txt:402

12778

msgid ""

12779

"post_transform\n"

12780

"~~~~~~~~~~~~~~"

12781

msgstr ""

12782

12783

#: en/help_topics/hooks.txt:407

12784

msgid ""

12785

"Called after a tree transform has been performed on a tree. The hook\n"

12786

"is called with the tree that is being transformed and the transform."

12787

msgstr ""

12788

12789

#: en/help_topics/hooks.txt:410

12790

msgid ""

12791

"pre_transform\n"

12792

"~~~~~~~~~~~~~"

12793

msgstr ""

12794

12795

#: en/help_topics/hooks.txt:415

12796

msgid ""

12797

"Called before a tree transform on this tree. The hook is called with\n"

12798

"the tree that is being transformed and the transform."

12799

msgstr ""

12800

12801

#: en/help_topics/hooks.txt:418

12516

12802

msgid ""

12517

12803

"start_commit\n"

12518

12804

"~~~~~~~~~~~~"

12519

12805

msgstr ""

12520

12806

12521

#: en/help_topics/hooks.txt:404

12807

#: en/help_topics/hooks.txt:423

12522

12808

msgid ""

12523

12809

"Called before a commit is performed on a tree. The start commit hook\n"

12524

12810

"is able to change the tree before the commit takes place. start_commit\n"

12526

12812

"being performed on."

12527

12813

msgstr ""

12528

12814

12529

#: en/help_topics/hooks.txt:409

12815

#: en/help_topics/hooks.txt:428

12530

12816

msgid ""

12531

12817

"SmartClientHooks\n"

12532

12818

"----------------"

12533

12819

msgstr ""

12534

12820

12535

#: en/help_topics/hooks.txt:412

12821

#: en/help_topics/hooks.txt:431

12536

12822

msgid ""

12537

12823

"call\n"

12538

12824

"~~~~"

12539

12825

msgstr ""

12540

12826

12541

#: en/help_topics/hooks.txt:415

12827

#: en/help_topics/hooks.txt:434

12542

12828

msgid "Introduced in: unknown"

12543

12829

msgstr ""

12544

12830

12545

#: en/help_topics/hooks.txt:417

12831

#: en/help_topics/hooks.txt:436

12546

12832

msgid ""

12547

12833

"Called when the smart client is submitting a request to the smart\n"

12548

12834

"server. Called with a bzrlib.smart.client.CallHookParams object.\n"

12549

12835

"Streaming request bodies, and responses, are not accessible."

12550

12836

msgstr ""

12551

12837

12552

#: en/help_topics/hooks.txt:421

12838

#: en/help_topics/hooks.txt:440

12553

12839

msgid ""

12554

12840

"SmartServerHooks\n"

12555

12841

"----------------"

12556

12842

msgstr ""

12557

12843

12558

#: en/help_topics/hooks.txt:424

12844

#: en/help_topics/hooks.txt:443

12559

12845

msgid ""

12560

12846

"server_exception\n"

12561

12847

"~~~~~~~~~~~~~~~~"

12562

12848

msgstr ""

12563

12849

12564

#: en/help_topics/hooks.txt:429

12850

#: en/help_topics/hooks.txt:448

12565

12851

msgid ""

12566

12852

"Called by the bzr server when an exception occurs. server_exception is\n"

12567

12853

"called with the sys.exc_info() tuple return true for the hook if the\n"

12569

12855

"normally."

12570

12856

msgstr ""

12571

12857

12572

#: en/help_topics/hooks.txt:434

12858

#: en/help_topics/hooks.txt:453

12573

12859

msgid ""

12574

12860

"server_started\n"

12575

12861

"~~~~~~~~~~~~~~"

12576

12862

msgstr ""

12577

12863

12578

#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456

12864

#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475

12579

12865

msgid "Introduced in: 0.16"

12580

12866

msgstr ""

12581

12867

12582

#: en/help_topics/hooks.txt:439

12868

#: en/help_topics/hooks.txt:458

12583

12869

msgid ""

12584

12870

"Called by the bzr server when it starts serving a directory.\n"

12585

12871

"server_started is called with (backing urls, public url), where\n"

12588

12874

"served."

12589

12875

msgstr ""

12590

12876

12591

#: en/help_topics/hooks.txt:445

12877

#: en/help_topics/hooks.txt:464

12592

12878

msgid ""

12593

12879

"server_started_ex\n"

12594

12880

"~~~~~~~~~~~~~~~~~"

12595

12881

msgstr ""

12596

12882

12597

#: en/help_topics/hooks.txt:450

12883

#: en/help_topics/hooks.txt:469

12598

12884

msgid ""

12599

12885

"Called by the bzr server when it starts serving a directory.\n"

12600

12886

"server_started is called with (backing_urls, server_obj)."

12601

12887

msgstr ""

12602

12888

12603

#: en/help_topics/hooks.txt:453

12889

#: en/help_topics/hooks.txt:472

12604

12890

msgid ""

12605

12891

"server_stopped\n"

12606

12892

"~~~~~~~~~~~~~~"

12607

12893

msgstr ""

12608

12894

12609

#: en/help_topics/hooks.txt:458

12895

#: en/help_topics/hooks.txt:477

12610

12896

msgid ""

12611

12897

"Called by the bzr server when it stops serving a directory.\n"

12612

12898

"server_stopped is called with the same parameters as the\n"

12613

12899

"server_started hook: (backing_urls, public_url)."

12614

12900

msgstr ""

12615

12901

12616

#: en/help_topics/hooks.txt:462

12902

#: en/help_topics/hooks.txt:481

12617

12903

msgid ""

12618

12904

"StatusHooks\n"

12619

12905

"-----------"

12620

12906

msgstr ""

12621

12907

12622

#: en/help_topics/hooks.txt:465

12908

#: en/help_topics/hooks.txt:484

12623

12909

msgid ""

12624

12910

"post_status\n"

12625

12911

"~~~~~~~~~~~"

12626

12912

msgstr ""

12627

12913

12628

#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479

12914

#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498

12629

12915

msgid "Introduced in: 2.3"

12630

12916

msgstr ""

12631

12917

12632

#: en/help_topics/hooks.txt:470

12918

#: en/help_topics/hooks.txt:489

12633

12919

msgid ""

12634

12920

"Called with argument StatusHookParams after Bazaar has displayed the\n"

12635

12921

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12638

12924

"status command. to_file is the output stream for writing."

12639

12925

msgstr ""

12640

12926

12641

#: en/help_topics/hooks.txt:476

12927

#: en/help_topics/hooks.txt:495

12642

12928

msgid ""

12643

12929

"pre_status\n"

12644

12930

"~~~~~~~~~~"

12645

12931

msgstr ""

12646

12932

12647

#: en/help_topics/hooks.txt:481

12933

#: en/help_topics/hooks.txt:500

12648

12934

msgid ""

12649

12935

"Called with argument StatusHookParams before Bazaar displays the\n"

12650

12936

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12653

12939

"status command. to_file is the output stream for writing."

12654

12940

msgstr ""

12655

12941

12656

#: en/help_topics/hooks.txt:487

12942

#: en/help_topics/hooks.txt:506

12657

12943

msgid ""

12658

12944

"TransportHooks\n"

12659

12945

"--------------"

12660

12946

msgstr ""

12661

12947

12662

#: en/help_topics/hooks.txt:490

12948

#: en/help_topics/hooks.txt:509

12663

12949

msgid ""

12664

12950

"post_connect\n"

12665

12951

"~~~~~~~~~~~~"

12666

12952

msgstr ""

12667

12953

12668

#: en/help_topics/hooks.txt:495

12954

#: en/help_topics/hooks.txt:514

12669

12955

msgid ""

12670

12956

"Called after a new connection is established or a reconnect occurs.\n"

12671

12957

"The sole argument passed is either the connected transport or smart\n"

12672

12958

"medium instance."

12673

12959

msgstr ""

12674

12960

12675

#: en/help_topics/hooks.txt:499

12961

#: en/help_topics/hooks.txt:518

12676

12962

msgid ""

12677

12963

"RioVersionInfoBuilderHooks\n"

12678

12964

"--------------------------"

12679

12965

msgstr ""

12680

12966

12681

#: en/help_topics/hooks.txt:502

12967

#: en/help_topics/hooks.txt:521

12682

12968

msgid ""

12683

12969

"revision\n"

12684

12970

"~~~~~~~~"

12685

12971

msgstr ""

12686

12972

12687

#: en/help_topics/hooks.txt:507

12973

#: en/help_topics/hooks.txt:526

12688

12974

msgid ""

12689

12975

"Invoked when adding information about a revision to the RIO stanza\n"

12690

12976

"that is printed. revision is called with a revision object and a RIO\n"