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

8

msgstr ""

9

"Project-Id-Version: bzr\n"

10

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

11

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

11

"POT-Creation-Date: 2012-03-15 10:20+0100\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

25

#: bzrlib/branch.py:872

25

#: bzrlib/branch.py:854

26

msgid "Unstacking"

27

msgstr ""

28

29

#: bzrlib/branch.py:3205

29

#: bzrlib/branch.py:3121

30

#, python-format

31

msgid "Pushed up to revision %d."

32

msgstr ""

33

34

#: bzrlib/branch.py:3207

34

#: bzrlib/branch.py:3123

35

#, python-format

36

msgid "%d tag updated."

37

msgid_plural "%d tags updated."

38

msgstr[0] ""

39

msgstr[1] ""

40

41

#: bzrlib/branch.py:3210

41

#: bzrlib/branch.py:3126

42

msgid "No new revisions or tags to push."

43

msgstr ""

44

45

#: bzrlib/branch.py:3212

45

#: bzrlib/branch.py:3128

46

msgid "No new revisions to push."

47

msgstr ""

48

49

#: bzrlib/branch.py:3232

49

#: bzrlib/branch.py:3148

50

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

51

msgstr ""

52

53

#: bzrlib/branch.py:3235

53

#: bzrlib/branch.py:3151

54

#, python-format

55

msgid "found error:%s"

56

msgstr ""

57

58

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

58

#: bzrlib/builtins.py:251 bzrlib/builtins.py:3026 bzrlib/workingtree.py:323

59

#, python-format

60

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

61

msgstr ""

62

63

#: bzrlib/builtins.py:218

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

68

#: bzrlib/builtins.py:315

69

msgid "Display status summary."

70

msgstr ""

71

72

#: bzrlib/builtins.py:305

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

183

#: bzrlib/builtins.py:382

184

msgid "Do not mark object type using indicator."

185

msgstr ""

186

187

#: bzrlib/builtins.py:385

187

#: bzrlib/builtins.py:397

188

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

189

msgstr ""

190

191

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

191

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

192

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

193

msgstr ""

194

195

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

195

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

196

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

197

msgstr ""

198

199

#: bzrlib/builtins.py:439

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

204

#: bzrlib/builtins.py:462

205

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

206

msgstr ""

207

208

#: bzrlib/builtins.py:457

208

#: bzrlib/builtins.py:469

209

msgid "You cannot specify a NULL revision."

210

msgstr ""

211

212

#: bzrlib/builtins.py:549

212

#: bzrlib/builtins.py:561

213

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

214

msgstr ""

215

216

#: bzrlib/builtins.py:551

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

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

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

231

#: bzrlib/builtins.py:586

232

msgid "No working tree to remove"

233

msgstr ""

234

235

#: bzrlib/builtins.py:576

235

#: bzrlib/builtins.py:588

236

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

237

msgstr ""

238

239

#: bzrlib/builtins.py:585

239

#: bzrlib/builtins.py:597

240

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

241

msgstr ""

242

243

#: bzrlib/builtins.py:625

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

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

255

#: bzrlib/builtins.py:652

256

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

257

msgstr ""

258

259

#: bzrlib/builtins.py:644

259

#: bzrlib/builtins.py:656

260

msgid "Show current revision number."

261

msgstr ""

262

263

#: bzrlib/builtins.py:646

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

267

#: bzrlib/builtins.py:671

268

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

269

msgstr ""

270

271

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

271

#: bzrlib/builtins.py:688 bzrlib/builtins.py:5953

272

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

273

msgstr ""

274

275

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

276

#: bzrlib/builtins.py:700

276

#: bzrlib/builtins.py:712

277

msgid "Show revno of working tree."

278

msgstr ""

279

280

#: bzrlib/builtins.py:748

280

#: bzrlib/builtins.py:760

281

msgid "Add specified files or directories."

282

msgstr ""

283

284

#: bzrlib/builtins.py:750

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

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

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

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

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

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

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

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

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

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

358

#: bzrlib/builtins.py:813

359

msgid "Lookup file ids from this tree."

360

msgstr ""

361

362

#: bzrlib/builtins.py:836

362

#: bzrlib/builtins.py:849

363

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

364

msgstr ""

365

366

#: bzrlib/builtins.py:841

366

#: bzrlib/builtins.py:854

367

msgid "Create a new versioned directory."

368

msgstr ""

369

370

#: bzrlib/builtins.py:843

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

375

#: bzrlib/builtins.py:863

376

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

377

msgstr ""

378

379

#: bzrlib/builtins.py:884

379

#: bzrlib/builtins.py:897

380

#, python-format

381

msgid "added %s\n"

382

msgstr ""

383

384

#: bzrlib/builtins.py:926

384

#: bzrlib/builtins.py:939

385

#, python-format

386

msgid "invalid kind %r specified"

387

msgstr ""

388

389

#: bzrlib/builtins.py:963

389

#: bzrlib/builtins.py:976

390

msgid "Move or rename a file."

391

msgstr ""

392

393

#: bzrlib/builtins.py:965

393

#: bzrlib/builtins.py:978

394

msgid " bzr mv SOURCE... DESTINATION"

395

msgstr ""

396

397

#: bzrlib/builtins.py:967

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

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

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

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

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

430

#: bzrlib/builtins.py:1000

431

msgid "Avoid making changes when guessing renames."

432

msgstr ""

433

434

#: bzrlib/builtins.py:996

434

#: bzrlib/builtins.py:1009

435

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

436

msgstr ""

437

438

#: bzrlib/builtins.py:1000

438

#: bzrlib/builtins.py:1013

439

msgid "missing file argument"

440

msgstr ""

441

442

#: bzrlib/builtins.py:1004

442

#: bzrlib/builtins.py:1017

443

msgid "can not move root of branch"

444

msgstr ""

445

446

#: bzrlib/builtins.py:1010

446

#: bzrlib/builtins.py:1023

447

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

448

msgstr ""

449

450

#: bzrlib/builtins.py:1013

450

#: bzrlib/builtins.py:1026

451

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

452

msgstr ""

453

454

#: bzrlib/builtins.py:1050

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

458

#: bzrlib/builtins.py:1114

459

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

460

msgstr ""

461

462

#: bzrlib/builtins.py:1104

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

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

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

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

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

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

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

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

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

524

#: bzrlib/builtins.py:1180

525

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

526

msgstr ""

527

528

#: bzrlib/builtins.py:1184

528

#: bzrlib/builtins.py:1196

529

msgid "No pull location known or specified."

530

msgstr ""

531

532

#: bzrlib/builtins.py:1190

532

#: bzrlib/builtins.py:1202

533

#, python-format

534

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

535

msgstr ""

536

537

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

537

#: bzrlib/builtins.py:1209 bzrlib/builtins.py:4406

538

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

539

msgstr ""

540

541

#: bzrlib/builtins.py:1238

541

#: bzrlib/builtins.py:1252

542

msgid "Update a mirror of this branch."

543

msgstr ""

544

545

#: bzrlib/builtins.py:1240

545

#: bzrlib/builtins.py:1254

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

551

#: bzrlib/builtins.py:1257

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

557

#: bzrlib/builtins.py:1260

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

564

#: bzrlib/builtins.py:1264

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

570

#: bzrlib/builtins.py:1267

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

577

#: bzrlib/builtins.py:1271

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

585

#: bzrlib/builtins.py:1276

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:1273 bzrlib/foreign.py:272

594

#: bzrlib/builtins.py:1287 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:1276

600

#: bzrlib/builtins.py:1290

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

607

#: bzrlib/builtins.py:1295

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

614

#: bzrlib/builtins.py:1298

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:1289 bzrlib/foreign.py:279

623

#: bzrlib/builtins.py:1303 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:1292

630

#: bzrlib/builtins.py:1306

631

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

632

msgstr ""

633

634

#: bzrlib/builtins.py:1336

634

#: bzrlib/builtins.py:1350

635

msgid "Could not determine branch to refer to."

636

msgstr ""

637

638

#: bzrlib/builtins.py:1345

638

#: bzrlib/builtins.py:1359

639

#, python-format

640

msgid ""

641

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

642

"use 'bzr push :parent'."

643

msgstr ""

644

645

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

645

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

646

msgid "No push location known or specified."

647

msgstr ""

648

649

#: bzrlib/builtins.py:1355

649

#: bzrlib/builtins.py:1369

650

#, python-format

651

msgid "Using saved push location: %s"

652

msgstr ""

653

654

#: bzrlib/builtins.py:1365

654

#: bzrlib/builtins.py:1379

655

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

656

msgstr ""

657

658

#: bzrlib/builtins.py:1367

658

#: bzrlib/builtins.py:1381

659

msgid ""

660

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

661

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

666

"create ./foo-bar."

667

msgstr ""

668

669

#: bzrlib/builtins.py:1374

669

#: bzrlib/builtins.py:1388

670

msgid ""

671

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

672

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

673

msgstr ""

674

675

#: bzrlib/builtins.py:1377

675

#: bzrlib/builtins.py:1391

676

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

677

msgstr ""

678

679

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

680

#: bzrlib/builtins.py:1387

680

#: bzrlib/builtins.py:1401

681

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

682

msgstr ""

683

684

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

685

#: bzrlib/builtins.py:1389

685

#: bzrlib/builtins.py:1403

686

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

687

msgstr ""

688

689

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

690

#: bzrlib/builtins.py:1392

690

#: bzrlib/builtins.py:1406

691

msgid ""

692

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

693

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

694

msgstr ""

695

696

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

697

#: bzrlib/builtins.py:1396

697

#: bzrlib/builtins.py:1410

698

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

699

msgstr ""

700

701

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

702

#: bzrlib/builtins.py:1398

702

#: bzrlib/builtins.py:1412

703

msgid ""

704

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

705

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

706

msgstr ""

707

708

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

709

#: bzrlib/builtins.py:1403

709

#: bzrlib/builtins.py:1417

710

msgid "Bind new branch to from location."

711

msgstr ""

712

713

#: bzrlib/builtins.py:1450

713

#: bzrlib/builtins.py:1464

714

#, python-format

715

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

716

msgstr ""

717

718

#: bzrlib/builtins.py:1462

718

#: bzrlib/builtins.py:1476

719

#, python-format

720

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

721

msgstr ""

722

723

#: bzrlib/builtins.py:1481

723

#: bzrlib/builtins.py:1495

724

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

725

msgstr ""

726

727

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

727

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

728

#, python-format

729

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

730

msgstr ""

731

732

#: bzrlib/builtins.py:1500

732

#: bzrlib/builtins.py:1514

733

#, python-format

734

msgid "Branched %d revision."

735

msgid_plural "Branched %d revisions."

736

msgstr[0] ""

737

msgstr[1] ""

738

739

#: bzrlib/builtins.py:1505

739

#: bzrlib/builtins.py:1519

740

#, python-format

741

msgid "New branch bound to %s"

742

msgstr ""

743

744

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

744

#: bzrlib/builtins.py:1524 bzrlib/builtins.py:6247

745

#, python-format

746

msgid "Switched to branch: %s"

747

msgstr ""

748

749

#: bzrlib/builtins.py:1515

749

#: bzrlib/builtins.py:1529

750

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

751

msgstr ""

752

753

#: bzrlib/builtins.py:1517

753

#: bzrlib/builtins.py:1531

754

msgid ""

755

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

756

"location."

757

msgstr ""

758

759

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

760

#: bzrlib/builtins.py:1524

760

#: bzrlib/builtins.py:1538

761

msgid ""

762

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

763

"location."

764

msgstr ""

765

766

#: bzrlib/builtins.py:1554

766

#: bzrlib/builtins.py:1567

767

msgid "(default)"

768

msgstr ""

769

770

#: bzrlib/builtins.py:1566

770

#: bzrlib/builtins.py:1579

771

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

772

msgstr ""

773

774

#: bzrlib/builtins.py:1568

774

#: bzrlib/builtins.py:1581

775

msgid ""

776

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

777

"for\n"

781

"location using SFTP."

782

msgstr ""

783

784

#: bzrlib/builtins.py:1573

784

#: bzrlib/builtins.py:1586

785

msgid ""

786

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

787

"will\n"

793

"create ./foo-bar."

794

msgstr ""

795

796

#: bzrlib/builtins.py:1580

796

#: bzrlib/builtins.py:1593

797

msgid ""

798

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

799

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

804

msgstr ""

805

806

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

807

#: bzrlib/builtins.py:1590

807

#: bzrlib/builtins.py:1603

808

msgid ""

809

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

810

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

814

815

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

816

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

817

#: bzrlib/builtins.py:1597

817

#: bzrlib/builtins.py:1610

818

msgid "Get file contents from this tree."

819

msgstr ""

820

821

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

822

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

823

#: bzrlib/builtins.py:1599

823

#: bzrlib/builtins.py:1612

824

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

825

msgstr ""

826

827

#: bzrlib/builtins.py:1640

827

#: bzrlib/builtins.py:1653

828

msgid ""

829

"Show list of renamed files.\n"

830

" "

831

msgstr ""

832

833

#: bzrlib/builtins.py:1670

833

#: bzrlib/builtins.py:1681

834

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

835

msgstr ""

836

837

#: bzrlib/builtins.py:1672

837

#: bzrlib/builtins.py:1683

838

msgid ""

839

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

840

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

841

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

842

msgstr ""

843

844

#: bzrlib/builtins.py:1676

844

#: bzrlib/builtins.py:1687

845

msgid ""

846

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

847

"that is out of date from its branch."

848

msgstr ""

849

850

#: bzrlib/builtins.py:1679

850

#: bzrlib/builtins.py:1690

851

msgid ""

852

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

853

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

855

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

856

msgstr ""

857

858

#: bzrlib/builtins.py:1684

858

#: bzrlib/builtins.py:1695

859

msgid ""

860

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

861

"the branch from the master."

862

msgstr ""

863

864

#: bzrlib/builtins.py:1687

864

#: bzrlib/builtins.py:1698

865

msgid ""

866

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

867

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

871

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

872

msgstr ""

873

874

#: bzrlib/builtins.py:1694

874

#: bzrlib/builtins.py:1705

875

msgid ""

876

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

877

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

878

"current working directory is used."

879

msgstr ""

880

881

#: bzrlib/builtins.py:1710

881

#: bzrlib/builtins.py:1721

882

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

883

msgstr ""

884

885

#: bzrlib/builtins.py:1718

885

#: bzrlib/builtins.py:1729

886

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

887

msgstr ""

888

889

#: bzrlib/builtins.py:1749

889

#: bzrlib/builtins.py:1760

890

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

891

msgstr ""

892

893

#: bzrlib/builtins.py:1765

893

#: bzrlib/builtins.py:1776

894

#, python-format

895

msgid ""

896

"branch has no revision %s\n"

897

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

898

msgstr ""

899

900

#: bzrlib/builtins.py:1771

900

#: bzrlib/builtins.py:1782

901

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

902

msgstr ""

903

904

#: bzrlib/builtins.py:1775

904

#: bzrlib/builtins.py:1786

905

msgid ""

906

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

907

"can be committed with 'bzr commit'."

908

msgstr ""

909

910

#: bzrlib/builtins.py:1784

910

#: bzrlib/builtins.py:1795

911

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

912

msgstr ""

913

914

#: bzrlib/builtins.py:1786

914

#: bzrlib/builtins.py:1797

915

msgid ""

916

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

917

"tree, branch or repository."

918

msgstr ""

919

920

#: bzrlib/builtins.py:1789

920

#: bzrlib/builtins.py:1800

921

msgid ""

922

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

923

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

924

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

925

msgstr ""

926

927

#: bzrlib/builtins.py:1793

927

#: bzrlib/builtins.py:1804

928

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

929

msgstr ""

930

931

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

932

#: bzrlib/builtins.py:6442

931

#: bzrlib/builtins.py:1806 bzrlib/builtins.py:3725 bzrlib/builtins.py:4859

932

#: bzrlib/builtins.py:6433

933

msgid ":Examples:"

934

msgstr ""

935

936

#: bzrlib/builtins.py:1797

936

#: bzrlib/builtins.py:1808

937

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

938

msgstr ""

939

940

#: bzrlib/builtins.py:1799

940

#: bzrlib/builtins.py:1810

941

msgid " bzr info"

942

msgstr ""

943

944

#: bzrlib/builtins.py:1801

944

#: bzrlib/builtins.py:1812

945

msgid ""

946

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

947

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

948

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

949

msgstr ""

950

951

#: bzrlib/builtins.py:1805

951

#: bzrlib/builtins.py:1816

952

msgid " bzr info -v"

953

msgstr ""

954

955

#: bzrlib/builtins.py:1807

955

#: bzrlib/builtins.py:1818

956

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

957

msgstr ""

958

959

#: bzrlib/builtins.py:1809

959

#: bzrlib/builtins.py:1820

960

msgid " bzr info -vv"

961

msgstr ""

962

963

#: bzrlib/builtins.py:1828

963

#: bzrlib/builtins.py:1839

964

msgid "Remove files or directories."

965

msgstr ""

966

967

#: bzrlib/builtins.py:1830

967

#: bzrlib/builtins.py:1841

968

msgid ""

969

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

970

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

974

msgstr ""

975

976

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

977

#: bzrlib/builtins.py:1838

977

#: bzrlib/builtins.py:1849

978

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

979

msgstr ""

980

981

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

982

#: bzrlib/builtins.py:1840

982

#: bzrlib/builtins.py:1851

983

msgid "The file deletion mode to be used."

984

msgstr ""

985

986

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

987

#: bzrlib/builtins.py:1841

987

#: bzrlib/builtins.py:1852

988

msgid "Deletion Strategy"

989

msgstr ""

990

991

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

992

#: bzrlib/builtins.py:1842

992

#: bzrlib/builtins.py:1853

993

msgid "Backup changed files (default)."

994

msgstr ""

995

996

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

997

#: bzrlib/builtins.py:1843

997

#: bzrlib/builtins.py:1854

998

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

999

msgstr ""

1000

1001

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

1002

#: bzrlib/builtins.py:1844

1002

#: bzrlib/builtins.py:1855

1003

msgid "Don't backup changed files."

1004

msgstr ""

1005

1006

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

1007

#: bzrlib/builtins.py:1845

1007

#: bzrlib/builtins.py:1856

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

1013

#: bzrlib/builtins.py:1865

1014

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

1015

msgstr ""

1016

1017

#: bzrlib/builtins.py:1871

1017

#: bzrlib/builtins.py:1882

1018

msgid "No matching files."

1019

msgstr ""

1020

1021

#: bzrlib/builtins.py:1932

1021

#: bzrlib/builtins.py:1943

1022

msgid "Reconcile bzr metadata in a branch."

1023

msgstr ""

1024

1025

#: bzrlib/builtins.py:1934

1025

#: bzrlib/builtins.py:1945

1026

msgid ""

1027

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

1028

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

1030

"advises you to run it."

1031

msgstr ""

1032

1033

#: bzrlib/builtins.py:1939

1033

#: bzrlib/builtins.py:1950

1034

msgid ""

1035

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

1036

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

1038

"correctly in both branches."

1039

msgstr ""

1040

1041

#: bzrlib/builtins.py:1944

1041

#: bzrlib/builtins.py:1955

1042

msgid ""

1043

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

1044

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

1045

msgstr ""

1046

1047

#: bzrlib/builtins.py:1947

1047

#: bzrlib/builtins.py:1958

1048

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

1049

msgstr ""

1050

1054

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

1055

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

1056

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

1057

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

1057

#: bzrlib/builtins.py:2025 bzrlib/builtins.py:2143 bzrlib/builtins.py:3760

1058

msgid ""

1059

"Format for the bzr 2.0 series.\n"

1060

"Uses group-compress storage.\n"

1064

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

1065

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

1066

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

1067

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

1067

#: bzrlib/builtins.py:2025 bzrlib/builtins.py:2143 bzrlib/builtins.py:3760

1068

msgid ""

1069

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

1070

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

1073

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

1074

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

1075

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

1076

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

1076

#: bzrlib/builtins.py:2025 bzrlib/builtins.py:2143 bzrlib/builtins.py:3760

1077

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

1078

msgstr ""

1079

1080

#: bzrlib/builtins.py:2015

1080

#: bzrlib/builtins.py:2026

1081

msgid "Make a directory into a versioned branch."

1082

msgstr ""

1083

1084

#: bzrlib/builtins.py:2017

1084

#: bzrlib/builtins.py:2028

1085

msgid ""

1086

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

1087

"existing project."

1088

msgstr ""

1089

1090

#: bzrlib/builtins.py:2020

1090

#: bzrlib/builtins.py:2031

1091

msgid ""

1092

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

1093

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

1095

"in the .bzr directory."

1096

msgstr ""

1097

1098

#: bzrlib/builtins.py:2025

1098

#: bzrlib/builtins.py:2036

1099

msgid ""

1100

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

1101

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

1102

msgstr ""

1103

1104

#: bzrlib/builtins.py:2028

1104

#: bzrlib/builtins.py:2039

1105

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

1106

msgstr ""

1107

1108

#: bzrlib/builtins.py:2030

1108

#: bzrlib/builtins.py:2041

1109

msgid ""

1110

" cd ~/project\n"

1111

" bzr init\n"

1116

1117

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

1118

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

1119

#: bzrlib/builtins.py:2041

1119

#: bzrlib/builtins.py:2052

1120

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

1121

msgstr ""

1122

1123

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

1124

#: bzrlib/builtins.py:2044

1124

#: bzrlib/builtins.py:2055

1125

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

1126

msgstr ""

1127

1128

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

1129

#: bzrlib/builtins.py:2052

1129

#: bzrlib/builtins.py:2063

1130

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

1131

msgstr ""

1132

1133

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

1134

#: bzrlib/builtins.py:2055

1134

#: bzrlib/builtins.py:2066

1135

msgid "Create a branch without a working tree."

1136

msgstr ""

1137

1138

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

1138

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

1139

#, python-format

1140

msgid ""

1141

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

1142

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

1143

msgstr ""

1144

1145

#: bzrlib/builtins.py:2109

1145

#: bzrlib/builtins.py:2120

1146

msgid ""

1147

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

1148

msgstr ""

1149

1150

#: bzrlib/builtins.py:2120

1150

#: bzrlib/builtins.py:2131

1151

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

1152

msgstr ""

1153

1154

#: bzrlib/builtins.py:2129

1154

#: bzrlib/builtins.py:2140

1155

#, python-format

1156

msgid "Using shared repository: %s\n"

1157

msgstr ""

1158

1159

#: bzrlib/builtins.py:2133

1159

#: bzrlib/builtins.py:2144

1160

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

1161

msgstr ""

1162

1163

#: bzrlib/builtins.py:2135

1163

#: bzrlib/builtins.py:2146

1164

msgid ""

1165

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

1166

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

1168

"speeds up the creation of new branches."

1169

msgstr ""

1170

1171

#: bzrlib/builtins.py:2140

1171

#: bzrlib/builtins.py:2151

1172

msgid ""

1173

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

1174

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

1178

"branches, such as on a server."

1179

msgstr ""

1180

1181

#: bzrlib/builtins.py:2147

1181

#: bzrlib/builtins.py:2158

1182

msgid ""

1183

":Examples:\n"

1184

" Create a shared repository holding just branches::"

1185

msgstr ""

1186

1187

#: bzrlib/builtins.py:2150

1187

#: bzrlib/builtins.py:2161

1188

msgid ""

1189

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

1190

" bzr init repo/trunk"

1191

msgstr ""

1192

1193

#: bzrlib/builtins.py:2153

1193

#: bzrlib/builtins.py:2164

1194

msgid " Make a lightweight checkout elsewhere::"

1195

msgstr ""

1196

1197

#: bzrlib/builtins.py:2155

1197

#: bzrlib/builtins.py:2166

1198

msgid ""

1199

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

1200

" cd trunk-checkout\n"

1202

msgstr ""

1203

1204

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

1205

#: bzrlib/builtins.py:2163

1205

#: bzrlib/builtins.py:2174

1206

msgid ""

1207

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

1208

msgstr ""

1209

1210

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

1211

#: bzrlib/builtins.py:2167

1211

#: bzrlib/builtins.py:2178

1212

msgid "Repository format"

1213

msgstr ""

1214

1215

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

1216

#: bzrlib/builtins.py:2169

1216

#: bzrlib/builtins.py:2180

1217

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

1218

msgstr ""

1219

1220

#: bzrlib/builtins.py:2195

1220

#: bzrlib/builtins.py:2206

1221

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

1222

msgstr ""

1223

1224

#: bzrlib/builtins.py:2197

1224

#: bzrlib/builtins.py:2208

1225

msgid ""

1226

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

1227

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

1231

"given."

1232

msgstr ""

1233

1234

#: bzrlib/builtins.py:2204

1234

#: bzrlib/builtins.py:2215

1235

msgid ""

1236

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

1237

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

1238

msgstr ""

1239

1240

#: bzrlib/builtins.py:2207

1240

#: bzrlib/builtins.py:2218

1241

msgid ""

1242

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

1243

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

1247

"in the range."

1248

msgstr ""

1249

1250

#: bzrlib/builtins.py:2214

1250

#: bzrlib/builtins.py:2225

1251

msgid ""

1252

":Exit values:\n"

1253

" 1 - changed\n"

1256

" 0 - no change"

1257

msgstr ""

1258

1259

#: bzrlib/builtins.py:2220

1259

#: bzrlib/builtins.py:2231

1260

msgid ""

1261

":Examples:\n"

1262

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

1263

msgstr ""

1264

1265

#: bzrlib/builtins.py:2223

1265

#: bzrlib/builtins.py:2234

1266

msgid " bzr diff"

1267

msgstr ""

1268

1269

#: bzrlib/builtins.py:2225

1269

#: bzrlib/builtins.py:2236

1270

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

1271

msgstr ""

1272

1273

#: bzrlib/builtins.py:2227

1273

#: bzrlib/builtins.py:2238

1274

msgid " bzr diff -r1"

1275

msgstr ""

1276

1277

#: bzrlib/builtins.py:2229

1277

#: bzrlib/builtins.py:2240

1278

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

1279

msgstr ""

1280

1281

#: bzrlib/builtins.py:2231

1281

#: bzrlib/builtins.py:2242

1282

msgid " bzr diff -r1..3"

1283

msgstr ""

1284

1285

#: bzrlib/builtins.py:2233

1285

#: bzrlib/builtins.py:2244

1286

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

1287

msgstr ""

1288

1289

#: bzrlib/builtins.py:2235

1289

#: bzrlib/builtins.py:2246

1290

msgid " bzr diff -r1..3 xxx"

1291

msgstr ""

1292

1293

#: bzrlib/builtins.py:2237

1293

#: bzrlib/builtins.py:2248

1294

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

1295

msgstr ""

1296

1297

#: bzrlib/builtins.py:2239

1297

#: bzrlib/builtins.py:2250

1298

msgid " bzr diff -c2"

1299

msgstr ""

1300

1301

#: bzrlib/builtins.py:2241

1301

#: bzrlib/builtins.py:2252

1302

msgid ""

1303

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

1304

" \n"

1305

" bzr diff -cX"

1306

msgstr ""

1307

1308

#: bzrlib/builtins.py:2245

1308

#: bzrlib/builtins.py:2256

1309

msgid ""

1310

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

1311

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

1312

" another parent, use::"

1313

msgstr ""

1314

1315

#: bzrlib/builtins.py:2249

1315

#: bzrlib/builtins.py:2260

1316

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

1317

msgstr ""

1318

1319

#: bzrlib/builtins.py:2251

1319

#: bzrlib/builtins.py:2262

1320

msgid ""

1321

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

1322

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

1323

msgstr ""

1324

1325

#: bzrlib/builtins.py:2254

1325

#: bzrlib/builtins.py:2265

1326

msgid " bzr diff -r-2.."

1327

msgstr ""

1328

1329

#: bzrlib/builtins.py:2256

1329

#: bzrlib/builtins.py:2267

1330

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

1331

msgstr ""

1332

1333

#: bzrlib/builtins.py:2258

1333

#: bzrlib/builtins.py:2269

1334

msgid " bzr diff NEWS"

1335

msgstr ""

1336

1337

#: bzrlib/builtins.py:2260

1337

#: bzrlib/builtins.py:2271

1338

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

1339

msgstr ""

1340

1341

#: bzrlib/builtins.py:2262

1341

#: bzrlib/builtins.py:2273

1342

msgid " bzr diff xxx/NEWS"

1343

msgstr ""

1344

1345

#: bzrlib/builtins.py:2264

1345

#: bzrlib/builtins.py:2275

1346

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

1347

msgstr ""

1348

1349

#: bzrlib/builtins.py:2266

1349

#: bzrlib/builtins.py:2277

1350

msgid " bzr diff --old xxx"

1351

msgstr ""

1352

1353

#: bzrlib/builtins.py:2268

1353

#: bzrlib/builtins.py:2279

1354

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

1355

msgstr ""

1356

1357

#: bzrlib/builtins.py:2270

1357

#: bzrlib/builtins.py:2281

1358

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

1359

msgstr ""

1360

1361

#: bzrlib/builtins.py:2272

1361

#: bzrlib/builtins.py:2283

1362

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

1363

msgstr ""

1364

1365

#: bzrlib/builtins.py:2274

1365

#: bzrlib/builtins.py:2285

1366

msgid ""

1367

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

1368

" \n"

1372

msgstr ""

1373

1374

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

1375

#: bzrlib/builtins.py:2284

1375

#: bzrlib/builtins.py:2295

1376

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

1377

msgstr ""

1378

1379

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

1380

#: bzrlib/builtins.py:2287

1380

#: bzrlib/builtins.py:2298

1381

msgid ""

1382

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

1383

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

1384

msgstr ""

1385

1386

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

1387

#: bzrlib/builtins.py:2290

1387

#: bzrlib/builtins.py:2301

1388

msgid "Branch/tree to compare from."

1389

msgstr ""

1390

1391

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

1392

#: bzrlib/builtins.py:2294

1392

#: bzrlib/builtins.py:2305

1393

msgid "Branch/tree to compare to."

1394

msgstr ""

1395

1396

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

1397

#: bzrlib/builtins.py:2300

1397

#: bzrlib/builtins.py:2311

1398

msgid "Use this command to compare files."

1399

msgstr ""

1400

1401

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

1402

#: bzrlib/builtins.py:2305

1402

#: bzrlib/builtins.py:2316

1403

msgid "Diff format to use."

1404

msgstr ""

1405

1406

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

1407

#: bzrlib/builtins.py:2307

1407

#: bzrlib/builtins.py:2318

1408

msgid "Diff format"

1409

msgstr ""

1410

1411

#: bzrlib/builtins.py:2329

1411

#: bzrlib/builtins.py:2340

1412

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

1413

msgstr ""

1414

1415

#: bzrlib/builtins.py:2333

1415

#: bzrlib/builtins.py:2344

1416

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

1417

msgstr ""

1418

1419

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

1420

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

1419

#: bzrlib/builtins.py:2349 bzrlib/builtins.py:2746 bzrlib/builtins.py:2759

1420

#: bzrlib/builtins.py:2767 bzrlib/builtins.py:4933

1421

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

1422

msgstr ""

1423

1424

#: bzrlib/builtins.py:2358

1424

#: bzrlib/builtins.py:2369

1425

msgid ""

1426

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

1427

" "

1428

msgstr ""

1429

1430

#: bzrlib/builtins.py:2436

1430

#: bzrlib/builtins.py:2446

1431

msgid "Show the tree root directory."

1432

msgstr ""

1433

1434

#: bzrlib/builtins.py:2438

1434

#: bzrlib/builtins.py:2448

1435

msgid ""

1436

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

1437

"directory."

1438

msgstr ""

1439

1440

#: bzrlib/builtins.py:2453

1440

#: bzrlib/builtins.py:2463

1441

msgid "The limit argument must be an integer."

1442

msgstr ""

1443

1444

#: bzrlib/builtins.py:2461

1444

#: bzrlib/builtins.py:2471

1445

msgid "The levels argument must be an integer."

1446

msgstr ""

1447

1448

#: bzrlib/builtins.py:2466

1448

#: bzrlib/builtins.py:2476

1449

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

1450

msgstr ""

1451

1452

#: bzrlib/builtins.py:2468

1452

#: bzrlib/builtins.py:2478

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

1460

#: bzrlib/builtins.py:2483

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

1467

#: bzrlib/builtins.py:2487

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

1477

#: bzrlib/builtins.py:2494

1478

msgid ":Output control:"

1479

msgstr ""

1480

1481

#: bzrlib/builtins.py:2486

1481

#: bzrlib/builtins.py:2496

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

1489

#: bzrlib/builtins.py:2501

1490

msgid ""

1491

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

1492

" displayed::"

1493

msgstr ""

1494

1495

#: bzrlib/builtins.py:2494

1495

#: bzrlib/builtins.py:2504

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

1504

#: bzrlib/builtins.py:2510

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

1511

#: bzrlib/builtins.py:2514

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

1518

#: bzrlib/builtins.py:2518

1519

msgid ":Ordering control:"

1520

msgstr ""

1521

1522

#: bzrlib/builtins.py:2510

1522

#: bzrlib/builtins.py:2520

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

1530

#: bzrlib/builtins.py:2525

1531

msgid ":Revision filtering:"

1532

msgstr ""

1533

1534

#: bzrlib/builtins.py:2517

1534

#: bzrlib/builtins.py:2527

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

1540

#: bzrlib/builtins.py:2530

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

1548

#: bzrlib/builtins.py:2535

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

1554

#: bzrlib/builtins.py:2538

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

1564

#: bzrlib/builtins.py:2545

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

1574

#: bzrlib/builtins.py:2552

1575

msgid ":Path filtering:"

1576

msgstr ""

1577

1578

#: bzrlib/builtins.py:2544

1578

#: bzrlib/builtins.py:2554

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

1585

#: bzrlib/builtins.py:2558

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

1592

#: bzrlib/builtins.py:2562

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

1598

#: bzrlib/builtins.py:2565

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

1605

#: bzrlib/builtins.py:2569

1606

msgid " In this case:"

1607

msgstr ""

1608

1609

#: bzrlib/builtins.py:2561

1609

#: bzrlib/builtins.py:2571

1610

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

1611

msgstr ""

1612

1613

#: bzrlib/builtins.py:2563

1613

#: bzrlib/builtins.py:2573

1614

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

1615

msgstr ""

1616

1617

#: bzrlib/builtins.py:2565

1617

#: bzrlib/builtins.py:2575

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

1623

#: bzrlib/builtins.py:2578

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

1629

#: bzrlib/builtins.py:2581

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

1636

#: bzrlib/builtins.py:2585

1637

msgid ":Other filtering:"

1638

msgstr ""

1639

1640

#: bzrlib/builtins.py:2577

1640

#: bzrlib/builtins.py:2587

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

1649

#: bzrlib/builtins.py:2593

1650

msgid ":Tips & tricks:"

1651

msgstr ""

1652

1653

#: bzrlib/builtins.py:2585

1653

#: bzrlib/builtins.py:2595

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

1662

#: bzrlib/builtins.py:2601

1663

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

1664

msgstr ""

1665

1666

#: bzrlib/builtins.py:2593

1666

#: bzrlib/builtins.py:2603

1667

msgid ""

1668

" [ALIASES]\n"

1669

" tip = log -r-1\n"

1671

" show = log -v -p"

1672

msgstr ""

1673

1674

#: bzrlib/builtins.py:2598

1674

#: bzrlib/builtins.py:2608

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

1681

#: bzrlib/builtins.py:2612

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

1687

#: bzrlib/builtins.py:2615

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

1695

#: bzrlib/builtins.py:2620

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

1703

#: bzrlib/builtins.py:2625

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

1712

#: bzrlib/builtins.py:2634

1713

msgid "Show from oldest to newest."

1714

msgstr ""

1715

1716

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

1717

#: bzrlib/builtins.py:2627

1717

#: bzrlib/builtins.py:2637

1718

msgid "Show files changed in each revision."

1719

msgstr ""

1720

1721

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

1722

#: bzrlib/builtins.py:2633

1722

#: bzrlib/builtins.py:2643

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

1727

#: bzrlib/builtins.py:2647

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

1732

#: bzrlib/builtins.py:2648

1733

msgid "Authors"

1734

msgstr ""

1735

1736

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

1737

#: bzrlib/builtins.py:2643

1737

#: bzrlib/builtins.py:2653

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

1742

#: bzrlib/builtins.py:2663

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

1747

#: bzrlib/builtins.py:2668

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

1752

#: bzrlib/builtins.py:2670

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

1757

#: bzrlib/builtins.py:2674

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

1762

#: bzrlib/builtins.py:2676

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

1769

#: bzrlib/builtins.py:2680

1770

msgid "Show digital signature validity."

1771

msgstr ""

1772

1773

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

1774

#: bzrlib/builtins.py:2673

1774

#: bzrlib/builtins.py:2683

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

1779

#: bzrlib/builtins.py:2687

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

1784

#: bzrlib/builtins.py:2691

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

1789

#: bzrlib/builtins.py:2695

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

1794

#: bzrlib/builtins.py:2699

1795

msgid "Show revisions whose bugs match this expression."

1796

msgstr ""

1797

1798

#: bzrlib/builtins.py:2743

1798

#: bzrlib/builtins.py:2753

1799

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

1800

msgstr ""

1801

1802

#: bzrlib/builtins.py:2771

1802

#: bzrlib/builtins.py:2781

1803

#, python-format

1804

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

1805

msgstr ""

1806

1807

#: bzrlib/builtins.py:2888

1807

#: bzrlib/builtins.py:2898

1808

#, python-format

1809

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

1810

msgstr ""

1811

1812

#: bzrlib/builtins.py:2904

1812

#: bzrlib/builtins.py:2914

1813

#, python-format

1814

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

1815

msgstr ""

1816

1817

#: bzrlib/builtins.py:2949

1817

#: bzrlib/builtins.py:2959

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

1824

#: bzrlib/builtins.py:2968

1825

msgid "Recurse into subdirectories."

1826

msgstr ""

1827

1828

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

1829

#: bzrlib/builtins.py:2960

1829

#: bzrlib/builtins.py:2970

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

1834

#: bzrlib/builtins.py:2972

1835

msgid "Print unknown files."

1836

msgstr ""

1837

1838

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

1839

#: bzrlib/builtins.py:2963

1839

#: bzrlib/builtins.py:2973

1840

msgid "Print versioned files."

1841

msgstr ""

1842

1843

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

1844

#: bzrlib/builtins.py:2966

1844

#: bzrlib/builtins.py:2976

1845

msgid "Print ignored files."

1846

msgstr ""

1847

1848

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

1849

#: bzrlib/builtins.py:2968

1849

#: bzrlib/builtins.py:2978

1850

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

1851

msgstr ""

1852

1853

#: bzrlib/builtins.py:2981

1853

#: bzrlib/builtins.py:2991

1854

msgid "invalid kind specified"

1855

msgstr ""

1856

1857

#: bzrlib/builtins.py:2984

1857

#: bzrlib/builtins.py:2994

1858

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

1859

msgstr ""

1860

1861

#: bzrlib/builtins.py:2993

1861

#: bzrlib/builtins.py:3003

1862

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

1863

msgstr ""

1864

1865

#: bzrlib/builtins.py:3080

1865

#: bzrlib/builtins.py:3090

1866

msgid "Ignore specified files or patterns."

1867

msgstr ""

1868

1869

#: bzrlib/builtins.py:3082

1869

#: bzrlib/builtins.py:3092

1870

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

1871

msgstr ""

1872

1873

#: bzrlib/builtins.py:3084

1873

#: bzrlib/builtins.py:3094

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

1882

#: bzrlib/builtins.py:3100

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

1890

#: bzrlib/builtins.py:3105

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

1899

#: bzrlib/builtins.py:3111

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

1906

#: bzrlib/builtins.py:3115

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

1912

#: bzrlib/builtins.py:3118

1913

msgid ""

1914

":Notes: \n"

1915

" \n"

1917

" the shell on Unix."

1918

msgstr ""

1919

1920

#: bzrlib/builtins.py:3113

1920

#: bzrlib/builtins.py:3123

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

1926

#: bzrlib/builtins.py:3126

1927

msgid ""

1928

":Examples:\n"

1929

" Ignore the top level Makefile::"

1930

msgstr ""

1931

1932

#: bzrlib/builtins.py:3119

1932

#: bzrlib/builtins.py:3129

1933

msgid " bzr ignore ./Makefile"

1934

msgstr ""

1935

1936

#: bzrlib/builtins.py:3121

1936

#: bzrlib/builtins.py:3131

1937

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

1938

msgstr ""

1939

1940

#: bzrlib/builtins.py:3123

1940

#: bzrlib/builtins.py:3133

1941

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

1942

msgstr ""

1943

1944

#: bzrlib/builtins.py:3125

1944

#: bzrlib/builtins.py:3135

1945

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

1946

msgstr ""

1947

1948

#: bzrlib/builtins.py:3127

1948

#: bzrlib/builtins.py:3137

1949

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

1950

msgstr ""

1951

1952

#: bzrlib/builtins.py:3129

1952

#: bzrlib/builtins.py:3139

1953

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

1954

msgstr ""

1955

1956

#: bzrlib/builtins.py:3131

1956

#: bzrlib/builtins.py:3141

1957

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

1958

msgstr ""

1959

1960

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

1960

#: bzrlib/builtins.py:3143 bzrlib/builtins.py:3147

1961

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

1962

msgstr ""

1963

1964

#: bzrlib/builtins.py:3135

1964

#: bzrlib/builtins.py:3145

1965

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

1966

msgstr ""

1967

1968

#: bzrlib/builtins.py:3139

1968

#: bzrlib/builtins.py:3149

1969

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

1970

msgstr ""

1971

1972

#: bzrlib/builtins.py:3141

1972

#: bzrlib/builtins.py:3151

1973

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

1974

msgstr ""

1975

1976

#: bzrlib/builtins.py:3143

1976

#: bzrlib/builtins.py:3153

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

1989

#: bzrlib/builtins.py:3167

1990

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

1991

msgstr ""

1992

1993

#: bzrlib/builtins.py:3169

1993

#: bzrlib/builtins.py:3179

1994

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

1995

msgstr ""

1996

1997

#: bzrlib/builtins.py:3180

1997

#: bzrlib/builtins.py:3190

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

2004

#: bzrlib/builtins.py:3199

2005

msgid "NAME_PATTERN should not be an absolute path"

2006

msgstr ""

2007

2008

#: bzrlib/builtins.py:3202

2008

#: bzrlib/builtins.py:3212

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

2018

#: bzrlib/builtins.py:3219

2019

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

2020

msgstr ""

2021

2022

#: bzrlib/builtins.py:3211

2022

#: bzrlib/builtins.py:3221

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

2028

#: bzrlib/builtins.py:3224

2029

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

2030

msgstr ""

2031

2032

#: bzrlib/builtins.py:3216

2032

#: bzrlib/builtins.py:3226

2033

msgid " bzr ls --ignored"

2034

msgstr ""

2035

2036

#: bzrlib/builtins.py:3250

2036

#: bzrlib/builtins.py:3260

2037

#, python-format

2038

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

2039

msgstr ""

2040

2041

#: bzrlib/builtins.py:3257

2041

#: bzrlib/builtins.py:3267

2042

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

2043

msgstr ""

2044

2045

#: bzrlib/builtins.py:3259

2045

#: bzrlib/builtins.py:3269

2046

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

2047

msgstr ""

2048

2049

#: bzrlib/builtins.py:3261

2049

#: bzrlib/builtins.py:3271

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

2056

#: bzrlib/builtins.py:3275

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

2063

#: bzrlib/builtins.py:3279

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

2069

#: bzrlib/builtins.py:3282

2070

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

2071

msgstr ""

2072

2073

#: bzrlib/builtins.py:3274

2073

#: bzrlib/builtins.py:3284

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

2087

#: bzrlib/builtins.py:3298

2088

msgid "Type of file to export to."

2089

msgstr ""

2090

2091

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

2092

#: bzrlib/builtins.py:3291

2092

#: bzrlib/builtins.py:3301

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

2097

#: bzrlib/builtins.py:3305

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

2102

#: bzrlib/builtins.py:3307

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

2109

#: bzrlib/builtins.py:3310

2110

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

2111

msgstr ""

2112

2113

#: bzrlib/builtins.py:3319

2113

#: bzrlib/builtins.py:3329

2114

msgid "--uncommitted requires a working tree"

2115

msgstr ""

2116

2117

#: bzrlib/builtins.py:3328

2117

#: bzrlib/builtins.py:3338

2118

#, python-format

2119

msgid "Unsupported export format: %s"

2120

msgstr ""

2121

2122

#: bzrlib/builtins.py:3332

2122

#: bzrlib/builtins.py:3342

2123

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

2124

msgstr ""

2125

2126

#: bzrlib/builtins.py:3334

2126

#: bzrlib/builtins.py:3344

2127

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

2128

msgstr ""

2129

2130

#: bzrlib/builtins.py:3336

2130

#: bzrlib/builtins.py:3346

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

2137

#: bzrlib/builtins.py:3352

2138

msgid "The path name in the old tree."

2139

msgstr ""

2140

2141

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

2142

#: bzrlib/builtins.py:3343

2142

#: bzrlib/builtins.py:3353

2143

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

2144

msgstr ""

2145

2146

#: bzrlib/builtins.py:3354

2146

#: bzrlib/builtins.py:3364

2147

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

2148

msgstr ""

2149

2150

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

2150

#: bzrlib/builtins.py:3389 bzrlib/builtins.py:3401

2151

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

2152

msgstr ""

2153

2154

#: bzrlib/builtins.py:3414

2154

#: bzrlib/builtins.py:3424

2155

msgid "Commit changes into a new revision."

2156

msgstr ""

2157

2158

#: bzrlib/builtins.py:3416

2158

#: bzrlib/builtins.py:3426

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

2168

#: bzrlib/builtins.py:3433

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

2175

#: bzrlib/builtins.py:3437

2176

msgid ":Selective commits:"

2177

msgstr ""

2178

2179

#: bzrlib/builtins.py:3429

2179

#: bzrlib/builtins.py:3439

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

2186

#: bzrlib/builtins.py:3443

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

2193

#: bzrlib/builtins.py:3447

2194

msgid " bzr commit foo -x foo/bar"

2195

msgstr ""

2196

2197

#: bzrlib/builtins.py:3439

2197

#: bzrlib/builtins.py:3449

2198

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

2199

msgstr ""

2200

2201

#: bzrlib/builtins.py:3441

2201

#: bzrlib/builtins.py:3451

2202

msgid ":Custom authors:"

2203

msgstr ""

2204

2205

#: bzrlib/builtins.py:3443

2205

#: bzrlib/builtins.py:3453

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

2215

#: bzrlib/builtins.py:3460

2216

msgid ":Checks:"

2217

msgstr ""

2218

2219

#: bzrlib/builtins.py:3452

2219

#: bzrlib/builtins.py:3462

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

2228

#: bzrlib/builtins.py:3468

2229

msgid ":Things to note:"

2230

msgstr ""

2231

2232

#: bzrlib/builtins.py:3460

2232

#: bzrlib/builtins.py:3470

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

2239

#: bzrlib/builtins.py:3474

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

2248

#: bzrlib/builtins.py:3484

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

2253

#: bzrlib/builtins.py:3487

2254

msgid "Description of the new revision."

2255

msgstr ""

2256

2257

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

2258

#: bzrlib/builtins.py:3480

2258

#: bzrlib/builtins.py:3490

2259

msgid "Commit even if nothing has changed."

2260

msgstr ""

2261

2262

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

2263

#: bzrlib/builtins.py:3484

2263

#: bzrlib/builtins.py:3494

2264

msgid "Take commit message from this file."

2265

msgstr ""

2266

2267

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

2268

#: bzrlib/builtins.py:3486

2268

#: bzrlib/builtins.py:3496

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

2273

#: bzrlib/builtins.py:3499

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

2280

#: bzrlib/builtins.py:3502

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

2285

#: bzrlib/builtins.py:3505

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

2290

#: bzrlib/builtins.py:3508

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

2297

#: bzrlib/builtins.py:3514

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

2304

#: bzrlib/builtins.py:3517

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

2310

#: bzrlib/builtins.py:3535

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

2318

#: bzrlib/builtins.py:3544

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

2326

#: bzrlib/builtins.py:3553

2327

#, python-format

2328

msgid "Unrecognized bug %s. Commit refused."

2329

msgstr ""

2330

2331

#: bzrlib/builtins.py:3546

2331

#: bzrlib/builtins.py:3556

2332

#, python-format

2333

msgid ""

2334

"%s\n"

2335

"Commit refused."

2336

msgstr ""

2337

2338

#: bzrlib/builtins.py:3570

2338

#: bzrlib/builtins.py:3580

2339

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

2340

msgstr ""

2341

2342

#: bzrlib/builtins.py:3610

2342

#: bzrlib/builtins.py:3620

2343

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

2344

msgstr ""

2345

2346

#: bzrlib/builtins.py:3639

2346

#: bzrlib/builtins.py:3649

2347

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

2348

msgstr ""

2349

2350

#: bzrlib/builtins.py:3642

2350

#: bzrlib/builtins.py:3652

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

2356

#: bzrlib/builtins.py:3672

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

2362

#: bzrlib/builtins.py:3676

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

2368

#: bzrlib/builtins.py:3680

2369

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

2370

msgstr ""

2371

2372

#: bzrlib/builtins.py:3673

2372

#: bzrlib/builtins.py:3683

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

2379

#: bzrlib/builtins.py:3691

2380

msgid ""

2381

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

2382

msgstr ""

2383

2384

#: bzrlib/builtins.py:3683

2384

#: bzrlib/builtins.py:3693

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

2390

#: bzrlib/builtins.py:3696

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

2396

#: bzrlib/builtins.py:3699

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

2403

#: bzrlib/builtins.py:3703

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

2410

#: bzrlib/builtins.py:3707

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

2418

#: bzrlib/builtins.py:3712

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

2425

#: bzrlib/builtins.py:3716

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

2434

#: bzrlib/builtins.py:3722

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

2441

#: bzrlib/builtins.py:3727

2442

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

2443

msgstr ""

2444

2445

#: bzrlib/builtins.py:3719

2445

#: bzrlib/builtins.py:3729

2446

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

2447

msgstr ""

2448

2449

#: bzrlib/builtins.py:3721

2449

#: bzrlib/builtins.py:3731

2450

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

2451

msgstr ""

2452

2453

#: bzrlib/builtins.py:3723

2453

#: bzrlib/builtins.py:3733

2454

msgid " bzr check --repo bar"

2455

msgstr ""

2456

2457

#: bzrlib/builtins.py:3725

2457

#: bzrlib/builtins.py:3735

2458

msgid " Check everything at 'baz'::"

2459

msgstr ""

2460

2461

#: bzrlib/builtins.py:3727

2461

#: bzrlib/builtins.py:3737

2462

msgid " bzr check baz"

2463

msgstr ""

2464

2465

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

2466

#: bzrlib/builtins.py:3733

2466

#: bzrlib/builtins.py:3743

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

2471

#: bzrlib/builtins.py:3745

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

2476

#: bzrlib/builtins.py:3747

2477

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

2478

msgstr ""

2479

2480

#: bzrlib/builtins.py:3751

2480

#: bzrlib/builtins.py:3761

2481

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

2482

msgstr ""

2483

2484

#: bzrlib/builtins.py:3753

2484

#: bzrlib/builtins.py:3763

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

2493

#: bzrlib/builtins.py:3769

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

2503

#: bzrlib/builtins.py:3776

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

2514

#: bzrlib/builtins.py:3784

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

2522

#: bzrlib/builtins.py:3789

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

2529

#: bzrlib/builtins.py:3797

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

2535

#: bzrlib/builtins.py:3801

2536

msgid "Branch format"

2537

msgstr ""

2538

2539

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

2540

#: bzrlib/builtins.py:3793

2540

#: bzrlib/builtins.py:3803

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

2546

#: bzrlib/builtins.py:3805

2547

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

2548

msgstr ""

2549

2550

#: bzrlib/builtins.py:3810

2550

#: bzrlib/builtins.py:3820

2551

msgid "Show or set bzr user id."

2552

msgstr ""

2553

2554

#: bzrlib/builtins.py:3812

2554

#: bzrlib/builtins.py:3822

2555

msgid ""

2556

":Examples:\n"

2557

" Show the email of the current user::"

2558

msgstr ""

2559

2560

#: bzrlib/builtins.py:3815

2560

#: bzrlib/builtins.py:3825

2561

msgid " bzr whoami --email"

2562

msgstr ""

2563

2564

#: bzrlib/builtins.py:3817

2564

#: bzrlib/builtins.py:3827

2565

msgid " Set the current user::"

2566

msgstr ""

2567

2568

#: bzrlib/builtins.py:3819

2568

#: bzrlib/builtins.py:3829

2569

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

2570

msgstr ""

2571

2572

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

2573

#: bzrlib/builtins.py:3823

2573

#: bzrlib/builtins.py:3833

2574

msgid "Display email address only."

2575

msgstr ""

2576

2577

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

2578

#: bzrlib/builtins.py:3825

2578

#: bzrlib/builtins.py:3835

2579

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

2580

msgstr ""

2581

2582

#: bzrlib/builtins.py:3851

2582

#: bzrlib/builtins.py:3861

2583

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

2584

msgstr ""

2585

2586

#: bzrlib/builtins.py:3873

2586

#: bzrlib/builtins.py:3885

2587

msgid "Print or set the branch nickname."

2588

msgstr ""

2589

2590

#: bzrlib/builtins.py:3875

2590

#: bzrlib/builtins.py:3887

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

2597

#: bzrlib/builtins.py:3891

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

2603

#: bzrlib/builtins.py:3911

2603

2604

msgid "Set/unset and display aliases."

2604

2605

msgstr ""

2605

2606

#: bzrlib/builtins.py:3900

2607

#: bzrlib/builtins.py:3913

2607

2608

msgid ""

2608

2609

":Examples:\n"

2609

2610

" Show the current aliases::"

2610

2611

msgstr ""

2611

2612

#: bzrlib/builtins.py:3903

2613

#: bzrlib/builtins.py:3916

2613

2614

msgid " bzr alias"

2614

2615

msgstr ""

2615

2616

#: bzrlib/builtins.py:3905

2617

#: bzrlib/builtins.py:3918

2617

2618

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

2618

2619

msgstr ""

2619

2620

#: bzrlib/builtins.py:3907

2621

#: bzrlib/builtins.py:3920

2621

2622

msgid " bzr alias ll"

2622

2623

msgstr ""

2623

2624

#: bzrlib/builtins.py:3909

2625

#: bzrlib/builtins.py:3922

2625

2626

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

2626

2627

msgstr ""

2627

2628

#: bzrlib/builtins.py:3911

2629

#: bzrlib/builtins.py:3924

2629

2630

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

2630

2631

msgstr ""

2631

2632

#: bzrlib/builtins.py:3913

2633

#: bzrlib/builtins.py:3926

2633

2634

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

2634

2635

msgstr ""

2635

2636

#: bzrlib/builtins.py:3915

2637

#: bzrlib/builtins.py:3928

2637

2638

msgid " bzr alias --remove ll"

2638

2639

msgstr ""

2639

2640

2641

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

2641

#: bzrlib/builtins.py:3920

2642

#: bzrlib/builtins.py:3933

2642

2643

msgid "Remove the alias."

2643

2644

msgstr ""

2644

2645

#: bzrlib/builtins.py:3938

2646

#: bzrlib/builtins.py:3951

2646

2647

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

2647

2648

msgstr ""

2648

2649

#: bzrlib/builtins.py:4119

2650

#: bzrlib/builtins.py:4132

2650

2651

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

2651

2652

msgstr ""

2652

2653

#: bzrlib/builtins.py:4136

2654

#: bzrlib/builtins.py:4149

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

2659

#: bzrlib/builtins.py:4196

2659

2660

msgid "Show version of bzr."

2660

2661

msgstr ""

2661

2662

2663

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

2663

#: bzrlib/builtins.py:4187

2664

#: bzrlib/builtins.py:4200

2664

2665

msgid "Print just the version number."

2665

2666

msgstr ""

2666

2667

#: bzrlib/builtins.py:4206

2668

#: bzrlib/builtins.py:4219

2668

2669

msgid "It sure does!\n"

2669

2670

msgstr ""

2670

2671

#: bzrlib/builtins.py:4230

2672

#: bzrlib/builtins.py:4243

2672

2673

#, python-format

2673

2674

msgid "merge base is revision %s\n"

2674

2675

msgstr ""

2675

2676

#: bzrlib/builtins.py:4234

2677

#: bzrlib/builtins.py:4247

2677

2678

msgid "Perform a three-way merge."

2678

2679

msgstr ""

2679

2680

#: bzrlib/builtins.py:4236

2681

#: bzrlib/builtins.py:4249

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

2692

#: bzrlib/builtins.py:4257

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

2699

#: bzrlib/builtins.py:4261

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

2705

#: bzrlib/builtins.py:4264

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

2716

#: bzrlib/builtins.py:4272

2716

2717

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

2717

2718

msgstr ""

2718

2719

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

2720

#: bzrlib/builtins.py:4274 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"

2724

2725

"before you can commit."

2725

2726

msgstr ""

2726

2727

#: bzrlib/builtins.py:4266

2728

#: bzrlib/builtins.py:4279

2728

2729

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

2729

2730

msgstr ""

2730

2731

#: bzrlib/builtins.py:4268

2732

#: bzrlib/builtins.py:4281

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

2740

#: bzrlib/builtins.py:4286

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

2747

#: bzrlib/builtins.py:4290

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

2756

#: bzrlib/builtins.py:4296

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

2763

#: bzrlib/builtins.py:4300

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

2769

#: bzrlib/builtins.py:4303

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

2775

#: bzrlib/builtins.py:4306

2775

2776

msgid " bzr merge ../bzr.dev"

2776

2777

msgstr ""

2777

2778

#: bzrlib/builtins.py:4295

2779

#: bzrlib/builtins.py:4308

2779

2780

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

2780

2781

msgstr ""

2781

2782

#: bzrlib/builtins.py:4297

2783

#: bzrlib/builtins.py:4310

2783

2784

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

2784

2785

msgstr ""

2785

2786

#: bzrlib/builtins.py:4299

2787

#: bzrlib/builtins.py:4312

2787

2788

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

2788

2789

msgstr ""

2789

2790

#: bzrlib/builtins.py:4301

2791

#: bzrlib/builtins.py:4314

2791

2792

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

2792

2793

msgstr ""

2793

2794

#: bzrlib/builtins.py:4303

2795

#: bzrlib/builtins.py:4316

2795

2796

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

2796

2797

msgstr ""

2797

2798

#: bzrlib/builtins.py:4305

2799

#: bzrlib/builtins.py:4318

2799

2800

msgid " bzr merge /tmp/merge"

2800

2801

msgstr ""

2801

2802

#: bzrlib/builtins.py:4307

2803

#: bzrlib/builtins.py:4320

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

2809

#: bzrlib/builtins.py:4323

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

2817

#: bzrlib/builtins.py:4335

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

2822

#: bzrlib/builtins.py:4341

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

2828

#: bzrlib/builtins.py:4343

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

2836

#: bzrlib/builtins.py:4348

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

2842

#: bzrlib/builtins.py:4350

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

2847

#: bzrlib/builtins.py:4352

2847

2848

msgid "Select changes interactively."

2848

2849

msgstr ""

2849

2850

#: bzrlib/builtins.py:4361

2851

#: bzrlib/builtins.py:4374

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

2857

#: bzrlib/builtins.py:4401

2857

2858

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

2858

2859

msgstr ""

2859

2860

#: bzrlib/builtins.py:4399

2861

#: bzrlib/builtins.py:4412

2861

2862

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

2862

2863

msgstr ""

2863

2864

#: bzrlib/builtins.py:4419

2865

#: bzrlib/builtins.py:4432

2865

2866

msgid "merger: "

2866

2867

msgstr ""

2867

2868

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

2869

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

2869

2870

msgid "Nothing to do."

2870

2871

msgstr ""

2871

2872

#: bzrlib/builtins.py:4425

2873

#: bzrlib/builtins.py:4438

2873

2874

msgid "Cannot pull individual files"

2874

2875

msgstr ""

2875

2876

#: bzrlib/builtins.py:4433

2877

#: bzrlib/builtins.py:4446

2877

2878

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

2878

2879

msgstr ""

2879

2880

#: bzrlib/builtins.py:4491

2881

#: bzrlib/builtins.py:4504

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

2886

#: bzrlib/builtins.py:4513

2886

2887

#, python-format

2887

2888

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

2888

2889

msgstr ""

2889

2890

#: bzrlib/builtins.py:4504

2891

#: bzrlib/builtins.py:4517

2891

2892

msgid "Cannot do conflict reduction and show base."

2892

2893

msgstr ""

2893

2894

#: bzrlib/builtins.py:4615

2895

#: bzrlib/builtins.py:4628

2895

2896

msgid "No location specified or remembered"

2896

2897

msgstr ""

2897

2898

#: bzrlib/builtins.py:4617

2899

#: bzrlib/builtins.py:4630

2899

2900

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

2900

2901

msgstr ""

2901

2902

#: bzrlib/builtins.py:4623

2903

#: bzrlib/builtins.py:4636

2903

2904

msgid "Redo a merge."

2904

2905

msgstr ""

2905

2906

#: bzrlib/builtins.py:4625

2907

#: bzrlib/builtins.py:4638

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

2914

#: bzrlib/builtins.py:4642

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

2921

#: bzrlib/builtins.py:4646

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

2928

#: bzrlib/builtins.py:4650

2928

2929

msgid " bzr remerge --show-base"

2929

2930

msgstr ""

2930

2931

#: bzrlib/builtins.py:4639

2932

#: bzrlib/builtins.py:4652

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

2938

#: bzrlib/builtins.py:4655

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

2946

#: bzrlib/builtins.py:4662

2946

2947

msgid "Show base revision text in conflicts."

2947

2948

msgstr ""

2948

2949

#: bzrlib/builtins.py:4661

2950

#: bzrlib/builtins.py:4674

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

2956

#: bzrlib/builtins.py:4731

2956

2957

msgid "Revert files to a previous revision."

2957

2958

msgstr ""

2958

2959

#: bzrlib/builtins.py:4719

2960

#: bzrlib/builtins.py:4733

2960

2961

msgid ""

2961

2962

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

2962

2963

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

2963

2964

"last committed revision is used."

2964

2965

msgstr ""

2965

2966

#: bzrlib/builtins.py:4723

2967

#: bzrlib/builtins.py:4737

2967

2968

msgid ""

2968

2969

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

2969

2970

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

2972

2973

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

2973

2974

msgstr ""

2974

2975

#: bzrlib/builtins.py:4729

2976

#: bzrlib/builtins.py:4743

2976

2977

msgid ""

2977

2978

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

2978

2979

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

2979

2980

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

2980

2981

msgstr ""

2981

2982

#: bzrlib/builtins.py:4733

2983

#: bzrlib/builtins.py:4747

2983

2984

msgid ""

2984

2985

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

2985

2986

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

2987

2988

"reverted."

2988

2989

msgstr ""

2989

2990

#: bzrlib/builtins.py:4738

2991

#: bzrlib/builtins.py:4752

2991

2992

msgid ""

2992

2993

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

2993

2994

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

2995

2996

"deleted."

2996

2997

msgstr ""

2997

2998

#: bzrlib/builtins.py:4743

2999

#: bzrlib/builtins.py:4757

2999

3000

msgid ""

3000

3001

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

3001

3002

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

3007

3008

"reverting any files."

3008

3009

msgstr ""

3009

3010

#: bzrlib/builtins.py:4752

3011

#: bzrlib/builtins.py:4766

3011

3012

msgid ""

3012

3013

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

3013

3014

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

3022

3023

msgstr ""

3023

3024

3025

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

3025

#: bzrlib/builtins.py:4766

3026

#: bzrlib/builtins.py:4780

3026

3027

msgid "Do not save backups of reverted files."

3027

3028

msgstr ""

3028

3029

3030

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

3030

#: bzrlib/builtins.py:4768

3031

#: bzrlib/builtins.py:4782

3031

3032

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

3032

3033

msgstr ""

3033

3034

#: bzrlib/builtins.py:4799

3035

#: bzrlib/builtins.py:4813

3035

3036

msgid ""

3036

3037

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

3037

3038

" "

3038

3039

msgstr ""

3039

3040

3041

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

3041

#: bzrlib/builtins.py:4804

3042

#: bzrlib/builtins.py:4818

3042

3043

msgid "Show help on all commands."

3043

3044

msgstr ""

3044

3045

#: bzrlib/builtins.py:4833

3046

#: bzrlib/builtins.py:4847

3046

3047

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

3047

3048

msgstr ""

3048

3049

#: bzrlib/builtins.py:4835

3050

#: bzrlib/builtins.py:4849

3050

3051

msgid "OTHER_BRANCH may be local or remote."

3051

3052

msgstr ""

3052

3053

#: bzrlib/builtins.py:4837

3054

#: bzrlib/builtins.py:4851

3054

3055

msgid ""

3055

3056

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

3056

3057

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

3061

3062

" 0 - no missing revisions"

3062

3063

msgstr ""

3063

3064

#: bzrlib/builtins.py:4847

3065

#: bzrlib/builtins.py:4861

3065

3066

msgid ""

3066

3067

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

3067

3068

" remembered pull location::"

3068

3069

msgstr ""

3069

3070

#: bzrlib/builtins.py:4850

3071

#: bzrlib/builtins.py:4864

3071

3072

msgid " bzr missing"

3072

3073

msgstr ""

3073

3074

#: bzrlib/builtins.py:4852

3075

#: bzrlib/builtins.py:4866

3075

3076

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

3076

3077

msgstr ""

3077

3078

#: bzrlib/builtins.py:4854

3079

#: bzrlib/builtins.py:4868

3079

3080

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

3080

3081

msgstr ""

3081

3082

#: bzrlib/builtins.py:4856

3083

#: bzrlib/builtins.py:4870

3083

3084

msgid ""

3084

3085

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

3085

3086

" branch::"

3086

3087

msgstr ""

3087

3088

#: bzrlib/builtins.py:4859

3089

#: bzrlib/builtins.py:4873

3089

3090

msgid " bzr missing -r ..-10"

3090

3091

msgstr ""

3091

3092

#: bzrlib/builtins.py:4861

3093

#: bzrlib/builtins.py:4875

3093

3094

msgid ""

3094

3095

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

3095

3096

" branch::"

3096

3097

msgstr ""

3097

3098

#: bzrlib/builtins.py:4864

3099

#: bzrlib/builtins.py:4878

3099

3100

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

3100

3101

msgstr ""

3101

3102

3103

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

3103

#: bzrlib/builtins.py:4871

3104

#: bzrlib/builtins.py:4885

3104

3105

msgid "Reverse the order of revisions."

3105

3106

msgstr ""

3106

3107

3108

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

3108

#: bzrlib/builtins.py:4873

3109

#: bzrlib/builtins.py:4887

3109

3110

msgid "Display changes in the local branch only."

3110

3111

msgstr ""

3111

3112

3113

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

3113

#: bzrlib/builtins.py:4874

3114

#: bzrlib/builtins.py:4888

3114

3115

msgid "Same as --mine-only."

3115

3116

msgstr ""

3116

3117

3118

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

3118

#: bzrlib/builtins.py:4876

3119

#: bzrlib/builtins.py:4890

3119

3120

msgid "Display changes in the remote branch only."

3120

3121

msgstr ""

3121

3122

3123

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

3123

#: bzrlib/builtins.py:4877

3124

#: bzrlib/builtins.py:4891

3124

3125

msgid "Same as --theirs-only."

3125

3126

msgstr ""

3126

3127

3128

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

3128

#: bzrlib/builtins.py:4882

3129

#: bzrlib/builtins.py:4896

3129

3130

msgid ""

3130

3131

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

3131

3132

"details."

3132

3133

msgstr ""

3133

3134

3135

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

3135

#: bzrlib/builtins.py:4886

3136

#: bzrlib/builtins.py:4900

3136

3137

msgid ""

3137

3138

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

3138

3139

"details."

3139

3140

msgstr ""

3140

3141

3142

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

3142

#: bzrlib/builtins.py:4889

3143

#: bzrlib/builtins.py:4903

3143

3144

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

3144

3145

msgstr ""

3145

3146

#: bzrlib/builtins.py:4943

3147

#: bzrlib/builtins.py:4957

3147

3148

msgid "No peer location known or specified."

3148

3149

msgstr ""

3149

3150

#: bzrlib/builtins.py:4947

3151

#: bzrlib/builtins.py:4961

3151

3152

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

3152

3153

msgstr ""

3153

3154

#: bzrlib/builtins.py:4980

3155

#: bzrlib/builtins.py:4994

3155

3156

#, python-format

3156

3157

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

3157

3158

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

3158

3159

msgstr[0] ""

3159

3160

msgstr[1] ""

3160

3161

#: bzrlib/builtins.py:4996

3162

#: bzrlib/builtins.py:5010

3162

3163

#, python-format

3163

3164

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

3164

3165

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

3165

3166

msgstr[0] ""

3166

3167

msgstr[1] ""

3167

3168

#: bzrlib/builtins.py:5008

3169

#: bzrlib/builtins.py:5022

3169

3170

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

3170

3171

msgstr ""

3171

3172

#: bzrlib/builtins.py:5011

3173

#: bzrlib/builtins.py:5025

3173

3174

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

3174

3175

msgstr ""

3175

3176

#: bzrlib/builtins.py:5016

3177

#: bzrlib/builtins.py:5030

3177

3178

msgid "Branches are up to date.\n"

3178

3179

msgstr ""

3179

3180

#: bzrlib/builtins.py:5027

3181

#: bzrlib/builtins.py:5041

3181

3182

msgid "Compress the data within a repository."

3182

3183

msgstr ""

3183

3184

#: bzrlib/builtins.py:5029

3185

#: bzrlib/builtins.py:5043

3185

3186

msgid ""

3186

3187

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

3187

3188

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

3188

3189

"normally not required to be done manually."

3189

3190

msgstr ""

3190

3191

#: bzrlib/builtins.py:5033

3192

#: bzrlib/builtins.py:5047

3192

3193

msgid ""

3193

3194

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

3194

3195

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

3197

3198

"used."

3198

3199

msgstr ""

3199

3200

#: bzrlib/builtins.py:5039

3201

#: bzrlib/builtins.py:5053

3201

3202

msgid ""

3202

3203

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

3203

3204

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

3206

3207

msgstr ""

3207

3208

3209

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

3209

#: bzrlib/builtins.py:5048

3210

#: bzrlib/builtins.py:5062

3210

3211

msgid "Delete obsolete packs to save disk space."

3211

3212

msgstr ""

3212

3213

#: bzrlib/builtins.py:5062

3214

#: bzrlib/builtins.py:5076

3214

3215

msgid "List the installed plugins."

3215

3216

msgstr ""

3216

3217

#: bzrlib/builtins.py:5064

3218

#: bzrlib/builtins.py:5078

3218

3219

msgid ""

3219

3220

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

3220

3221

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

3221

3222

msgstr ""

3222

3223

#: bzrlib/builtins.py:5067

3224

#: bzrlib/builtins.py:5081

3224

3225

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

3225

3226

msgstr ""

3226

3227

#: bzrlib/builtins.py:5069

3228

#: bzrlib/builtins.py:5083

3228

3229

msgid ""

3229

3230

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

3230

3231

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

3233

3234

"customizing log output."

3234

3235

msgstr ""

3235

3236

#: bzrlib/builtins.py:5075

3237

#: bzrlib/builtins.py:5089

3237

3238

msgid ""

3238

3239

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

3239

3240

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

3241

3242

"plugins using the Python programming language."

3242

3243

msgstr ""

3243

3244

#: bzrlib/builtins.py:5091

3245

#: bzrlib/builtins.py:5105

3245

3246

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

3246

3247

msgstr ""

3247

3248

3249

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

3249

#: bzrlib/builtins.py:5094

3250

#: bzrlib/builtins.py:5108

3250

3251

msgid "Produce long-format testament."

3251

3252

msgstr ""

3252

3253

3254

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

3254

#: bzrlib/builtins.py:5096

3255

#: bzrlib/builtins.py:5110

3255

3256

msgid "Produce a strict-format testament."

3256

3257

msgstr ""

3257

3258

#: bzrlib/builtins.py:5122

3259

#: bzrlib/builtins.py:5136

3259

3260

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

3260

3261

msgstr ""

3261

3262

#: bzrlib/builtins.py:5124

3263

#: bzrlib/builtins.py:5138

3263

3264

msgid ""

3264

3265

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

3265

3266

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

3266

3267

msgstr ""

3267

3268

#: bzrlib/builtins.py:5127

3269

#: bzrlib/builtins.py:5141

3269

3270

msgid ""

3270

3271

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

3271

3272

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

3272

3273

msgstr ""

3273

3274

3275

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

3275

#: bzrlib/builtins.py:5135

3276

#: bzrlib/builtins.py:5149

3276

3277

msgid "Show annotations on all lines."

3277

3278

msgstr ""

3278

3279

3280

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

3280

#: bzrlib/builtins.py:5136

3281

#: bzrlib/builtins.py:5150

3281

3282

msgid "Show commit date in annotations."

3282

3283

msgstr ""

3283

3284

#: bzrlib/builtins.py:5223

3285

#: bzrlib/builtins.py:5237

3285

3286

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

3286

3287

msgstr ""

3287

3288

#: bzrlib/builtins.py:5235

3289

#: bzrlib/builtins.py:5249

3289

3290

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

3290

3291

msgstr ""

3291

3292

#: bzrlib/builtins.py:5239

3293

#: bzrlib/builtins.py:5253

3293

3294

msgid ""

3294

3295

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

3295

3296

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

3296

3297

msgstr ""

3297

3298

#: bzrlib/builtins.py:5242

3299

#: bzrlib/builtins.py:5256

3299

3300

msgid ""

3300

3301

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

3301

3302

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

3302

3303

msgstr ""

3303

3304

#: bzrlib/builtins.py:5245

3305

#: bzrlib/builtins.py:5259

3305

3306

msgid ""

3306

3307

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

3307

3308

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

3308

3309

"that of the master."

3309

3310

msgstr ""

3310

3311

#: bzrlib/builtins.py:5260

3312

#: bzrlib/builtins.py:5274

3312

3313

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

3313

3314

msgstr ""

3314

3315

#: bzrlib/builtins.py:5265

3316

#: bzrlib/builtins.py:5280

3316

3317

msgid "Branch is already bound"

3317

3318

msgstr ""

3318

3319

#: bzrlib/builtins.py:5267

3320

#: bzrlib/builtins.py:5283

3320

3321

msgid "No location supplied and no previous location known"

3321

3322

msgstr ""

3322

3323

#: bzrlib/builtins.py:5273

3324

#: bzrlib/builtins.py:5289

3324

3325

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

3325

3326

msgstr ""

3326

3327

#: bzrlib/builtins.py:5280

3328

#: bzrlib/builtins.py:5296

3328

3329

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

3329

3330

msgstr ""

3330

3331

#: bzrlib/builtins.py:5282

3332

#: bzrlib/builtins.py:5298

3332

3333

msgid ""

3333

3334

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

3334

3335

"commits will be local only."

3335

3336

msgstr ""

3336

3337

#: bzrlib/builtins.py:5293

3338

#: bzrlib/builtins.py:5309

3338

3339

msgid "Local branch is not bound"

3339

3340

msgstr ""

3340

3341

#: bzrlib/builtins.py:5297

3342

#: bzrlib/builtins.py:5313

3342

3343

msgid "Remove the last committed revision."

3343

3344

msgstr ""

3344

3345

#: bzrlib/builtins.py:5299

3346

#: bzrlib/builtins.py:5315

3346

3347

msgid ""

3347

3348

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

3348

3349

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

3349

3350

"remove anything."

3350

3351

msgstr ""

3351

3352

#: bzrlib/builtins.py:5303

3353

#: bzrlib/builtins.py:5319

3353

3354

msgid ""

3354

3355

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

3355

3356

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

3356

3357

"branch at revision 15."

3357

3358

msgstr ""

3358

3359

#: bzrlib/builtins.py:5307

3360

#: bzrlib/builtins.py:5323

3360

3361

msgid ""

3361

3362

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

3362

3363

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

3364

3365

msgstr ""

3365

3366

3367

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

3367

#: bzrlib/builtins.py:5318

3368

#: bzrlib/builtins.py:5334

3368

3369

msgid "Don't actually make changes."

3369

3370

msgstr ""

3370

3371

3372

# help of 'force' option of 'uncommit' command

3372

#: bzrlib/builtins.py:5319

3373

#: bzrlib/builtins.py:5335

3373

3374

msgid "Say yes to all questions."

3374

3375

msgstr ""

3375

3376

3377

# help of 'keep-tags' option of 'uncommit' command

3377

#: bzrlib/builtins.py:5321

3378

#: bzrlib/builtins.py:5337

3378

3379

msgid "Keep tags that point to removed revisions."

3379

3380

msgstr ""

3380

3381

3382

# help of 'local' option of 'uncommit' command

3382

#: bzrlib/builtins.py:5323

3383

#: bzrlib/builtins.py:5339

3383

3384

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

3384

3385

msgstr ""

3385

3386

#: bzrlib/builtins.py:5372

3387

#: bzrlib/builtins.py:5388

3387

3388

msgid "No revisions to uncommit.\n"

3388

3389

msgstr ""

3389

3390

#: bzrlib/builtins.py:5387

3391

#: bzrlib/builtins.py:5403

3391

3392

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

3392

3393

msgstr ""

3393

3394

#: bzrlib/builtins.py:5390

3395

#: bzrlib/builtins.py:5406

3395

3396

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

3396

3397

msgstr ""

3397

3398

#: bzrlib/builtins.py:5394

3399

#: bzrlib/builtins.py:5410

3399

3400

msgid "Uncommit these revisions"

3400

3401

msgstr ""

3401

3402

#: bzrlib/builtins.py:5397

3403

#: bzrlib/builtins.py:5413

3403

3404

msgid "Canceled\n"

3404

3405

msgstr ""

3405

3406

#: bzrlib/builtins.py:5404

3407

#: bzrlib/builtins.py:5420

3407

3408

#, python-format

3408

3409

msgid ""

3409

3410

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

3410

3411

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

3411

3412

msgstr ""

3412

3413

#: bzrlib/builtins.py:5409

3414

#: bzrlib/builtins.py:5425

3414

3415

msgid "Break a dead lock."

3415

3416

msgstr ""

3416

3417

#: bzrlib/builtins.py:5411

3418

#: bzrlib/builtins.py:5427

3418

3419

msgid ""

3419

3420

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

3420

3421

"config file."

3421

3422

msgstr ""

3422

3423

#: bzrlib/builtins.py:5414

3424

#: bzrlib/builtins.py:5430

3424

3425

msgid ""

3425

3426

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

3426

3427

"holding the lock has been stopped."

3427

3428

msgstr ""

3428

3429

#: bzrlib/builtins.py:5417

3430

#: bzrlib/builtins.py:5433

3430

3431

msgid ""

3431

3432

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

3432

3433

"[location]' command."

3433

3434

msgstr ""

3434

3435

#: bzrlib/builtins.py:5420

3436

#: bzrlib/builtins.py:5436

3436

3437

msgid ""

3437

3438

":Examples:\n"

3438

3439

" bzr break-lock\n"

3441

3442

msgstr ""

3442

3443

3444

# help of 'config' option of 'break-lock' command

3444

#: bzrlib/builtins.py:5429

3445

#: bzrlib/builtins.py:5445

3445

3446

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

3446

3447

msgstr ""

3447

3448

3449

# help of 'force' option of 'break-lock' command

3449

#: bzrlib/builtins.py:5431

3450

#: bzrlib/builtins.py:5447

3450

3451

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

3451

3452

msgstr ""

3452

3453

3454

# help of 'protocol=bzr' option of 'serve' command

3454

#: bzrlib/builtins.py:5466

3455

#: bzrlib/builtins.py:5482

3455

3456

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

3456

3457

msgstr ""

3457

3458

#: bzrlib/builtins.py:5467

3459

#: bzrlib/builtins.py:5483

3459

3460

msgid "Run the bzr server."

3460

3461

msgstr ""

3461

3462

3463

# help of 'inet' option of 'serve' command

3463

#: bzrlib/builtins.py:5473

3464

#: bzrlib/builtins.py:5489

3464

3465

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

3465

3466

msgstr ""

3466

3467

3468

# title of 'protocol' option of 'serve' command

3468

#: bzrlib/builtins.py:5474

3469

#: bzrlib/builtins.py:5490

3469

3470

msgid "protocol"

3470

3471

msgstr ""

3471

3472

3473

# help of 'protocol' option of 'serve' command

3473

#: bzrlib/builtins.py:5475

3474

#: bzrlib/builtins.py:5491

3474

3475

msgid "Protocol to serve."

3475

3476

msgstr ""

3476

3477

3478

# help of 'listen' option of 'serve' command

3479

#: bzrlib/builtins.py:5495

3480

msgid "Listen for connections on nominated address."

3481

msgstr ""

3482

3477

3483

# help of 'port' option of 'serve' command

3478

#: bzrlib/builtins.py:5479

3484

#: bzrlib/builtins.py:5497

3479

3485

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

3486

"Listen for connections on nominated port. Passing 0 as the port number will "

3487

"result in a dynamically allocated port. The default port depends on the "

3488

"protocol."

3483

3489

msgstr ""

3484

3490

3485

3491

# help of 'directory' option of 'serve' command

3486

#: bzrlib/builtins.py:5485

3492

#: bzrlib/builtins.py:5502

3487

3493

msgid "Serve contents of this directory."

3488

3494

msgstr ""

3489

3495

3490

3496

# help of 'allow-writes' option of 'serve' command

3491

#: bzrlib/builtins.py:5487

3497

#: bzrlib/builtins.py:5504

3492

3498

msgid ""

3493

3499

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

3494

3500

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

3498

3504

msgstr ""

3499

3505

3500

3506

# help of 'client-timeout' option of 'serve' command

3501

#: bzrlib/builtins.py:5496

3507

#: bzrlib/builtins.py:5513

3502

3508

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

3503

3509

msgstr ""

3504

3510

3505

#: bzrlib/builtins.py:5546

3511

#: bzrlib/builtins.py:5531

3506

3512

msgid "Combine a tree into its containing tree."

3507

3513

msgstr ""

3508

3514

3509

#: bzrlib/builtins.py:5548

3515

#: bzrlib/builtins.py:5533

3510

3516

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

3511

3517

msgstr ""

3512

3518

3513

#: bzrlib/builtins.py:5550

3519

#: bzrlib/builtins.py:5535

3514

3520

msgid ""

3515

3521

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

3516

3522

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

3517

3523

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

3518

3524

msgstr ""

3519

3525

3520

#: bzrlib/builtins.py:5554

3526

#: bzrlib/builtins.py:5539

3521

3527

msgid ""

3522

3528

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

3523

3529

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

3524

3530

"and all history is preserved."

3525

3531

msgstr ""

3526

3532

3527

#: bzrlib/builtins.py:5572

3533

#: bzrlib/builtins.py:5557

3528

3534

#, python-format

3529

3535

msgid ""

3530

3536

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

3531

3537

"You can use bzr upgrade on the repository."

3532

3538

msgstr ""

3533

3539

3534

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

3540

#: bzrlib/builtins.py:5567 bzrlib/builtins.py:5573

3535

3541

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

3536

3542

msgstr ""

3537

3543

3538

#: bzrlib/builtins.py:5592

3544

#: bzrlib/builtins.py:5577

3539

3545

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

3540

3546

msgstr ""

3541

3547

3542

#: bzrlib/builtins.py:5594

3548

#: bzrlib/builtins.py:5579

3543

3549

msgid ""

3544

3550

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

3545

3551

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

3546

3552

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

3547

3553

msgstr ""

3548

3554

3549

#: bzrlib/builtins.py:5598

3555

#: bzrlib/builtins.py:5583

3550

3556

msgid ""

3551

3557

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

3552

3558

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

3553

3559

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

3554

3560

msgstr ""

3555

3561

3556

#: bzrlib/builtins.py:5678

3562

#: bzrlib/builtins.py:5663

3557

3563

msgid "No submit branch specified or known"

3558

3564

msgstr ""

3559

3565

3560

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

3566

#: bzrlib/builtins.py:5672 bzrlib/send.py:109

3561

3567

msgid "No public branch specified or known"

3562

3568

msgstr ""

3563

3569

3564

#: bzrlib/builtins.py:5691

3570

#: bzrlib/builtins.py:5677

3565

3571

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

3566

3572

msgstr ""

3567

3573

3568

#: bzrlib/builtins.py:5700

3574

#: bzrlib/builtins.py:5686

3569

3575

msgid "No revisions to bundle."

3570

3576

msgstr ""

3571

3577

3572

#: bzrlib/builtins.py:5719

3578

#: bzrlib/builtins.py:5705

3573

3579

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

3574

3580

msgstr ""

3575

3581

3576

#: bzrlib/builtins.py:5721

3582

#: bzrlib/builtins.py:5707

3577

3583

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

3578

3584

msgstr ""

3579

3585

3580

#: bzrlib/builtins.py:5723

3586

#: bzrlib/builtins.py:5709

3581

3587

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

3582

3588

msgstr ""

3583

3589

3584

#: bzrlib/builtins.py:5725

3590

#: bzrlib/builtins.py:5711

3585

3591

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

3586

3592

msgstr ""

3587

3593

3588

#: bzrlib/builtins.py:5727

3594

#: bzrlib/builtins.py:5713

3589

3595

msgid ""

3590

3596

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

3591

3597

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

3592

3598

" branch."

3593

3599

msgstr ""

3594

3600

3595

#: bzrlib/builtins.py:5731

3601

#: bzrlib/builtins.py:5717

3596

3602

msgid ""

3597

3603

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

3598

3604

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

3599

3605

msgstr ""

3600

3606

3601

#: bzrlib/builtins.py:5734

3607

#: bzrlib/builtins.py:5720

3602

3608

msgid ""

3603

3609

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

3604

3610

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

3605

3611

"the source branch."

3606

3612

msgstr ""

3607

3613

3608

#: bzrlib/builtins.py:5738

3614

#: bzrlib/builtins.py:5724

3609

3615

msgid ""

3610

3616

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

3611

3617

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

3614

3620

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

3615

3621

msgstr ""

3616

3622

3617

#: bzrlib/builtins.py:5744

3623

#: bzrlib/builtins.py:5730

3618

3624

msgid ""

3619

3625

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

3620

3626

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

3623

3629

"be changed using --from."

3624

3630

msgstr ""

3625

3631

3626

#: bzrlib/builtins.py:5750

3632

#: bzrlib/builtins.py:5736

3627

3633

msgid ""

3628

3634

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

3629

3635

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

3632

3638

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

3633

3639

msgstr ""

3634

3640

3635

#: bzrlib/builtins.py:5756

3641

#: bzrlib/builtins.py:5742

3636

3642

msgid ""

3637

3643

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

3638

3644

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

3640

3646

"in the merge directive."

3641

3647

msgstr ""

3642

3648

3643

#: bzrlib/builtins.py:5761

3649

#: bzrlib/builtins.py:5747

3644

3650

msgid ""

3645

3651

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

3646

3652

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

3647

3653

msgstr ""

3648

3654

3649

#: bzrlib/builtins.py:5764

3655

#: bzrlib/builtins.py:5750

3650

3656

msgid ""

3651

3657

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

3652

3658

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

3653

3659

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

3654

3660

msgstr ""

3655

3661

3656

#: bzrlib/builtins.py:5768

3662

#: bzrlib/builtins.py:5754

3657

3663

msgid ""

3658

3664

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

3659

3665

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

3665

3671

"supported clients."

3666

3672

msgstr ""

3667

3673

3668

#: bzrlib/builtins.py:5775

3674

#: bzrlib/builtins.py:5761

3669

3675

msgid ""

3670

3676

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

3671

3677

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

3673

3679

"in the submit branch."

3674

3680

msgstr ""

3675

3681

3676

#: bzrlib/builtins.py:5780

3682

#: bzrlib/builtins.py:5766

3677

3683

msgid ""

3678

3684

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

3679

3685

"and\n"

3683

3689

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

3684

3690

msgstr ""

3685

3691

3686

#: bzrlib/builtins.py:5786

3692

#: bzrlib/builtins.py:5772

3687

3693

msgid ""

3688

3694

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

3689

3695

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

3690

3696

msgstr ""

3691

3697

3692

#: bzrlib/builtins.py:5789

3698

#: bzrlib/builtins.py:5775

3693

3699

msgid ""

3694

3700

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

3695

3701

"into\n"

3698

3704

msgstr ""

3699

3705

3700

3706

# help of 'output' option of 'send' command

3701

#: bzrlib/builtins.py:5813

3707

#: bzrlib/builtins.py:5799

3702

3708

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

3703

3709

msgstr ""

3704

3710

3705

3711

# help of 'strict' option of 'send' command

3706

#: bzrlib/builtins.py:5817

3712

#: bzrlib/builtins.py:5803

3707

3713

msgid ""

3708

3714

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

3709

3715

"strict disables the check."

3710

3716

msgstr ""

3711

3717

3712

3718

# help of 'mail-to' option of 'send' command

3713

#: bzrlib/builtins.py:5819

3719

#: bzrlib/builtins.py:5805

3714

3720

msgid "Mail the request to this address."

3715

3721

msgstr ""

3716

3722

3717

3723

# help of 'body' option of 'send' command

3718

#: bzrlib/builtins.py:5823

3724

#: bzrlib/builtins.py:5809

3719

3725

msgid "Body for the email."

3720

3726

msgstr ""

3721

3727

3722

3728

# help of 'no-bundle' option of 'send' command

3723

#: bzrlib/builtins.py:5876

3729

#: bzrlib/builtins.py:5862

3724

3730

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

3725

3731

msgstr ""

3726

3732

3727

3733

# help of 'no-patch' option of 'send' command

3728

#: bzrlib/builtins.py:5877

3734

#: bzrlib/builtins.py:5863

3729

3735

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

3730

3736

msgstr ""

3731

3737

3732

3738

# help of 'remember' option of 'send' command

3733

#: bzrlib/builtins.py:5880

3739

#: bzrlib/builtins.py:5866

3734

3740

msgid "Remember submit and public branch."

3735

3741

msgstr ""

3736

3742

3737

3743

# help of 'from' option of 'send' command

3738

#: bzrlib/builtins.py:5882

3744

#: bzrlib/builtins.py:5868

3739

3745

msgid ""

3740

3746

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

3741

3747

"working directory."

3743

3749

3744

3750

# title of 'format' option of 'send' command

3745

3751

# title of 'format' option of 'version-info' command

3746

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

3752

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

3747

3753

msgid "format"

3748

3754

msgstr ""

3749

3755

3750

3756

# help of 'format' option of 'send' command

3751

#: bzrlib/builtins.py:5893

3757

#: bzrlib/builtins.py:5879

3752

3758

msgid "Use the specified output format."

3753

3759

msgstr ""

3754

3760

3755

#: bzrlib/builtins.py:5915

3761

#: bzrlib/builtins.py:5901

3756

3762

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

3757

3763

msgstr ""

3758

3764

3759

#: bzrlib/builtins.py:5917

3765

#: bzrlib/builtins.py:5903

3760

3766

msgid ""

3761

3767

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

3762

3768

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

3763

3769

"created tag."

3764

3770

msgstr ""

3765

3771

3766

#: bzrlib/builtins.py:5921

3772

#: bzrlib/builtins.py:5907

3767

3773

msgid ""

3768

3774

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

3769

3775

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

3770

3776

msgstr ""

3771

3777

3772

#: bzrlib/builtins.py:5924

3778

#: bzrlib/builtins.py:5910

3773

3779

msgid ""

3774

3780

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

3775

3781

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

3776

3782

msgstr ""

3777

3783

3778

#: bzrlib/builtins.py:5927

3784

#: bzrlib/builtins.py:5913

3779

3785

msgid ""

3780

3786

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

3781

3787

"``bzr\n"

3782

3788

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

3783

3789

msgstr ""

3784

3790

3785

#: bzrlib/builtins.py:5930

3791

#: bzrlib/builtins.py:5916

3786

3792

msgid ""

3787

3793

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

3788

3794

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

3791

3797

msgstr ""

3792

3798

3793

3799

# help of 'delete' option of 'tag' command

3794

#: bzrlib/builtins.py:5940

3800

#: bzrlib/builtins.py:5926

3795

3801

msgid "Delete this tag rather than placing it."

3796

3802

msgstr ""

3797

3803

3798

3804

# help of 'directory' option of 'tag' command

3799

#: bzrlib/builtins.py:5943

3805

#: bzrlib/builtins.py:5929

3800

3806

msgid "Branch in which to place the tag."

3801

3807

msgstr ""

3802

3808

3803

3809

# help of 'force' option of 'tag' command

3804

#: bzrlib/builtins.py:5945

3810

#: bzrlib/builtins.py:5931

3805

3811

msgid "Replace existing tags."

3806

3812

msgstr ""

3807

3813

3808

#: bzrlib/builtins.py:5960

3814

#: bzrlib/builtins.py:5946

3809

3815

msgid "No tag specified to delete."

3810

3816

msgstr ""

3811

3817

3818

#: bzrlib/builtins.py:5948

3819

#, python-format

3820

msgid "Deleted tag %s."

3821

msgstr ""

3822

3812

3823

#: bzrlib/builtins.py:5962

3813

#, python-format

3814

msgid "Deleted tag %s."

3815

msgstr ""

3816

3817

#: bzrlib/builtins.py:5976

3818

3824

msgid "Please specify a tag name."

3819

3825

msgstr ""

3820

3826

3821

#: bzrlib/builtins.py:5984

3827

#: bzrlib/builtins.py:5970

3822

3828

#, python-format

3823

3829

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

3824

3830

msgstr ""

3825

3831

3826

#: bzrlib/builtins.py:5988

3832

#: bzrlib/builtins.py:5974

3827

3833

#, python-format

3828

3834

msgid "Created tag %s."

3829

3835

msgstr ""

3830

3836

3831

#: bzrlib/builtins.py:5990

3837

#: bzrlib/builtins.py:5976

3832

3838

#, python-format

3833

3839

msgid "Updated tag %s."

3834

3840

msgstr ""

3835

3841

3836

#: bzrlib/builtins.py:5994

3842

#: bzrlib/builtins.py:5980

3837

3843

msgid "List tags."

3838

3844

msgstr ""

3839

3845

3840

#: bzrlib/builtins.py:5996

3846

#: bzrlib/builtins.py:5982

3841

3847

msgid ""

3842

3848

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

3843

3849

msgstr ""

3844

3850

3845

3851

# help of 'directory' option of 'tags' command

3846

#: bzrlib/builtins.py:6002

3852

#: bzrlib/builtins.py:5988

3847

3853

msgid "Branch whose tags should be displayed."

3848

3854

msgstr ""

3849

3855

3850

3856

# help of 'sort' option of 'tags' command

3851

#: bzrlib/builtins.py:6004

3857

#: bzrlib/builtins.py:5990

3852

3858

msgid "Sort tags by different criteria."

3853

3859

msgstr ""

3854

3860

3855

3861

# title of 'sort' option of 'tags' command

3856

#: bzrlib/builtins.py:6004

3862

#: bzrlib/builtins.py:5990

3857

3863

msgid "Sorting"

3858

3864

msgstr ""

3859

3865

3860

#: bzrlib/builtins.py:6073

3866

#: bzrlib/builtins.py:6059

3861

3867

msgid "Reconfigure the type of a bzr directory."

3862

3868

msgstr ""

3863

3869

3864

#: bzrlib/builtins.py:6075

3870

#: bzrlib/builtins.py:6061

3865

3871

msgid "A target configuration must be specified."

3866

3872

msgstr ""

3867

3873

3868

#: bzrlib/builtins.py:6077

3874

#: bzrlib/builtins.py:6063

3869

3875

msgid ""

3870

3876

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

3871

3877

"The order of preference is\n"

3877

3883

msgstr ""

3878

3884

3879

3885

# title of 'tree_type' option of 'reconfigure' command

3880

#: bzrlib/builtins.py:6091

3886

#: bzrlib/builtins.py:6077

3881

3887

msgid "Tree type"

3882

3888

msgstr ""

3883

3889

3884

3890

# help of 'tree_type' option of 'reconfigure' command

3885

#: bzrlib/builtins.py:6092

3891

#: bzrlib/builtins.py:6078

3886

3892

msgid "The relation between branch and tree."

3887

3893

msgstr ""

3888

3894

3889

3895

# help of 'tree_type=branch' option of 'reconfigure' command

3890

#: bzrlib/builtins.py:6094

3896

#: bzrlib/builtins.py:6080

3891

3897

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

3892

3898

msgstr ""

3893

3899

3894

3900

# help of 'tree_type=tree' option of 'reconfigure' command

3895

#: bzrlib/builtins.py:6095

3901

#: bzrlib/builtins.py:6081

3896

3902

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

3897

3903

msgstr ""

3898

3904

3899

3905

# help of 'tree_type=checkout' option of 'reconfigure' command

3900

#: bzrlib/builtins.py:6096

3906

#: bzrlib/builtins.py:6082

3901

3907

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

3902

3908

msgstr ""

3903

3909

3904

3910

# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command

3905

#: bzrlib/builtins.py:6097

3911

#: bzrlib/builtins.py:6083

3906

3912

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

3907

3913

msgstr ""

3908

3914

3909

3915

# title of 'repository_type' option of 'reconfigure' command

3910

#: bzrlib/builtins.py:6102

3916

#: bzrlib/builtins.py:6088

3911

3917

msgid "Repository type"

3912

3918

msgstr ""

3913

3919

3914

3920

# help of 'repository_type' option of 'reconfigure' command

3915

#: bzrlib/builtins.py:6103

3921

#: bzrlib/builtins.py:6089

3916

3922

msgid "Location fo the repository."

3917

3923

msgstr ""

3918

3924

3919

3925

# help of 'repository_type=standalone' option of 'reconfigure' command

3920

#: bzrlib/builtins.py:6105

3926

#: bzrlib/builtins.py:6091

3921

3927

msgid ""

3922

3928

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

3923

3929

msgstr ""

3924

3930

3925

3931

# help of 'repository_type=use-shared' option of 'reconfigure' command

3926

#: bzrlib/builtins.py:6107

3932

#: bzrlib/builtins.py:6093

3927

3933

msgid "Reconfigure to use a shared repository."

3928

3934

msgstr ""

3929

3935

3930

3936

# title of 'repository_trees' option of 'reconfigure' command

3931

#: bzrlib/builtins.py:6111

3937

#: bzrlib/builtins.py:6097

3932

3938

msgid "Trees in Repository"

3933

3939

msgstr ""

3934

3940

3935

3941

# help of 'repository_trees' option of 'reconfigure' command

3936

#: bzrlib/builtins.py:6112

3942

#: bzrlib/builtins.py:6098

3937

3943

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

3938

3944

msgstr ""

3939

3945

3940

3946

# help of 'repository_trees=with-trees' option of 'reconfigure' command

3941

#: bzrlib/builtins.py:6114

3947

#: bzrlib/builtins.py:6100

3942

3948

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

3943

3949

msgstr ""

3944

3950

3945

3951

# help of 'repository_trees=with-no-trees' option of 'reconfigure' command

3946

#: bzrlib/builtins.py:6116

3952

#: bzrlib/builtins.py:6102

3947

3953

msgid ""

3948

3954

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

3949

3955

msgstr ""

3950

3956

3951

3957

# help of 'bind-to' option of 'reconfigure' command

3952

#: bzrlib/builtins.py:6119

3958

#: bzrlib/builtins.py:6105

3953

3959

msgid "Branch to bind checkout to."

3954

3960

msgstr ""

3955

3961

3956

3962

# help of 'force' option of 'reconfigure' command

3957

#: bzrlib/builtins.py:6121

3963

#: bzrlib/builtins.py:6107

3958

3964

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

3959

3965

msgstr ""

3960

3966

3961

3967

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

3962

#: bzrlib/builtins.py:6124

3968

#: bzrlib/builtins.py:6110

3963

3969

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

3964

3970

msgstr ""

3965

3971

3966

3972

# help of 'unstacked' option of 'reconfigure' command

3967

#: bzrlib/builtins.py:6128

3973

#: bzrlib/builtins.py:6114

3968

3974

msgid ""

3969

3975

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

3970

3976

"data into it."

3971

3977

msgstr ""

3972

3978

3979

#: bzrlib/builtins.py:6124

3980

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

3981

msgstr ""

3982

3973

3983

#: bzrlib/builtins.py:6138

3974

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

3975

msgstr ""

3976

3977

#: bzrlib/builtins.py:6152

3978

3984

msgid "No target configuration specified"

3979

3985

msgstr ""

3980

3986

3981

#: bzrlib/builtins.py:6187

3987

#: bzrlib/builtins.py:6173

3982

3988

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

3983

3989

msgstr ""

3984

3990

3985

#: bzrlib/builtins.py:6189

3991

#: bzrlib/builtins.py:6175

3986

3992

msgid ""

3987

3993

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

3988

3994

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

3990

3996

"of the new location and binds to it."

3991

3997

msgstr ""

3992

3998

3993

#: bzrlib/builtins.py:6194

3999

#: bzrlib/builtins.py:6180

3994

4000

msgid ""

3995

4001

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

3996

4002

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

3997

4003

msgstr ""

3998

4004

3999

#: bzrlib/builtins.py:6197

4005

#: bzrlib/builtins.py:6183

4000

4006

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

4001

4007

msgstr ""

4002

4008

4003

#: bzrlib/builtins.py:6199

4009

#: bzrlib/builtins.py:6185

4004

4010

msgid ""

4005

4011

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

4006

4012

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

4008

4014

"/path/to/newbranch."

4009

4015

msgstr ""

4010

4016

4011

#: bzrlib/builtins.py:6204

4017

#: bzrlib/builtins.py:6190

4012

4018

msgid ""

4013

4019

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

4014

4020

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

4016

4022

msgstr ""

4017

4023

4018

4024

# help of 'force' option of 'switch' command

4019

#: bzrlib/builtins.py:6212

4025

#: bzrlib/builtins.py:6198

4020

4026

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

4021

4027

msgstr ""

4022

4028

4023

4029

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

4030

#: bzrlib/builtins.py:6201

4031

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

4032

msgstr ""

4033

4024

4034

#: bzrlib/builtins.py:6215

4025

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

4026

msgstr ""

4027

4028

#: bzrlib/builtins.py:6229

4029

4035

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

4030

4036

msgstr ""

4031

4037

4032

#: bzrlib/builtins.py:6242

4038

#: bzrlib/builtins.py:6228

4033

4039

msgid "cannot create branch without source branch"

4034

4040

msgstr ""

4035

4041

4036

#: bzrlib/builtins.py:6262

4042

#: bzrlib/builtins.py:6253

4037

4043

msgid "Manage filtered views."

4038

4044

msgstr ""

4039

4045

4040

#: bzrlib/builtins.py:6264

4046

#: bzrlib/builtins.py:6255

4041

4047

msgid ""

4042

4048

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

4043

4049

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

4047

4053

"must be within the current view."

4048

4054

msgstr ""

4049

4055

4050

#: bzrlib/builtins.py:6271

4056

#: bzrlib/builtins.py:6262

4051

4057

msgid ""

4052

4058

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

4053

4059

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

4055

4061

"and switch between them."

4056

4062

msgstr ""

4057

4063

4058

#: bzrlib/builtins.py:6276

4064

#: bzrlib/builtins.py:6267

4059

4065

msgid ""

4060

4066

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

4061

4067

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

4063

4069

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

4064

4070

msgstr ""

4065

4071

4066

#: bzrlib/builtins.py:6281

4072

#: bzrlib/builtins.py:6272

4067

4073

msgid ""

4068

4074

":Examples:\n"

4069

4075

" To define the current view::"

4070

4076

msgstr ""

4071

4077

4072

#: bzrlib/builtins.py:6284

4078

#: bzrlib/builtins.py:6275

4073

4079

msgid " bzr view file1 dir1 ..."

4074

4080

msgstr ""

4075

4081

4076

#: bzrlib/builtins.py:6286

4082

#: bzrlib/builtins.py:6277

4077

4083

msgid " To list the current view::"

4078

4084

msgstr ""

4079

4085

4080

#: bzrlib/builtins.py:6288

4086

#: bzrlib/builtins.py:6279

4081

4087

msgid " bzr view"

4082

4088

msgstr ""

4083

4089

4084

#: bzrlib/builtins.py:6290

4090

#: bzrlib/builtins.py:6281

4085

4091

msgid " To delete the current view::"

4086

4092

msgstr ""

4087

4093

4088

#: bzrlib/builtins.py:6292

4094

#: bzrlib/builtins.py:6283

4089

4095

msgid " bzr view --delete"

4090

4096

msgstr ""

4091

4097

4092

#: bzrlib/builtins.py:6294

4098

#: bzrlib/builtins.py:6285

4093

4099

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

4094

4100

msgstr ""

4095

4101

4096

#: bzrlib/builtins.py:6296

4102

#: bzrlib/builtins.py:6287

4097

4103

msgid " bzr view --switch off"

4098

4104

msgstr ""

4099

4105

4100

#: bzrlib/builtins.py:6298

4106

#: bzrlib/builtins.py:6289

4101

4107

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

4102

4108

msgstr ""

4103

4109

4104

#: bzrlib/builtins.py:6300

4110

#: bzrlib/builtins.py:6291

4105

4111

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

4106

4112

msgstr ""

4107

4113

4108

#: bzrlib/builtins.py:6302

4114

#: bzrlib/builtins.py:6293

4109

4115

msgid " To list a named view::"

4110

4116

msgstr ""

4111

4117

4112

#: bzrlib/builtins.py:6304

4118

#: bzrlib/builtins.py:6295

4113

4119

msgid " bzr view --name view-name"

4114

4120

msgstr ""

4115

4121

4116

#: bzrlib/builtins.py:6306

4122

#: bzrlib/builtins.py:6297

4117

4123

msgid " To delete a named view::"

4118

4124

msgstr ""

4119

4125

4120

#: bzrlib/builtins.py:6308

4126

#: bzrlib/builtins.py:6299

4121

4127

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

4122

4128

msgstr ""

4123

4129

4124

#: bzrlib/builtins.py:6310

4130

#: bzrlib/builtins.py:6301

4125

4131

msgid " To switch to a named view::"

4126

4132

msgstr ""

4127

4133

4128

#: bzrlib/builtins.py:6312

4134

#: bzrlib/builtins.py:6303

4129

4135

msgid " bzr view --switch view-name"

4130

4136

msgstr ""

4131

4137

4132

#: bzrlib/builtins.py:6314

4138

#: bzrlib/builtins.py:6305

4133

4139

msgid " To list all views defined::"

4134

4140

msgstr ""

4135

4141

4136

#: bzrlib/builtins.py:6316

4142

#: bzrlib/builtins.py:6307

4137

4143

msgid " bzr view --all"

4138

4144

msgstr ""

4139

4145

4140

#: bzrlib/builtins.py:6318

4146

#: bzrlib/builtins.py:6309

4141

4147

msgid " To delete all views::"

4142

4148

msgstr ""

4143

4149

4144

#: bzrlib/builtins.py:6320

4150

#: bzrlib/builtins.py:6311

4145

4151

msgid " bzr view --delete --all"

4146

4152

msgstr ""

4147

4153

4148

4154

# help of 'all' option of 'view' command

4149

#: bzrlib/builtins.py:6327

4155

#: bzrlib/builtins.py:6318

4150

4156

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

4151

4157

msgstr ""

4152

4158

4153

4159

# help of 'delete' option of 'view' command

4154

#: bzrlib/builtins.py:6330

4160

#: bzrlib/builtins.py:6321

4155

4161

msgid "Delete the view."

4156

4162

msgstr ""

4157

4163

4158

4164

# help of 'name' option of 'view' command

4159

#: bzrlib/builtins.py:6333

4165

#: bzrlib/builtins.py:6324

4160

4166

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

4161

4167

msgstr ""

4162

4168

4163

4169

# help of 'switch' option of 'view' command

4164

#: bzrlib/builtins.py:6337

4170

#: bzrlib/builtins.py:6328

4165

4171

msgid "Name of the view to switch to."

4166

4172

msgstr ""

4167

4173

4168

#: bzrlib/builtins.py:6356

4174

#: bzrlib/builtins.py:6347

4169

4175

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

4170

4176

msgstr ""

4171

4177

4172

#: bzrlib/builtins.py:6359

4178

#: bzrlib/builtins.py:6350

4173

4179

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

4174

4180

msgstr ""

4175

4181

4176

#: bzrlib/builtins.py:6362

4182

#: bzrlib/builtins.py:6353

4177

4183

msgid "Deleted all views.\n"

4178

4184

msgstr ""

4179

4185

4180

#: bzrlib/builtins.py:6364

4186

#: bzrlib/builtins.py:6355

4181

4187

msgid "No current view to delete"

4182

4188

msgstr ""

4183

4189

4184

#: bzrlib/builtins.py:6367

4190

#: bzrlib/builtins.py:6358

4185

4191

#, python-format

4186

4192

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

4187

4193

msgstr ""

4188

4194

4189

#: bzrlib/builtins.py:6371

4195

#: bzrlib/builtins.py:6362

4190

4196

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

4191

4197

msgstr ""

4192

4198

4193

#: bzrlib/builtins.py:6374

4199

#: bzrlib/builtins.py:6365

4194

4200

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

4195

4201

msgstr ""

4196

4202

4197

#: bzrlib/builtins.py:6377

4203

#: bzrlib/builtins.py:6368

4198

4204

msgid "No current view to disable"

4199

4205

msgstr ""

4200

4206

4201

#: bzrlib/builtins.py:6379

4207

#: bzrlib/builtins.py:6370

4202

4208

#, python-format

4203

4209

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

4204

4210

msgstr ""

4205

4211

4206

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

4212

#: bzrlib/builtins.py:6374 bzrlib/builtins.py:6396

4207

4213

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

4208

4214

msgstr ""

4209

4215

4216

#: bzrlib/builtins.py:6377

4217

msgid "Views defined:\n"

4218

msgstr ""

4219

4210

4220

#: bzrlib/builtins.py:6386

4211

msgid "Views defined:\n"

4212

msgstr ""

4213

4214

#: bzrlib/builtins.py:6395

4215

4221

msgid "No views defined.\n"

4216

4222

msgstr ""

4217

4223

4218

#: bzrlib/builtins.py:6402

4224

#: bzrlib/builtins.py:6393

4219

4225

msgid "Cannot change the 'off' pseudo view"

4220

4226

msgstr ""

4221

4227

4222

#: bzrlib/builtins.py:6410

4228

#: bzrlib/builtins.py:6401

4223

4229

msgid "No current view.\n"

4224

4230

msgstr ""

4225

4231

4226

#: bzrlib/builtins.py:6413

4232

#: bzrlib/builtins.py:6404

4227

4233

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

4228

4234

msgstr ""

4229

4235

4230

#: bzrlib/builtins.py:6433

4236

#: bzrlib/builtins.py:6424

4231

4237

msgid " <no hooks installed>\n"

4232

4238

msgstr ""

4233

4239

4234

#: bzrlib/builtins.py:6437

4240

#: bzrlib/builtins.py:6428

4235

4241

msgid "Remove a branch."

4236

4242

msgstr ""

4237

4243

4238

#: bzrlib/builtins.py:6439

4244

#: bzrlib/builtins.py:6430

4239

4245

msgid ""

4240

4246

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

4241

4247

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

4242

4248

msgstr ""

4243

4249

4244

#: bzrlib/builtins.py:6444

4250

#: bzrlib/builtins.py:6435

4245

4251

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

4246

4252

msgstr ""

4247

4253

4248

#: bzrlib/builtins.py:6446

4254

#: bzrlib/builtins.py:6437

4249

4255

msgid " bzr remove-branch repo/trunk"

4250

4256

msgstr ""

4251

4257

4258

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

4259

#: bzrlib/builtins.py:6444

4260

msgid "Remove branch even if it is the active branch."

4261

msgstr ""

4262

4263

#: bzrlib/builtins.py:6458

4264

msgid "Branch is active. Use --force to remove it."

4265

msgstr ""

4266

4252

4267

# help of 'writer=plain' option of 'shelve' command

4253

#: bzrlib/builtins.py:6461

4268

#: bzrlib/builtins.py:6462

4254

4269

msgid "Plaintext diff output."

4255

4270

msgstr ""

4256

4271

4257

#: bzrlib/builtins.py:6462

4272

#: bzrlib/builtins.py:6463

4258

4273

msgid "Temporarily set aside some changes from the current tree."

4259

4274

msgstr ""

4260

4275

4261

#: bzrlib/builtins.py:6464

4276

#: bzrlib/builtins.py:6465

4262

4277

msgid ""

4263

4278

"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"

4264

4279

"ie. out of the way, until a later time when you can bring them back from\n"

4267

4282

"will they survive its deletion."

4268

4283

msgstr ""

4269

4284

4270

#: bzrlib/builtins.py:6470

4285

#: bzrlib/builtins.py:6471

4271

4286

msgid "If shelve --list is specified, previously-shelved changes are listed."

4272

4287

msgstr ""

4273

4288

4274

#: bzrlib/builtins.py:6472

4289

#: bzrlib/builtins.py:6473

4275

4290

msgid ""

4276

4291

"Shelve is intended to help separate several sets of changes that have\n"

4277

4292

"been inappropriately mingled. If you just want to get rid of all changes\n"

4279

4294

"shelve all text changes at once, use shelve --all."

4280

4295

msgstr ""

4281

4296

4282

#: bzrlib/builtins.py:6477

4297

#: bzrlib/builtins.py:6478

4283

4298

msgid ""

4284

4299

"If filenames are specified, only the changes to those files will be\n"

4285

4300

"shelved. Other files will be left untouched."

4286

4301

msgstr ""

4287

4302

4288

#: bzrlib/builtins.py:6480

4303

#: bzrlib/builtins.py:6481

4289

4304

msgid ""

4290

4305

"If a revision is specified, changes since that revision will be shelved."

4291

4306

msgstr ""

4292

4307

4293

#: bzrlib/builtins.py:6482

4308

#: bzrlib/builtins.py:6483

4294

4309

msgid ""

4295

4310

"You can put multiple items on the shelf, and by default, 'unshelve' will\n"

4296

4311

"restore the most recently shelved changes."

4297

4312

msgstr ""

4298

4313

4299

#: bzrlib/builtins.py:6485

4314

#: bzrlib/builtins.py:6486

4300

4315

msgid ""

4301

4316

"For complicated changes, it is possible to edit the changes in a separate\n"

4302

4317

"editor program to decide what the file remaining in the working copy\n"

4303

4318

"should look like. To do this, add the configuration option"

4304

4319

msgstr ""

4305

4320

4306

#: bzrlib/builtins.py:6489

4321

#: bzrlib/builtins.py:6490

4307

4322

msgid " change_editor = PROGRAM @new_path @old_path"

4308

4323

msgstr ""

4309

4324

4310

#: bzrlib/builtins.py:6491

4325

#: bzrlib/builtins.py:6492

4311

4326

msgid ""

4312

4327

"where @new_path is replaced with the path of the new version of the \n"

4313

4328

"file and @old_path is replaced with the path of the old version of \n"

4317

4332

msgstr ""

4318

4333

4319

4334

# help of 'all' option of 'shelve' command

4320

#: bzrlib/builtins.py:6503

4335

#: bzrlib/builtins.py:6504

4321

4336

msgid "Shelve all changes."

4322

4337

msgstr ""

4323

4338

4324

4339

# help of 'writer' option of 'shelve' command

4325

#: bzrlib/builtins.py:6505

4340

#: bzrlib/builtins.py:6506

4326

4341

msgid "Method to use for writing diffs."

4327

4342

msgstr ""

4328

4343

4329

4344

# title of 'writer' option of 'shelve' command

4330

#: bzrlib/builtins.py:6505

4345

#: bzrlib/builtins.py:6506

4331

4346

msgid "writer"

4332

4347

msgstr ""

4333

4348

4334

4349

# help of 'list' option of 'shelve' command

4335

#: bzrlib/builtins.py:6509

4350

#: bzrlib/builtins.py:6510

4336

4351

msgid "List shelved changes."

4337

4352

msgstr ""

4338

4353

4339

4354

# help of 'destroy' option of 'shelve' command

4340

#: bzrlib/builtins.py:6511

4355

#: bzrlib/builtins.py:6512

4341

4356

msgid "Destroy removed changes instead of shelving them."

4342

4357

msgstr ""

4343

4358

4344

#: bzrlib/builtins.py:6540

4359

#: bzrlib/builtins.py:6541

4345

4360

msgid "No shelved changes."

4346

4361

msgstr ""

4347

4362

4348

#: bzrlib/builtins.py:6551

4363

#: bzrlib/builtins.py:6552

4349

4364

msgid "Restore shelved changes."

4350

4365

msgstr ""

4351

4366

4352

#: bzrlib/builtins.py:6553

4367

#: bzrlib/builtins.py:6554

4353

4368

msgid ""

4354

4369

"By default, the most recently shelved changes are restored. However if you\n"

4355

4370

"specify a shelf by id those changes will be restored instead. This works\n"

4357

4372

msgstr ""

4358

4373

4359

4374

# help of 'action' option of 'unshelve' command

4360

#: bzrlib/builtins.py:6562

4375

#: bzrlib/builtins.py:6563

4361

4376

msgid "The action to perform."

4362

4377

msgstr ""

4363

4378

4364

4379

# title of 'action' option of 'resolve' command

4365

4380

# title of 'action' option of 'unshelve' command

4366

#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694

4381

#: bzrlib/builtins.py:6563 bzrlib/conflicts.py:694

4367

4382

msgid "action"

4368

4383

msgstr ""

4369

4384

4370

4385

# help of 'action=apply' option of 'unshelve' command

4371

#: bzrlib/builtins.py:6564

4386

#: bzrlib/builtins.py:6565

4372

4387

msgid "Apply changes and remove from the shelf."

4373

4388

msgstr ""

4374

4389

4375

4390

# help of 'action=dry-run' option of 'unshelve' command

4376

#: bzrlib/builtins.py:6565

4391

#: bzrlib/builtins.py:6566

4377

4392

msgid "Show changes, but do not apply or remove them."

4378

4393

msgstr ""

4379

4394

4380

4395

# help of 'action=preview' option of 'unshelve' command

4381

#: bzrlib/builtins.py:6566

4396

#: bzrlib/builtins.py:6567

4382

4397

msgid ""

4383

4398

"Instead of unshelving the changes, show the diff that would result from "

4384

4399

"unshelving."

4385

4400

msgstr ""

4386

4401

4387

4402

# help of 'action=delete-only' option of 'unshelve' command

4388

#: bzrlib/builtins.py:6568

4403

#: bzrlib/builtins.py:6569

4389

4404

msgid "Delete changes without applying them."

4390

4405

msgstr ""

4391

4406

4392

4407

# help of 'action=keep' option of 'unshelve' command

4393

#: bzrlib/builtins.py:6569

4408

#: bzrlib/builtins.py:6570

4394

4409

msgid "Apply changes but don't delete them."

4395

4410

msgstr ""

4396

4411

4397

#: bzrlib/builtins.py:6584

4412

#: bzrlib/builtins.py:6585

4398

4413

msgid "Remove unwanted files from working tree."

4399

4414

msgstr ""

4400

4415

4401

#: bzrlib/builtins.py:6586

4416

#: bzrlib/builtins.py:6587

4402

4417

msgid ""

4403

4418

"By default, only unknown files, not ignored files, are deleted. Versioned\n"

4404

4419

"files are never deleted."

4405

4420

msgstr ""

4406

4421

4407

#: bzrlib/builtins.py:6589

4422

#: bzrlib/builtins.py:6590

4408

4423

msgid ""

4409

4424

"Another class is 'detritus', which includes files emitted by bzr during\n"

4410

4425

"normal operations and selftests. (The value of these files decreases with\n"

4411

4426

"time.)"

4412

4427

msgstr ""

4413

4428

4414

#: bzrlib/builtins.py:6593

4429

#: bzrlib/builtins.py:6594

4415

4430

msgid ""

4416

4431

"If no options are specified, unknown files are deleted. Otherwise, option\n"

4417

4432

"flags are respected, and may be combined."

4418

4433

msgstr ""

4419

4434

4420

#: bzrlib/builtins.py:6596

4435

#: bzrlib/builtins.py:6597

4421

4436

msgid "To check what clean-tree will do, use --dry-run."

4422

4437

msgstr ""

4423

4438

4424

4439

# help of 'ignored' option of 'clean-tree' command

4425

#: bzrlib/builtins.py:6599

4440

#: bzrlib/builtins.py:6600

4426

4441

msgid "Delete all ignored files."

4427

4442

msgstr ""

4428

4443

4429

4444

# help of 'detritus' option of 'clean-tree' command

4430

#: bzrlib/builtins.py:6600

4445

#: bzrlib/builtins.py:6601

4431

4446

msgid ""

4432

4447

"Delete conflict files, merge and revert backups, and failed selftest dirs."

4433

4448

msgstr ""

4434

4449

4435

4450

# help of 'unknown' option of 'clean-tree' command

4436

#: bzrlib/builtins.py:6603

4451

#: bzrlib/builtins.py:6604

4437

4452

msgid "Delete files unknown to bzr (default)."

4438

4453

msgstr ""

4439

4454

4440

4455

# help of 'dry-run' option of 'clean-tree' command

4441

#: bzrlib/builtins.py:6604

4456

#: bzrlib/builtins.py:6605

4442

4457

msgid "Show files to delete instead of deleting them."

4443

4458

msgstr ""

4444

4459

4445

4460

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

4446

#: bzrlib/builtins.py:6606

4461

#: bzrlib/builtins.py:6607

4447

4462

msgid "Do not prompt before deleting."

4448

4463

msgstr ""

4449

4464

4503

4518

msgstr[0] ""

4504

4519

msgstr[1] ""

4505

4520

4506

#: bzrlib/bzrdir.py:490

4521

#: bzrlib/bzrdir.py:486

4507

4522

msgid ""

4508

4523

"making backup of {0}\n"

4509

4524

" to {1}"

4510

4525

msgstr ""

4511

4526

4512

#: bzrlib/bzrdir.py:513

4527

#: bzrlib/bzrdir.py:509

4513

4528

msgid "renamed {0} to {1}"

4514

4529

msgstr ""

4515

4530

4516

#: bzrlib/bzrdir.py:1652

4531

#: bzrlib/bzrdir.py:1638

4517

4532

#, python-format

4518

4533

msgid ""

4519

4534

"Source repository format does not support stacking, using format:\n"

4520

4535

" %s"

4521

4536

msgstr ""

4522

4537

4523

#: bzrlib/bzrdir.py:1672

4538

#: bzrlib/bzrdir.py:1658

4524

4539

#, python-format

4525

4540

msgid ""

4526

4541

"Source branch format does not support stacking, using format:\n"

4527

4542

" %s"

4528

4543

msgstr ""

4529

4544

4530

#: bzrlib/bzrdir.py:1818

4545

#: bzrlib/bzrdir.py:1804

4531

4546

msgid "starting repository conversion"

4532

4547

msgstr ""

4533

4548

4534

#: bzrlib/bzrdir.py:2039

4549

#: bzrlib/bzrdir.py:2025

4535

4550

msgid "Using default stacking branch {0} at {1}"

4536

4551

msgstr ""

4537

4552

4843

4858

msgid ":See also: %s"

4844

4859

msgstr ""

4845

4860

4846

#: bzrlib/commands.py:816 bzrlib/gpg.py:324

4861

#: bzrlib/commands.py:826 bzrlib/gpg.py:347

4847

4862

msgid "Only ASCII permitted in option names"

4848

4863

msgstr ""

4849

4864

4850

#: bzrlib/commands.py:841 bzrlib/commands.py:849

4865

#: bzrlib/commands.py:851 bzrlib/commands.py:859

4851

4866

msgid "command {0!r} needs one or more {1}"

4852

4867

msgstr ""

4853

4868

4854

#: bzrlib/commands.py:858

4869

#: bzrlib/commands.py:868

4855

4870

msgid "command {0!r} requires argument {1}"

4856

4871

msgstr ""

4857

4872

4858

#: bzrlib/commands.py:865

4873

#: bzrlib/commands.py:875

4859

4874

msgid "extra argument to command {0}: {1}"

4860

4875

msgstr ""

4861

4876

4862

#: bzrlib/commands.py:962

4877

#: bzrlib/commands.py:972

4863

4878

#, python-format

4864

4879

msgid "Profile data written to \"%s\"."

4865

4880

msgstr ""

4902

4917

msgid "renamed"

4903

4918

msgstr ""

4904

4919

4905

#: bzrlib/commit.py:977

4920

#: bzrlib/commit.py:976

4906

4921

msgid "unchanged"

4907

4922

msgstr ""

4908

4923

4909

#: bzrlib/commit.py:999

4924

#: bzrlib/commit.py:998

4910

4925

msgid "{0} [{1}] - Stage"

4911

4926

msgstr ""

4912

4927

4913

#: bzrlib/commit.py:1002

4928

#: bzrlib/commit.py:1001

4914

4929

#, python-format

4915

4930

msgid "%s - Stage"

4916

4931

msgstr ""

4917

4932

4933

#: bzrlib/commit_signature_commands.py:34

4934

msgid "Sign all commits by a given committer."

4935

msgstr ""

4936

4918

4937

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

4938

msgid ""

4924

4939

"If location is not specified the local tree is used.\n"

4925

4940

"If committer is not specified the default committer is used."

4926

4941

msgstr ""

4927

4942

4928

#: bzrlib/commit_signature_commands.py:41

4943

#: bzrlib/commit_signature_commands.py:39

4929

4944

msgid "This does not sign commits that already have signatures."

4930

4945

msgstr ""

4931

4946

4932

4947

# help of 'dry-run' option of 'sign-my-commits' command

4933

#: bzrlib/commit_signature_commands.py:49

4948

#: bzrlib/commit_signature_commands.py:47

4934

4949

msgid ""

4935

4950

"Don't actually sign anything, just print the revisions that would be signed."

4936

4951

msgstr ""

4937

4952

4953

#: bzrlib/commit_signature_commands.py:98

4954

#, python-format

4955

msgid "Signed %d revision.\n"

4956

msgid_plural "Signed %d revisions.\n"

4957

msgstr[0] ""

4958

msgstr[1] ""

4959

4938

4960

#: bzrlib/commit_signature_commands.py:103

4939

4961

msgid "Verify all commit signatures."

4940

4962

msgstr ""

4950

4972

"verification."

4951

4973

msgstr ""

4952

4974

4953

#: bzrlib/commit_signature_commands.py:147

4975

#: bzrlib/commit_signature_commands.py:148

4954

4976

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

4955

4977

msgstr ""

4956

4978

4957

#: bzrlib/commit_signature_commands.py:168

4979

#: bzrlib/commit_signature_commands.py:166

4958

4980

msgid "All commits signed with verifiable keys"

4959

4981

msgstr ""

4960

4982

4961

#: bzrlib/config.py:475

4983

#: bzrlib/config.py:436

4962

4984

msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."

4963

4985

msgstr ""

4964

4986

4965

#: bzrlib/config.py:2485

4987

#: bzrlib/config.py:2451

4966

4988

msgid "{0} is not an SI unit."

4967

4989

msgstr ""

4968

4990

4969

#: bzrlib/config.py:2949

4991

#: bzrlib/config.py:2970

4970

4992

msgid ""

4971

4993

"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "

4972

4994

"will be saved."

4973

4995

msgstr ""

4974

4996

4975

#: bzrlib/config.py:3093

4997

#: bzrlib/config.py:3114

4976

4998

#, python-format

4977

4999

msgid "Invalid '%s', should be of the form 'name=value'"

4978

5000

msgstr ""

4979

5001

4980

#: bzrlib/config.py:3962

5002

#: bzrlib/config.py:4004

4981

5003

msgid "Display, set or remove a configuration option."

4982

5004

msgstr ""

4983

5005

4984

#: bzrlib/config.py:3964

5006

#: bzrlib/config.py:4006

4985

5007

msgid "Display the active value for a given option."

4986

5008

msgstr ""

4987

5009

4988

#: bzrlib/config.py:3966

5010

#: bzrlib/config.py:4008

4989

5011

msgid ""

4990

5012

"If --all is specified, NAME is interpreted as a regular expression and all\n"

4991

5013

"matching options are displayed mentioning their scope. The active value\n"

4992

5014

"that bzr will take into account is the first one displayed for each option."

4993

5015

msgstr ""

4994

5016

4995

#: bzrlib/config.py:3970

5017

#: bzrlib/config.py:4012

4996

5018

msgid "If no NAME is given, --all .* is implied."

4997

5019

msgstr ""

4998

5020

4999

#: bzrlib/config.py:3972

5021

#: bzrlib/config.py:4014

5000

5022

msgid ""

5001

5023

"Setting a value is achieved by using name=value without spaces. The value\n"

5002

5024

"is set in the most relevant scope and can be checked by displaying the\n"

5004

5026

msgstr ""

5005

5027

5006

5028

# help of 'scope' option of 'config' command

5007

#: bzrlib/config.py:3984

5029

#: bzrlib/config.py:4026

5008

5030

msgid "Reduce the scope to the specified configuration file."

5009

5031

msgstr ""

5010

5032

5011

5033

# help of 'all' option of 'config' command

5012

#: bzrlib/config.py:3988

5034

#: bzrlib/config.py:4030

5013

5035

msgid "Display all the defined values for the matching options."

5014

5036

msgstr ""

5015

5037

5016

5038

# help of 'remove' option of 'config' command

5017

#: bzrlib/config.py:3990

5039

#: bzrlib/config.py:4032

5018

5040

msgid "Remove the option from the configuration file."

5019

5041

msgstr ""

5020

5042

5100

5122

msgstr[0] ""

5101

5123

msgstr[1] ""

5102

5124

5103

#: bzrlib/controldir.py:710

5125

#: bzrlib/controldir.py:712

5104

5126

msgid "{0} is{1} redirected to {2}"

5105

5127

msgstr ""

5106

5128

5317

5339

msgstr ""

5318

5340

5319

5341

#: bzrlib/errors.py:715

5342

msgid "Invalid branch name: %(name)s"

5343

msgstr ""

5344

5345

#: bzrlib/errors.py:724

5320

5346

msgid "Parent branch already exists: \"%(path)s\"."

5321

5347

msgstr ""

5322

5348

5323

#: bzrlib/errors.py:721

5349

#: bzrlib/errors.py:730

5324

5350

msgid ""

5325

5351

"Directory contains a branch, but no working tree (use bzr checkout if you "

5326

5352

"wish to build a working tree): \"%(path)s\""

5327

5353

msgstr ""

5328

5354

5329

#: bzrlib/errors.py:726

5355

#: bzrlib/errors.py:735

5330

5356

msgid ""

5331

5357

"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""

5332

5358

msgstr ""

5333

5359

5334

#: bzrlib/errors.py:736

5360

#: bzrlib/errors.py:745

5335

5361

msgid ""

5336

5362

"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""

5337

5363

msgstr ""

5338

5364

5339

#: bzrlib/errors.py:746

5365

#: bzrlib/errors.py:755

5340

5366

msgid "No repository present: \"%(path)s\""

5341

5367

msgstr ""

5342

5368

5343

#: bzrlib/errors.py:753

5369

#: bzrlib/errors.py:762

5344

5370

msgid ""

5345

5371

"Unsupported branch format: %(format)s\n"

5346

5372

"Please run 'bzr upgrade'"

5347

5373

msgstr ""

5348

5374

5349

#: bzrlib/errors.py:759

5375

#: bzrlib/errors.py:768

5350

5376

msgid "Unknown %(kind)s format: %(format)r"

5351

5377

msgstr ""

5352

5378

5353

#: bzrlib/errors.py:768

5379

#: bzrlib/errors.py:777

5354

5380

msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."

5355

5381

msgstr ""

5356

5382

5357

#: bzrlib/errors.py:778

5383

#: bzrlib/errors.py:787

5358

5384

msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"

5359

5385

msgstr ""

5360

5386

5361

#: bzrlib/errors.py:793

5387

#: bzrlib/errors.py:802

5362

5388

msgid ""

5363

5389

"%(target)s\n"

5364

5390

"is not compatible with\n"

5366

5392

"%(details)s"

5367

5393

msgstr ""

5368

5394

5369

#: bzrlib/errors.py:809

5395

#: bzrlib/errors.py:818

5370

5396

msgid "Revision is not compatible with %(repo_format)s"

5371

5397

msgstr ""

5372

5398

5373

#: bzrlib/errors.py:819

5399

#: bzrlib/errors.py:828

5374

5400

msgid "%(context_info)s%(path)s is already versioned."

5375

5401

msgstr ""

5376

5402

5377

#: bzrlib/errors.py:840

5403

#: bzrlib/errors.py:849

5378

5404

msgid "%(context_info)s%(path)s is not versioned."

5379

5405

msgstr ""

5380

5406

5381

#: bzrlib/errors.py:861

5407

#: bzrlib/errors.py:870

5382

5408

msgid "Path(s) are not versioned: %(paths_as_string)s"

5383

5409

msgstr ""

5384

5410

5385

#: bzrlib/errors.py:872

5411

#: bzrlib/errors.py:881

5386

5412

msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"

5387

5413

msgstr ""

5388

5414

5389

#: bzrlib/errors.py:891

5415

#: bzrlib/errors.py:900

5390

5416

msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""

5391

5417

msgstr ""

5392

5418

5393

#: bzrlib/errors.py:899

5419

#: bzrlib/errors.py:908

5394

5420

msgid ""

5395

5421

"Filename %(filename)r is not valid in your current filesystem encoding "

5396

5422

"%(fs_encoding)s"

5397

5423

msgstr ""

5398

5424

5399

#: bzrlib/errors.py:910

5425

#: bzrlib/errors.py:919

5400

5426

msgid "Cannot operate on \"%(filename)s\" because it is a control file"

5401

5427

msgstr ""

5402

5428

5403

#: bzrlib/errors.py:928

5429

#: bzrlib/errors.py:937

5404

5430

msgid "The lock for '%(lock_description)s' is in use and cannot be broken."

5405

5431

msgstr ""

5406

5432

5407

#: bzrlib/errors.py:967

5433

#: bzrlib/errors.py:976

5408

5434

msgid "Cannot lock %(lock)s: %(why)s"

5409

5435

msgstr ""

5410

5436

5411

#: bzrlib/errors.py:977

5437

#: bzrlib/errors.py:986

5412

5438

msgid ""

5413

5439

"A transaction related operation was attempted after the transaction finished."

5414

5440

msgstr ""

5415

5441

5416

#: bzrlib/errors.py:1004

5442

#: bzrlib/errors.py:1013

5417

5443

msgid "Cannot lock: transport is read only: %(transport)s"

5418

5444

msgstr ""

5419

5445

5420

#: bzrlib/errors.py:1012

5446

#: bzrlib/errors.py:1021

5421

5447

msgid "Could not acquire lock \"%(lock)s\": %(msg)s"

5422

5448

msgstr ""

5423

5449

5424

#: bzrlib/errors.py:1023

5450

#: bzrlib/errors.py:1032

5425

5451

msgid "Lock was broken while still open: %(lock)s - check storage consistency!"

5426

5452

msgstr ""

5427

5453

5428

#: bzrlib/errors.py:1034

5454

#: bzrlib/errors.py:1043

5429

5455

msgid ""

5430

5456

"Lock was released and re-acquired before being broken: %(lock)s: held by "

5431

5457

"%(holder)r, wanted to break %(target)r"

5432

5458

msgstr ""

5433

5459

5434

#: bzrlib/errors.py:1046

5460

#: bzrlib/errors.py:1055

5435

5461

msgid ""

5436

5462

"Lock is apparently held, but corrupted: %(corruption_info)s\n"

5437

5463

"Use 'bzr break-lock' to clear it"

5438

5464

msgstr ""

5439

5465

5440

#: bzrlib/errors.py:1059

5466

#: bzrlib/errors.py:1068

5441

5467

msgid "Lock not held: %(lock)s"

5442

5468

msgstr ""

5443

5469

5444

#: bzrlib/errors.py:1088

5470

#: bzrlib/errors.py:1097

5445

5471

msgid "No changes to commit"

5446

5472

msgstr ""

5447

5473

5448

#: bzrlib/errors.py:1093

5474

#: bzrlib/errors.py:1102

5449

5475

msgid ""

5450

5476

"Selected-file commit of merges is not supported yet: files %(files_str)s"

5451

5477

msgstr ""

5452

5478

5453

#: bzrlib/errors.py:1103

5479

#: bzrlib/errors.py:1112

5454

5480

msgid ""

5455

5481

"Excluding paths during commit is not supported by repository at %(repository)"

5456

5482

"r."

5457

5483

msgstr ""

5458

5484

5459

#: bzrlib/errors.py:1112

5485

#: bzrlib/errors.py:1121

5460

5486

msgid ""

5461

5487

"The specified commit message contains characters unsupported by the current "

5462

5488

"encoding."

5463

5489

msgstr ""

5464

5490

5465

#: bzrlib/errors.py:1118

5491

#: bzrlib/errors.py:1127

5466

5492

msgid "Upgrade URL cannot work with readonly URLs."

5467

5493

msgstr ""

5468

5494

5469

#: bzrlib/errors.py:1123

5495

#: bzrlib/errors.py:1132

5470

5496

msgid "The branch format %(format)s is already at the most recent format."

5471

5497

msgstr ""

5472

5498

5473

#: bzrlib/errors.py:1146

5499

#: bzrlib/errors.py:1155

5474

5500

msgid "Option --change does not accept revision ranges"

5475

5501

msgstr ""

5476

5502

5477

#: bzrlib/errors.py:1151

5503

#: bzrlib/errors.py:1160

5478

5504

msgid "No namespace registered for string: %(spec)r"

5479

5505

msgstr ""

5480

5506

5481

#: bzrlib/errors.py:1170

5507

#: bzrlib/errors.py:1179

5482

5508

msgid ""

5483

5509

"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"

5484

5510

"%(extra)s"

5485

5511

msgstr ""

5486

5512

5487

#: bzrlib/errors.py:1184

5513

#: bzrlib/errors.py:1193

5488

5514

msgid ""

5489

5515

"Operation denied because it would change the main history, which is not "

5490

5516

"permitted by the append_revisions_only setting on branch \"%(location)s\"."

5491

5517

msgstr ""

5492

5518

5493

#: bzrlib/errors.py:1195

5519

#: bzrlib/errors.py:1204

5494

5520

msgid ""

5495

5521

"These branches have diverged. Use the missing command to see how.\n"

5496

5522

"Use the merge command to reconcile them."

5497

5523

msgstr ""

5498

5524

5499

#: bzrlib/errors.py:1215

5525

#: bzrlib/errors.py:1224

5500

5526

msgid ""

5501

5527

"Branches have no common ancestor, and no merge base revision was specified."

5502

5528

msgstr ""

5503

5529

5504

#: bzrlib/errors.py:1221

5530

#: bzrlib/errors.py:1230

5505

5531

msgid ""

5506

5532

"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."

5507

5533

msgstr ""

5508

5534

5509

#: bzrlib/errors.py:1227

5535

#: bzrlib/errors.py:1236

5510

5536

msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"

5511

5537

msgstr ""

5512

5538

5513

#: bzrlib/errors.py:1236

5539

#: bzrlib/errors.py:1245

5514

5540

msgid ""

5515

5541

"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."

5516

5542

msgstr ""

5517

5543

5518

#: bzrlib/errors.py:1245

5544

#: bzrlib/errors.py:1254

5519

5545

msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"

5520

5546

msgstr ""

5521

5547

5522

#: bzrlib/errors.py:1254

5548

#: bzrlib/errors.py:1263

5523

5549

msgid "Branch %(branch)s has no commits."

5524

5550

msgstr ""

5525

5551

5526

#: bzrlib/errors.py:1272

5552

#: bzrlib/errors.py:1281

5527

5553

msgid ""

5528

5554

"Bound branch %(branch)s is out of date with master branch %(master)s."

5529

5555

"%(extra_help)s"

5530

5556

msgstr ""

5531

5557

5532

#: bzrlib/errors.py:1284

5558

#: bzrlib/errors.py:1293

5533

5559

msgid ""

5534

5560

"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "

5535

5561

"bound to %(remote)s."

5536

5562

msgstr ""

5537

5563

5538

#: bzrlib/errors.py:1296

5564

#: bzrlib/errors.py:1305

5539

5565

msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"

5540

5566

msgstr ""

5541

5567

5542

#: bzrlib/errors.py:1305

5568

#: bzrlib/errors.py:1314

5543

5569

msgid ""

5544

5570

"Unable to connect to target of bound branch %(branch)s => %(target)s: "

5545

5571

"%(error)s"

5546

5572

msgstr ""

5547

5573

5548

#: bzrlib/errors.py:1317

5574

#: bzrlib/errors.py:1326

5549

5575

msgid "Error in processing weave: %(msg)s"

5550

5576

msgstr ""

5551

5577

5552

#: bzrlib/errors.py:1326

5578

#: bzrlib/errors.py:1335

5553

5579

msgid "Revision {%(revision_id)s} already present in %(weave)s"

5554

5580

msgstr ""

5555

5581

5556

#: bzrlib/errors.py:1337

5582

#: bzrlib/errors.py:1346

5557

5583

msgid "Revision {%(revision_id)s} not present in %(weave)s"

5558

5584

msgstr ""

5559

5585

5560

#: bzrlib/errors.py:1347

5586

#: bzrlib/errors.py:1356

5561

5587

msgid "Weave invariant violated: %(what)s"

5562

5588

msgstr ""

5563

5589

5564

#: bzrlib/errors.py:1356

5590

#: bzrlib/errors.py:1365

5565

5591

msgid "Parents are mismatched between two revisions. %(msg)s"

5566

5592

msgstr ""

5567

5593

5568

#: bzrlib/errors.py:1378

5594

#: bzrlib/errors.py:1387

5569

5595

msgid ""

5570

5596

"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "

5571

5597

"%(weave_b)s"

5572

5598

msgstr ""

5573

5599

5574

#: bzrlib/errors.py:1390

5600

#: bzrlib/errors.py:1399

5575

5601

msgid "Versioned file error"

5576

5602

msgstr ""

5577

5603

5578

#: bzrlib/errors.py:1395

5604

#: bzrlib/errors.py:1404

5579

5605

msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."

5580

5606

msgstr ""

5581

5607

5582

#: bzrlib/errors.py:1405

5608

#: bzrlib/errors.py:1414

5583

5609

msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."

5584

5610

msgstr ""

5585

5611

5586

#: bzrlib/errors.py:1415

5612

#: bzrlib/errors.py:1424

5587

5613

msgid "Text did not match its checksum: %(msg)s"

5588

5614

msgstr ""

5589

5615

5590

#: bzrlib/errors.py:1541

5616

#: bzrlib/errors.py:1550

5591

5617

msgid "Export format %(format)r not supported"

5592

5618

msgstr ""

5593

5619

5594

#: bzrlib/errors.py:1550

5620

#: bzrlib/errors.py:1559

5595

5621

msgid "Transport error: %(msg)s %(orig_error)s"

5596

5622

msgstr ""

5597

5623

5598

#: bzrlib/errors.py:1576

5624

#: bzrlib/errors.py:1585

5599

5625

msgid "Generic bzr smart protocol error: %(details)s"

5600

5626

msgstr ""

5601

5627

5602

#: bzrlib/errors.py:1584

5628

#: bzrlib/errors.py:1593

5603

5629

msgid "Received bad protocol version marker: %(marker)r"

5604

5630

msgstr ""

5605

5631

5606

#: bzrlib/errors.py:1616

5632

#: bzrlib/errors.py:1625

5607

5633

msgid "Transport operation not possible: %(msg)s %(orig_error)s"

5608

5634

msgstr ""

5609

5635

5610

#: bzrlib/errors.py:1621

5636

#: bzrlib/errors.py:1630

5611

5637

msgid "Connection error: %(msg)s %(orig_error)s"

5612

5638

msgstr ""

5613

5639

5614

#: bzrlib/errors.py:1626

5640

#: bzrlib/errors.py:1635

5615

5641

msgid "%(msg)s %(host)s%(port)s%(orig_error)s"

5616

5642

msgstr ""

5617

5643

5618

#: bzrlib/errors.py:1647

5644

#: bzrlib/errors.py:1656

5619

5645

msgid "Connection closed: %(msg)s %(orig_error)s"

5620

5646

msgstr ""

5621

5647

5622

#: bzrlib/errors.py:1652

5648

#: bzrlib/errors.py:1661

5623

5649

msgid "Connection Timeout: %(msg)s%(orig_error)s"

5624

5650

msgstr ""

5625

5651

5626

#: bzrlib/errors.py:1657

5652

#: bzrlib/errors.py:1666

5627

5653

msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"

5628

5654

msgstr ""

5629

5655

5630

#: bzrlib/errors.py:1667

5656

#: bzrlib/errors.py:1676

5631

5657

msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"

5632

5658

msgstr ""

5633

5659

5634

#: bzrlib/errors.py:1682

5660

#: bzrlib/errors.py:1691

5635

5661

msgid "Certificate error: %(error)s"

5636

5662

msgstr ""

5637

5663

5638

#: bzrlib/errors.py:1690

5664

#: bzrlib/errors.py:1699

5639

5665

msgid "Invalid http range %(range)r for %(path)s: %(msg)s"

5640

5666

msgstr ""

5641

5667

5642

#: bzrlib/errors.py:1704

5668

#: bzrlib/errors.py:1713

5643

5669

msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"

5644

5670

msgstr ""

5645

5671

5646

#: bzrlib/errors.py:1712

5672

#: bzrlib/errors.py:1721

5647

5673

msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"

5648

5674

msgstr ""

5649

5675

5650

#: bzrlib/errors.py:1721

5676

#: bzrlib/errors.py:1730

5651

5677

msgid "%(source)s is%(permanently)s redirected to %(target)s"

5652

5678

msgstr ""

5653

5679

5654

#: bzrlib/errors.py:1735

5680

#: bzrlib/errors.py:1744

5655

5681

msgid "Too many redirections"

5656

5682

msgstr ""

5657

5683

5658

#: bzrlib/errors.py:1740

5684

#: bzrlib/errors.py:1749

5659

5685

msgid "Working tree has conflicts."

5660

5686

msgstr ""

5661

5687

5662

#: bzrlib/errors.py:1744

5688

#: bzrlib/errors.py:1753

5663

5689

msgid "Config file %(filename)s is not UTF-8 encoded\n"

5664

5690

msgstr ""

5665

5691

5666

#: bzrlib/errors.py:1753

5692

#: bzrlib/errors.py:1762

5667

5693

msgid ""

5668

5694

"Error(s) parsing config file %(filename)s:\n"

5669

5695

"%(errors)s"

5670

5696

msgstr ""

5671

5697

5672

#: bzrlib/errors.py:1763

5698

#: bzrlib/errors.py:1772

5673

5699

msgid ""

5674

5700

"Bad value \"%(value)s\" for option \"%(name)s\".\n"

5675

5701

"See ``bzr help %(name)s``"

5676

5702

msgstr ""

5677

5703

5678

#: bzrlib/errors.py:1773

5704

#: bzrlib/errors.py:1782

5679

5705

msgid "%(username)r does not seem to contain a reasonable email address"

5680

5706

msgstr ""

5681

5707

5682

#: bzrlib/errors.py:1782

5708

#: bzrlib/errors.py:1791

5683

5709

msgid "Failed to GPG sign data with command \"%(command_line)s\""

5684

5710

msgstr ""

5685

5711

5686

#: bzrlib/errors.py:1790

5712

#: bzrlib/errors.py:1799

5687

5713

msgid "Failed to verify GPG signature data with error \"%(error)s\""

5688

5714

msgstr ""

5689

5715

5690

#: bzrlib/errors.py:1798

5716

#: bzrlib/errors.py:1807

5691

5717

msgid "Unable to import library \"%(library)s\": %(error)s"

5692

5718

msgstr ""

5693

5719

5694

#: bzrlib/errors.py:1806

5720

#: bzrlib/errors.py:1815

5695

5721

msgid "python-gpgme is not installed, it is needed to verify signatures"

5696

5722

msgstr ""

5697

5723

5698

#: bzrlib/errors.py:1814

5724

#: bzrlib/errors.py:1823

5699

5725

msgid ""

5700

5726

"The working tree for %(basedir)s has changed since the last commit, but "

5701

5727

"weave merge requires that it be unchanged"

5702

5728

msgstr ""

5703

5729

5704

#: bzrlib/errors.py:1824

5730

#: bzrlib/errors.py:1833

5705

5731

msgid ""

5706

5732

"Can't reprocess and show base, because reprocessing obscures the "

5707

5733

"relationship of conflicting lines to the base"

5708

5734

msgstr ""

5709

5735

5710

#: bzrlib/errors.py:1830

5736

#: bzrlib/errors.py:1839

5711

5737

msgid "Cycle in graph %(graph)r"

5712

5738

msgstr ""

5713

5739

5714

#: bzrlib/errors.py:1858

5740

#: bzrlib/errors.py:1867

5715

5741

msgid "File %(filename)s is not conflicted."

5716

5742

msgstr ""

5717

5743

5718

#: bzrlib/errors.py:1880

5744

#: bzrlib/errors.py:1889

5719

5745

msgid "No bundle was found in \"%(filename)s\"."

5720

5746

msgstr ""

5721

5747

5722

#: bzrlib/errors.py:1889

5748

#: bzrlib/errors.py:1898

5723

5749

msgid "Unable to handle bundle version %(version)s: %(msg)s"

5724

5750

msgstr ""

5725

5751

5726

#: bzrlib/errors.py:1899

5752

#: bzrlib/errors.py:1908

5727

5753

msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"

5728

5754

msgstr ""

5729

5755

5730

#: bzrlib/errors.py:1912

5756

#: bzrlib/errors.py:1921

5731

5757

msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"

5732

5758

msgstr ""

5733

5759

5734

#: bzrlib/errors.py:1922

5760

#: bzrlib/errors.py:1931

5735

5761

msgid "Key %(key)s is already present in map"

5736

5762

msgstr ""

5737

5763

5738

#: bzrlib/errors.py:1927

5764

#: bzrlib/errors.py:1936

5739

5765

msgid "The prefix %(prefix)s is in the help search path twice."

5740

5766

msgstr ""

5741

5767

5742

#: bzrlib/errors.py:1937

5768

#: bzrlib/errors.py:1946

5743

5769

msgid ""

5744

5770

"No final name for trans_id %(trans_id)r\n"

5745

5771

"file-id: %(file_id)r\n"

5746

5772

"root trans-id: %(root_trans_id)r\n"

5747

5773

msgstr ""

5748

5774

5749

#: bzrlib/errors.py:1969

5775

#: bzrlib/errors.py:1978

5750

5776

msgid "Attempt to reuse a transform that has already been applied."

5751

5777

msgstr ""

5752

5778

5753

#: bzrlib/errors.py:1974

5779

#: bzrlib/errors.py:1983

5754

5780

msgid "Moving the root directory is not supported at this time"

5755

5781

msgstr ""

5756

5782

5757

#: bzrlib/errors.py:1979

5783

#: bzrlib/errors.py:1988

5758

5784

msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"

5759

5785

msgstr ""

5760

5786

5761

#: bzrlib/errors.py:1990

5787

#: bzrlib/errors.py:1999

5762

5788

msgid ""

5763

5789

"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5764

5790

msgstr ""

5765

5791

5766

#: bzrlib/errors.py:2026

5792

#: bzrlib/errors.py:2035

5767

5793

msgid ""

5768

5794

"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5769

5795

msgstr ""

5770

5796

5771

#: bzrlib/errors.py:2056

5797

#: bzrlib/errors.py:2065

5772

5798

msgid "Unable to import paramiko (required for sftp support): %(error)s"

5773

5799

msgstr ""

5774

5800

5775

#: bzrlib/errors.py:2064

5801

#: bzrlib/errors.py:2073

5776

5802

msgid "Nothing to merge."

5777

5803

msgstr ""

5778

5804

5779

#: bzrlib/errors.py:2069

5805

#: bzrlib/errors.py:2078

5780

5806

msgid "Format %(format)s cannot be initialised by this version of bzr."

5781

5807

msgstr ""

5782

5808

5783

#: bzrlib/errors.py:2078

5809

#: bzrlib/errors.py:2087

5784

5810

msgid ""

5785

5811

"Cannot convert from format %(from_format)s to format %(format)s. "

5786

5812

"%(problem)s"

5787

5813

msgstr ""

5788

5814

5789

#: bzrlib/errors.py:2090

5815

#: bzrlib/errors.py:2099

5790

5816

msgid "Could not find an appropriate Differ for file \"%(path)s\""

5791

5817

msgstr ""

5792

5818

5793

#: bzrlib/errors.py:2098

5819

#: bzrlib/errors.py:2107

5794

5820

msgid "%(exe_name)s could not be found on this machine"

5795

5821

msgstr ""

5796

5822

5797

#: bzrlib/errors.py:2106

5823

#: bzrlib/errors.py:2115

5798

5824

msgid "Diff is not installed on this machine: %(msg)s"

5799

5825

msgstr ""

5800

5826

5801

#: bzrlib/errors.py:2114

5827

#: bzrlib/errors.py:2123

5802

5828

msgid "Diff3 is not installed on this machine."

5803

5829

msgstr ""

5804

5830

5805

#: bzrlib/errors.py:2120

5831

#: bzrlib/errors.py:2129

5806

5832

msgid "The content being inserted is already present."

5807

5833

msgstr ""

5808

5834

5809

#: bzrlib/errors.py:2125

5835

#: bzrlib/errors.py:2134

5810

5836

msgid ""

5811

5837

"This tree contains left-over files from a failed operation.\n"

5812

5838

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5814

5840

" keep, and delete it when you are done."

5815

5841

msgstr ""

5816

5842

5817

#: bzrlib/errors.py:2136

5843

#: bzrlib/errors.py:2145

5818

5844

msgid ""

5819

5845

"This tree contains left-over files from a failed operation.\n"

5820

5846

" Please examine %(pending_deletion)s to see if it contains any files you\n"

5821

5847

" wish to keep, and delete it when you are done."

5822

5848

msgstr ""

5823

5849

5824

#: bzrlib/errors.py:2146

5850

#: bzrlib/errors.py:2155

5825

5851

msgid ""

5826

5852

"Unable to delete transform temporary directory %(limbo_dir)s.\n"

5827

5853

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5829

5855

" keep, and delete it when you are done."

5830

5856

msgstr ""

5831

5857

5832

#: bzrlib/errors.py:2157

5858

#: bzrlib/errors.py:2166

5833

5859

msgid ""

5834

5860

"Unable to delete transform temporary directory %(pending_deletion)s. Please "

5835

5861

"examine %(pending_deletion)s to see if it contains any files you wish to "

5836

5862

"keep, and delete it when you are done."

5837

5863

msgstr ""

5838

5864

5839

#: bzrlib/errors.py:2167

5865

#: bzrlib/errors.py:2176

5840

5866

msgid "Working tree is out of date, please run 'bzr update'.%(more)s"

5841

5867

msgstr ""

5842

5868

5843

#: bzrlib/errors.py:2181

5869

#: bzrlib/errors.py:2190

5844

5870

msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."

5845

5871

msgstr ""

5846

5872

5847

#: bzrlib/errors.py:2194

5873

#: bzrlib/errors.py:2203

5848

5874

msgid "Error in merge modified format"

5849

5875

msgstr ""

5850

5876

5851

#: bzrlib/errors.py:2199

5877

#: bzrlib/errors.py:2208

5852

5878

msgid "Format error in conflict listings"

5853

5879

msgstr ""

5854

5880

5855

#: bzrlib/errors.py:2203

5881

#: bzrlib/errors.py:2212

5856

5882

msgid ""

5857

5883

"Inconsistency in dirstate file %(dirstate_path)s.\n"

5858

5884

"Error: %(description)s"

5859

5885

msgstr ""

5860

5886

5861

#: bzrlib/errors.py:2214

5887

#: bzrlib/errors.py:2223

5862

5888

msgid ""

5863

5889

"An error has been detected in the repository %(repo_path)s.\n"

5864

5890

"Please run bzr reconcile on this repository."

5865

5891

msgstr ""

5866

5892

5867

#: bzrlib/errors.py:2225

5893

#: bzrlib/errors.py:2234

5868

5894

msgid ""

5869

5895

"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"

5870

5896

"reason: %(reason)s"

5871

5897

msgstr ""

5872

5898

5873

#: bzrlib/errors.py:2238

5899

#: bzrlib/errors.py:2247

5874

5900

msgid ""

5875

5901

"An inconsistent delta was supplied: %(delta)r\n"

5876

5902

"reason: %(reason)s"

5877

5903

msgstr ""

5878

5904

5879

#: bzrlib/errors.py:2250

5905

#: bzrlib/errors.py:2259

5880

5906

msgid "To use this feature you must upgrade your branch at %(path)s."

5881

5907

msgstr ""

5882

5908

5883

#: bzrlib/errors.py:2259

5909

#: bzrlib/errors.py:2268

5884

5910

msgid "To use this feature you must upgrade your repository at %(path)s."

5885

5911

msgstr ""

5886

5912

5887

#: bzrlib/errors.py:2264

5913

#: bzrlib/errors.py:2273

5888

5914

msgid ""

5889

5915

"To use this feature you must upgrade your branch at %(path)s to a format "

5890

5916

"which supports rich roots."

5891

5917

msgstr ""

5892

5918

5893

#: bzrlib/errors.py:2270

5919

#: bzrlib/errors.py:2279

5894

5920

msgid "Cannot perform local-only commits on unbound branches."

5895

5921

msgstr ""

5896

5922

5897

#: bzrlib/errors.py:2275

5923

#: bzrlib/errors.py:2284

5898

5924

msgid "The method %(mname)s is not supported on objects of type %(tname)s."

5899

5925

msgstr ""

5900

5926

5901

#: bzrlib/errors.py:2296

5927

#: bzrlib/errors.py:2305

5902

5928

msgid "Ghost tags not supported by format %(format)r."

5903

5929

msgstr ""

5904

5930

5905

#: bzrlib/errors.py:2304

5931

#: bzrlib/errors.py:2313

5906

5932

msgid "File is binary but should be text."

5907

5933

msgstr ""

5908

5934

5909

#: bzrlib/errors.py:2309

5935

#: bzrlib/errors.py:2318

5910

5936

msgid "The path %(path)s is not permitted on this platform"

5911

5937

msgstr ""

5912

5938

5913

#: bzrlib/errors.py:2318

5939

#: bzrlib/errors.py:2327

5914

5940

msgid ""

5915

5941

"Testament did not match expected value.\n"

5916

5942

" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"

5917

5943

" {%(measured)s}"

5918

5944

msgstr ""

5919

5945

5920

#: bzrlib/errors.py:2330

5946

#: bzrlib/errors.py:2339

5921

5947

msgid "Not a bzr revision-bundle: %(text)r"

5922

5948

msgstr ""

5923

5949

5924

#: bzrlib/errors.py:2339

5950

#: bzrlib/errors.py:2348

5925

5951

msgid "Bad bzr revision-bundle: %(text)r"

5926

5952

msgstr ""

5927

5953

5928

#: bzrlib/errors.py:2348

5954

#: bzrlib/errors.py:2357

5929

5955

msgid "Malformed bzr revision-bundle header: %(text)r"

5930

5956

msgstr ""

5931

5957

5932

#: bzrlib/errors.py:2353

5958

#: bzrlib/errors.py:2362

5933

5959

msgid "Malformed patches in bzr revision-bundle: %(text)r"

5934

5960

msgstr ""

5935

5961

5936

#: bzrlib/errors.py:2358

5962

#: bzrlib/errors.py:2367

5937

5963

msgid "Malformed footer in bzr revision-bundle: %(text)r"

5938

5964

msgstr ""

5939

5965

5940

#: bzrlib/errors.py:2363

5966

#: bzrlib/errors.py:2372

5941

5967

msgid "End of line marker was not \\n in bzr revision-bundle"

5942

5968

msgstr ""

5943

5969

5944

#: bzrlib/errors.py:2373

5970

#: bzrlib/errors.py:2382

5945

5971

msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"

5946

5972

msgstr ""

5947

5973

5948

#: bzrlib/errors.py:2383

5974

#: bzrlib/errors.py:2392

5949

5975

msgid "Root class for inventory serialization errors"

5950

5976

msgstr ""

5951

5977

5952

#: bzrlib/errors.py:2387

5978

#: bzrlib/errors.py:2396

5953

5979

msgid ""

5954

5980

"The inventory was not in the expected format:\n"

5955

5981

" %(msg)s"

5956

5982

msgstr ""

5957

5983

5958

#: bzrlib/errors.py:2396

5984

#: bzrlib/errors.py:2405

5959

5985

msgid "This operation requires rich root data storage"

5960

5986

msgstr ""

5961

5987

5962

#: bzrlib/errors.py:2409

5988

#: bzrlib/errors.py:2418

5963

5989

msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"

5964

5990

msgstr ""

5965

5991

5966

#: bzrlib/errors.py:2418

5992

#: bzrlib/errors.py:2427

5967

5993

msgid ""

5968

5994

"Don't know how to handle SSH connections. Please set BZR_SSH environment "

5969

5995

"variable."

5970

5996

msgstr ""

5971

5997

5972

#: bzrlib/errors.py:2425

5998

#: bzrlib/errors.py:2434

5973

5999

msgid ""

5974

6000

"Could not determine revno for {%(revision_id)s} because its ancestry shows a "

5975

6001

"ghost at {%(ghost_revision_id)s}"

5976

6002

msgstr ""

5977

6003

5978

#: bzrlib/errors.py:2435

6004

#: bzrlib/errors.py:2444

5979

6005

msgid "Ghost revision {%(revision_id)s} cannot be used here."

5980

6006

msgstr ""

5981

6007

5982

#: bzrlib/errors.py:2486

6008

#: bzrlib/errors.py:2495

5983

6009

msgid ""

5984

6010

"A merge directive must provide either a bundle or a public branch location."

5985

6011

msgstr ""

5986

6012

5987

#: bzrlib/errors.py:2493

6013

#: bzrlib/errors.py:2502

5988

6014

msgid "Bad merge directive payload %(start)r"

5989

6015

msgstr ""

5990

6016

5991

#: bzrlib/errors.py:2503

6017

#: bzrlib/errors.py:2512

5992

6018

msgid "Preview patch does not match requested changes."

5993

6019

msgstr ""

5994

6020

5995

#: bzrlib/errors.py:2509

6021

#: bzrlib/errors.py:2518

5996

6022

msgid "Patch_type was %(patch_type)s, but no patch was supplied."

5997

6023

msgstr ""

5998

6024

5999

#: bzrlib/errors.py:2519

6025

#: bzrlib/errors.py:2528

6000

6026

msgid ""

6001

6027

"Your branch does not have all of the revisions required in order to merge "

6002

6028

"this merge directive and the target location specified in the merge "

6003

6029

"directive is not a branch: %(location)s."

6004

6030

msgstr ""

6005

6031

6006

#: bzrlib/errors.py:2531

6032

#: bzrlib/errors.py:2540

6007

6033

msgid "Unsupported entry kind %(kind)s"

6008

6034

msgstr ""

6009

6035

6010

#: bzrlib/errors.py:2539

6036

#: bzrlib/errors.py:2548

6011

6037

msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"

6012

6038

msgstr ""

6013

6039

6014

#: bzrlib/errors.py:2549

6040

#: bzrlib/errors.py:2558

6015

6041

msgid "Subsume target %(other_tree)s needs to be upgraded."

6016

6042

msgstr ""

6017

6043

6018

#: bzrlib/errors.py:2568

6044

#: bzrlib/errors.py:2577

6019

6045

msgid "No such tag: %(tag_name)s"

6020

6046

msgstr ""

6021

6047

6022

#: bzrlib/errors.py:2576

6048

#: bzrlib/errors.py:2585

6023

6049

msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."

6024

6050

msgstr ""

6025

6051

6026

#: bzrlib/errors.py:2585

6052

#: bzrlib/errors.py:2594

6027

6053

msgid "Tag %(tag_name)s already exists."

6028

6054

msgstr ""

6029

6055

6030

#: bzrlib/errors.py:2593

6056

#: bzrlib/errors.py:2602

6031

6057

msgid ""

6032

6058

"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"

6033

6059

"\" for more information on this feature."

6034

6060

msgstr ""

6035

6061

6036

#: bzrlib/errors.py:2603

6062

#: bzrlib/errors.py:2612

6037

6063

msgid ""

6038

6064

"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"

6039

6065

msgstr ""

6040

6066

6041

#: bzrlib/errors.py:2613

6067

#: bzrlib/errors.py:2622

6042

6068

msgid ""

6043

6069

"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"

6044

6070

msgstr ""

6045

6071

6046

#: bzrlib/errors.py:2623

6072

#: bzrlib/errors.py:2632

6047

6073

msgid "Invalid line in bugs property: '%(line)s'"

6048

6074

msgstr ""

6049

6075

6050

#: bzrlib/errors.py:2631

6076

#: bzrlib/errors.py:2640

6051

6077

msgid "Invalid bug status: '%(status)s'"

6052

6078

msgstr ""

6053

6079

6054

#: bzrlib/errors.py:2639

6080

#: bzrlib/errors.py:2648

6055

6081

msgid "Could not understand response from smart server: %(response_tuple)r"

6056

6082

msgstr ""

6057

6083

6058

#: bzrlib/errors.py:2678

6084

#: bzrlib/errors.py:2687

6059

6085

msgid "Server sent an unexpected error: %(error_tuple)r"

6060

6086

msgstr ""

6061

6087

6062

#: bzrlib/errors.py:2697

6088

#: bzrlib/errors.py:2706

6063

6089

msgid "Unrecognised container format: %(container_format)r"

6064

6090

msgstr ""

6065

6091

6066

#: bzrlib/errors.py:2705

6092

#: bzrlib/errors.py:2714

6067

6093

msgid "Unexpected end of container stream"

6068

6094

msgstr ""

6069

6095

6070

#: bzrlib/errors.py:2710

6096

#: bzrlib/errors.py:2719

6071

6097

msgid "Unknown record type: %(record_type)r"

6072

6098

msgstr ""

6073

6099

6074

#: bzrlib/errors.py:2718

6100

#: bzrlib/errors.py:2727

6075

6101

msgid "Invalid record: %(reason)s"

6076

6102

msgstr ""

6077

6103

6078

#: bzrlib/errors.py:2726

6104

#: bzrlib/errors.py:2735

6079

6105

msgid "Container has data after end marker: %(excess)r"

6080

6106

msgstr ""

6081

6107

6082

#: bzrlib/errors.py:2734

6108

#: bzrlib/errors.py:2743

6083

6109

msgid "Container has multiple records with the same name: %(name)s"

6084

6110

msgstr ""

6085

6111

6086

#: bzrlib/errors.py:2747

6112

#: bzrlib/errors.py:2756

6087

6113

msgid "Corrupt or incompatible data stream: %(reason)s"

6088

6114

msgstr ""

6089

6115

6090

#: bzrlib/errors.py:2755

6116

#: bzrlib/errors.py:2764

6091

6117

msgid "SMTP error: %(error)s"

6092

6118

msgstr ""

6093

6119

6094

#: bzrlib/errors.py:2763

6120

#: bzrlib/errors.py:2772

6095

6121

msgid "No message supplied."

6096

6122

msgstr ""

6097

6123

6098

#: bzrlib/errors.py:2768

6124

#: bzrlib/errors.py:2777

6099

6125

msgid "No mail-to address (--mail-to) or output (-o) specified."

6100

6126

msgstr ""

6101

6127

6102

#: bzrlib/errors.py:2773

6103

msgid "Unknown mail client: %(mail_client)s"

6104

msgstr ""

6105

6106

#: bzrlib/errors.py:2781

6128

#: bzrlib/errors.py:2782

6107

6129

msgid ""

6108

6130

"Unable to find mail client with the following names: "

6109

6131

"%(mail_command_list_string)s"

6110

6132

msgstr ""

6111

6133

6112

#: bzrlib/errors.py:2791

6134

#: bzrlib/errors.py:2792

6113

6135

msgid "SMTP connection to %(host)s refused"

6114

6136

msgstr ""

6115

6137

6116

#: bzrlib/errors.py:2800

6138

#: bzrlib/errors.py:2801

6117

6139

msgid "Please specify smtp_server. No server at default %(host)s."

6118

6140

msgstr ""

6119

6141

6120

#: bzrlib/errors.py:2814

6142

#: bzrlib/errors.py:2815

6121

6143

msgid ""

6122

6144

"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"

6123

6145

"reconfigure."

6124

6146

msgstr ""

6125

6147

6126

#: bzrlib/errors.py:2826

6148

#: bzrlib/errors.py:2827

6127

6149

msgid "'%(display_url)s' is already a branch."

6128

6150

msgstr ""

6129

6151

6130

#: bzrlib/errors.py:2831

6152

#: bzrlib/errors.py:2832

6131

6153

msgid "'%(display_url)s' is already a tree."

6132

6154

msgstr ""

6133

6155

6134

#: bzrlib/errors.py:2836

6156

#: bzrlib/errors.py:2837

6135

6157

msgid "'%(display_url)s' is already a checkout."

6136

6158

msgstr ""

6137

6159

6138

#: bzrlib/errors.py:2841

6160

#: bzrlib/errors.py:2842

6139

6161

msgid "'%(display_url)s' is already a lightweight checkout."

6140

6162

msgstr ""

6141

6163

6142

#: bzrlib/errors.py:2846

6164

#: bzrlib/errors.py:2847

6143

6165

msgid "'%(display_url)s' is already using a shared repository."

6144

6166

msgstr ""

6145

6167

6146

#: bzrlib/errors.py:2851

6168

#: bzrlib/errors.py:2852

6147

6169

msgid "'%(display_url)s' is already standalone."

6148

6170

msgstr ""

6149

6171

6150

#: bzrlib/errors.py:2856

6172

#: bzrlib/errors.py:2857

6151

6173

msgid "Shared repository '%(display_url)s' already creates working trees."

6152

6174

msgstr ""

6153

6175

6154

#: bzrlib/errors.py:2862

6176

#: bzrlib/errors.py:2863

6155

6177

msgid ""

6156

6178

"Shared repository '%(display_url)s' already doesn't create working trees."

6157

6179

msgstr ""

6158

6180

6159

#: bzrlib/errors.py:2868

6181

#: bzrlib/errors.py:2869

6160

6182

msgid "Requested reconfiguration of '%(display_url)s' is not supported."

6161

6183

msgstr ""

6162

6184

6163

#: bzrlib/errors.py:2873

6185

#: bzrlib/errors.py:2874

6164

6186

msgid "No location could be found to bind to at %(display_url)s."

6165

6187

msgstr ""

6166

6188

6167

#: bzrlib/errors.py:2878

6189

#: bzrlib/errors.py:2879

6168

6190

msgid ""

6169

6191

"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."

6170

6192

"%(more)s"

6171

6193

msgstr ""

6172

6194

6173

#: bzrlib/errors.py:2897

6195

#: bzrlib/errors.py:2898

6174

6196

msgid ""

6175

6197

"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."

6176

6198

"%(more)s"

6177

6199

msgstr ""

6178

6200

6179

#: bzrlib/errors.py:2903

6201

#: bzrlib/errors.py:2904

6180

6202

msgid "Variable {%(name)s} is not available."

6181

6203

msgstr ""

6182

6204

6183

#: bzrlib/errors.py:2911

6205

#: bzrlib/errors.py:2912

6184

6206

msgid "No template specified."

6185

6207

msgstr ""

6186

6208

6187

#: bzrlib/errors.py:2916

6209

#: bzrlib/errors.py:2917

6188

6210

msgid "Unable to create symlink %(path_str)son this platform"

6189

6211

msgstr ""

6190

6212

6191

#: bzrlib/errors.py:2931

6213

#: bzrlib/errors.py:2932

6192

6214

msgid ""

6193

6215

"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"

6194

6216

"\", \"local\"."

6195

6217

msgstr ""

6196

6218

6197

#: bzrlib/errors.py:2965

6219

#: bzrlib/errors.py:2966

6198

6220

msgid ""

6199

6221

"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"

6200

6222

msgstr ""

6201

6223

6202

#: bzrlib/errors.py:2977

6224

#: bzrlib/errors.py:2978

6203

6225

msgid "The \"%(config_id)s\" configuration does not exist."

6204

6226

msgstr ""

6205

6227

6206

#: bzrlib/errors.py:2985

6228

#: bzrlib/errors.py:2986

6207

6229

msgid "The \"%(option_name)s\" configuration option does not exist."

6208

6230

msgstr ""

6209

6231

6210

#: bzrlib/errors.py:2993

6232

#: bzrlib/errors.py:2994

6211

6233

msgid "The alias \"%(alias_name)s\" does not exist."

6212

6234

msgstr ""

6213

6235

6214

#: bzrlib/errors.py:3007

6236

#: bzrlib/errors.py:3008

6215

6237

msgid "\"%(alias_name)s\" is not a valid location alias."

6216

6238

msgstr ""

6217

6239

6218

#: bzrlib/errors.py:3015

6240

#: bzrlib/errors.py:3016

6219

6241

msgid "No %(alias_name)s location assigned."

6220

6242

msgstr ""

6221

6243

6222

#: bzrlib/errors.py:3023

6244

#: bzrlib/errors.py:3024

6223

6245

msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."

6224

6246

msgstr ""

6225

6247

6226

#: bzrlib/errors.py:3033

6248

#: bzrlib/errors.py:3034

6227

6249

msgid "Unknown rules detected: %(unknowns_str)s."

6228

6250

msgstr ""

6229

6251

6230

#: bzrlib/errors.py:3044

6252

#: bzrlib/errors.py:3045

6231

6253

msgid "Tip change rejected: %(msg)s"

6232

6254

msgstr ""

6233

6255

6234

#: bzrlib/errors.py:3052

6256

#: bzrlib/errors.py:3053

6235

6257

msgid "Shelf corrupt."

6236

6258

msgstr ""

6237

6259

6238

#: bzrlib/errors.py:3057

6260

#: bzrlib/errors.py:3058

6239

6261

msgid "Corruption while decompressing repository file%(orig_error)s"

6240

6262

msgstr ""

6241

6263

6242

#: bzrlib/errors.py:3069

6264

#: bzrlib/errors.py:3070

6243

6265

msgid "No changes are shelved with id \"%(shelf_id)d\"."

6244

6266

msgstr ""

6245

6267

6246

#: bzrlib/errors.py:3077

6268

#: bzrlib/errors.py:3078

6247

6269

msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."

6248

6270

msgstr ""

6249

6271

6250

#: bzrlib/errors.py:3085

6272

#: bzrlib/errors.py:3086

6251

6273

msgid "An attempt to access a url outside the server jail was made: '%(url)s'."

6252

6274

msgstr ""

6253

6275

6254

#: bzrlib/errors.py:3093

6276

#: bzrlib/errors.py:3094

6255

6277

msgid "The user aborted the operation."

6256

6278

msgstr ""

6257

6279

6258

#: bzrlib/errors.py:3098

6280

#: bzrlib/errors.py:3099

6259

6281

msgid "Branching '%(url)s'(%(format)s) must create a working tree."

6260

6282

msgstr ""

6261

6283

6262

#: bzrlib/errors.py:3108

6284

#: bzrlib/errors.py:3109

6263

6285

msgid "No such view: %(view_name)s."

6264

6286

msgstr ""

6265

6287

6266

#: bzrlib/errors.py:3118

6288

#: bzrlib/errors.py:3119

6267

6289

msgid ""

6268

6290

"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "

6269

6291

"to a later format."

6270

6292

msgstr ""

6271

6293

6272

#: bzrlib/errors.py:3127

6294

#: bzrlib/errors.py:3128

6273

6295

msgid ""

6274

6296

"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"

6275

6297

msgstr ""

6276

6298

6277

#: bzrlib/errors.py:3194

6299

#: bzrlib/errors.py:3195

6278

6300

msgid "%(bzrdir)r does not support co-located branches."

6279

6301

msgstr ""

6280

6302

6281

#: bzrlib/errors.py:3200

6303

#: bzrlib/errors.py:3201

6282

6304

msgid ""

6283

6305

"Unable to determine your name.\n"

6284

6306

"Please, set your name with the 'whoami' command.\n"

6285

6307

"E.g. bzr whoami \"Your Name <name@example.com>\""

6286

6308

msgstr ""

6287

6309

6288

#: bzrlib/errors.py:3209

6310

#: bzrlib/errors.py:3210

6289

6311

msgid "Invalid pattern(s) found. %(msg)s"

6290

6312

msgstr ""

6291

6313

6292

#: bzrlib/errors.py:3217

6314

#: bzrlib/errors.py:3218

6293

6315

msgid ""

6294

6316

"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "

6295

6317

"unbind` to fix."

6296

6318

msgstr ""

6297

6319

6298

#: bzrlib/errors.py:3228

6320

#: bzrlib/errors.py:3229

6299

6321

msgid "Loop involving %(refs)r while expanding \"%(string)s\"."

6300

6322

msgstr ""

6301

6323

6302

#: bzrlib/errors.py:3237

6324

#: bzrlib/errors.py:3238

6303

6325

msgid "Option %(name)s is not defined while expanding \"%(string)s\"."

6304

6326

msgstr ""

6305

6327

6306

#: bzrlib/errors.py:3246

6328

#: bzrlib/errors.py:3247

6307

6329

msgid ""

6308

6330

"No compatible object available for operations from %(source)r to %(target)r."

6309

6331

msgstr ""

6310

6332

6311

#: bzrlib/errors.py:3256

6333

#: bzrlib/errors.py:3257

6312

6334

msgid ""

6313

6335

"VFS requests over the smart server are not allowed. Encountered: %(method)s, "

6314

6336

"%(arguments)s."

6315

6337

msgstr ""

6316

6338

6317

#: bzrlib/errors.py:3266

6339

#: bzrlib/errors.py:3267

6318

6340

msgid ""

6319

6341

"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "

6320

6342

"format %(format)r"

6321

6343

msgstr ""

6322

6344

6323

#: bzrlib/errors.py:3278

6345

#: bzrlib/errors.py:3279

6324

6346

msgid ""

6325

6347

"Missing feature %(feature)s not provided by this version of Bazaar or any "

6326

6348

"plugin."

6327

6349

msgstr ""

6328

6350

6329

#: bzrlib/errors.py:3291

6351

#: bzrlib/errors.py:3292

6330

6352

msgid "Binary files section encountered."

6331

6353

msgstr ""

6332

6354

6333

#: bzrlib/errors.py:3299

6355

#: bzrlib/errors.py:3300

6334

6356

msgid ""

6335

6357

"Malformed patch header. %(desc)s\n"

6336

6358

"%(line)r"

6337

6359

msgstr ""

6338

6360

6339

#: bzrlib/errors.py:3308

6361

#: bzrlib/errors.py:3309

6340

6362

msgid ""

6341

6363

"Malformed hunk header. %(desc)s\n"

6342

6364

"%(line)r"

6343

6365

msgstr ""

6344

6366

6345

#: bzrlib/errors.py:3317

6367

#: bzrlib/errors.py:3318

6346

6368

msgid ""

6347

6369

"Malformed line. %(desc)s\n"

6348

6370

"%(line)r"

6349

6371

msgstr ""

6350

6372

6351

#: bzrlib/errors.py:3327

6373

#: bzrlib/errors.py:3328

6352

6374

msgid ""

6353

6375

"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "

6354

6376

"but patch says it should be \"%(patch_line)s\""

6355

6377

msgstr ""

6356

6378

6357

#: bzrlib/errors.py:3338

6379

#: bzrlib/errors.py:3339

6358

6380

msgid "The feature %(feature)s has already been registered."

6359

6381

msgstr ""

6360

6382

6407

6429

"regular push."

6408

6430

msgstr ""

6409

6431

6410

#: bzrlib/gpg.py:119 bzrlib/gpg.py:460

6432

#: bzrlib/gpg.py:366

6433

msgid "No GnuPG key results for pattern: {0}"

6434

msgstr ""

6435

6436

#: bzrlib/gpg.py:439

6411

6437

msgid "{0} commits with valid signatures"

6412

6438

msgstr ""

6413

6439

6414

#: bzrlib/gpg.py:123 bzrlib/gpg.py:465

6440

#: bzrlib/gpg.py:445

6415

6441

msgid "{0} commit with unknown key"

6416

6442

msgid_plural "{0} commits with unknown keys"

6417

6443

msgstr[0] ""

6418

6444

msgstr[1] ""

6419

6445

6420

#: bzrlib/gpg.py:129 bzrlib/gpg.py:472

6446

#: bzrlib/gpg.py:453

6421

6447

msgid "{0} commit not valid"

6422

6448

msgid_plural "{0} commits not valid"

6423

6449

msgstr[0] ""

6424

6450

msgstr[1] ""

6425

6451

6426

#: bzrlib/gpg.py:135 bzrlib/gpg.py:479

6452

#: bzrlib/gpg.py:461

6427

6453

msgid "{0} commit not signed"

6428

6454

msgid_plural "{0} commits not signed"

6429

6455

msgstr[0] ""

6430

6456

msgstr[1] ""

6431

6457

6432

#: bzrlib/gpg.py:141 bzrlib/gpg.py:486

6458

#: bzrlib/gpg.py:469

6433

6459

msgid "{0} commit with key now expired"

6434

6460

msgid_plural "{0} commits with key now expired"

6435

6461

msgstr[0] ""

6436

6462

msgstr[1] ""

6437

6463

6438

#: bzrlib/gpg.py:343

6439

msgid "No GnuPG key results for pattern: {0}"

6440

msgstr ""

6464

#: bzrlib/gpg.py:489

6465

msgid "{0} commit by author {1} with key {2} now expired"

6466

msgid_plural "{0} commits by author {1} with key {2} now expired"

6467

msgstr[0] ""

6468

msgstr[1] ""

6441

6469

6442

#: bzrlib/gpg.py:386

6470

#: bzrlib/gpg.py:505

6443

6471

msgid "{0} signed {1} commit"

6444

6472

msgid_plural "{0} signed {1} commits"

6445

6473

msgstr[0] ""

6446

6474

msgstr[1] ""

6447

6475

6448

#: bzrlib/gpg.py:403 bzrlib/gpg.py:419

6476

#: bzrlib/gpg.py:522 bzrlib/gpg.py:539

6449

6477

msgid "{0} commit by author {1}"

6450

6478

msgid_plural "{0} commits by author {1}"

6451

6479

msgstr[0] ""

6452

6480

msgstr[1] ""

6453

6481

6454

#: bzrlib/gpg.py:433

6482

#: bzrlib/gpg.py:554

6455

6483

msgid "Unknown key {0} signed {1} commit"

6456

6484

msgid_plural "Unknown key {0} signed {1} commits"

6457

6485

msgstr[0] ""

6458

6486

msgstr[1] ""

6459

6487

6460

#: bzrlib/gpg.py:452

6461

msgid "{0} commit by author {1} with key {2} now expired"

6462

msgid_plural "{0} commits by author {1} with key {2} now expired"

6463

msgstr[0] ""

6464

msgstr[1] ""

6465

6466

6488

#: bzrlib/groupcompress.py:1739

6467

6489

#, python-format

6468

6490

msgid "Insert claimed random_id=True, but then inserted %r two times"

6469

6491

msgstr ""

6470

6492

6471

#: bzrlib/hooks.py:331

6493

#: bzrlib/hooks.py:313

6472

6494

#, python-format

6473

6495

msgid "Introduced in: %s"

6474

6496

msgstr ""

6475

6497

6476

#: bzrlib/hooks.py:334

6498

#: bzrlib/hooks.py:316

6477

6499

#, python-format

6478

6500

msgid "Deprecated in: %s"

6479

6501

msgstr ""

6522

6544

"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"

6523

6545

msgstr ""

6524

6546

6525

#: bzrlib/log.py:572

6547

#: bzrlib/log.py:563

6526

6548

msgid "--exclude-common-ancestry requires two different revisions"

6527

6549

msgstr ""

6528

6550

6529

#: bzrlib/log.py:574

6551

#: bzrlib/log.py:565

6530

6552

#, python-format

6531

6553

msgid "invalid direction %r"

6532

6554

msgstr ""

6533

6555

6534

#: bzrlib/log.py:662

6556

#: bzrlib/log.py:653

6535

6557

msgid "Start revision not found in history of end revision."

6536

6558

msgstr ""

6537

6559

6538

#: bzrlib/log.py:1080 bzrlib/log.py:1138

6560

#: bzrlib/log.py:1071 bzrlib/log.py:1129

6539

6561

msgid "Logging revision 0 is invalid."

6540

6562

msgstr ""

6541

6563

6542

#: bzrlib/log.py:1082 bzrlib/log.py:1140

6564

#: bzrlib/log.py:1073 bzrlib/log.py:1131

6543

6565

msgid "Start revision must be older than the end revision."

6544

6566

msgstr ""

6545

6567

6546

#: bzrlib/log.py:1827

6568

#: bzrlib/log.py:1818

6547

6569

#, python-format

6548

6570

msgid "unknown log formatter: %r"

6549

6571

msgstr ""

6550

6572

6551

#: bzrlib/log.py:2123

6573

#: bzrlib/log.py:2114

6552

6574

msgid "fixes bug"

6553

6575

msgid_plural "fixes bugs"

6554

6576

msgstr[0] ""

6563

6585

msgid "%d conflicts encountered."

6564

6586

msgstr ""

6565

6587

6566

#: bzrlib/merge.py:845 bzrlib/merge.py:1933

6588

#: bzrlib/merge.py:845 bzrlib/merge.py:1868

6567

6589

msgid "Preparing file merge"

6568

6590

msgstr ""

6569

6591

6711

6733

msgid "lstat/stat of ({0!r}): {1!r}"

6712

6734

msgstr ""

6713

6735

6714

#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019

6736

#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041

6715

6737

#, python-format

6716

6738

msgid "sorry, %r not allowed in path"

6717

6739

msgstr ""

6718

6740

6719

#: bzrlib/osutils.py:1237

6741

#: bzrlib/osutils.py:1259

6720

6742

#, python-format

6721

6743

msgid "%r is too short to calculate a relative path"

6722

6744

msgstr ""

6758

6780

msgid "Generate only the shell function, don't enable it"

6759

6781

msgstr ""

6760

6782

6761

#: bzrlib/plugins/launchpad/__init__.py:81

6783

#: bzrlib/plugins/launchpad/account.py:66

6784

msgid "Setting ssh/sftp usernames for launchpad.net."

6785

msgstr ""

6786

6787

#: bzrlib/plugins/launchpad/cmds.py:44

6762

6788

msgid "Register a branch with launchpad.net."

6763

6789

msgstr ""

6764

6790

6765

#: bzrlib/plugins/launchpad/__init__.py:83

6791

#: bzrlib/plugins/launchpad/cmds.py:46

6766

6792

msgid ""

6767

6793

"This command lists a bzr branch in the directory of branches on\n"

6768

6794

"launchpad.net. Registration allows the branch to be associated with\n"

6769

6795

"bugs or specifications."

6770

6796

msgstr ""

6771

6797

6772

#: bzrlib/plugins/launchpad/__init__.py:87

6798

#: bzrlib/plugins/launchpad/cmds.py:50

6773

6799

msgid ""

6774

6800

"Before using this command you must register the project to which the\n"

6775

6801

"branch belongs, and create an account for yourself on launchpad.net."

6776

6802

msgstr ""

6777

6803

6778

#: bzrlib/plugins/launchpad/__init__.py:90

6804

#: bzrlib/plugins/launchpad/cmds.py:53

6779

6805

msgid ""

6780

6806

"arguments:\n"

6781

6807

" public_url: The publicly visible url for the branch to register.\n"

6787

6813

" otherwise error."

6788

6814

msgstr ""

6789

6815

6790

#: bzrlib/plugins/launchpad/__init__.py:99

6816

#: bzrlib/plugins/launchpad/cmds.py:62

6791

6817

msgid ""

6792

6818

"example:\n"

6793

6819

" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"

6795

6821

msgstr ""

6796

6822

6797

6823

# help of 'project' option of 'register-branch' command

6798

#: bzrlib/plugins/launchpad/__init__.py:106

6824

#: bzrlib/plugins/launchpad/cmds.py:69

6799

6825

msgid "Launchpad project short name to associate with the branch."

6800

6826

msgstr ""

6801

6827

6802

6828

# help of 'branch-name' option of 'register-branch' command

6803

#: bzrlib/plugins/launchpad/__init__.py:113

6829

#: bzrlib/plugins/launchpad/cmds.py:76

6804

6830

msgid ""

6805

6831

"Short name for the branch; by default taken from the last component of the "

6806

6832

"url."

6807

6833

msgstr ""

6808

6834

6809

6835

# help of 'branch-title' option of 'register-branch' command

6810

#: bzrlib/plugins/launchpad/__init__.py:117

6836

#: bzrlib/plugins/launchpad/cmds.py:80

6811

6837

msgid "One-sentence description of the branch."

6812

6838

msgstr ""

6813

6839

6814

6840

# help of 'branch-description' option of 'register-branch' command

6815

#: bzrlib/plugins/launchpad/__init__.py:120

6841

#: bzrlib/plugins/launchpad/cmds.py:83

6816

6842

msgid "Longer description of the purpose or contents of the branch."

6817

6843

msgstr ""

6818

6844

6819

6845

# help of 'author' option of 'register-branch' command

6820

#: bzrlib/plugins/launchpad/__init__.py:123

6846

#: bzrlib/plugins/launchpad/cmds.py:86

6821

6847

msgid "Branch author's email address, if not yourself."

6822

6848

msgstr ""

6823

6849

6824

6850

# help of 'link-bug' option of 'register-branch' command

6825

#: bzrlib/plugins/launchpad/__init__.py:126

6851

#: bzrlib/plugins/launchpad/cmds.py:89

6826

6852

msgid "The bug this branch fixes."

6827

6853

msgstr ""

6828

6854

6829

6855

# help of 'dry-run' option of 'register-branch' command

6830

#: bzrlib/plugins/launchpad/__init__.py:129

6856

#: bzrlib/plugins/launchpad/cmds.py:92

6831

6857

msgid "Prepare the request but don't actually send it."

6832

6858

msgstr ""

6833

6859

6834

#: bzrlib/plugins/launchpad/__init__.py:151

6860

#: bzrlib/plugins/launchpad/cmds.py:114

6835

6861

msgid ""

6836

6862

"register-branch requires a public branch url - see bzr help register-branch."

6837

6863

msgstr ""

6838

6864

6839

#: bzrlib/plugins/launchpad/__init__.py:159

6865

#: bzrlib/plugins/launchpad/cmds.py:122

6840

6866

msgid "--product is deprecated; please use --project."

6841

6867

msgstr ""

6842

6868

6843

#: bzrlib/plugins/launchpad/__init__.py:191

6869

#: bzrlib/plugins/launchpad/cmds.py:152

6844

6870

msgid "Open a Launchpad branch page in your web browser."

6845

6871

msgstr ""

6846

6872

6847

6873

# help of 'dry-run' option of 'launchpad-open' command

6848

#: bzrlib/plugins/launchpad/__init__.py:196

6874

#: bzrlib/plugins/launchpad/cmds.py:157

6849

6875

msgid "Do not actually open the browser. Just say the URL we would use."

6850

6876

msgstr ""

6851

6877

6852

#: bzrlib/plugins/launchpad/__init__.py:231

6878

#: bzrlib/plugins/launchpad/cmds.py:192

6853

6879

#, python-format

6854

6880

msgid "Opening %s in web browser"

6855

6881

msgstr ""

6856

6882

6857

#: bzrlib/plugins/launchpad/__init__.py:241

6883

#: bzrlib/plugins/launchpad/cmds.py:200

6858

6884

msgid "Show or set the Launchpad user ID."

6859

6885

msgstr ""

6860

6886

6861

#: bzrlib/plugins/launchpad/__init__.py:243

6887

#: bzrlib/plugins/launchpad/cmds.py:202

6862

6888

msgid ""

6863

6889

"When communicating with Launchpad, some commands need to know your\n"

6864

6890

"Launchpad user ID. This command can be used to set or show the\n"

6865

6891

"user ID that Bazaar will use for such communication."

6866

6892

msgstr ""

6867

6893

6868

#: bzrlib/plugins/launchpad/__init__.py:247

6894

#: bzrlib/plugins/launchpad/cmds.py:206

6869

6895

msgid ""

6870

6896

":Examples:\n"

6871

6897

" Show the Launchpad ID of the current user::"

6872

6898

msgstr ""

6873

6899

6874

#: bzrlib/plugins/launchpad/__init__.py:250

6900

#: bzrlib/plugins/launchpad/cmds.py:209

6875

6901

msgid " bzr launchpad-login"

6876

6902

msgstr ""

6877

6903

6878

#: bzrlib/plugins/launchpad/__init__.py:252

6904

#: bzrlib/plugins/launchpad/cmds.py:211

6879

6905

msgid " Set the Launchpad ID of the current user to 'bob'::"

6880

6906

msgstr ""

6881

6907

6882

#: bzrlib/plugins/launchpad/__init__.py:254

6908

#: bzrlib/plugins/launchpad/cmds.py:213

6883

6909

msgid " bzr launchpad-login bob"

6884

6910

msgstr ""

6885

6911

6886

6912

# help of 'no-check' option of 'launchpad-login' command

6887

#: bzrlib/plugins/launchpad/__init__.py:261

6913

#: bzrlib/plugins/launchpad/cmds.py:220

6888

6914

msgid "Don't check that the user name is valid."

6889

6915

msgstr ""

6890

6916

6891

#: bzrlib/plugins/launchpad/__init__.py:276

6892

#: bzrlib/plugins/launchpad/__init__.py:287

6917

#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246

6893

6918

msgid "Launchpad user ID exists and has SSH keys.\n"

6894

6919

msgstr ""

6895

6920

6896

#: bzrlib/plugins/launchpad/__init__.py:279

6921

#: bzrlib/plugins/launchpad/cmds.py:238

6897

6922

msgid "No Launchpad user ID configured.\n"

6898

6923

msgstr ""

6899

6924

6900

#: bzrlib/plugins/launchpad/__init__.py:290

6925

#: bzrlib/plugins/launchpad/cmds.py:249

6901

6926

#, python-format

6902

6927

msgid "Launchpad user ID set to '%s'.\n"

6903

6928

msgstr ""

6904

6929

6905

#: bzrlib/plugins/launchpad/__init__.py:298

6930

#: bzrlib/plugins/launchpad/cmds.py:255

6906

6931

msgid "Ask Launchpad to mirror a branch now."

6907

6932

msgstr ""

6908

6933

6909

#: bzrlib/plugins/launchpad/__init__.py:318

6934

#: bzrlib/plugins/launchpad/cmds.py:272

6910

6935

msgid "Propose merging a branch on Launchpad."

6911

6936

msgstr ""

6912

6937

6913

#: bzrlib/plugins/launchpad/__init__.py:320

6938

#: bzrlib/plugins/launchpad/cmds.py:274

6914

6939

msgid ""

6915

6940

"This will open your usual editor to provide the initial comment. When it\n"

6916

6941

"has created the proposal, it will open it in your default web browser."

6917

6942

msgstr ""

6918

6943

6919

#: bzrlib/plugins/launchpad/__init__.py:323

6944

#: bzrlib/plugins/launchpad/cmds.py:277

6920

6945

msgid ""

6921

6946

"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"

6922

6947

"is not supplied, the remembered submit branch will be used. If no submit\n"

6923

6948

"branch is remembered, the development focus will be used."

6924

6949

msgstr ""

6925

6950

6926

#: bzrlib/plugins/launchpad/__init__.py:327

6951

#: bzrlib/plugins/launchpad/cmds.py:281

6927

6952

msgid ""

6928

6953

"By default, the SUBMIT_BRANCH's review team will be requested to review\n"

6929

6954

"the merge proposal. This can be overriden by specifying --review (-R).\n"

6931

6956

"may optionally be followed by '=' and the review type. For example:"

6932

6957

msgstr ""

6933

6958

6934

#: bzrlib/plugins/launchpad/__init__.py:332

6959

#: bzrlib/plugins/launchpad/cmds.py:286

6935

6960

msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"

6936

6961

msgstr ""

6937

6962

6938

#: bzrlib/plugins/launchpad/__init__.py:334

6963

#: bzrlib/plugins/launchpad/cmds.py:288

6939

6964

msgid ""

6940

6965

"This will propose a merge, request \"jrandom\" to perform a review of\n"

6941

6966

"unspecified type, and request \"review-team\" to perform a \"qa\" review."

6942

6967

msgstr ""

6943

6968

6944

6969

# help of 'staging' option of 'lp-propose-merge' command

6945

#: bzrlib/plugins/launchpad/__init__.py:339

6970

#: bzrlib/plugins/launchpad/cmds.py:293

6946

6971

msgid "Propose the merge on staging."

6947

6972

msgstr ""

6948

6973

6949

6974

# help of 'message' option of 'lp-propose-merge' command

6950

#: bzrlib/plugins/launchpad/__init__.py:341

6975

#: bzrlib/plugins/launchpad/cmds.py:295

6951

6976

msgid "Commit message."

6952

6977

msgstr ""

6953

6978

6954

6979

# help of 'approve' option of 'lp-propose-merge' command

6955

#: bzrlib/plugins/launchpad/__init__.py:343

6980

#: bzrlib/plugins/launchpad/cmds.py:297

6956

6981

msgid "Mark the proposal as approved immediately."

6957

6982

msgstr ""

6958

6983

6984

# help of 'fixes' option of 'lp-propose-merge' command

6985

#: bzrlib/plugins/launchpad/cmds.py:298

6986

msgid "The bug this proposal fixes."

6987

msgstr ""

6988

6959

6989

# help of 'review' option of 'lp-propose-merge' command

6960

#: bzrlib/plugins/launchpad/__init__.py:345

6990

#: bzrlib/plugins/launchpad/cmds.py:300

6961

6991

msgid "Requested reviewer and optional type."

6962

6992

msgstr ""

6963

6993

6964

#: bzrlib/plugins/launchpad/__init__.py:382

6994

#: bzrlib/plugins/launchpad/cmds.py:335

6965

6995

msgid "Find the proposal to merge this revision."

6966

6996

msgstr ""

6967

6997

6968

#: bzrlib/plugins/launchpad/__init__.py:384

6998

#: bzrlib/plugins/launchpad/cmds.py:337

6969

6999

msgid ""

6970

7000

"Finds the merge proposal(s) that discussed landing the specified revision.\n"

6971

7001

"This works only if the selected branch was the merge proposal target, and\n"

6973

7003

"are opened in a web browser."

6974

7004

msgstr ""

6975

7005

6976

#: bzrlib/plugins/launchpad/__init__.py:389

7006

#: bzrlib/plugins/launchpad/cmds.py:342

6977

7007

msgid ""

6978

7008

"Any revision involved in the merge may be specified-- the revision in\n"

6979

7009

"which the merge was performed, or one of the revisions that was merged."

6980

7010

msgstr ""

6981

7011

6982

#: bzrlib/plugins/launchpad/__init__.py:392

7012

#: bzrlib/plugins/launchpad/cmds.py:345

6983

7013

msgid "So, to find the merge proposal that reviewed line 1 of README::"

6984

7014

msgstr ""

6985

7015

6986

#: bzrlib/plugins/launchpad/__init__.py:394

7016

#: bzrlib/plugins/launchpad/cmds.py:347

6987

7017

msgid " bzr lp-find-proposal -r annotate:README:1"

6988

7018

msgstr ""

6989

7019

6990

#: bzrlib/plugins/launchpad/__init__.py:409

7020

#: bzrlib/plugins/launchpad/cmds.py:363

6991

7021

msgid "No review found."

6992

7022

msgstr ""

6993

7023

6994

#: bzrlib/plugins/launchpad/__init__.py:410

7024

#: bzrlib/plugins/launchpad/cmds.py:364

6995

7025

#, python-format

6996

7026

msgid "%d proposals(s) found."

6997

7027

msgstr ""

6998

7028

6999

#: bzrlib/plugins/launchpad/__init__.py:420

7029

#: bzrlib/plugins/launchpad/cmds.py:374

7000

7030

msgid "Finding revision-id"

7001

7031

msgstr ""

7002

7032

7003

#: bzrlib/plugins/launchpad/__init__.py:427

7033

#: bzrlib/plugins/launchpad/cmds.py:381

7004

7034

msgid "Finding merge"

7005

7035

msgstr ""

7006

7036

7007

#: bzrlib/plugins/launchpad/__init__.py:432

7037

#: bzrlib/plugins/launchpad/cmds.py:386

7008

7038

msgid "Finding revno"

7009

7039

msgstr ""

7010

7040

7011

#: bzrlib/plugins/launchpad/__init__.py:437

7041

#: bzrlib/plugins/launchpad/cmds.py:392

7012

7042

msgid "Finding Launchpad branch"

7013

7043

msgstr ""

7014

7044

7015

#: bzrlib/plugins/launchpad/__init__.py:440

7045

#: bzrlib/plugins/launchpad/cmds.py:395

7016

7046

msgid "Finding proposals"

7017

7047

msgstr ""

7018

7048

7019

#: bzrlib/plugins/launchpad/account.py:66

7020

msgid "Setting ssh/sftp usernames for launchpad.net."

7021

msgstr ""

7022

7023

7049

#: bzrlib/plugins/launchpad/lp_api.py:241

7024

7050

#: bzrlib/plugins/launchpad/lp_api.py:246

7025

7051

#, python-format

7063

7089

" remote: {2}"

7064

7090

msgstr ""

7065

7091

7066

#: bzrlib/plugins/launchpad/lp_propose.py:149

7092

#: bzrlib/plugins/launchpad/lp_propose.py:150

7067

7093

#, python-format

7068

7094

msgid "There is already a branch merge proposal: %s"

7069

7095

msgstr ""

7070

7096

7071

#: bzrlib/plugins/weave_fmt/bzrdir.py:236

7097

#: bzrlib/plugins/weave_fmt/bzrdir.py:237

7072

7098

msgid "pb parameter to convert() is deprecated"

7073

7099

msgstr ""

7074

7100

7075

#: bzrlib/plugins/weave_fmt/bzrdir.py:239

7101

#: bzrlib/plugins/weave_fmt/bzrdir.py:240

7076

7102

msgid "starting upgrade from format 4 to 5"

7077

7103

msgstr ""

7078

7104

7079

#: bzrlib/plugins/weave_fmt/bzrdir.py:249

7105

#: bzrlib/plugins/weave_fmt/bzrdir.py:250

7080

7106

msgid "note: upgrade may be faster if all store files are ungzipped first"

7081

7107

msgstr ""

7082

7108

7083

#: bzrlib/plugins/weave_fmt/bzrdir.py:278

7109

#: bzrlib/plugins/weave_fmt/bzrdir.py:279

7084

7110

msgid "converting revision"

7085

7111

msgstr ""

7086

7112

7087

#: bzrlib/plugins/weave_fmt/bzrdir.py:283

7113

#: bzrlib/plugins/weave_fmt/bzrdir.py:284

7088

7114

msgid "upgraded to weaves:"

7089

7115

msgstr ""

7090

7116

7091

#: bzrlib/plugins/weave_fmt/bzrdir.py:284

7117

#: bzrlib/plugins/weave_fmt/bzrdir.py:285

7092

7118

#, python-format

7093

7119

msgid "%6d revisions and inventories"

7094

7120

msgstr ""

7095

7121

7096

#: bzrlib/plugins/weave_fmt/bzrdir.py:286

7122

#: bzrlib/plugins/weave_fmt/bzrdir.py:287

7097

7123

#, python-format

7098

7124

msgid "%6d revisions not present"

7099

7125

msgstr ""

7100

7126

7101

#: bzrlib/plugins/weave_fmt/bzrdir.py:288

7127

#: bzrlib/plugins/weave_fmt/bzrdir.py:289

7102

7128

#, python-format

7103

7129

msgid "%6d texts"

7104

7130

msgstr ""

7105

7131

7106

#: bzrlib/plugins/weave_fmt/bzrdir.py:324

7132

#: bzrlib/plugins/weave_fmt/bzrdir.py:325

7107

7133

msgid "writing weave"

7108

7134

msgstr ""

7109

7135

7110

#: bzrlib/plugins/weave_fmt/bzrdir.py:328

7111

#: bzrlib/plugins/weave_fmt/bzrdir.py:330

7136

#: bzrlib/plugins/weave_fmt/bzrdir.py:329

7137

#: bzrlib/plugins/weave_fmt/bzrdir.py:331

7112

7138

msgid "inventory"

7113

7139

msgstr ""

7114

7140

7115

#: bzrlib/plugins/weave_fmt/bzrdir.py:347

7141

#: bzrlib/plugins/weave_fmt/bzrdir.py:348

7116

7142

msgid "write revision"

7117

7143

msgstr ""

7118

7144

7119

#: bzrlib/plugins/weave_fmt/bzrdir.py:361

7145

#: bzrlib/plugins/weave_fmt/bzrdir.py:362

7120

7146

msgid "loading revision"

7121

7147

msgstr ""

7122

7148

7123

#: bzrlib/plugins/weave_fmt/bzrdir.py:366

7149

#: bzrlib/plugins/weave_fmt/bzrdir.py:367

7124

7150

#, python-format

7125

7151

msgid "revision {%s} not present in branch; will be converted as a ghost"

7126

7152

msgstr ""

7127

7153

7128

#: bzrlib/plugins/weave_fmt/bzrdir.py:506

7154

#: bzrlib/plugins/weave_fmt/bzrdir.py:507

7129

7155

msgid "starting upgrade from format 5 to 6"

7130

7156

msgstr ""

7131

7157

7132

#: bzrlib/plugins/weave_fmt/bzrdir.py:516

7158

#: bzrlib/plugins/weave_fmt/bzrdir.py:517

7133

7159

#, python-format

7134

7160

msgid "adding prefixes to %s"

7135

7161

msgstr ""

7136

7162

7137

#: bzrlib/plugins/weave_fmt/bzrdir.py:556

7163

#: bzrlib/plugins/weave_fmt/bzrdir.py:557

7138

7164

msgid "starting upgrade from format 6 to metadir"

7139

7165

msgstr ""

7140

7166

7141

#: bzrlib/plugins/weave_fmt/bzrdir.py:564

7167

#: bzrlib/plugins/weave_fmt/bzrdir.py:565

7142

7168

msgid "Removing ancestry.weave"

7143

7169

msgstr ""

7144

7170

7145

#: bzrlib/plugins/weave_fmt/bzrdir.py:569

7171

#: bzrlib/plugins/weave_fmt/bzrdir.py:570

7146

7172

msgid "Finding branch files"

7147

7173

msgstr ""

7148

7174

7149

#: bzrlib/plugins/weave_fmt/bzrdir.py:579

7175

#: bzrlib/plugins/weave_fmt/bzrdir.py:580

7150

7176

msgid "Upgrading repository"

7151

7177

msgstr ""

7152

7178

7153

#: bzrlib/plugins/weave_fmt/bzrdir.py:589

7179

#: bzrlib/plugins/weave_fmt/bzrdir.py:590

7154

7180

msgid "Upgrading branch"

7155

7181

msgstr ""

7156

7182

7157

#: bzrlib/plugins/weave_fmt/bzrdir.py:612

7183

#: bzrlib/plugins/weave_fmt/bzrdir.py:613

7158

7184

msgid "No working tree."

7159

7185

msgstr ""

7160

7186

7161

#: bzrlib/plugins/weave_fmt/bzrdir.py:619

7187

#: bzrlib/plugins/weave_fmt/bzrdir.py:620

7162

7188

msgid "Upgrading working tree"

7163

7189

msgstr ""

7164

7190

7165

#: bzrlib/plugins/weave_fmt/bzrdir.py:640

7191

#: bzrlib/plugins/weave_fmt/bzrdir.py:641

7166

7192

#, python-format

7167

7193

msgid "Make %s lock"

7168

7194

msgstr ""

7169

7195

7170

#: bzrlib/plugins/weave_fmt/bzrdir.py:651

7196

#: bzrlib/plugins/weave_fmt/bzrdir.py:652

7171

7197

#, python-format

7172

7198

msgid "Moving %s"

7173

7199

msgstr ""

7194

7220

msgid "Too many redirections trying to make %s."

7195

7221

msgstr ""

7196

7222

7197

#: bzrlib/push.py:147

7223

#: bzrlib/push.py:148

7198

7224

msgid ""

7199

7225

"These branches have diverged. See \"bzr help diverged-branches\" for more "

7200

7226

"information."

7201

7227

msgstr ""

7202

7228

7203

#: bzrlib/push.py:151

7229

#: bzrlib/push.py:152

7204

7230

#, python-format

7205

7231

msgid ""

7206

7232

"It is not possible to losslessly push to %s. You may want to use dpush "

7207

7233

"instead."

7208

7234

msgstr ""

7209

7235

7210

#: bzrlib/push.py:157

7236

#: bzrlib/push.py:158

7211

7237

#, python-format

7212

7238

msgid ""

7213

7239

"At %s you have a valid .bzr control directory, but not a branch or "

7324

7350

msgid "{0} => {1}"

7325

7351

msgstr ""

7326

7352

7327

#: bzrlib/repository.py:1787

7353

#: bzrlib/repository.py:1799

7328

7354

msgid "Moving repository to repository.backup"

7329

7355

msgstr ""

7330

7356

7331

#: bzrlib/repository.py:1794

7357

#: bzrlib/repository.py:1806

7332

7358

msgid "Creating new repository"

7333

7359

msgstr ""

7334

7360

7335

#: bzrlib/repository.py:1799

7361

#: bzrlib/repository.py:1811

7336

7362

msgid "Copying content"

7337

7363

msgstr ""

7338

7364

7339

#: bzrlib/repository.py:1803

7365

#: bzrlib/repository.py:1815

7340

7366

msgid "Deleting old repository content"

7341

7367

msgstr ""

7342

7368

7343

#: bzrlib/repository.py:1805

7369

#: bzrlib/repository.py:1817

7344

7370

msgid "repository converted"

7345

7371

msgstr ""

7346

7372

7348

7374

msgid "Using {0} {1}"

7349

7375

msgstr ""

7350

7376

7351

#: bzrlib/send.py:58

7377

#: bzrlib/send.py:59

7352

7378

#, python-format

7353

7379

msgid "Mail client \"%s\" does not support specifying body"

7354

7380

msgstr ""

7355

7381

7356

#: bzrlib/send.py:62

7382

#: bzrlib/send.py:63

7357

7383

msgid "--remember requires a branch to be specified."

7358

7384

msgstr ""

7359

7385

7360

#: bzrlib/send.py:77

7386

#: bzrlib/send.py:78

7361

7387

msgid "No submit branch known or specified"

7362

7388

msgstr ""

7363

7389

7364

#: bzrlib/send.py:80

7390

#: bzrlib/send.py:81

7365

7391

msgid "Using saved {0} location \"{1}\" to determine what changes to submit."

7366

7392

msgstr ""

7367

7393

7368

#: bzrlib/send.py:98

7394

#: bzrlib/send.py:99

7369

7395

#, python-format

7370

7396

msgid "No such send format '%s'."

7371

7397

msgstr ""

7372

7398

7373

#: bzrlib/send.py:114

7399

#: bzrlib/send.py:115

7374

7400

msgid "bzr send takes at most two one revision identifiers"

7375

7401

msgstr ""

7376

7402

7377

#: bzrlib/send.py:127

7403

#: bzrlib/send.py:128

7378

7404

msgid "No revisions to submit."

7379

7405

msgstr ""

7380

7406

7381

#: bzrlib/send.py:139

7407

#: bzrlib/send.py:140

7382

7408

msgid ""

7383

7409

"- not supported for merge directives that use more than one output file."

7384

7410

msgstr ""

7385

7411

7386

#: bzrlib/send.py:185

7412

#: bzrlib/send.py:186

7387

7413

msgid "Format 0.9 does not permit bundle with no patch"

7388

7414

msgstr ""

7389

7415

7540

7566

"anyway, use --force."

7541

7567

msgstr ""

7542

7568

7543

#: bzrlib/switch.py:125

7569

#: bzrlib/switch.py:129

7544

7570

msgid "Cannot switch a branch, only a checkout."

7545

7571

msgstr ""

7546

7572

7547

#: bzrlib/switch.py:163

7573

#: bzrlib/switch.py:167

7548

7574

#, python-format

7549

7575

msgid "Tree is up to date at revision %d."

7550

7576

msgstr ""

7551

7577

7552

#: bzrlib/switch.py:169

7578

#: bzrlib/switch.py:173

7553

7579

#, python-format

7554

7580

msgid "Updated to revision %d."

7555

7581

msgstr ""

7556

7582

7557

#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747

7583

#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736

7558

7584

msgid "Apply phase"

7559

7585

msgstr ""

7560

7586

7561

#: bzrlib/transform.py:1773 bzrlib/transform.py:1841

7587

#: bzrlib/transform.py:1762 bzrlib/transform.py:1830

7562

7588

msgid "removing file"

7563

7589

msgstr ""

7564

7590

7565

#: bzrlib/transform.py:1791 bzrlib/transform.py:1876

7591

#: bzrlib/transform.py:1780 bzrlib/transform.py:1865

7566

7592

msgid "adding file"

7567

7593

msgstr ""

7568

7594

7569

#: bzrlib/transform.py:2591

7595

#: bzrlib/transform.py:2590

7570

7596

msgid "Building tree"

7571

7597

msgstr ""

7572

7598

7573

#: bzrlib/transform.py:2681 bzrlib/transform.py:2708

7599

#: bzrlib/transform.py:2680 bzrlib/transform.py:2707

7574

7600

msgid "Adding file contents"

7575

7601

msgstr ""

7576

7602

7577

#: bzrlib/transform.py:3028

7603

#: bzrlib/transform.py:3009

7578

7604

msgid "Resolution pass"

7579

7605

msgstr ""

7580

7606

7583

7609

msgid "Authenticated as %s"

7584

7610

msgstr ""

7585

7611

7586

#: bzrlib/tree.py:634

7612

#: bzrlib/tree.py:637

7587

7613

msgid "*** {0} content-filter: {1} => {2!r}"

7588

7614

msgstr ""

7589

7615

7642

7668

msgid "failed to clean-up {0}: {1}"

7643

7669

msgstr ""

7644

7670

7645

#: bzrlib/vf_repository.py:1090

7671

#: bzrlib/vf_repository.py:1091

7646

7672

msgid "inventories"

7647

7673

msgstr ""

7648

7674

7649

#: bzrlib/vf_repository.py:1116

7675

#: bzrlib/vf_repository.py:1117

7650

7676

msgid "texts"

7651

7677

msgstr ""

7652

7678

7653

#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630

7679

#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631

7654

7680

msgid "Calculating text parents"

7655

7681

msgstr ""

7656

7682

7657

#: bzrlib/vf_repository.py:1706

7683

#: bzrlib/vf_repository.py:1707

7658

7684

msgid "Fetch texts"

7659

7685

msgstr ""

7660

7686

7661

#: bzrlib/vf_repository.py:2535

7687

#: bzrlib/vf_repository.py:2536

7662

7688

msgid "loading text store"

7663

7689

msgstr ""

7664

7690

7665

#: bzrlib/vf_repository.py:2541

7691

#: bzrlib/vf_repository.py:2542

7666

7692

msgid "checking text graph"

7667

7693

msgstr ""

7668

7694

7669

#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009

7670

#: bzrlib/vf_repository.py:3124

7695

#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012

7696

#: bzrlib/vf_repository.py:3127

7671

7697

msgid "Transferring revisions"

7672

7698

msgstr ""

7673

7699

7713

7739

msgid "PageFaultCount %8d"

7714

7740

msgstr ""

7715

7741

7716

#: bzrlib/workingtree.py:1478

7742

#: bzrlib/workingtree.py:1482

7717

7743

msgid "Rerun update after fixing the conflicts."

7718

7744

msgstr ""

7719

7745

7723

7749

7724

7750

#: dummy/help_topics/basic/detail.txt:1

7725

7751

msgid ""

7726

"Bazaar 2.5b6 -- a free distributed version-control tool\n"

7752

"Bazaar 2.6.0dev1 -- a free distributed version-control tool\n"

7727

7753

"http://bazaar.canonical.com/"

7728

7754

msgstr ""

7729

7755

11935

11961

msgstr ""

11936

11962

11937

11963

#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56

11938

#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259

11964

#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262

11939

11965

msgid "Introduced in: 2.2"

11940

11966

msgstr ""

11941

11967

11953

11979

"~~~~"

11954

11980

msgstr ""

11955

11981

11956

#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290

11957

#: en/help_topics/hooks.txt:304

11982

#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293

11983

#: en/help_topics/hooks.txt:307

11958

11984

msgid "Introduced in: 1.8"

11959

11985

msgstr ""

11960

11986

11984

12010

"~~~~~~~~~~~~~~~~~~~~~~"

11985

12011

msgstr ""

11986

12012

11987

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418

12013

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421

11988

12014

msgid "Introduced in: 1.4"

11989

12015

msgstr ""

11990

12016

11996

12022

"uncommit will all trigger this hook."

11997

12023

msgstr ""

11998

12024

11999

#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389

12025

#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392

12000

12026

msgid ""

12001

12027

"post_commit\n"

12002

12028

"~~~~~~~~~~~"

12004

12030

12005

12031

#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86

12006

12032

#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110

12007

#: en/help_topics/hooks.txt:145

12008

12033

msgid "Introduced in: 0.15"

12009

12034

msgstr ""

12010

12035

12109

12134

12110

12135

#: en/help_topics/hooks.txt:142

12111

12136

msgid ""

12112

"set_rh\n"

12113

"~~~~~~"

12114

msgstr ""

12115

12116

#: en/help_topics/hooks.txt:147

12117

msgid ""

12118

"Invoked whenever the revision history has been set via\n"

12119

"set_revision_history. The api signature is (branch, revision_history),\n"

12120

"and the branch will be write-locked. The set_rh hook can be expensive\n"

12121

"for bzr to trigger, a better hook to use is\n"

12122

"Branch.post_change_branch_tip."

12123

msgstr ""

12124

12125

#: en/help_topics/hooks.txt:153

12126

msgid ""

12127

12137

"transform_fallback_location\n"

12128

12138

"~~~~~~~~~~~~~~~~~~~~~~~~~~~"

12129

12139

msgstr ""

12130

12140

12131

#: en/help_topics/hooks.txt:156

12141

#: en/help_topics/hooks.txt:145

12132

12142

msgid "Introduced in: 1.9"

12133

12143

msgstr ""

12134

12144

12135

#: en/help_topics/hooks.txt:158

12145

#: en/help_topics/hooks.txt:147

12136

12146

msgid ""

12137

12147

"Called when a stacked branch is activating its fallback locations.\n"

12138

12148

"transform_fallback_location is called with (branch, url), and should\n"

12146

12156

"however undefined."

12147

12157

msgstr ""

12148

12158

12149

#: en/help_topics/hooks.txt:169

12159

#: en/help_topics/hooks.txt:158

12150

12160

msgid ""

12151

12161

"CommandHooks\n"

12152

12162

"------------"

12153

12163

msgstr ""

12154

12164

12155

#: en/help_topics/hooks.txt:172

12165

#: en/help_topics/hooks.txt:161

12156

12166

msgid ""

12157

12167

"extend_command\n"

12158

12168

"~~~~~~~~~~~~~~"

12159

12169

msgstr ""

12160

12170

12161

#: en/help_topics/hooks.txt:175

12171

#: en/help_topics/hooks.txt:164

12162

12172

msgid "Introduced in: 1.13"

12163

12173

msgstr ""

12164

12174

12165

#: en/help_topics/hooks.txt:177

12175

#: en/help_topics/hooks.txt:166

12166

12176

msgid ""

12167

12177

"Called after creating a command object to allow modifications such as\n"

12168

12178

"adding or removing options, docs etc. Called with the new\n"

12169

12179

"bzrlib.commands.Command object."

12170

12180

msgstr ""

12171

12181

12172

#: en/help_topics/hooks.txt:181

12182

#: en/help_topics/hooks.txt:170

12173

12183

msgid ""

12174

12184

"get_command\n"

12175

12185

"~~~~~~~~~~~"

12176

12186

msgstr ""

12177

12187

12178

#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196

12179

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464

12188

#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185

12189

#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467

12180

12190

msgid "Introduced in: 1.17"

12181

12191

msgstr ""

12182

12192

12183

#: en/help_topics/hooks.txt:186

12193

#: en/help_topics/hooks.txt:175

12184

12194

msgid ""

12185

12195

"Called when creating a single command. Called with (cmd_or_None,\n"

12186

12196

"command_name). get_command should either return the cmd_or_None\n"

12190

12200

"plugin_cmds.register_lazy."

12191

12201

msgstr ""

12192

12202

12193

#: en/help_topics/hooks.txt:193

12203

#: en/help_topics/hooks.txt:182

12194

12204

msgid ""

12195

12205

"get_missing_command\n"

12196

12206

"~~~~~~~~~~~~~~~~~~~"

12197

12207

msgstr ""

12198

12208

12199

#: en/help_topics/hooks.txt:198

12209

#: en/help_topics/hooks.txt:187

12200

12210

msgid ""

12201

12211

"Called when creating a single command if no command could be found.\n"

12202

12212

"Called with (command_name). get_missing_command should either return\n"

12203

12213

"None, or a Command object to be used for the command."

12204

12214

msgstr ""

12205

12215

12206

#: en/help_topics/hooks.txt:202

12216

#: en/help_topics/hooks.txt:191

12207

12217

msgid ""

12208

12218

"list_commands\n"

12209

12219

"~~~~~~~~~~~~~"

12210

12220

msgstr ""

12211

12221

12212

#: en/help_topics/hooks.txt:207

12222

#: en/help_topics/hooks.txt:196

12213

12223

msgid ""

12214

12224

"Called when enumerating commands. Called with a set of cmd_name\n"

12215

12225

"strings for all the commands found so far. This set is safe to mutate\n"

12217

12227

"set of command names."

12218

12228

msgstr ""

12219

12229

12220

#: en/help_topics/hooks.txt:212

12230

#: en/help_topics/hooks.txt:201

12231

msgid ""

12232

"post_command\n"

12233

"~~~~~~~~~~~~"

12234

msgstr ""

12235

12236

#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211

12237

msgid "Introduced in: 2.6"

12238

msgstr ""

12239

12240

#: en/help_topics/hooks.txt:206

12241

msgid "Called after executing a command. Called with the command object."

12242

msgstr ""

12243

12244

#: en/help_topics/hooks.txt:208

12245

msgid ""

12246

"pre_command\n"

12247

"~~~~~~~~~~~"

12248

msgstr ""

12249

12250

#: en/help_topics/hooks.txt:213

12251

msgid "Called prior to executing a command. Called with the command object."

12252

msgstr ""

12253

12254

#: en/help_topics/hooks.txt:215

12221

12255

msgid ""

12222

12256

"_ConfigHooks\n"

12223

12257

"------------"

12224

12258

msgstr ""

12225

12259

12226

#: en/help_topics/hooks.txt:215

12260

#: en/help_topics/hooks.txt:218

12227

12261

msgid ""

12228

12262

"get\n"

12229

12263

"~~~"

12230

12264

msgstr ""

12231

12265

12232

#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226

12233

#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241

12234

#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370

12235

#: en/help_topics/hooks.txt:443

12266

#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229

12267

#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244

12268

#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373

12269

#: en/help_topics/hooks.txt:446

12236

12270

msgid "Introduced in: 2.4"

12237

12271

msgstr ""

12238

12272

12239

#: en/help_topics/hooks.txt:220

12273

#: en/help_topics/hooks.txt:223

12240

12274

msgid ""

12241

12275

"Invoked when a config option is read. The signature is (stack, name,\n"

12242

12276

"value)."

12243

12277

msgstr ""

12244

12278

12245

#: en/help_topics/hooks.txt:223

12279

#: en/help_topics/hooks.txt:226

12246

12280

msgid ""

12247

12281

"load\n"

12248

12282

"~~~~"

12249

12283

msgstr ""

12250

12284

12251

#: en/help_topics/hooks.txt:228

12285

#: en/help_topics/hooks.txt:231

12252

12286

msgid "Invoked when a config store is loaded. The signature is (store)."

12253

12287

msgstr ""

12254

12288

12255

#: en/help_topics/hooks.txt:230

12289

#: en/help_topics/hooks.txt:233

12256

12290

msgid ""

12257

12291

"remove\n"

12258

12292

"~~~~~~"

12259

12293

msgstr ""

12260

12294

12261

#: en/help_topics/hooks.txt:235

12295

#: en/help_topics/hooks.txt:238

12262

12296

msgid ""

12263

12297

"Invoked when a config option is removed. The signature is (stack,\n"

12264

12298

"name)."

12265

12299

msgstr ""

12266

12300

12267

#: en/help_topics/hooks.txt:238

12301

#: en/help_topics/hooks.txt:241

12268

12302

msgid ""

12269

12303

"save\n"

12270

12304

"~~~~"

12271

12305

msgstr ""

12272

12306

12273

#: en/help_topics/hooks.txt:243

12307

#: en/help_topics/hooks.txt:246

12274

12308

msgid "Invoked when a config store is saved. The signature is (store)."

12275

12309

msgstr ""

12276

12310

12277

#: en/help_topics/hooks.txt:245

12311

#: en/help_topics/hooks.txt:248

12278

12312

msgid ""

12279

12313

"set\n"

12280

12314

"~~~"

12281

12315

msgstr ""

12282

12316

12283

#: en/help_topics/hooks.txt:250

12317

#: en/help_topics/hooks.txt:253

12284

12318

msgid ""

12285

12319

"Invoked when a config option is set. The signature is (stack, name,\n"

12286

12320

"value)."

12287

12321

msgstr ""

12288

12322

12289

#: en/help_topics/hooks.txt:253

12323

#: en/help_topics/hooks.txt:256

12290

12324

msgid ""

12291

12325

"ControlDirHooks\n"

12292

12326

"---------------"

12293

12327

msgstr ""

12294

12328

12295

#: en/help_topics/hooks.txt:256

12329

#: en/help_topics/hooks.txt:259

12296

12330

msgid ""

12297

12331

"post_repo_init\n"

12298

12332

"~~~~~~~~~~~~~~"

12299

12333

msgstr ""

12300

12334

12301

#: en/help_topics/hooks.txt:261

12335

#: en/help_topics/hooks.txt:264

12302

12336

msgid ""

12303

12337

"Invoked after a repository has been initialized. post_repo_init is\n"

12304

12338

"called with a bzrlib.controldir.RepoInitHookParams."

12305

12339

msgstr ""

12306

12340

12307

#: en/help_topics/hooks.txt:264

12341

#: en/help_topics/hooks.txt:267

12308

12342

msgid ""

12309

12343

"pre_open\n"

12310

12344

"~~~~~~~~"

12311

12345

msgstr ""

12312

12346

12313

#: en/help_topics/hooks.txt:267

12347

#: en/help_topics/hooks.txt:270

12314

12348

msgid "Introduced in: 1.14"

12315

12349

msgstr ""

12316

12350

12317

#: en/help_topics/hooks.txt:269

12351

#: en/help_topics/hooks.txt:272

12318

12352

msgid ""

12319

12353

"Invoked before attempting to open a ControlDir with the transport that\n"

12320

12354

"the open will use."

12321

12355

msgstr ""

12322

12356

12323

#: en/help_topics/hooks.txt:272

12357

#: en/help_topics/hooks.txt:275

12324

12358

msgid ""

12325

12359

"InfoHooks\n"

12326

12360

"---------"

12327

12361

msgstr ""

12328

12362

12329

#: en/help_topics/hooks.txt:275

12363

#: en/help_topics/hooks.txt:278

12330

12364

msgid ""

12331

12365

"repository\n"

12332

12366

"~~~~~~~~~~"

12333

12367

msgstr ""

12334

12368

12335

#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297

12336

#: en/help_topics/hooks.txt:521

12369

#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300

12370

#: en/help_topics/hooks.txt:524

12337

12371

msgid "Introduced in: 1.15"

12338

12372

msgstr ""

12339

12373

12340

#: en/help_topics/hooks.txt:280

12374

#: en/help_topics/hooks.txt:283

12341

12375

msgid ""

12342

12376

"Invoked when displaying the statistics for a repository. repository is\n"

12343

12377

"called with a statistics dictionary as returned by the repository and\n"

12344

12378

"a file-like object to write to."

12345

12379

msgstr ""

12346

12380

12347

#: en/help_topics/hooks.txt:284

12381

#: en/help_topics/hooks.txt:287

12348

12382

msgid ""

12349

12383

"LockHooks\n"

12350

12384

"---------"

12351

12385

msgstr ""

12352

12386

12353

#: en/help_topics/hooks.txt:287

12387

#: en/help_topics/hooks.txt:290

12354

12388

msgid ""

12355

12389

"lock_acquired\n"

12356

12390

"~~~~~~~~~~~~~"

12357

12391

msgstr ""

12358

12392

12359

#: en/help_topics/hooks.txt:292

12393

#: en/help_topics/hooks.txt:295

12360

12394

msgid "Called with a bzrlib.lock.LockResult when a physical lock is acquired."

12361

12395

msgstr ""

12362

12396

12363

#: en/help_topics/hooks.txt:294

12397

#: en/help_topics/hooks.txt:297

12364

12398

msgid ""

12365

12399

"lock_broken\n"

12366

12400

"~~~~~~~~~~~"

12367

12401

msgstr ""

12368

12402

12369

#: en/help_topics/hooks.txt:299

12403

#: en/help_topics/hooks.txt:302

12370

12404

msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."

12371

12405

msgstr ""

12372

12406

12373

#: en/help_topics/hooks.txt:301

12407

#: en/help_topics/hooks.txt:304

12374

12408

msgid ""

12375

12409

"lock_released\n"

12376

12410

"~~~~~~~~~~~~~"

12377

12411

msgstr ""

12378

12412

12379

#: en/help_topics/hooks.txt:306

12413

#: en/help_topics/hooks.txt:309

12380

12414

msgid "Called with a bzrlib.lock.LockResult when a physical lock is released."

12381

12415

msgstr ""

12382

12416

12383

#: en/help_topics/hooks.txt:308

12417

#: en/help_topics/hooks.txt:311

12384

12418

msgid ""

12385

12419

"MergeHooks\n"

12386

12420

"----------"

12387

12421

msgstr ""

12388

12422

12389

#: en/help_topics/hooks.txt:311

12423

#: en/help_topics/hooks.txt:314

12390

12424

msgid ""

12391

12425

"merge_file_content\n"

12392

12426

"~~~~~~~~~~~~~~~~~~"

12393

12427

msgstr ""

12394

12428

12395

#: en/help_topics/hooks.txt:314

12429

#: en/help_topics/hooks.txt:317

12396

12430

msgid "Introduced in: 2.1"

12397

12431

msgstr ""

12398

12432

12399

#: en/help_topics/hooks.txt:316

12433

#: en/help_topics/hooks.txt:319

12400

12434

msgid ""

12401

12435

"Called with a bzrlib.merge.Merger object to create a per file merge\n"

12402

12436

"object when starting a merge. Should return either None or a subclass\n"

12406

12440

"AbstractPerFileMerger API docs for details on how it is used by merge."

12407

12441

msgstr ""

12408

12442

12409

#: en/help_topics/hooks.txt:323

12443

#: en/help_topics/hooks.txt:326

12410

12444

msgid ""

12411

12445

"post_merge\n"

12412

12446

"~~~~~~~~~~"

12413

12447

msgstr ""

12414

12448

12415

#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334

12416

#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402

12417

#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509

12449

#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337

12450

#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405

12451

#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512

12418

12452

msgid "Introduced in: 2.5"

12419

12453

msgstr ""

12420

12454

12421

#: en/help_topics/hooks.txt:328

12455

#: en/help_topics/hooks.txt:331

12422

12456

msgid ""

12423

12457

"Called after a merge. Receives a Merger object as the single argument.\n"

12424

12458

"The return value is ignored."

12425

12459

msgstr ""

12426

12460

12427

#: en/help_topics/hooks.txt:331

12461

#: en/help_topics/hooks.txt:334

12428

12462

msgid ""

12429

12463

"pre_merge\n"

12430

12464

"~~~~~~~~~"

12431

12465

msgstr ""

12432

12466

12433

#: en/help_topics/hooks.txt:336

12467

#: en/help_topics/hooks.txt:339

12434

12468

msgid ""

12435

12469

"Called before a merge. Receives a Merger object as the single\n"

12436

12470

"argument."

12437

12471

msgstr ""

12438

12472

12439

#: en/help_topics/hooks.txt:339

12473

#: en/help_topics/hooks.txt:342

12440

12474

msgid ""

12441

12475

"MergeDirectiveHooks\n"

12442

12476

"-------------------"

12443

12477

msgstr ""

12444

12478

12445

#: en/help_topics/hooks.txt:342

12479

#: en/help_topics/hooks.txt:345

12446

12480

msgid ""

12447

12481

"merge_request_body\n"

12448

12482

"~~~~~~~~~~~~~~~~~~"

12449

12483

msgstr ""

12450

12484

12451

#: en/help_topics/hooks.txt:345

12485

#: en/help_topics/hooks.txt:348

12452

12486

msgid "Introduced in: 1.15.0"

12453

12487

msgstr ""

12454

12488

12455

#: en/help_topics/hooks.txt:347

12489

#: en/help_topics/hooks.txt:350

12456

12490

msgid ""

12457

12491

"Called with a MergeRequestBodyParams when a body is needed for a merge\n"

12458

12492

"request. Callbacks must return a body. If more than one callback is\n"

12459

12493

"registered, the output of one callback is provided to the next."

12460

12494

msgstr ""

12461

12495

12462

#: en/help_topics/hooks.txt:351

12496

#: en/help_topics/hooks.txt:354

12463

12497

msgid ""

12464

12498

"MessageEditorHooks\n"

12465

12499

"------------------"

12466

12500

msgstr ""

12467

12501

12468

#: en/help_topics/hooks.txt:354

12502

#: en/help_topics/hooks.txt:357

12469

12503

msgid ""

12470

12504

"commit_message_template\n"

12471

12505

"~~~~~~~~~~~~~~~~~~~~~~~"

12472

12506

msgstr ""

12473

12507

12474

#: en/help_topics/hooks.txt:357

12508

#: en/help_topics/hooks.txt:360

12475

12509

msgid "Introduced in: 1.10"

12476

12510

msgstr ""

12477

12511

12478

#: en/help_topics/hooks.txt:359

12512

#: en/help_topics/hooks.txt:362

12479

12513

msgid ""

12480

12514

"Called when a commit message is being generated.\n"

12481

12515

"commit_message_template is called with the bzrlib.commit.Commit object\n"

12486

12520

"second, and so on."

12487

12521

msgstr ""

12488

12522

12489

#: en/help_topics/hooks.txt:367

12523

#: en/help_topics/hooks.txt:370

12490

12524

msgid ""

12491

12525

"set_commit_message\n"

12492

12526

"~~~~~~~~~~~~~~~~~~"

12493

12527

msgstr ""

12494

12528

12495

#: en/help_topics/hooks.txt:372

12529

#: en/help_topics/hooks.txt:375

12496

12530

msgid ""

12497

12531

"Set a fixed commit message. set_commit_message is called with the\n"

12498

12532

"bzrlib.commit.Commit object (so you can also change e.g. revision\n"

12501

12535

"should use the message editor as normal."

12502

12536

msgstr ""

12503

12537

12504

#: en/help_topics/hooks.txt:378

12538

#: en/help_topics/hooks.txt:381

12505

12539

msgid ""

12506

12540

"MutableTreeHooks\n"

12507

12541

"----------------"

12508

12542

msgstr ""

12509

12543

12510

#: en/help_topics/hooks.txt:381

12544

#: en/help_topics/hooks.txt:384

12511

12545

msgid ""

12512

12546

"post_build_tree\n"

12513

12547

"~~~~~~~~~~~~~~~"

12514

12548

msgstr ""

12515

12549

12516

#: en/help_topics/hooks.txt:386

12550

#: en/help_topics/hooks.txt:389

12517

12551

msgid ""

12518

12552

"Called after a completely new tree is built. The hook is called with\n"

12519

12553

"the tree as its only argument."

12520

12554

msgstr ""

12521

12555

12522

#: en/help_topics/hooks.txt:392

12556

#: en/help_topics/hooks.txt:395

12523

12557

msgid "Introduced in: 2.0"

12524

12558

msgstr ""

12525

12559

12526

#: en/help_topics/hooks.txt:394

12560

#: en/help_topics/hooks.txt:397

12527

12561

msgid ""

12528

12562

"Called after a commit is performed on a tree. The hook is called with\n"

12529

12563

"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"

12531

12565

"that object."

12532

12566

msgstr ""

12533

12567

12534

#: en/help_topics/hooks.txt:399

12568

#: en/help_topics/hooks.txt:402

12535

12569

msgid ""

12536

12570

"post_transform\n"

12537

12571

"~~~~~~~~~~~~~~"

12538

12572

msgstr ""

12539

12573

12540

#: en/help_topics/hooks.txt:404

12574

#: en/help_topics/hooks.txt:407

12541

12575

msgid ""

12542

12576

"Called after a tree transform has been performed on a tree. The hook\n"

12543

12577

"is called with the tree that is being transformed and the transform."

12544

12578

msgstr ""

12545

12579

12546

#: en/help_topics/hooks.txt:407

12580

#: en/help_topics/hooks.txt:410

12547

12581

msgid ""

12548

12582

"pre_transform\n"

12549

12583

"~~~~~~~~~~~~~"

12550

12584

msgstr ""

12551

12585

12552

#: en/help_topics/hooks.txt:412

12586

#: en/help_topics/hooks.txt:415

12553

12587

msgid ""

12554

12588

"Called before a tree transform on this tree. The hook is called with\n"

12555

12589

"the tree that is being transformed and the transform."

12556

12590

msgstr ""

12557

12591

12558

#: en/help_topics/hooks.txt:415

12592

#: en/help_topics/hooks.txt:418

12559

12593

msgid ""

12560

12594

"start_commit\n"

12561

12595

"~~~~~~~~~~~~"

12562

12596

msgstr ""

12563

12597

12564

#: en/help_topics/hooks.txt:420

12598

#: en/help_topics/hooks.txt:423

12565

12599

msgid ""

12566

12600

"Called before a commit is performed on a tree. The start commit hook\n"

12567

12601

"is able to change the tree before the commit takes place. start_commit\n"

12569

12603

"being performed on."

12570

12604

msgstr ""

12571

12605

12572

#: en/help_topics/hooks.txt:425

12606

#: en/help_topics/hooks.txt:428

12573

12607

msgid ""

12574

12608

"SmartClientHooks\n"

12575

12609

"----------------"

12576

12610

msgstr ""

12577

12611

12578

#: en/help_topics/hooks.txt:428

12612

#: en/help_topics/hooks.txt:431

12579

12613

msgid ""

12580

12614

"call\n"

12581

12615

"~~~~"

12582

12616

msgstr ""

12583

12617

12584

#: en/help_topics/hooks.txt:431

12618

#: en/help_topics/hooks.txt:434

12585

12619

msgid "Introduced in: unknown"

12586

12620

msgstr ""

12587

12621

12588

#: en/help_topics/hooks.txt:433

12622

#: en/help_topics/hooks.txt:436

12589

12623

msgid ""

12590

12624

"Called when the smart client is submitting a request to the smart\n"

12591

12625

"server. Called with a bzrlib.smart.client.CallHookParams object.\n"

12592

12626

"Streaming request bodies, and responses, are not accessible."

12593

12627

msgstr ""

12594

12628

12595

#: en/help_topics/hooks.txt:437

12629

#: en/help_topics/hooks.txt:440

12596

12630

msgid ""

12597

12631

"SmartServerHooks\n"

12598

12632

"----------------"

12599

12633

msgstr ""

12600

12634

12601

#: en/help_topics/hooks.txt:440

12635

#: en/help_topics/hooks.txt:443

12602

12636

msgid ""

12603

12637

"server_exception\n"

12604

12638

"~~~~~~~~~~~~~~~~"

12605

12639

msgstr ""

12606

12640

12607

#: en/help_topics/hooks.txt:445

12641

#: en/help_topics/hooks.txt:448

12608

12642

msgid ""

12609

12643

"Called by the bzr server when an exception occurs. server_exception is\n"

12610

12644

"called with the sys.exc_info() tuple return true for the hook if the\n"

12612

12646

"normally."

12613

12647

msgstr ""

12614

12648

12615

#: en/help_topics/hooks.txt:450

12649

#: en/help_topics/hooks.txt:453

12616

12650

msgid ""

12617

12651

"server_started\n"

12618

12652

"~~~~~~~~~~~~~~"

12619

12653

msgstr ""

12620

12654

12621

#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472

12655

#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475

12622

12656

msgid "Introduced in: 0.16"

12623

12657

msgstr ""

12624

12658

12625

#: en/help_topics/hooks.txt:455

12659

#: en/help_topics/hooks.txt:458

12626

12660

msgid ""

12627

12661

"Called by the bzr server when it starts serving a directory.\n"

12628

12662

"server_started is called with (backing urls, public url), where\n"

12631

12665

"served."

12632

12666

msgstr ""

12633

12667

12634

#: en/help_topics/hooks.txt:461

12668

#: en/help_topics/hooks.txt:464

12635

12669

msgid ""

12636

12670

"server_started_ex\n"

12637

12671

"~~~~~~~~~~~~~~~~~"

12638

12672

msgstr ""

12639

12673

12640

#: en/help_topics/hooks.txt:466

12674

#: en/help_topics/hooks.txt:469

12641

12675

msgid ""

12642

12676

"Called by the bzr server when it starts serving a directory.\n"

12643

12677

"server_started is called with (backing_urls, server_obj)."

12644

12678

msgstr ""

12645

12679

12646

#: en/help_topics/hooks.txt:469

12680

#: en/help_topics/hooks.txt:472

12647

12681

msgid ""

12648

12682

"server_stopped\n"

12649

12683

"~~~~~~~~~~~~~~"

12650

12684

msgstr ""

12651

12685

12652

#: en/help_topics/hooks.txt:474

12686

#: en/help_topics/hooks.txt:477

12653

12687

msgid ""

12654

12688

"Called by the bzr server when it stops serving a directory.\n"

12655

12689

"server_stopped is called with the same parameters as the\n"

12656

12690

"server_started hook: (backing_urls, public_url)."

12657

12691

msgstr ""

12658

12692

12659

#: en/help_topics/hooks.txt:478

12693

#: en/help_topics/hooks.txt:481

12660

12694

msgid ""

12661

12695

"StatusHooks\n"

12662

12696

"-----------"

12663

12697

msgstr ""

12664

12698

12665

#: en/help_topics/hooks.txt:481

12699

#: en/help_topics/hooks.txt:484

12666

12700

msgid ""

12667

12701

"post_status\n"

12668

12702

"~~~~~~~~~~~"

12669

12703

msgstr ""

12670

12704

12671

#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495

12705

#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498

12672

12706

msgid "Introduced in: 2.3"

12673

12707

msgstr ""

12674

12708

12675

#: en/help_topics/hooks.txt:486

12709

#: en/help_topics/hooks.txt:489

12676

12710

msgid ""

12677

12711

"Called with argument StatusHookParams after Bazaar has displayed the\n"

12678

12712

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12681

12715

"status command. to_file is the output stream for writing."

12682

12716

msgstr ""

12683

12717

12684

#: en/help_topics/hooks.txt:492

12718

#: en/help_topics/hooks.txt:495

12685

12719

msgid ""

12686

12720

"pre_status\n"

12687

12721

"~~~~~~~~~~"

12688

12722

msgstr ""

12689

12723

12690

#: en/help_topics/hooks.txt:497

12724

#: en/help_topics/hooks.txt:500

12691

12725

msgid ""

12692

12726

"Called with argument StatusHookParams before Bazaar displays the\n"

12693

12727

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12696

12730

"status command. to_file is the output stream for writing."

12697

12731

msgstr ""

12698

12732

12699

#: en/help_topics/hooks.txt:503

12733

#: en/help_topics/hooks.txt:506

12700

12734

msgid ""

12701

12735

"TransportHooks\n"

12702

12736

"--------------"

12703

12737

msgstr ""

12704

12738

12705

#: en/help_topics/hooks.txt:506

12739

#: en/help_topics/hooks.txt:509

12706

12740

msgid ""

12707

12741

"post_connect\n"

12708

12742

"~~~~~~~~~~~~"

12709

12743

msgstr ""

12710

12744

12711

#: en/help_topics/hooks.txt:511

12745

#: en/help_topics/hooks.txt:514

12712

12746

msgid ""

12713

12747

"Called after a new connection is established or a reconnect occurs.\n"

12714

12748

"The sole argument passed is either the connected transport or smart\n"

12715

12749

"medium instance."

12716

12750

msgstr ""

12717

12751

12718

#: en/help_topics/hooks.txt:515

12752

#: en/help_topics/hooks.txt:518

12719

12753

msgid ""

12720

12754

"RioVersionInfoBuilderHooks\n"

12721

12755

"--------------------------"

12722

12756

msgstr ""

12723

12757

12724

#: en/help_topics/hooks.txt:518

12758

#: en/help_topics/hooks.txt:521

12725

12759

msgid ""

12726

12760

"revision\n"

12727

12761

"~~~~~~~~"

12728

12762

msgstr ""

12729

12763

12730

#: en/help_topics/hooks.txt:523

12764

#: en/help_topics/hooks.txt:526

12731

12765

msgid ""

12732

12766

"Invoked when adding information about a revision to the RIO stanza\n"

12733

12767

"that is printed. revision is called with a revision object and a RIO\n"