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

8

msgstr ""

9

"Project-Id-Version: bzr\n"

10

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

11

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

11

"POT-Creation-Date: 2012-02-02 17:39+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"

26

msgid "Unstacking"

27

msgstr ""

28

29

#: bzrlib/branch.py:3183

29

#: bzrlib/branch.py:3205

30

#, python-format

31

msgid "Pushed up to revision %d."

32

msgstr ""

33

34

#: bzrlib/branch.py:3185

34

#: bzrlib/branch.py:3207

35

#, python-format

36

msgid "%d tag updated."

37

msgid_plural "%d tags updated."

38

msgstr[0] ""

39

msgstr[1] ""

40

41

#: bzrlib/branch.py:3188

41

#: bzrlib/branch.py:3210

42

msgid "No new revisions or tags to push."

43

msgstr ""

44

45

#: bzrlib/branch.py:3190

45

#: bzrlib/branch.py:3212

46

msgid "No new revisions to push."

47

msgstr ""

48

49

#: bzrlib/branch.py:3210

49

#: bzrlib/branch.py:3232

50

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

51

msgstr ""

52

53

#: bzrlib/branch.py:3213

53

#: bzrlib/branch.py:3235

54

#, python-format

55

msgid "found error:%s"

56

msgstr ""

57

58

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

58

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

59

#, python-format

60

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

61

msgstr ""

62

63

#: bzrlib/builtins.py:130

63

#: bzrlib/builtins.py:218

64

#, python-format

65

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

66

msgstr ""

67

68

#: bzrlib/builtins.py:215

68

#: bzrlib/builtins.py:303

69

msgid "Display status summary."

70

msgstr ""

71

72

#: bzrlib/builtins.py:217

72

#: bzrlib/builtins.py:305

73

msgid ""

74

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

75

"grouped by state. Possible states are:"

76

msgstr ""

77

78

#: bzrlib/builtins.py:220

78

#: bzrlib/builtins.py:308

79

msgid ""

80

"added\n"

81

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

82

msgstr ""

83

84

#: bzrlib/builtins.py:223

84

#: bzrlib/builtins.py:311

85

msgid ""

86

"removed\n"

87

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

88

" in the working copy."

89

msgstr ""

90

91

#: bzrlib/builtins.py:227

91

#: bzrlib/builtins.py:315

92

msgid ""

93

"renamed\n"

94

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

96

" parent directory was renamed."

97

msgstr ""

98

99

#: bzrlib/builtins.py:232

99

#: bzrlib/builtins.py:320

100

msgid ""

101

"modified\n"

102

" Text has changed since the previous revision."

103

msgstr ""

104

105

#: bzrlib/builtins.py:235

105

#: bzrlib/builtins.py:323

106

msgid ""

107

"kind changed\n"

108

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

109

msgstr ""

110

111

#: bzrlib/builtins.py:238

111

#: bzrlib/builtins.py:326

112

msgid ""

113

"unknown\n"

114

" Not versioned and not matching an ignore pattern."

115

msgstr ""

116

117

#: bzrlib/builtins.py:241

117

#: bzrlib/builtins.py:329

118

msgid ""

119

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

120

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

122

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

123

msgstr ""

124

125

#: bzrlib/builtins.py:246

125

#: bzrlib/builtins.py:334

126

msgid ""

127

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

128

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

129

msgstr ""

130

131

#: bzrlib/builtins.py:249

131

#: bzrlib/builtins.py:337

132

msgid ""

133

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

134

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

135

"use bzr status -SV."

136

msgstr ""

137

138

#: bzrlib/builtins.py:253

138

#: bzrlib/builtins.py:341

139

msgid ""

140

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

141

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

143

"is reported for everything inside that directory."

144

msgstr ""

145

146

#: bzrlib/builtins.py:258

146

#: bzrlib/builtins.py:346

147

msgid ""

148

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

149

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

151

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

152

msgstr ""

153

154

#: bzrlib/builtins.py:263

154

#: bzrlib/builtins.py:351

155

msgid ""

156

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

157

"single revision to the revision argument."

158

msgstr ""

159

160

#: bzrlib/builtins.py:266

160

#: bzrlib/builtins.py:354

161

msgid ""

162

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

163

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

165

msgstr ""

166

167

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

168

#: bzrlib/builtins.py:275

168

#: bzrlib/builtins.py:363

169

msgid "Use short status indicators."

170

msgstr ""

171

172

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

173

#: bzrlib/builtins.py:277

173

#: bzrlib/builtins.py:365

174

msgid "Only show versioned files."

175

msgstr ""

176

177

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

178

#: bzrlib/builtins.py:279

178

#: bzrlib/builtins.py:367

179

msgid "Don't show pending merges."

180

msgstr ""

181

182

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

183

#: bzrlib/builtins.py:282

183

#: bzrlib/builtins.py:370

184

msgid "Do not mark object type using indicator."

185

msgstr ""

186

187

#: bzrlib/builtins.py:297

187

#: bzrlib/builtins.py:385

188

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

189

msgstr ""

190

191

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

191

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

192

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

193

msgstr ""

194

195

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

195

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

196

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

197

msgstr ""

198

199

#: bzrlib/builtins.py:351

199

#: bzrlib/builtins.py:439

200

#, python-format

201

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

202

msgstr ""

203

204

#: bzrlib/builtins.py:362

204

#: bzrlib/builtins.py:450

205

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

206

msgstr ""

207

208

#: bzrlib/builtins.py:369

208

#: bzrlib/builtins.py:457

209

msgid "You cannot specify a NULL revision."

210

msgstr ""

211

212

#: bzrlib/builtins.py:461

212

#: bzrlib/builtins.py:549

213

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

214

msgstr ""

215

216

#: bzrlib/builtins.py:463

216

#: bzrlib/builtins.py:551

217

msgid ""

218

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

219

"this will refuse to run against one."

220

msgstr ""

221

222

#: bzrlib/builtins.py:466

222

#: bzrlib/builtins.py:554

223

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

224

msgstr ""

225

226

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

227

#: bzrlib/builtins.py:472

227

#: bzrlib/builtins.py:560

228

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

229

msgstr ""

230

231

#: bzrlib/builtins.py:486

231

#: bzrlib/builtins.py:574

232

msgid "No working tree to remove"

233

msgstr ""

234

235

#: bzrlib/builtins.py:488

235

#: bzrlib/builtins.py:576

236

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

237

msgstr ""

238

239

#: bzrlib/builtins.py:497

239

#: bzrlib/builtins.py:585

240

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

241

msgstr ""

242

243

#: bzrlib/builtins.py:537

243

#: bzrlib/builtins.py:625

244

msgid ""

245

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

246

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

247

msgstr ""

248

249

#: bzrlib/builtins.py:548

249

#: bzrlib/builtins.py:636

250

msgid ""

251

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

252

"commit"

253

msgstr ""

254

255

#: bzrlib/builtins.py:552

255

#: bzrlib/builtins.py:640

256

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

257

msgstr ""

258

259

#: bzrlib/builtins.py:556

259

#: bzrlib/builtins.py:644

260

msgid "Show current revision number."

261

msgstr ""

262

263

#: bzrlib/builtins.py:558

263

#: bzrlib/builtins.py:646

264

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

265

msgstr ""

266

267

#: bzrlib/builtins.py:571

267

#: bzrlib/builtins.py:659

268

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

269

msgstr ""

270

271

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

271

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

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

276

#: bzrlib/builtins.py:700

277

msgid "Show revno of working tree."

278

msgstr ""

279

280

#: bzrlib/builtins.py:660

280

#: bzrlib/builtins.py:748

281

msgid "Add specified files or directories."

282

msgstr ""

283

284

#: bzrlib/builtins.py:662

284

#: bzrlib/builtins.py:750

285

msgid ""

286

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

287

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

288

"any of the named files are already versioned."

289

msgstr ""

290

291

#: bzrlib/builtins.py:666

291

#: bzrlib/builtins.py:754

292

msgid ""

293

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

294

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

299

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

300

msgstr ""

301

302

#: bzrlib/builtins.py:674

302

#: bzrlib/builtins.py:762

303

msgid ""

304

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

305

"unless they are explicitly ignored."

306

msgstr ""

307

308

#: bzrlib/builtins.py:677

308

#: bzrlib/builtins.py:765

309

msgid ""

310

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

311

"are currently unknown."

312

msgstr ""

313

314

#: bzrlib/builtins.py:680

314

#: bzrlib/builtins.py:768

315

msgid ""

316

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

317

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

319

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

320

msgstr ""

321

322

#: bzrlib/builtins.py:685

322

#: bzrlib/builtins.py:773

323

msgid ""

324

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

325

"add them."

326

msgstr ""

327

328

#: bzrlib/builtins.py:688

328

#: bzrlib/builtins.py:776

329

msgid ""

330

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

331

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

336

"into a subdirectory of this one."

337

msgstr ""

338

339

#: bzrlib/builtins.py:696

339

#: bzrlib/builtins.py:784

340

msgid ""

341

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

342

"unless they are explicitly mentioned."

343

msgstr ""

344

345

#: bzrlib/builtins.py:699

345

#: bzrlib/builtins.py:787

346

msgid ""

347

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

348

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

350

msgstr ""

351

352

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

353

#: bzrlib/builtins.py:706

353

#: bzrlib/builtins.py:794

354

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

355

msgstr ""

356

357

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

358

#: bzrlib/builtins.py:712

358

#: bzrlib/builtins.py:800

359

msgid "Lookup file ids from this tree."

360

msgstr ""

361

362

#: bzrlib/builtins.py:748

362

#: bzrlib/builtins.py:836

363

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

364

msgstr ""

365

366

#: bzrlib/builtins.py:753

366

#: bzrlib/builtins.py:841

367

msgid "Create a new versioned directory."

368

msgstr ""

369

370

#: bzrlib/builtins.py:755

370

#: bzrlib/builtins.py:843

371

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

372

msgstr ""

373

374

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

375

#: bzrlib/builtins.py:762

375

#: bzrlib/builtins.py:850

376

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

377

msgstr ""

378

379

#: bzrlib/builtins.py:796

379

#: bzrlib/builtins.py:884

380

#, python-format

381

msgid "added %s\n"

382

msgstr ""

383

384

#: bzrlib/builtins.py:838

384

#: bzrlib/builtins.py:926

385

#, python-format

386

msgid "invalid kind %r specified"

387

msgstr ""

388

389

#: bzrlib/builtins.py:875

389

#: bzrlib/builtins.py:963

390

msgid "Move or rename a file."

391

msgstr ""

392

393

#: bzrlib/builtins.py:877

393

#: bzrlib/builtins.py:965

394

msgid " bzr mv SOURCE... DESTINATION"

395

msgstr ""

396

397

#: bzrlib/builtins.py:879

397

#: bzrlib/builtins.py:967

398

msgid ""

399

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

400

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

401

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

402

msgstr ""

403

404

#: bzrlib/builtins.py:883

404

#: bzrlib/builtins.py:971

405

msgid ""

406

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

407

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

410

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

411

msgstr ""

412

413

#: bzrlib/builtins.py:889

413

#: bzrlib/builtins.py:977

414

msgid "Files cannot be moved between branches."

415

msgstr ""

416

417

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

418

#: bzrlib/builtins.py:896

418

#: bzrlib/builtins.py:984

419

msgid ""

420

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

421

"moved."

422

msgstr ""

423

424

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

425

#: bzrlib/builtins.py:898

425

#: bzrlib/builtins.py:986

426

msgid "Automatically guess renames."

427

msgstr ""

428

429

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

430

#: bzrlib/builtins.py:899

430

#: bzrlib/builtins.py:987

431

msgid "Avoid making changes when guessing renames."

432

msgstr ""

433

434

#: bzrlib/builtins.py:908

434

#: bzrlib/builtins.py:996

435

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

436

msgstr ""

437

438

#: bzrlib/builtins.py:912

438

#: bzrlib/builtins.py:1000

439

msgid "missing file argument"

440

msgstr ""

441

442

#: bzrlib/builtins.py:916

442

#: bzrlib/builtins.py:1004

443

msgid "can not move root of branch"

444

msgstr ""

445

446

#: bzrlib/builtins.py:922

446

#: bzrlib/builtins.py:1010

447

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

448

msgstr ""

449

450

#: bzrlib/builtins.py:925

450

#: bzrlib/builtins.py:1013

451

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

452

msgstr ""

453

454

#: bzrlib/builtins.py:962

454

#: bzrlib/builtins.py:1050

455

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

456

msgstr ""

457

458

#: bzrlib/builtins.py:1014

458

#: bzrlib/builtins.py:1102

459

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

460

msgstr ""

461

462

#: bzrlib/builtins.py:1016

462

#: bzrlib/builtins.py:1104

463

msgid ""

464

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

465

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

467

"parent."

468

msgstr ""

469

470

#: bzrlib/builtins.py:1021

470

#: bzrlib/builtins.py:1109

471

msgid ""

472

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

473

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

474

"be able to pull it again."

475

msgstr ""

476

477

#: bzrlib/builtins.py:1025

477

#: bzrlib/builtins.py:1113

478

msgid ""

479

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

480

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

481

"branches have diverged."

482

msgstr ""

483

484

#: bzrlib/builtins.py:1029

484

#: bzrlib/builtins.py:1117

485

msgid ""

486

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

487

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

489

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

490

msgstr ""

491

492

#: bzrlib/builtins.py:1034

492

#: bzrlib/builtins.py:1122

493

msgid ""

494

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

495

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

496

"-Olog_format=<other_format>."

497

msgstr ""

498

499

#: bzrlib/builtins.py:1038

499

#: bzrlib/builtins.py:1126

500

msgid ""

501

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

502

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

504

msgstr ""

505

506

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

507

#: bzrlib/builtins.py:1046

507

#: bzrlib/builtins.py:1134

508

msgid "Show logs of pulled revisions."

509

msgstr ""

510

511

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

512

#: bzrlib/builtins.py:1048

512

#: bzrlib/builtins.py:1136

513

msgid ""

514

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

515

msgstr ""

516

517

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

518

#: bzrlib/builtins.py:1051

518

#: bzrlib/builtins.py:1139

519

msgid ""

520

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

521

"master branch."

522

msgstr ""

523

524

#: bzrlib/builtins.py:1080

524

#: bzrlib/builtins.py:1168

525

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

526

msgstr ""

527

528

#: bzrlib/builtins.py:1096

528

#: bzrlib/builtins.py:1184

529

msgid "No pull location known or specified."

530

msgstr ""

531

532

#: bzrlib/builtins.py:1102

532

#: bzrlib/builtins.py:1190

533

#, python-format

534

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

535

msgstr ""

536

537

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

537

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

538

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

539

msgstr ""

540

541

#: bzrlib/builtins.py:1150

541

#: bzrlib/builtins.py:1238

542

msgid "Update a mirror of this branch."

543

msgstr ""

544

545

#: bzrlib/builtins.py:1152

545

#: bzrlib/builtins.py:1240

546

msgid ""

547

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

548

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

549

msgstr ""

550

551

#: bzrlib/builtins.py:1155

551

#: bzrlib/builtins.py:1243

552

msgid ""

553

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

554

"the future."

555

msgstr ""

556

557

#: bzrlib/builtins.py:1158

557

#: bzrlib/builtins.py:1246

558

msgid ""

559

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

560

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

561

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

562

msgstr ""

563

564

#: bzrlib/builtins.py:1162

564

#: bzrlib/builtins.py:1250

565

msgid ""

566

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

567

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

568

msgstr ""

569

570

#: bzrlib/builtins.py:1165

570

#: bzrlib/builtins.py:1253

571

msgid ""

572

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

573

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

574

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

575

msgstr ""

576

577

#: bzrlib/builtins.py:1169

577

#: bzrlib/builtins.py:1257

578

msgid ""

579

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

580

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

582

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

583

msgstr ""

584

585

#: bzrlib/builtins.py:1174

585

#: bzrlib/builtins.py:1262

586

msgid ""

587

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

588

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

591

592

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

593

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

594

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

594

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

595

msgid ""

596

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

597

msgstr ""

598

599

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

600

#: bzrlib/builtins.py:1188

600

#: bzrlib/builtins.py:1276

601

msgid ""

602

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

603

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

604

msgstr ""

605

606

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

607

#: bzrlib/builtins.py:1193

607

#: bzrlib/builtins.py:1281

608

msgid ""

609

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

610

"branch."

611

msgstr ""

612

613

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

614

#: bzrlib/builtins.py:1196

614

#: bzrlib/builtins.py:1284

615

msgid ""

616

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

617

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

620

621

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

622

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

623

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

623

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

624

msgid ""

625

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

626

"strict disables the check."

627

msgstr ""

628

629

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

630

#: bzrlib/builtins.py:1204

630

#: bzrlib/builtins.py:1292

631

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

632

msgstr ""

633

634

#: bzrlib/builtins.py:1248

634

#: bzrlib/builtins.py:1336

635

msgid "Could not determine branch to refer to."

636

msgstr ""

637

638

#: bzrlib/builtins.py:1257

638

#: bzrlib/builtins.py:1345

639

#, python-format

640

msgid ""

641

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

642

"use 'bzr push :parent'."

643

msgstr ""

644

645

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

645

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

646

msgid "No push location known or specified."

647

msgstr ""

648

649

#: bzrlib/builtins.py:1267

649

#: bzrlib/builtins.py:1355

650

#, python-format

651

msgid "Using saved push location: %s"

652

msgstr ""

653

654

#: bzrlib/builtins.py:1277

654

#: bzrlib/builtins.py:1365

655

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

656

msgstr ""

657

658

#: bzrlib/builtins.py:1279

658

#: bzrlib/builtins.py:1367

659

msgid ""

660

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

661

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

666

"create ./foo-bar."

667

msgstr ""

668

669

#: bzrlib/builtins.py:1286

669

#: bzrlib/builtins.py:1374

670

msgid ""

671

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

672

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

673

msgstr ""

674

675

#: bzrlib/builtins.py:1289

675

#: bzrlib/builtins.py:1377

676

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

677

msgstr ""

678

679

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

680

#: bzrlib/builtins.py:1299

680

#: bzrlib/builtins.py:1387

681

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

682

msgstr ""

683

684

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

685

#: bzrlib/builtins.py:1301

685

#: bzrlib/builtins.py:1389

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

690

#: bzrlib/builtins.py:1392

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

697

#: bzrlib/builtins.py:1396

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

702

#: bzrlib/builtins.py:1398

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

709

#: bzrlib/builtins.py:1403

710

msgid "Bind new branch to from location."

711

msgstr ""

712

713

#: bzrlib/builtins.py:1362

713

#: bzrlib/builtins.py:1450

714

#, python-format

715

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

716

msgstr ""

717

718

#: bzrlib/builtins.py:1374

718

#: bzrlib/builtins.py:1462

719

#, python-format

720

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

721

msgstr ""

722

723

#: bzrlib/builtins.py:1393

723

#: bzrlib/builtins.py:1481

724

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

725

msgstr ""

726

727

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

727

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

728

#, python-format

729

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

730

msgstr ""

731

732

#: bzrlib/builtins.py:1407

732

#: bzrlib/builtins.py:1500

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

739

#: bzrlib/builtins.py:1505

740

#, python-format

741

msgid "New branch bound to %s"

742

msgstr ""

743

744

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

744

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

745

#, python-format

746

msgid "Switched to branch: %s"

747

msgstr ""

748

749

#: bzrlib/builtins.py:1422

749

#: bzrlib/builtins.py:1515

750

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

751

msgstr ""

752

753

#: bzrlib/builtins.py:1424

753

#: bzrlib/builtins.py:1517

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

760

#: bzrlib/builtins.py:1524

761

msgid ""

762

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

763

"location."

764

msgstr ""

765

766

#: bzrlib/builtins.py:1461

766

#: bzrlib/builtins.py:1554

767

msgid "(default)"

768

msgstr ""

769

770

#: bzrlib/builtins.py:1473

770

#: bzrlib/builtins.py:1566

771

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

772

msgstr ""

773

774

#: bzrlib/builtins.py:1475

774

#: bzrlib/builtins.py:1568

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

784

#: bzrlib/builtins.py:1573

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

796

#: bzrlib/builtins.py:1580

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

807

#: bzrlib/builtins.py:1590

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

817

#: bzrlib/builtins.py:1597

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

823

#: bzrlib/builtins.py:1599

824

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

825

msgstr ""

826

827

#: bzrlib/builtins.py:1547

827

#: bzrlib/builtins.py:1640

828

msgid ""

829

"Show list of renamed files.\n"

830

" "

831

msgstr ""

832

833

#: bzrlib/builtins.py:1577

833

#: bzrlib/builtins.py:1670

834

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

835

msgstr ""

836

837

#: bzrlib/builtins.py:1579

837

#: bzrlib/builtins.py:1672

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

844

#: bzrlib/builtins.py:1676

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

850

#: bzrlib/builtins.py:1679

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

858

#: bzrlib/builtins.py:1684

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

864

#: bzrlib/builtins.py:1687

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

874

#: bzrlib/builtins.py:1694

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

881

#: bzrlib/builtins.py:1710

882

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

883

msgstr ""

884

885

#: bzrlib/builtins.py:1625

885

#: bzrlib/builtins.py:1718

886

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

887

msgstr ""

888

889

#: bzrlib/builtins.py:1656

889

#: bzrlib/builtins.py:1749

890

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

891

msgstr ""

892

893

#: bzrlib/builtins.py:1672

893

#: bzrlib/builtins.py:1765

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

900

#: bzrlib/builtins.py:1771

901

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

902

msgstr ""

903

904

#: bzrlib/builtins.py:1682

904

#: bzrlib/builtins.py:1775

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

910

#: bzrlib/builtins.py:1784

911

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

912

msgstr ""

913

914

#: bzrlib/builtins.py:1693

914

#: bzrlib/builtins.py:1786

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

920

#: bzrlib/builtins.py:1789

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

927

#: bzrlib/builtins.py:1793

928

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

929

msgstr ""

930

931

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

932

#: bzrlib/builtins.py:6389

931

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

932

#: bzrlib/builtins.py:6442

933

msgid ":Examples:"

934

msgstr ""

935

936

#: bzrlib/builtins.py:1704

936

#: bzrlib/builtins.py:1797

937

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

938

msgstr ""

939

940

#: bzrlib/builtins.py:1706

940

#: bzrlib/builtins.py:1799

941

msgid " bzr info"

942

msgstr ""

943

944

#: bzrlib/builtins.py:1708

944

#: bzrlib/builtins.py:1801

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

951

#: bzrlib/builtins.py:1805

952

msgid " bzr info -v"

953

msgstr ""

954

955

#: bzrlib/builtins.py:1714

955

#: bzrlib/builtins.py:1807

956

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

957

msgstr ""

958

959

#: bzrlib/builtins.py:1716

959

#: bzrlib/builtins.py:1809

960

msgid " bzr info -vv"

961

msgstr ""

962

963

#: bzrlib/builtins.py:1735

963

#: bzrlib/builtins.py:1828

964

msgid "Remove files or directories."

965

msgstr ""

966

967

#: bzrlib/builtins.py:1737

967

#: bzrlib/builtins.py:1830

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

977

#: bzrlib/builtins.py:1838

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

982

#: bzrlib/builtins.py:1840

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

987

#: bzrlib/builtins.py:1841

988

msgid "Deletion Strategy"

989

msgstr ""

990

991

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

992

#: bzrlib/builtins.py:1749

992

#: bzrlib/builtins.py:1842

993

msgid "Backup changed files (default)."

994

msgstr ""

995

996

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

997

#: bzrlib/builtins.py:1750

997

#: bzrlib/builtins.py:1843

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

1002

#: bzrlib/builtins.py:1844

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

1007

#: bzrlib/builtins.py:1845

1008

msgid ""

1009

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

1010

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

1011

msgstr ""

1012

1013

#: bzrlib/builtins.py:1761

1013

#: bzrlib/builtins.py:1854

1014

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

1015

msgstr ""

1016

1017

#: bzrlib/builtins.py:1778

1017

#: bzrlib/builtins.py:1871

1018

msgid "No matching files."

1019

msgstr ""

1020

1021

#: bzrlib/builtins.py:1839

1021

#: bzrlib/builtins.py:1932

1022

msgid "Reconcile bzr metadata in a branch."

1023

msgstr ""

1024

1025

#: bzrlib/builtins.py:1841

1025

#: bzrlib/builtins.py:1934

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

1033

#: bzrlib/builtins.py:1939

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

1041

#: bzrlib/builtins.py:1944

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

1047

#: bzrlib/builtins.py:1947

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:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657

1057

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

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:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657

1067

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

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:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657

1076

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

1077

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

1078

msgstr ""

1079

1080

#: bzrlib/builtins.py:1922

1080

#: bzrlib/builtins.py:2015

1081

msgid "Make a directory into a versioned branch."

1082

msgstr ""

1083

1084

#: bzrlib/builtins.py:1924

1084

#: bzrlib/builtins.py:2017

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

1090

#: bzrlib/builtins.py:2020

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

1098

#: bzrlib/builtins.py:2025

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

1104

#: bzrlib/builtins.py:2028

1105

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

1106

msgstr ""

1107

1108

#: bzrlib/builtins.py:1937

1108

#: bzrlib/builtins.py:2030

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

1119

#: bzrlib/builtins.py:2041

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

1124

#: bzrlib/builtins.py:2044

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

1129

#: bzrlib/builtins.py:2052

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

1134

#: bzrlib/builtins.py:2055

1135

msgid "Create a branch without a working tree."

1136

msgstr ""

1137

1138

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

1138

#: bzrlib/builtins.py:2075 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:2016

1145

#: bzrlib/builtins.py:2109

1146

msgid ""

1147

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

1148

msgstr ""

1149

1150

#: bzrlib/builtins.py:2027

1150

#: bzrlib/builtins.py:2120

1151

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

1152

msgstr ""

1153

1154

#: bzrlib/builtins.py:2036

1154

#: bzrlib/builtins.py:2129

1155

#, python-format

1156

msgid "Using shared repository: %s\n"

1157

msgstr ""

1158

1159

#: bzrlib/builtins.py:2040

1159

#: bzrlib/builtins.py:2133

1160

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

1161

msgstr ""

1162

1163

#: bzrlib/builtins.py:2042

1163

#: bzrlib/builtins.py:2135

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

1171

#: bzrlib/builtins.py:2140

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

1181

#: bzrlib/builtins.py:2147

1182

msgid ""

1183

":Examples:\n"

1184

" Create a shared repository holding just branches::"

1185

msgstr ""

1186

1187

#: bzrlib/builtins.py:2057

1187

#: bzrlib/builtins.py:2150

1188

msgid ""

1189

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

1190

" bzr init repo/trunk"

1191

msgstr ""

1192

1193

#: bzrlib/builtins.py:2060

1193

#: bzrlib/builtins.py:2153

1194

msgid " Make a lightweight checkout elsewhere::"

1195

msgstr ""

1196

1197

#: bzrlib/builtins.py:2062

1197

#: bzrlib/builtins.py:2155

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

1205

#: bzrlib/builtins.py:2163

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

1211

#: bzrlib/builtins.py:2167

1212

msgid "Repository format"

1213

msgstr ""

1214

1215

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

1216

#: bzrlib/builtins.py:2076

1216

#: bzrlib/builtins.py:2169

1217

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

1218

msgstr ""

1219

1220

#: bzrlib/builtins.py:2102

1220

#: bzrlib/builtins.py:2195

1221

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

1222

msgstr ""

1223

1224

#: bzrlib/builtins.py:2104

1224

#: bzrlib/builtins.py:2197

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

1234

#: bzrlib/builtins.py:2204

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

1240

#: bzrlib/builtins.py:2207

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

1250

#: bzrlib/builtins.py:2214

1251

msgid ""

1252

":Exit values:\n"

1253

" 1 - changed\n"

1256

" 0 - no change"

1257

msgstr ""

1258

1259

#: bzrlib/builtins.py:2127

1259

#: bzrlib/builtins.py:2220

1260

msgid ""

1261

":Examples:\n"

1262

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

1263

msgstr ""

1264

1265

#: bzrlib/builtins.py:2130

1265

#: bzrlib/builtins.py:2223

1266

msgid " bzr diff"

1267

msgstr ""

1268

1269

#: bzrlib/builtins.py:2132

1269

#: bzrlib/builtins.py:2225

1270

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

1271

msgstr ""

1272

1273

#: bzrlib/builtins.py:2134

1273

#: bzrlib/builtins.py:2227

1274

msgid " bzr diff -r1"

1275

msgstr ""

1276

1277

#: bzrlib/builtins.py:2136

1277

#: bzrlib/builtins.py:2229

1278

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

1279

msgstr ""

1280

1281

#: bzrlib/builtins.py:2138

1281

#: bzrlib/builtins.py:2231

1282

msgid " bzr diff -r1..3"

1283

msgstr ""

1284

1285

#: bzrlib/builtins.py:2140

1285

#: bzrlib/builtins.py:2233

1286

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

1287

msgstr ""

1288

1289

#: bzrlib/builtins.py:2142

1289

#: bzrlib/builtins.py:2235

1290

msgid " bzr diff -r1..3 xxx"

1291

msgstr ""

1292

1293

#: bzrlib/builtins.py:2144

1293

#: bzrlib/builtins.py:2237

1294

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

1295

msgstr ""

1296

1297

#: bzrlib/builtins.py:2146

1297

#: bzrlib/builtins.py:2239

1298

msgid " bzr diff -c2"

1299

msgstr ""

1300

1301

#: bzrlib/builtins.py:2148

1301

#: bzrlib/builtins.py:2241

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

1308

#: bzrlib/builtins.py:2245

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

1315

#: bzrlib/builtins.py:2249

1316

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

1317

msgstr ""

1318

1319

#: bzrlib/builtins.py:2158

1319

#: bzrlib/builtins.py:2251

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

1325

#: bzrlib/builtins.py:2254

1326

msgid " bzr diff -r-2.."

1327

msgstr ""

1328

1329

#: bzrlib/builtins.py:2163

1329

#: bzrlib/builtins.py:2256

1330

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

1331

msgstr ""

1332

1333

#: bzrlib/builtins.py:2165

1333

#: bzrlib/builtins.py:2258

1334

msgid " bzr diff NEWS"

1335

msgstr ""

1336

1337

#: bzrlib/builtins.py:2167

1337

#: bzrlib/builtins.py:2260

1338

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

1339

msgstr ""

1340

1341

#: bzrlib/builtins.py:2169

1341

#: bzrlib/builtins.py:2262

1342

msgid " bzr diff xxx/NEWS"

1343

msgstr ""

1344

1345

#: bzrlib/builtins.py:2171

1345

#: bzrlib/builtins.py:2264

1346

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

1347

msgstr ""

1348

1349

#: bzrlib/builtins.py:2173

1349

#: bzrlib/builtins.py:2266

1350

msgid " bzr diff --old xxx"

1351

msgstr ""

1352

1353

#: bzrlib/builtins.py:2175

1353

#: bzrlib/builtins.py:2268

1354

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

1355

msgstr ""

1356

1357

#: bzrlib/builtins.py:2177

1357

#: bzrlib/builtins.py:2270

1358

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

1359

msgstr ""

1360

1361

#: bzrlib/builtins.py:2179

1361

#: bzrlib/builtins.py:2272

1362

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

1363

msgstr ""

1364

1365

#: bzrlib/builtins.py:2181

1365

#: bzrlib/builtins.py:2274

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

1375

#: bzrlib/builtins.py:2284

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

1380

#: bzrlib/builtins.py:2287

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

1387

#: bzrlib/builtins.py:2290

1388

msgid "Branch/tree to compare from."

1389

msgstr ""

1390

1391

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

1392

#: bzrlib/builtins.py:2201

1392

#: bzrlib/builtins.py:2294

1393

msgid "Branch/tree to compare to."

1394

msgstr ""

1395

1396

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

1397

#: bzrlib/builtins.py:2207

1397

#: bzrlib/builtins.py:2300

1398

msgid "Use this command to compare files."

1399

msgstr ""

1400

1401

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

1402

#: bzrlib/builtins.py:2212

1402

#: bzrlib/builtins.py:2305

1403

msgid "Diff format to use."

1404

msgstr ""

1405

1406

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

1407

#: bzrlib/builtins.py:2214

1407

#: bzrlib/builtins.py:2307

1408

msgid "Diff format"

1409

msgstr ""

1410

1411

#: bzrlib/builtins.py:2236

1411

#: bzrlib/builtins.py:2329

1412

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

1413

msgstr ""

1414

1415

#: bzrlib/builtins.py:2240

1415

#: bzrlib/builtins.py:2333

1416

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

1417

msgstr ""

1418

1419

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

1420

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

1419

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

1420

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

1421

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

1422

msgstr ""

1423

1424

#: bzrlib/builtins.py:2265

1424

#: bzrlib/builtins.py:2358

1425

msgid ""

1426

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

1427

" "

1428

msgstr ""

1429

1430

#: bzrlib/builtins.py:2343

1430

#: bzrlib/builtins.py:2436

1431

msgid "Show the tree root directory."

1432

msgstr ""

1433

1434

#: bzrlib/builtins.py:2345

1434

#: bzrlib/builtins.py:2438

1435

msgid ""

1436

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

1437

"directory."

1438

msgstr ""

1439

1440

#: bzrlib/builtins.py:2360

1440

#: bzrlib/builtins.py:2453

1441

msgid "The limit argument must be an integer."

1442

msgstr ""

1443

1444

#: bzrlib/builtins.py:2368

1444

#: bzrlib/builtins.py:2461

1445

msgid "The levels argument must be an integer."

1446

msgstr ""

1447

1448

#: bzrlib/builtins.py:2373

1448

#: bzrlib/builtins.py:2466

1449

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

1450

msgstr ""

1451

1452

#: bzrlib/builtins.py:2375

1452

#: bzrlib/builtins.py:2468

1453

msgid ""

1454

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

1455

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

1457

"Here are some simple examples::"

1458

msgstr ""

1459

1460

#: bzrlib/builtins.py:2380

1460

#: bzrlib/builtins.py:2473

1461

msgid ""

1462

" bzr log log the current branch\n"

1463

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

1464

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

1465

msgstr ""

1466

1467

#: bzrlib/builtins.py:2384

1467

#: bzrlib/builtins.py:2477

1468

msgid ""

1469

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

1470

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

1474

"were merged."

1475

msgstr ""

1476

1477

#: bzrlib/builtins.py:2391

1477

#: bzrlib/builtins.py:2484

1478

msgid ":Output control:"

1479

msgstr ""

1480

1481

#: bzrlib/builtins.py:2393

1481

#: bzrlib/builtins.py:2486

1482

msgid ""

1483

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

1484

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

1486

" for more details on log formats."

1487

msgstr ""

1488

1489

#: bzrlib/builtins.py:2398

1489

#: bzrlib/builtins.py:2491

1490

msgid ""

1491

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

1492

" displayed::"

1493

msgstr ""

1494

1495

#: bzrlib/builtins.py:2401

1495

#: bzrlib/builtins.py:2494

1496

msgid ""

1497

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

1498

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

1501

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

1502

msgstr ""

1503

1504

#: bzrlib/builtins.py:2407

1504

#: bzrlib/builtins.py:2500

1505

msgid ""

1506

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

1507

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

1508

" just the top level (mainline)."

1509

msgstr ""

1510

1511

#: bzrlib/builtins.py:2411

1511

#: bzrlib/builtins.py:2504

1512

msgid ""

1513

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

1514

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

1515

" instead, use the -vv option."

1516

msgstr ""

1517

1518

#: bzrlib/builtins.py:2415

1518

#: bzrlib/builtins.py:2508

1519

msgid ":Ordering control:"

1520

msgstr ""

1521

1522

#: bzrlib/builtins.py:2417

1522

#: bzrlib/builtins.py:2510

1523

msgid ""

1524

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

1525

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

1527

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

1528

msgstr ""

1529

1530

#: bzrlib/builtins.py:2422

1530

#: bzrlib/builtins.py:2515

1531

msgid ":Revision filtering:"

1532

msgstr ""

1533

1534

#: bzrlib/builtins.py:2424

1534

#: bzrlib/builtins.py:2517

1535

msgid ""

1536

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

1537

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

1538

msgstr ""

1539

1540

#: bzrlib/builtins.py:2427

1540

#: bzrlib/builtins.py:2520

1541

msgid ""

1542

" -rX display revision X\n"

1543

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

1545

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

1546

msgstr ""

1547

1548

#: bzrlib/builtins.py:2432

1548

#: bzrlib/builtins.py:2525

1549

msgid ""

1550

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

1551

" Some common examples are given below::"

1552

msgstr ""

1553

1554

#: bzrlib/builtins.py:2435

1554

#: bzrlib/builtins.py:2528

1555

msgid ""

1556

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

1557

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

1561

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

1562

msgstr ""

1563

1564

#: bzrlib/builtins.py:2442

1564

#: bzrlib/builtins.py:2535

1565

msgid ""

1566

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

1567

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

1571

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

1572

msgstr ""

1573

1574

#: bzrlib/builtins.py:2449

1574

#: bzrlib/builtins.py:2542

1575

msgid ":Path filtering:"

1576

msgstr ""

1577

1578

#: bzrlib/builtins.py:2451

1578

#: bzrlib/builtins.py:2544

1579

msgid ""

1580

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

1581

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

1582

" nominated files or directories."

1583

msgstr ""

1584

1585

#: bzrlib/builtins.py:2455

1585

#: bzrlib/builtins.py:2548

1586

msgid ""

1587

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

1588

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

1589

" the end or start of the range."

1590

msgstr ""

1591

1592

#: bzrlib/builtins.py:2459

1592

#: bzrlib/builtins.py:2552

1593

msgid ""

1594

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

1595

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

1596

msgstr ""

1597

1598

#: bzrlib/builtins.py:2462

1598

#: bzrlib/builtins.py:2555

1599

msgid ""

1600

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

1601

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

1602

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

1603

msgstr ""

1604

1605

#: bzrlib/builtins.py:2466

1605

#: bzrlib/builtins.py:2559

1606

msgid " In this case:"

1607

msgstr ""

1608

1609

#: bzrlib/builtins.py:2468

1609

#: bzrlib/builtins.py:2561

1610

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

1611

msgstr ""

1612

1613

#: bzrlib/builtins.py:2470

1613

#: bzrlib/builtins.py:2563

1614

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

1615

msgstr ""

1616

1617

#: bzrlib/builtins.py:2472

1617

#: bzrlib/builtins.py:2565

1618

msgid ""

1619

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

1620

" the original file in revision 2."

1621

msgstr ""

1622

1623

#: bzrlib/builtins.py:2475

1623

#: bzrlib/builtins.py:2568

1624

msgid ""

1625

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

1626

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

1627

msgstr ""

1628

1629

#: bzrlib/builtins.py:2478

1629

#: bzrlib/builtins.py:2571

1630

msgid ""

1631

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

1632

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

1633

" until it was last renamed)."

1634

msgstr ""

1635

1636

#: bzrlib/builtins.py:2482

1636

#: bzrlib/builtins.py:2575

1637

msgid ":Other filtering:"

1638

msgstr ""

1639

1640

#: bzrlib/builtins.py:2484

1640

#: bzrlib/builtins.py:2577

1641

msgid ""

1642

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

1643

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

1646

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

1647

msgstr ""

1648

1649

#: bzrlib/builtins.py:2490

1649

#: bzrlib/builtins.py:2583

1650

msgid ":Tips & tricks:"

1651

msgstr ""

1652

1653

#: bzrlib/builtins.py:2492

1653

#: bzrlib/builtins.py:2585

1654

msgid ""

1655

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

1656

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

1659

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

1660

msgstr ""

1661

1662

#: bzrlib/builtins.py:2498

1662

#: bzrlib/builtins.py:2591

1663

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

1664

msgstr ""

1665

1666

#: bzrlib/builtins.py:2500

1666

#: bzrlib/builtins.py:2593

1667

msgid ""

1668

" [ALIASES]\n"

1669

" tip = log -r-1\n"

1671

" show = log -v -p"

1672

msgstr ""

1673

1674

#: bzrlib/builtins.py:2505

1674

#: bzrlib/builtins.py:2598

1675

msgid ""

1676

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

1677

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

1678

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

1679

msgstr ""

1680

1681

#: bzrlib/builtins.py:2509

1681

#: bzrlib/builtins.py:2602

1682

msgid ""

1683

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

1684

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

1685

msgstr ""

1686

1687

#: bzrlib/builtins.py:2512

1687

#: bzrlib/builtins.py:2605

1688

msgid ""

1689

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

1690

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

1692

" be given when using the -v option."

1693

msgstr ""

1694

1695

#: bzrlib/builtins.py:2517

1695

#: bzrlib/builtins.py:2610

1696

msgid ""

1697

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

1698

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

1700

" a list of words but not others."

1701

msgstr ""

1702

1703

#: bzrlib/builtins.py:2522

1703

#: bzrlib/builtins.py:2615

1704

msgid ""

1705

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

1706

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

1709

msgstr ""

1710

1711

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

1712

#: bzrlib/builtins.py:2531

1712

#: bzrlib/builtins.py:2624

1713

msgid "Show from oldest to newest."

1714

msgstr ""

1715

1716

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

1717

#: bzrlib/builtins.py:2534

1717

#: bzrlib/builtins.py:2627

1718

msgid "Show files changed in each revision."

1719

msgstr ""

1720

1721

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

1722

#: bzrlib/builtins.py:2540

1722

#: bzrlib/builtins.py:2633

1723

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

1724

msgstr ""

1725

1726

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

1727

#: bzrlib/builtins.py:2544

1727

#: bzrlib/builtins.py:2637

1728

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

1729

msgstr ""

1730

1731

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

1732

#: bzrlib/builtins.py:2545

1732

#: bzrlib/builtins.py:2638

1733

msgid "Authors"

1734

msgstr ""

1735

1736

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

1737

#: bzrlib/builtins.py:2550

1737

#: bzrlib/builtins.py:2643

1738

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

1739

msgstr ""

1740

1741

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

1742

#: bzrlib/builtins.py:2560

1742

#: bzrlib/builtins.py:2653

1743

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

1744

msgstr ""

1745

1746

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

1747

#: bzrlib/builtins.py:2565

1747

#: bzrlib/builtins.py:2658

1748

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

1749

msgstr ""

1750

1751

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

1752

#: bzrlib/builtins.py:2567

1752

#: bzrlib/builtins.py:2660

1753

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

1754

msgstr ""

1755

1756

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

1757

#: bzrlib/builtins.py:2571

1757

#: bzrlib/builtins.py:2664

1758

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

1759

msgstr ""

1760

1761

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

1762

#: bzrlib/builtins.py:2573

1762

#: bzrlib/builtins.py:2666

1763

msgid ""

1764

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

1765

"rX..Y)."

1766

msgstr ""

1767

1768

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

1769

#: bzrlib/builtins.py:2577

1769

#: bzrlib/builtins.py:2670

1770

msgid "Show digital signature validity."

1771

msgstr ""

1772

1773

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

1774

#: bzrlib/builtins.py:2580

1774

#: bzrlib/builtins.py:2673

1775

msgid "Show revisions whose properties match this expression."

1776

msgstr ""

1777

1778

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

1779

#: bzrlib/builtins.py:2584

1779

#: bzrlib/builtins.py:2677

1780

msgid "Show revisions whose message matches this expression."

1781

msgstr ""

1782

1783

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

1784

#: bzrlib/builtins.py:2588

1784

#: bzrlib/builtins.py:2681

1785

msgid "Show revisions whose committer matches this expression."

1786

msgstr ""

1787

1788

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

1789

#: bzrlib/builtins.py:2592

1789

#: bzrlib/builtins.py:2685

1790

msgid "Show revisions whose authors match this expression."

1791

msgstr ""

1792

1793

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

1794

#: bzrlib/builtins.py:2596

1794

#: bzrlib/builtins.py:2689

1795

msgid "Show revisions whose bugs match this expression."

1796

msgstr ""

1797

1798

#: bzrlib/builtins.py:2650

1798

#: bzrlib/builtins.py:2743

1799

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

1800

msgstr ""

1801

1802

#: bzrlib/builtins.py:2678

1802

#: bzrlib/builtins.py:2771

1803

#, python-format

1804

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

1805

msgstr ""

1806

1807

#: bzrlib/builtins.py:2795

1807

#: bzrlib/builtins.py:2888

1808

#, python-format

1809

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

1810

msgstr ""

1811

1812

#: bzrlib/builtins.py:2811

1812

#: bzrlib/builtins.py:2904

1813

#, python-format

1814

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

1815

msgstr ""

1816

1817

#: bzrlib/builtins.py:2856

1817

#: bzrlib/builtins.py:2949

1818

msgid ""

1819

"List files in a tree.\n"

1820

" "

1821

msgstr ""

1822

1823

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

1824

#: bzrlib/builtins.py:2865

1824

#: bzrlib/builtins.py:2958

1825

msgid "Recurse into subdirectories."

1826

msgstr ""

1827

1828

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

1829

#: bzrlib/builtins.py:2867

1829

#: bzrlib/builtins.py:2960

1830

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

1831

msgstr ""

1832

1833

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

1834

#: bzrlib/builtins.py:2869

1834

#: bzrlib/builtins.py:2962

1835

msgid "Print unknown files."

1836

msgstr ""

1837

1838

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

1839

#: bzrlib/builtins.py:2870

1839

#: bzrlib/builtins.py:2963

1840

msgid "Print versioned files."

1841

msgstr ""

1842

1843

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

1844

#: bzrlib/builtins.py:2873

1844

#: bzrlib/builtins.py:2966

1845

msgid "Print ignored files."

1846

msgstr ""

1847

1848

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

1849

#: bzrlib/builtins.py:2875

1849

#: bzrlib/builtins.py:2968

1850

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

1851

msgstr ""

1852

1853

#: bzrlib/builtins.py:2888

1853

#: bzrlib/builtins.py:2981

1854

msgid "invalid kind specified"

1855

msgstr ""

1856

1857

#: bzrlib/builtins.py:2891

1857

#: bzrlib/builtins.py:2984

1858

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

1859

msgstr ""

1860

1861

#: bzrlib/builtins.py:2900

1861

#: bzrlib/builtins.py:2993

1862

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

1863

msgstr ""

1864

1865

#: bzrlib/builtins.py:2987

1865

#: bzrlib/builtins.py:3080

1866

msgid "Ignore specified files or patterns."

1867

msgstr ""

1868

1869

#: bzrlib/builtins.py:2989

1869

#: bzrlib/builtins.py:3082

1870

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

1871

msgstr ""

1872

1873

#: bzrlib/builtins.py:2991

1873

#: bzrlib/builtins.py:3084

1874

msgid ""

1875

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

1876

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

1879

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

1880

msgstr ""

1881

1882

#: bzrlib/builtins.py:2997

1882

#: bzrlib/builtins.py:3090

1883

msgid ""

1884

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

1885

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

1887

"it."

1888

msgstr ""

1889

1890

#: bzrlib/builtins.py:3002

1890

#: bzrlib/builtins.py:3095

1891

msgid ""

1892

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

1893

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

1896

"can be edited directly using an editor."

1897

msgstr ""

1898

1899

#: bzrlib/builtins.py:3008

1899

#: bzrlib/builtins.py:3101

1900

msgid ""

1901

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

1902

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

1903

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

1904

msgstr ""

1905

1906

#: bzrlib/builtins.py:3012

1906

#: bzrlib/builtins.py:3105

1907

msgid ""

1908

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

1909

"precedence over the '!' exception patterns."

1910

msgstr ""

1911

1912

#: bzrlib/builtins.py:3015

1912

#: bzrlib/builtins.py:3108

1913

msgid ""

1914

":Notes: \n"

1915

" \n"

1917

" the shell on Unix."

1918

msgstr ""

1919

1920

#: bzrlib/builtins.py:3020

1920

#: bzrlib/builtins.py:3113

1921

msgid ""

1922

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

1923

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

1924

msgstr ""

1925

1926

#: bzrlib/builtins.py:3023

1926

#: bzrlib/builtins.py:3116

1927

msgid ""

1928

":Examples:\n"

1929

" Ignore the top level Makefile::"

1930

msgstr ""

1931

1932

#: bzrlib/builtins.py:3026

1932

#: bzrlib/builtins.py:3119

1933

msgid " bzr ignore ./Makefile"

1934

msgstr ""

1935

1936

#: bzrlib/builtins.py:3028

1936

#: bzrlib/builtins.py:3121

1937

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

1938

msgstr ""

1939

1940

#: bzrlib/builtins.py:3030

1940

#: bzrlib/builtins.py:3123

1941

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

1942

msgstr ""

1943

1944

#: bzrlib/builtins.py:3032

1944

#: bzrlib/builtins.py:3125

1945

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

1946

msgstr ""

1947

1948

#: bzrlib/builtins.py:3034

1948

#: bzrlib/builtins.py:3127

1949

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

1950

msgstr ""

1951

1952

#: bzrlib/builtins.py:3036

1952

#: bzrlib/builtins.py:3129

1953

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

1954

msgstr ""

1955

1956

#: bzrlib/builtins.py:3038

1956

#: bzrlib/builtins.py:3131

1957

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

1958

msgstr ""

1959

1960

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

1960

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

1961

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

1962

msgstr ""

1963

1964

#: bzrlib/builtins.py:3042

1964

#: bzrlib/builtins.py:3135

1965

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

1966

msgstr ""

1967

1968

#: bzrlib/builtins.py:3046

1968

#: bzrlib/builtins.py:3139

1969

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

1970

msgstr ""

1971

1972

#: bzrlib/builtins.py:3048

1972

#: bzrlib/builtins.py:3141

1973

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

1974

msgstr ""

1975

1976

#: bzrlib/builtins.py:3050

1976

#: bzrlib/builtins.py:3143

1977

msgid ""

1978

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

1979

" \n"

1986

msgstr ""

1987

1988

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

1989

#: bzrlib/builtins.py:3064

1989

#: bzrlib/builtins.py:3157

1990

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

1991

msgstr ""

1992

1993

#: bzrlib/builtins.py:3076

1993

#: bzrlib/builtins.py:3169

1994

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

1995

msgstr ""

1996

1997

#: bzrlib/builtins.py:3087

1997

#: bzrlib/builtins.py:3180

1998

#, python-format

1999

msgid "Invalid ignore pattern found. %s"

2000

msgid_plural "Invalid ignore patterns found. %s"

2001

msgstr[0] ""

2002

msgstr[1] ""

2003

2004

#: bzrlib/builtins.py:3096

2004

#: bzrlib/builtins.py:3189

2005

msgid "NAME_PATTERN should not be an absolute path"

2006

msgstr ""

2007

2008

#: bzrlib/builtins.py:3109

2008

#: bzrlib/builtins.py:3202

2009

#, python-format

2010

msgid ""

2011

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

2015

"them.\n"

2016

msgstr ""

2017

2018

#: bzrlib/builtins.py:3116

2018

#: bzrlib/builtins.py:3209

2019

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

2020

msgstr ""

2021

2022

#: bzrlib/builtins.py:3118

2022

#: bzrlib/builtins.py:3211

2023

msgid ""

2024

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

2025

"be ignored."

2026

msgstr ""

2027

2028

#: bzrlib/builtins.py:3121

2028

#: bzrlib/builtins.py:3214

2029

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

2030

msgstr ""

2031

2032

#: bzrlib/builtins.py:3123

2032

#: bzrlib/builtins.py:3216

2033

msgid " bzr ls --ignored"

2034

msgstr ""

2035

2036

#: bzrlib/builtins.py:3157

2036

#: bzrlib/builtins.py:3250

2037

#, python-format

2038

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

2039

msgstr ""

2040

2041

#: bzrlib/builtins.py:3164

2041

#: bzrlib/builtins.py:3257

2042

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

2043

msgstr ""

2044

2045

#: bzrlib/builtins.py:3166

2045

#: bzrlib/builtins.py:3259

2046

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

2047

msgstr ""

2048

2049

#: bzrlib/builtins.py:3168

2049

#: bzrlib/builtins.py:3261

2050

msgid ""

2051

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

2052

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

2053

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

2054

msgstr ""

2055

2056

#: bzrlib/builtins.py:3172

2056

#: bzrlib/builtins.py:3265

2057

msgid ""

2058

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

2059

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

2060

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

2061

msgstr ""

2062

2063

#: bzrlib/builtins.py:3176

2063

#: bzrlib/builtins.py:3269

2064

msgid ""

2065

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

2066

"directory will be used."

2067

msgstr ""

2068

2069

#: bzrlib/builtins.py:3179

2069

#: bzrlib/builtins.py:3272

2070

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

2071

msgstr ""

2072

2073

#: bzrlib/builtins.py:3181

2073

#: bzrlib/builtins.py:3274

2074

msgid ""

2075

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

2076

" Supported formats Autodetected by extension\n"

2084

msgstr ""

2085

2086

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

2087

#: bzrlib/builtins.py:3195

2087

#: bzrlib/builtins.py:3288

2088

msgid "Type of file to export to."

2089

msgstr ""

2090

2091

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

2092

#: bzrlib/builtins.py:3198

2092

#: bzrlib/builtins.py:3291

2093

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

2094

msgstr ""

2095

2096

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

2097

#: bzrlib/builtins.py:3202

2097

#: bzrlib/builtins.py:3295

2098

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

2099

msgstr ""

2100

2101

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

2102

#: bzrlib/builtins.py:3204

2102

#: bzrlib/builtins.py:3297

2103

msgid ""

2104

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

2105

"changed."

2106

msgstr ""

2107

2108

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

2109

#: bzrlib/builtins.py:3207

2109

#: bzrlib/builtins.py:3300

2110

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

2111

msgstr ""

2112

2113

#: bzrlib/builtins.py:3226

2113

#: bzrlib/builtins.py:3319

2114

msgid "--uncommitted requires a working tree"

2115

msgstr ""

2116

2117

#: bzrlib/builtins.py:3235

2117

#: bzrlib/builtins.py:3328

2118

#, python-format

2119

msgid "Unsupported export format: %s"

2120

msgstr ""

2121

2122

#: bzrlib/builtins.py:3239

2122

#: bzrlib/builtins.py:3332

2123

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

2124

msgstr ""

2125

2126

#: bzrlib/builtins.py:3241

2126

#: bzrlib/builtins.py:3334

2127

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

2128

msgstr ""

2129

2130

#: bzrlib/builtins.py:3243

2130

#: bzrlib/builtins.py:3336

2131

msgid ""

2132

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

2133

"binary file."

2134

msgstr ""

2135

2136

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

2137

#: bzrlib/builtins.py:3249

2137

#: bzrlib/builtins.py:3342

2138

msgid "The path name in the old tree."

2139

msgstr ""

2140

2141

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

2142

#: bzrlib/builtins.py:3250

2142

#: bzrlib/builtins.py:3343

2143

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

2144

msgstr ""

2145

2146

#: bzrlib/builtins.py:3261

2146

#: bzrlib/builtins.py:3354

2147

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

2148

msgstr ""

2149

2150

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

2150

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

2151

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

2152

msgstr ""

2153

2154

#: bzrlib/builtins.py:3321

2154

#: bzrlib/builtins.py:3414

2155

msgid "Commit changes into a new revision."

2156

msgstr ""

2157

2158

#: bzrlib/builtins.py:3323

2158

#: bzrlib/builtins.py:3416

2159

msgid ""

2160

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

2161

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

2165

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

2166

msgstr ""

2167

2168

#: bzrlib/builtins.py:3330

2168

#: bzrlib/builtins.py:3423

2169

msgid ""

2170

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

2171

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

2172

"as explained below."

2173

msgstr ""

2174

2175

#: bzrlib/builtins.py:3334

2175

#: bzrlib/builtins.py:3427

2176

msgid ":Selective commits:"

2177

msgstr ""

2178

2179

#: bzrlib/builtins.py:3336

2179

#: bzrlib/builtins.py:3429

2180

msgid ""

2181

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

2182

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

2183

" everything within it is committed."

2184

msgstr ""

2185

2186

#: bzrlib/builtins.py:3340

2186

#: bzrlib/builtins.py:3433

2187

msgid ""

2188

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

2189

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

2190

" within foo/bar::"

2191

msgstr ""

2192

2193

#: bzrlib/builtins.py:3344

2193

#: bzrlib/builtins.py:3437

2194

msgid " bzr commit foo -x foo/bar"

2195

msgstr ""

2196

2197

#: bzrlib/builtins.py:3346

2197

#: bzrlib/builtins.py:3439

2198

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

2199

msgstr ""

2200

2201

#: bzrlib/builtins.py:3348

2201

#: bzrlib/builtins.py:3441

2202

msgid ":Custom authors:"

2203

msgstr ""

2204

2205

#: bzrlib/builtins.py:3350

2205

#: bzrlib/builtins.py:3443

2206

msgid ""

2207

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

2208

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

2212

" author."

2213

msgstr ""

2214

2215

#: bzrlib/builtins.py:3357

2215

#: bzrlib/builtins.py:3450

2216

msgid ":Checks:"

2217

msgstr ""

2218

2219

#: bzrlib/builtins.py:3359

2219

#: bzrlib/builtins.py:3452

2220

msgid ""

2221

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

2222

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

2225

" for details."

2226

msgstr ""

2227

2228

#: bzrlib/builtins.py:3365

2228

#: bzrlib/builtins.py:3458

2229

msgid ":Things to note:"

2230

msgstr ""

2231

2232

#: bzrlib/builtins.py:3367

2232

#: bzrlib/builtins.py:3460

2233

msgid ""

2234

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

2235

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

2236

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

2237

msgstr ""

2238

2239

#: bzrlib/builtins.py:3371

2239

#: bzrlib/builtins.py:3464

2240

msgid ""

2241

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

2242

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

2245

msgstr ""

2246

2247

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

2248

#: bzrlib/builtins.py:3381

2248

#: bzrlib/builtins.py:3474

2249

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

2250

msgstr ""

2251

2252

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

2253

#: bzrlib/builtins.py:3384

2253

#: bzrlib/builtins.py:3477

2254

msgid "Description of the new revision."

2255

msgstr ""

2256

2257

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

2258

#: bzrlib/builtins.py:3387

2258

#: bzrlib/builtins.py:3480

2259

msgid "Commit even if nothing has changed."

2260

msgstr ""

2261

2262

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

2263

#: bzrlib/builtins.py:3391

2263

#: bzrlib/builtins.py:3484

2264

msgid "Take commit message from this file."

2265

msgstr ""

2266

2267

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

2268

#: bzrlib/builtins.py:3393

2268

#: bzrlib/builtins.py:3486

2269

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

2270

msgstr ""

2271

2272

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

2273

#: bzrlib/builtins.py:3396

2273

#: bzrlib/builtins.py:3489

2274

msgid ""

2275

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

2276

"08:00:00 +0100'."

2277

msgstr ""

2278

2279

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

2280

#: bzrlib/builtins.py:3399

2280

#: bzrlib/builtins.py:3492

2281

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

2282

msgstr ""

2283

2284

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

2285

#: bzrlib/builtins.py:3402

2285

#: bzrlib/builtins.py:3495

2286

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

2287

msgstr ""

2288

2289

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

2290

#: bzrlib/builtins.py:3405

2290

#: bzrlib/builtins.py:3498

2291

msgid ""

2292

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

2293

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

2294

msgstr ""

2295

2296

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

2297

#: bzrlib/builtins.py:3411

2297

#: bzrlib/builtins.py:3504

2298

msgid ""

2299

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

2300

"the message editor."

2301

msgstr ""

2302

2303

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

2304

#: bzrlib/builtins.py:3414

2304

#: bzrlib/builtins.py:3507

2305

msgid ""

2306

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

2307

"can not be natively represented."

2308

msgstr ""

2309

2310

#: bzrlib/builtins.py:3432

2310

#: bzrlib/builtins.py:3525

2311

#, python-format

2312

msgid ""

2313

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

2315

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

2316

msgstr ""

2317

2318

#: bzrlib/builtins.py:3441

2318

#: bzrlib/builtins.py:3534

2319

#, python-format

2320

msgid ""

2321

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

2323

"Commit refused."

2324

msgstr ""

2325

2326

#: bzrlib/builtins.py:3450

2326

#: bzrlib/builtins.py:3543

2327

#, python-format

2328

msgid "Unrecognized bug %s. Commit refused."

2329

msgstr ""

2330

2331

#: bzrlib/builtins.py:3453

2331

#: bzrlib/builtins.py:3546

2332

#, python-format

2333

msgid ""

2334

"%s\n"

2335

"Commit refused."

2336

msgstr ""

2337

2338

#: bzrlib/builtins.py:3477

2338

#: bzrlib/builtins.py:3570

2339

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

2340

msgstr ""

2341

2342

#: bzrlib/builtins.py:3517

2342

#: bzrlib/builtins.py:3610

2343

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

2344

msgstr ""

2345

2346

#: bzrlib/builtins.py:3546

2346

#: bzrlib/builtins.py:3639

2347

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

2348

msgstr ""

2349

2350

#: bzrlib/builtins.py:3549

2350

#: bzrlib/builtins.py:3642

2351

msgid ""

2352

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

2353

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

2354

msgstr ""

2355

2356

#: bzrlib/builtins.py:3569

2356

#: bzrlib/builtins.py:3662

2357

msgid ""

2358

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

2359

"--unchanged to force an empty commit."

2360

msgstr ""

2361

2362

#: bzrlib/builtins.py:3573

2362

#: bzrlib/builtins.py:3666

2363

msgid ""

2364

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

2365

"resolve FILE\" to resolve."

2366

msgstr ""

2367

2368

#: bzrlib/builtins.py:3577

2368

#: bzrlib/builtins.py:3670

2369

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

2370

msgstr ""

2371

2372

#: bzrlib/builtins.py:3580

2372

#: bzrlib/builtins.py:3673

2373

msgid ""

2374

"\n"

2375

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

2376

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

2377

msgstr ""

2378

2379

#: bzrlib/builtins.py:3588

2379

#: bzrlib/builtins.py:3681

2380

msgid ""

2381

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

2382

msgstr ""

2383

2384

#: bzrlib/builtins.py:3590

2384

#: bzrlib/builtins.py:3683

2385

msgid ""

2386

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

2387

"to detect data corruption or bzr bugs."

2388

msgstr ""

2389

2390

#: bzrlib/builtins.py:3593

2390

#: bzrlib/builtins.py:3686

2391

msgid ""

2392

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

2393

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

2394

msgstr ""

2395

2396

#: bzrlib/builtins.py:3596

2396

#: bzrlib/builtins.py:3689

2397

msgid ""

2398

"revisions\n"

2399

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

2400

" indicate a problem."

2401

msgstr ""

2402

2403

#: bzrlib/builtins.py:3600

2403

#: bzrlib/builtins.py:3693

2404

msgid ""

2405

"versionedfiles\n"

2406

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

2407

" doesn't indicate a problem."

2408

msgstr ""

2409

2410

#: bzrlib/builtins.py:3604

2410

#: bzrlib/builtins.py:3697

2411

msgid ""

2412

"unreferenced ancestors\n"

2413

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

2415

" subtle problem that Bazaar can work around."

2416

msgstr ""

2417

2418

#: bzrlib/builtins.py:3609

2418

#: bzrlib/builtins.py:3702

2419

msgid ""

2420

"unique file texts\n"

2421

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

2422

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

2423

msgstr ""

2424

2425

#: bzrlib/builtins.py:3613

2425

#: bzrlib/builtins.py:3706

2426

msgid ""

2427

"repeated file texts\n"

2428

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

2431

" indicate a problem."

2432

msgstr ""

2433

2434

#: bzrlib/builtins.py:3619

2434

#: bzrlib/builtins.py:3712

2435

msgid ""

2436

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

2437

"given\n"

2438

"location will be checked."

2439

msgstr ""

2440

2441

#: bzrlib/builtins.py:3624

2441

#: bzrlib/builtins.py:3717

2442

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

2443

msgstr ""

2444

2445

#: bzrlib/builtins.py:3626

2445

#: bzrlib/builtins.py:3719

2446

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

2447

msgstr ""

2448

2449

#: bzrlib/builtins.py:3628

2449

#: bzrlib/builtins.py:3721

2450

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

2451

msgstr ""

2452

2453

#: bzrlib/builtins.py:3630

2453

#: bzrlib/builtins.py:3723

2454

msgid " bzr check --repo bar"

2455

msgstr ""

2456

2457

#: bzrlib/builtins.py:3632

2457

#: bzrlib/builtins.py:3725

2458

msgid " Check everything at 'baz'::"

2459

msgstr ""

2460

2461

#: bzrlib/builtins.py:3634

2461

#: bzrlib/builtins.py:3727

2462

msgid " bzr check baz"

2463

msgstr ""

2464

2465

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

2466

#: bzrlib/builtins.py:3640

2466

#: bzrlib/builtins.py:3733

2467

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

2468

msgstr ""

2469

2470

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

2471

#: bzrlib/builtins.py:3642

2471

#: bzrlib/builtins.py:3735

2472

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

2473

msgstr ""

2474

2475

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

2476

#: bzrlib/builtins.py:3644

2476

#: bzrlib/builtins.py:3737

2477

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

2478

msgstr ""

2479

2480

#: bzrlib/builtins.py:3658

2480

#: bzrlib/builtins.py:3751

2481

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

2482

msgstr ""

2483

2484

#: bzrlib/builtins.py:3660

2484

#: bzrlib/builtins.py:3753

2485

msgid ""

2486

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

2487

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

2490

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

2491

msgstr ""

2492

2493

#: bzrlib/builtins.py:3666

2493

#: bzrlib/builtins.py:3759

2494

msgid ""

2495

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

2496

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

2500

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

2501

msgstr ""

2502

2503

#: bzrlib/builtins.py:3673

2503

#: bzrlib/builtins.py:3766

2504

msgid ""

2505

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

2506

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

2511

"afterwards."

2512

msgstr ""

2513

2514

#: bzrlib/builtins.py:3681

2514

#: bzrlib/builtins.py:3774

2515

msgid ""

2516

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

2517

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

2519

"tried."

2520

msgstr ""

2521

2522

#: bzrlib/builtins.py:3686

2522

#: bzrlib/builtins.py:3779

2523

msgid ""

2524

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

2525

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

2526

msgstr ""

2527

2528

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

2529

#: bzrlib/builtins.py:3694

2529

#: bzrlib/builtins.py:3787

2530

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

2531

msgstr ""

2532

2533

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

2534

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

2535

#: bzrlib/builtins.py:3698

2535

#: bzrlib/builtins.py:3791

2536

msgid "Branch format"

2537

msgstr ""

2538

2539

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

2540

#: bzrlib/builtins.py:3700

2540

#: bzrlib/builtins.py:3793

2541

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

2542

msgstr ""

2543

2544

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

2545

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

2546

#: bzrlib/builtins.py:3702

2546

#: bzrlib/builtins.py:3795

2547

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

2548

msgstr ""

2549

2550

#: bzrlib/builtins.py:3717

2550

#: bzrlib/builtins.py:3810

2551

msgid "Show or set bzr user id."

2552

msgstr ""

2553

2554

#: bzrlib/builtins.py:3719

2554

#: bzrlib/builtins.py:3812

2555

msgid ""

2556

":Examples:\n"

2557

" Show the email of the current user::"

2558

msgstr ""

2559

2560

#: bzrlib/builtins.py:3722

2560

#: bzrlib/builtins.py:3815

2561

msgid " bzr whoami --email"

2562

msgstr ""

2563

2564

#: bzrlib/builtins.py:3724

2564

#: bzrlib/builtins.py:3817

2565

msgid " Set the current user::"

2566

msgstr ""

2567

2568

#: bzrlib/builtins.py:3726

2568

#: bzrlib/builtins.py:3819

2569

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

2570

msgstr ""

2571

2572

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

2573

#: bzrlib/builtins.py:3730

2573

#: bzrlib/builtins.py:3823

2574

msgid "Display email address only."

2575

msgstr ""

2576

2577

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

2578

#: bzrlib/builtins.py:3732

2578

#: bzrlib/builtins.py:3825

2579

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

2580

msgstr ""

2581

2582

#: bzrlib/builtins.py:3758

2582

#: bzrlib/builtins.py:3851

2583

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

2584

msgstr ""

2585

2586

#: bzrlib/builtins.py:3780

2586

#: bzrlib/builtins.py:3873

2587

msgid "Print or set the branch nickname."

2588

msgstr ""

2589

2590

#: bzrlib/builtins.py:3782

2590

#: bzrlib/builtins.py:3875

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

2594

msgstr ""

2595

2596

#: bzrlib/builtins.py:3785

2596

#: bzrlib/builtins.py:3878

2597

msgid ""

2598

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

2599

"locally."

2600

msgstr ""

2601

2602

#: bzrlib/builtins.py:3805

2602

#: bzrlib/builtins.py:3898

2603

msgid "Set/unset and display aliases."

2604

msgstr ""

2605

2606

#: bzrlib/builtins.py:3807

2606

#: bzrlib/builtins.py:3900

2607

msgid ""

2608

":Examples:\n"

2609

" Show the current aliases::"

2610

msgstr ""

2611

2612

#: bzrlib/builtins.py:3810

2612

#: bzrlib/builtins.py:3903

2613

msgid " bzr alias"

2614

msgstr ""

2615

2616

#: bzrlib/builtins.py:3812

2616

#: bzrlib/builtins.py:3905

2617

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

2618

msgstr ""

2619

2620

#: bzrlib/builtins.py:3814

2620

#: bzrlib/builtins.py:3907

2621

msgid " bzr alias ll"

2622

msgstr ""

2623

2624

#: bzrlib/builtins.py:3816

2624

#: bzrlib/builtins.py:3909

2625

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

2626

msgstr ""

2627

2628

#: bzrlib/builtins.py:3818

2628

#: bzrlib/builtins.py:3911

2629

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

2630

msgstr ""

2631

2632

#: bzrlib/builtins.py:3820

2632

#: bzrlib/builtins.py:3913

2633

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

2634

msgstr ""

2635

2636

#: bzrlib/builtins.py:3822

2636

#: bzrlib/builtins.py:3915

2637

msgid " bzr alias --remove ll"

2638

msgstr ""

2639

2640

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

2641

#: bzrlib/builtins.py:3827

2641

#: bzrlib/builtins.py:3920

2642

msgid "Remove the alias."

2643

msgstr ""

2644

2645

#: bzrlib/builtins.py:3845

2645

#: bzrlib/builtins.py:3938

2646

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

2647

msgstr ""

2648

2649

#: bzrlib/builtins.py:4026

2649

#: bzrlib/builtins.py:4119

2650

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

2651

msgstr ""

2652

2653

#: bzrlib/builtins.py:4043

2653

#: bzrlib/builtins.py:4136

2654

msgid ""

2655

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

2656

msgstr ""

2657

2658

#: bzrlib/builtins.py:4090

2658

#: bzrlib/builtins.py:4183

2659

msgid "Show version of bzr."

2660

msgstr ""

2661

2662

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

2663

#: bzrlib/builtins.py:4094

2663

#: bzrlib/builtins.py:4187

2664

msgid "Print just the version number."

2665

msgstr ""

2666

2667

#: bzrlib/builtins.py:4113

2667

#: bzrlib/builtins.py:4206

2668

msgid "It sure does!\n"

2669

msgstr ""

2670

2671

#: bzrlib/builtins.py:4137

2671

#: bzrlib/builtins.py:4230

2672

#, python-format

2673

msgid "merge base is revision %s\n"

2674

msgstr ""

2675

2676

#: bzrlib/builtins.py:4141

2676

#: bzrlib/builtins.py:4234

2677

msgid "Perform a three-way merge."

2678

msgstr ""

2679

2680

#: bzrlib/builtins.py:4143

2680

#: bzrlib/builtins.py:4236

2681

msgid ""

2682

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

2683

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

2688

"the current working tree."

2689

msgstr ""

2690

2691

#: bzrlib/builtins.py:4151

2691

#: bzrlib/builtins.py:4244

2692

msgid ""

2693

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

2694

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

2695

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

2696

msgstr ""

2697

2698

#: bzrlib/builtins.py:4155

2698

#: bzrlib/builtins.py:4248

2699

msgid ""

2700

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

2701

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

2702

msgstr ""

2703

2704

#: bzrlib/builtins.py:4158

2704

#: bzrlib/builtins.py:4251

2705

msgid ""

2706

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

2707

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

2712

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

2713

msgstr ""

2714

2715

#: bzrlib/builtins.py:4166

2715

#: bzrlib/builtins.py:4259

2716

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

2717

msgstr ""

2718

2719

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

2719

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

2720

msgid ""

2721

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

2722

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

2723

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

2724

"before you should commit."

2724

"before you can commit."

2725

msgstr ""

2726

2727

#: bzrlib/builtins.py:4173

2727

#: bzrlib/builtins.py:4266

2728

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

2729

msgstr ""

2730

2731

#: bzrlib/builtins.py:4175

2731

#: bzrlib/builtins.py:4268

2732

msgid ""

2733

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

2734

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

2736

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

2737

msgstr ""

2738

2739

#: bzrlib/builtins.py:4180

2739

#: bzrlib/builtins.py:4273

2740

msgid ""

2741

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

2742

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

2743

"committed to record the result of the merge."

2744

msgstr ""

2745

2746

#: bzrlib/builtins.py:4184

2746

#: bzrlib/builtins.py:4277

2747

msgid ""

2748

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

2749

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

2752

"merge revision which has more than two parents."

2753

msgstr ""

2754

2755

#: bzrlib/builtins.py:4190

2755

#: bzrlib/builtins.py:4283

2756

msgid ""

2757

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

2758

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

2759

"can be given."

2760

msgstr ""

2761

2762

#: bzrlib/builtins.py:4194

2762

#: bzrlib/builtins.py:4287

2763

msgid ""

2764

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

2765

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

2766

msgstr ""

2767

2768

#: bzrlib/builtins.py:4197

2768

#: bzrlib/builtins.py:4290

2769

msgid ""

2770

":Examples:\n"

2771

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

2772

msgstr ""

2773

2774

#: bzrlib/builtins.py:4200

2774

#: bzrlib/builtins.py:4293

2775

msgid " bzr merge ../bzr.dev"

2776

msgstr ""

2777

2778

#: bzrlib/builtins.py:4202

2778

#: bzrlib/builtins.py:4295

2779

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

2780

msgstr ""

2781

2782

#: bzrlib/builtins.py:4204

2782

#: bzrlib/builtins.py:4297

2783

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

2784

msgstr ""

2785

2786

#: bzrlib/builtins.py:4206

2786

#: bzrlib/builtins.py:4299

2787

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

2788

msgstr ""

2789

2790

#: bzrlib/builtins.py:4208

2790

#: bzrlib/builtins.py:4301

2791

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

2792

msgstr ""

2793

2794

#: bzrlib/builtins.py:4210

2794

#: bzrlib/builtins.py:4303

2795

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

2796

msgstr ""

2797

2798

#: bzrlib/builtins.py:4212

2798

#: bzrlib/builtins.py:4305

2799

msgid " bzr merge /tmp/merge"

2800

msgstr ""

2801

2802

#: bzrlib/builtins.py:4214

2802

#: bzrlib/builtins.py:4307

2803

msgid ""

2804

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

2805

" feature1a and feature1b:"

2806

msgstr ""

2807

2808

#: bzrlib/builtins.py:4217

2808

#: bzrlib/builtins.py:4310

2809

msgid ""

2810

" bzr merge ../feature1a\n"

2811

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

2813

msgstr ""

2814

2815

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

2816

#: bzrlib/builtins.py:4229

2816

#: bzrlib/builtins.py:4322

2817

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

2818

msgstr ""

2819

2820

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

2821

#: bzrlib/builtins.py:4235

2821

#: bzrlib/builtins.py:4328

2822

msgid ""

2823

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

2824

msgstr ""

2825

2826

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

2827

#: bzrlib/builtins.py:4237

2827

#: bzrlib/builtins.py:4330

2828

msgid ""

2829

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

2830

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

2832

msgstr ""

2833

2834

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

2835

#: bzrlib/builtins.py:4242

2835

#: bzrlib/builtins.py:4335

2836

msgid ""

2837

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

2838

msgstr ""

2839

2840

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

2841

#: bzrlib/builtins.py:4244

2841

#: bzrlib/builtins.py:4337

2842

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

2843

msgstr ""

2844

2845

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

2846

#: bzrlib/builtins.py:4246

2846

#: bzrlib/builtins.py:4339

2847

msgid "Select changes interactively."

2848

msgstr ""

2849

2850

#: bzrlib/builtins.py:4268

2850

#: bzrlib/builtins.py:4361

2851

msgid ""

2852

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

2853

"net/bzr/+bug/308562"

2854

msgstr ""

2855

2856

#: bzrlib/builtins.py:4295

2856

#: bzrlib/builtins.py:4388

2857

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

2858

msgstr ""

2859

2860

#: bzrlib/builtins.py:4306

2860

#: bzrlib/builtins.py:4399

2861

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

2862

msgstr ""

2863

2864

#: bzrlib/builtins.py:4326

2864

#: bzrlib/builtins.py:4419

2865

msgid "merger: "

2866

msgstr ""

2867

2868

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

2868

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

2869

msgid "Nothing to do."

2870

msgstr ""

2871

2872

#: bzrlib/builtins.py:4332

2872

#: bzrlib/builtins.py:4425

2873

msgid "Cannot pull individual files"

2874

msgstr ""

2875

2876

#: bzrlib/builtins.py:4340

2876

#: bzrlib/builtins.py:4433

2877

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

2878

msgstr ""

2879

2880

#: bzrlib/builtins.py:4398

2880

#: bzrlib/builtins.py:4491

2881

#, python-format

2882

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

2883

msgstr ""

2884

2885

#: bzrlib/builtins.py:4407

2885

#: bzrlib/builtins.py:4500

2886

#, python-format

2887

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

2888

msgstr ""

2889

2890

#: bzrlib/builtins.py:4411

2890

#: bzrlib/builtins.py:4504

2891

msgid "Cannot do conflict reduction and show base."

2892

msgstr ""

2893

2894

#: bzrlib/builtins.py:4522

2894

#: bzrlib/builtins.py:4615

2895

msgid "No location specified or remembered"

2896

msgstr ""

2897

2898

#: bzrlib/builtins.py:4524

2898

#: bzrlib/builtins.py:4617

2899

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

2900

msgstr ""

2901

2902

#: bzrlib/builtins.py:4530

2902

#: bzrlib/builtins.py:4623

2903

msgid "Redo a merge."

2904

msgstr ""

2905

2906

#: bzrlib/builtins.py:4532

2906

#: bzrlib/builtins.py:4625

2907

msgid ""

2908

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

2909

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

2910

"lets you try different ones on different files."

2911

msgstr ""

2912

2913

#: bzrlib/builtins.py:4536

2913

#: bzrlib/builtins.py:4629

2914

msgid ""

2915

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

2916

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

2917

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

2918

msgstr ""

2919

2920

#: bzrlib/builtins.py:4540

2920

#: bzrlib/builtins.py:4633

2921

msgid ""

2922

":Examples:\n"

2923

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

2924

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

2925

msgstr ""

2926

2927

#: bzrlib/builtins.py:4544

2927

#: bzrlib/builtins.py:4637

2928

msgid " bzr remerge --show-base"

2929

msgstr ""

2930

2931

#: bzrlib/builtins.py:4546

2931

#: bzrlib/builtins.py:4639

2932

msgid ""

2933

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

2934

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

2935

msgstr ""

2936

2937

#: bzrlib/builtins.py:4549

2937

#: bzrlib/builtins.py:4642

2938

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

2939

msgstr ""

2940

2942

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

2943

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

2944

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

2945

#: bzrlib/builtins.py:4556

2945

#: bzrlib/builtins.py:4649

2946

msgid "Show base revision text in conflicts."

2947

msgstr ""

2948

2949

#: bzrlib/builtins.py:4568

2949

#: bzrlib/builtins.py:4661

2950

msgid ""

2951

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

2952

"merges."

2953

msgstr ""

2954

2955

#: bzrlib/builtins.py:4624

2955

#: bzrlib/builtins.py:4717

2956

msgid "Revert files to a previous revision."

2957

msgstr ""

2958

2959

#: bzrlib/builtins.py:4626

2959

#: bzrlib/builtins.py:4719

2960

msgid ""

2961

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

2962

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

2963

"last committed revision is used."

2964

msgstr ""

2965

2966

#: bzrlib/builtins.py:4630

2966

#: bzrlib/builtins.py:4723

2967

msgid ""

2968

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

2969

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

2972

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

2973

msgstr ""

2974

2975

#: bzrlib/builtins.py:4636

2975

#: bzrlib/builtins.py:4729

2976

msgid ""

2977

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

2978

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

2979

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

2980

msgstr ""

2981

2982

#: bzrlib/builtins.py:4640

2982

#: bzrlib/builtins.py:4733

2983

msgid ""

2984

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

2985

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

2987

"reverted."

2988

msgstr ""

2989

2990

#: bzrlib/builtins.py:4645

2990

#: bzrlib/builtins.py:4738

2991

msgid ""

2992

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

2993

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

2995

"deleted."

2996

msgstr ""

2997

2998

#: bzrlib/builtins.py:4650

2998

#: bzrlib/builtins.py:4743

2999

msgid ""

3000

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

3001

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

3007

"reverting any files."

3008

msgstr ""

3009

3010

#: bzrlib/builtins.py:4659

3010

#: bzrlib/builtins.py:4752

3011

msgid ""

3012

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

3013

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

3022

msgstr ""

3023

3024

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

3025

#: bzrlib/builtins.py:4673

3025

#: bzrlib/builtins.py:4766

3026

msgid "Do not save backups of reverted files."

3027

msgstr ""

3028

3029

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

3030

#: bzrlib/builtins.py:4675

3030

#: bzrlib/builtins.py:4768

3031

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

3032

msgstr ""

3033

3034

#: bzrlib/builtins.py:4706

3034

#: bzrlib/builtins.py:4799

3035

msgid ""

3036

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

3037

" "

3038

msgstr ""

3039

3040

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

3041

#: bzrlib/builtins.py:4711

3041

#: bzrlib/builtins.py:4804

3042

msgid "Show help on all commands."

3043

msgstr ""

3044

3045

#: bzrlib/builtins.py:4740

3045

#: bzrlib/builtins.py:4833

3046

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

3047

msgstr ""

3048

3049

#: bzrlib/builtins.py:4742

3049

#: bzrlib/builtins.py:4835

3050

msgid "OTHER_BRANCH may be local or remote."

3051

msgstr ""

3052

3053

#: bzrlib/builtins.py:4744

3053

#: bzrlib/builtins.py:4837

3054

msgid ""

3055

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

3056

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

3061

" 0 - no missing revisions"

3062

msgstr ""

3063

3064

#: bzrlib/builtins.py:4754

3064

#: bzrlib/builtins.py:4847

3065

msgid ""

3066

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

3067

" remembered pull location::"

3068

msgstr ""

3069

3070

#: bzrlib/builtins.py:4757

3070

#: bzrlib/builtins.py:4850

3071

msgid " bzr missing"

3072

msgstr ""

3073

3074

#: bzrlib/builtins.py:4759

3074

#: bzrlib/builtins.py:4852

3075

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

3076

msgstr ""

3077

3078

#: bzrlib/builtins.py:4761

3078

#: bzrlib/builtins.py:4854

3079

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

3080

msgstr ""

3081

3082

#: bzrlib/builtins.py:4763

3082

#: bzrlib/builtins.py:4856

3083

msgid ""

3084

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

3085

" branch::"

3086

msgstr ""

3087

3088

#: bzrlib/builtins.py:4766

3088

#: bzrlib/builtins.py:4859

3089

msgid " bzr missing -r ..-10"

3090

msgstr ""

3091

3092

#: bzrlib/builtins.py:4768

3092

#: bzrlib/builtins.py:4861

3093

msgid ""

3094

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

3095

" branch::"

3096

msgstr ""

3097

3098

#: bzrlib/builtins.py:4771

3098

#: bzrlib/builtins.py:4864

3099

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

3100

msgstr ""

3101

3102

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

3103

#: bzrlib/builtins.py:4778

3103

#: bzrlib/builtins.py:4871

3104

msgid "Reverse the order of revisions."

3105

msgstr ""

3106

3107

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

3108

#: bzrlib/builtins.py:4780

3108

#: bzrlib/builtins.py:4873

3109

msgid "Display changes in the local branch only."

3110

msgstr ""

3111

3112

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

3113

#: bzrlib/builtins.py:4781

3113

#: bzrlib/builtins.py:4874

3114

msgid "Same as --mine-only."

3115

msgstr ""

3116

3117

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

3118

#: bzrlib/builtins.py:4783

3118

#: bzrlib/builtins.py:4876

3119

msgid "Display changes in the remote branch only."

3120

msgstr ""

3121

3122

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

3123

#: bzrlib/builtins.py:4784

3123

#: bzrlib/builtins.py:4877

3124

msgid "Same as --theirs-only."

3125

msgstr ""

3126

3127

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

3128

#: bzrlib/builtins.py:4789

3128

#: bzrlib/builtins.py:4882

3129

msgid ""

3130

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

3131

"details."

3132

msgstr ""

3133

3134

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

3135

#: bzrlib/builtins.py:4793

3135

#: bzrlib/builtins.py:4886

3136

msgid ""

3137

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

3138

"details."

3139

msgstr ""

3140

3141

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

3142

#: bzrlib/builtins.py:4796

3142

#: bzrlib/builtins.py:4889

3143

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

3144

msgstr ""

3145

3146

#: bzrlib/builtins.py:4850

3146

#: bzrlib/builtins.py:4943

3147

msgid "No peer location known or specified."

3148

msgstr ""

3149

3150

#: bzrlib/builtins.py:4854

3150

#: bzrlib/builtins.py:4947

3151

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

3152

msgstr ""

3153

3154

#: bzrlib/builtins.py:4887

3154

#: bzrlib/builtins.py:4980

3155

#, python-format

3156

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

3157

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

3158

msgstr[0] ""

3159

msgstr[1] ""

3160

3161

#: bzrlib/builtins.py:4903

3161

#: bzrlib/builtins.py:4996

3162

#, python-format

3163

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

3164

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

3165

msgstr[0] ""

3166

msgstr[1] ""

3167

3168

#: bzrlib/builtins.py:4915

3168

#: bzrlib/builtins.py:5008

3169

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

3170

msgstr ""

3171

3172

#: bzrlib/builtins.py:4918

3172

#: bzrlib/builtins.py:5011

3173

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

3174

msgstr ""

3175

3176

#: bzrlib/builtins.py:4923

3176

#: bzrlib/builtins.py:5016

3177

msgid "Branches are up to date.\n"

3178

msgstr ""

3179

3180

#: bzrlib/builtins.py:4934

3180

#: bzrlib/builtins.py:5027

3181

msgid "Compress the data within a repository."

3182

msgstr ""

3183

3184

#: bzrlib/builtins.py:4936

3184

#: bzrlib/builtins.py:5029

3185

msgid ""

3186

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

3187

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

3188

"normally not required to be done manually."

3189

msgstr ""

3190

3191

#: bzrlib/builtins.py:4940

3191

#: bzrlib/builtins.py:5033

3192

msgid ""

3193

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

3194

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

3197

"used."

3198

msgstr ""

3199

3200

#: bzrlib/builtins.py:4946

3200

#: bzrlib/builtins.py:5039

3201

msgid ""

3202

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

3203

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

3206

msgstr ""

3207

3208

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

3209

#: bzrlib/builtins.py:4955

3209

#: bzrlib/builtins.py:5048

3210

msgid "Delete obsolete packs to save disk space."

3211

msgstr ""

3212

3213

#: bzrlib/builtins.py:4969

3213

#: bzrlib/builtins.py:5062

3214

msgid "List the installed plugins."

3215

msgstr ""

3216

3217

#: bzrlib/builtins.py:4971

3217

#: bzrlib/builtins.py:5064

3218

msgid ""

3219

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

3220

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

3221

msgstr ""

3222

3223

#: bzrlib/builtins.py:4974

3223

#: bzrlib/builtins.py:5067

3224

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

3225

msgstr ""

3226

3227

#: bzrlib/builtins.py:4976

3227

#: bzrlib/builtins.py:5069

3228

msgid ""

3229

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

3230

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

3233

"customizing log output."

3234

msgstr ""

3235

3236

#: bzrlib/builtins.py:4982

3236

#: bzrlib/builtins.py:5075

3237

msgid ""

3238

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

3239

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

3241

"plugins using the Python programming language."

3242

msgstr ""

3243

3244

#: bzrlib/builtins.py:4998

3244

#: bzrlib/builtins.py:5091

3245

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

3246

msgstr ""

3247

3248

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

3249

#: bzrlib/builtins.py:5001

3249

#: bzrlib/builtins.py:5094

3250

msgid "Produce long-format testament."

3251

msgstr ""

3252

3253

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

3254

#: bzrlib/builtins.py:5003

3254

#: bzrlib/builtins.py:5096

3255

msgid "Produce a strict-format testament."

3256

msgstr ""

3257

3258

#: bzrlib/builtins.py:5029

3258

#: bzrlib/builtins.py:5122

3259

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

3260

msgstr ""

3261

3262

#: bzrlib/builtins.py:5031

3262

#: bzrlib/builtins.py:5124

3263

msgid ""

3264

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

3265

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

3266

msgstr ""

3267

3268

#: bzrlib/builtins.py:5034

3268

#: bzrlib/builtins.py:5127

3269

msgid ""

3270

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

3271

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

3272

msgstr ""

3273

3274

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

3275

#: bzrlib/builtins.py:5042

3275

#: bzrlib/builtins.py:5135

3276

msgid "Show annotations on all lines."

3277

msgstr ""

3278

3279

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

3280

#: bzrlib/builtins.py:5043

3280

#: bzrlib/builtins.py:5136

3281

msgid "Show commit date in annotations."

3282

msgstr ""

3283

3284

#: bzrlib/builtins.py:5130

3284

#: bzrlib/builtins.py:5223

3285

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

3286

msgstr ""

3287

3288

#: bzrlib/builtins.py:5142

3288

#: bzrlib/builtins.py:5235

3289

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

3290

msgstr ""

3291

3292

#: bzrlib/builtins.py:5146

3292

#: bzrlib/builtins.py:5239

3293

msgid ""

3294

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

3295

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

3296

msgstr ""

3297

3298

#: bzrlib/builtins.py:5149

3298

#: bzrlib/builtins.py:5242

3299

msgid ""

3300

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

3301

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

3302

msgstr ""

3303

3304

#: bzrlib/builtins.py:5152

3304

#: bzrlib/builtins.py:5245

3305

msgid ""

3306

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

3307

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

3308

"that of the master."

3309

msgstr ""

3310

3311

#: bzrlib/builtins.py:5167

3311

#: bzrlib/builtins.py:5260

3312

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

3313

msgstr ""

3314

3315

#: bzrlib/builtins.py:5172

3315

#: bzrlib/builtins.py:5265

3316

msgid "Branch is already bound"

3317

msgstr ""

3318

3319

#: bzrlib/builtins.py:5174

3319

#: bzrlib/builtins.py:5267

3320

msgid "No location supplied and no previous location known"

3321

msgstr ""

3322

3323

#: bzrlib/builtins.py:5180

3323

#: bzrlib/builtins.py:5273

3324

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

3325

msgstr ""

3326

3327

#: bzrlib/builtins.py:5187

3327

#: bzrlib/builtins.py:5280

3328

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

3329

msgstr ""

3330

3331

#: bzrlib/builtins.py:5189

3331

#: bzrlib/builtins.py:5282

3332

msgid ""

3333

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

3334

"commits will be local only."

3335

msgstr ""

3336

3337

#: bzrlib/builtins.py:5200

3337

#: bzrlib/builtins.py:5293

3338

msgid "Local branch is not bound"

3339

msgstr ""

3340

3341

#: bzrlib/builtins.py:5204

3341

#: bzrlib/builtins.py:5297

3342

msgid "Remove the last committed revision."

3343

msgstr ""

3344

3345

#: bzrlib/builtins.py:5206

3345

#: bzrlib/builtins.py:5299

3346

msgid ""

3347

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

3348

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

3349

"remove anything."

3350

msgstr ""

3351

3352

#: bzrlib/builtins.py:5210

3352

#: bzrlib/builtins.py:5303

3353

msgid ""

3354

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

3355

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

3356

"branch at revision 15."

3357

msgstr ""

3358

3359

#: bzrlib/builtins.py:5214

3359

#: bzrlib/builtins.py:5307

3360

msgid ""

3361

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

3362

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

3364

msgstr ""

3365

3366

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

3367

#: bzrlib/builtins.py:5225

3367

#: bzrlib/builtins.py:5318

3368

msgid "Don't actually make changes."

3369

msgstr ""

3370

3371

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

3372

#: bzrlib/builtins.py:5226

3372

#: bzrlib/builtins.py:5319

3373

msgid "Say yes to all questions."

3374

msgstr ""

3375

3376

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

3377

#: bzrlib/builtins.py:5228

3377

#: bzrlib/builtins.py:5321

3378

msgid "Keep tags that point to removed revisions."

3379

msgstr ""

3380

3381

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

3382

#: bzrlib/builtins.py:5230

3382

#: bzrlib/builtins.py:5323

3383

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

3384

msgstr ""

3385

3386

#: bzrlib/builtins.py:5279

3386

#: bzrlib/builtins.py:5372

3387

msgid "No revisions to uncommit.\n"

3388

msgstr ""

3389

3390

#: bzrlib/builtins.py:5294

3390

#: bzrlib/builtins.py:5387

3391

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

3392

msgstr ""

3393

3394

#: bzrlib/builtins.py:5297

3394

#: bzrlib/builtins.py:5390

3395

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

3396

msgstr ""

3397

3398

#: bzrlib/builtins.py:5301

3398

#: bzrlib/builtins.py:5394

3399

msgid "Uncommit these revisions"

3400

msgstr ""

3401

3402

#: bzrlib/builtins.py:5304

3402

#: bzrlib/builtins.py:5397

3403

msgid "Canceled\n"

3404

msgstr ""

3405

3406

#: bzrlib/builtins.py:5311

3406

#: bzrlib/builtins.py:5404

3407

#, python-format

3408

msgid ""

3409

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

3410

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

3411

msgstr ""

3412

3413

#: bzrlib/builtins.py:5316

3413

#: bzrlib/builtins.py:5409

3414

msgid "Break a dead lock."

3415

msgstr ""

3416

3417

#: bzrlib/builtins.py:5318

3417

#: bzrlib/builtins.py:5411

3418

msgid ""

3419

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

3420

"config file."

3421

msgstr ""

3422

3423

#: bzrlib/builtins.py:5321

3423

#: bzrlib/builtins.py:5414

3424

msgid ""

3425

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

3426

"holding the lock has been stopped."

3427

msgstr ""

3428

3429

#: bzrlib/builtins.py:5324

3429

#: bzrlib/builtins.py:5417

3430

msgid ""

3431

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

3432

"[location]' command."

3433

msgstr ""

3434

3435

#: bzrlib/builtins.py:5327

3435

#: bzrlib/builtins.py:5420

3436

msgid ""

3437

":Examples:\n"

3438

" bzr break-lock\n"

3441

msgstr ""

3442

3443

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

3444

#: bzrlib/builtins.py:5336

3444

#: bzrlib/builtins.py:5429

3445

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

3446

msgstr ""

3447

3448

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

3449

#: bzrlib/builtins.py:5338

3449

#: bzrlib/builtins.py:5431

3450

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

3451

msgstr ""

3452

3453

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

3454

#: bzrlib/builtins.py:5373

3454

#: bzrlib/builtins.py:5466

3455

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

3456

msgstr ""

3457

3458

#: bzrlib/builtins.py:5374

3458

#: bzrlib/builtins.py:5467

3459

msgid "Run the bzr server."

3460

msgstr ""

3461

3462

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

3463

#: bzrlib/builtins.py:5380

3463

#: bzrlib/builtins.py:5473

3464

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

3465

msgstr ""

3466

3467

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

3468

#: bzrlib/builtins.py:5381

3468

#: bzrlib/builtins.py:5474

3469

msgid "protocol"

3470

msgstr ""

3471

3472

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

3473

#: bzrlib/builtins.py:5382

3473

#: bzrlib/builtins.py:5475

3474

msgid "Protocol to serve."

3475

msgstr ""

3476

3477

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

3478

#: bzrlib/builtins.py:5386

3478

#: bzrlib/builtins.py:5479

3479

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

3483

msgstr ""

3484

3485

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

3486

#: bzrlib/builtins.py:5392

3486

#: bzrlib/builtins.py:5485

3487

msgid "Serve contents of this directory."

3488

msgstr ""

3489

3490

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

3491

#: bzrlib/builtins.py:5394

3491

#: bzrlib/builtins.py:5487

3492

msgid ""

3493

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

3494

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

3498

msgstr ""

3499

3500

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

3501

#: bzrlib/builtins.py:5403

3501

#: bzrlib/builtins.py:5496

3502

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

3503

msgstr ""

3504

3505

#: bzrlib/builtins.py:5453

3505

#: bzrlib/builtins.py:5546

3506

msgid "Combine a tree into its containing tree."

3507

msgstr ""

3508

3509

#: bzrlib/builtins.py:5455

3509

#: bzrlib/builtins.py:5548

3510

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

3511

msgstr ""

3512

3513

#: bzrlib/builtins.py:5457

3513

#: bzrlib/builtins.py:5550

3514

msgid ""

3515

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

3516

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

3517

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

3518

msgstr ""

3519

3520

#: bzrlib/builtins.py:5461

3520

#: bzrlib/builtins.py:5554

3521

msgid ""

3522

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

3523

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

3524

"and all history is preserved."

3525

msgstr ""

3526

3527

#: bzrlib/builtins.py:5479

3527

#: bzrlib/builtins.py:5572

3528

#, python-format

3529

msgid ""

3530

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

3531

"You can use bzr upgrade on the repository."

3532

msgstr ""

3533

3534

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

3534

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

3535

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

3536

msgstr ""

3537

3538

#: bzrlib/builtins.py:5499

3538

#: bzrlib/builtins.py:5592

3539

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

3540

msgstr ""

3541

3542

#: bzrlib/builtins.py:5501

3542

#: bzrlib/builtins.py:5594

3543

msgid ""

3544

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

3545

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

3546

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

3547

msgstr ""

3548

3549

#: bzrlib/builtins.py:5505

3549

#: bzrlib/builtins.py:5598

3550

msgid ""

3551

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

3552

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

3553

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

3554

msgstr ""

3555

3556

#: bzrlib/builtins.py:5585

3556

#: bzrlib/builtins.py:5678

3557

msgid "No submit branch specified or known"

3558

msgstr ""

3559

3560

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

3560

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

3561

msgid "No public branch specified or known"

3562

msgstr ""

3563

3564

#: bzrlib/builtins.py:5598

3564

#: bzrlib/builtins.py:5691

3565

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

3566

msgstr ""

3567

3568

#: bzrlib/builtins.py:5607

3568

#: bzrlib/builtins.py:5700

3569

msgid "No revisions to bundle."

3570

msgstr ""

3571

3572

#: bzrlib/builtins.py:5626

3572

#: bzrlib/builtins.py:5719

3573

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

3574

msgstr ""

3575

3576

#: bzrlib/builtins.py:5628

3576

#: bzrlib/builtins.py:5721

3577

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

3578

msgstr ""

3579

3580

#: bzrlib/builtins.py:5630

3580

#: bzrlib/builtins.py:5723

3581

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

3582

msgstr ""

3583

3584

#: bzrlib/builtins.py:5632

3584

#: bzrlib/builtins.py:5725

3585

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

3586

msgstr ""

3587

3588

#: bzrlib/builtins.py:5634

3588

#: bzrlib/builtins.py:5727

3589

msgid ""

3590

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

3591

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

3592

" branch."

3593

msgstr ""

3594

3595

#: bzrlib/builtins.py:5638

3595

#: bzrlib/builtins.py:5731

3596

msgid ""

3597

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

3598

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

3599

msgstr ""

3600

3601

#: bzrlib/builtins.py:5641

3601

#: bzrlib/builtins.py:5734

3602

msgid ""

3603

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

3604

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

3605

"the source branch."

3606

msgstr ""

3607

3608

#: bzrlib/builtins.py:5645

3608

#: bzrlib/builtins.py:5738

3609

msgid ""

3610

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

3611

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

3614

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

3615

msgstr ""

3616

3617

#: bzrlib/builtins.py:5651

3617

#: bzrlib/builtins.py:5744

3618

msgid ""

3619

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

3620

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

3623

"be changed using --from."

3624

msgstr ""

3625

3626

#: bzrlib/builtins.py:5657

3626

#: bzrlib/builtins.py:5750

3627

msgid ""

3628

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

3629

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

3632

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

3633

msgstr ""

3634

3635

#: bzrlib/builtins.py:5663

3635

#: bzrlib/builtins.py:5756

3636

msgid ""

3637

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

3638

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

3640

"in the merge directive."

3641

msgstr ""

3642

3643

#: bzrlib/builtins.py:5668

3643

#: bzrlib/builtins.py:5761

3644

msgid ""

3645

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

3646

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

3647

msgstr ""

3648

3649

#: bzrlib/builtins.py:5671

3649

#: bzrlib/builtins.py:5764

3650

msgid ""

3651

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

3652

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

3653

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

3654

msgstr ""

3655

3656

#: bzrlib/builtins.py:5675

3656

#: bzrlib/builtins.py:5768

3657

msgid ""

3658

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

3659

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

3665

"supported clients."

3666

msgstr ""

3667

3668

#: bzrlib/builtins.py:5682

3668

#: bzrlib/builtins.py:5775

3669

msgid ""

3670

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

3671

"either on the commandline, by setting the submit_to configuration\n"

3673

"in the submit branch."

3674

msgstr ""

3675

3676

#: bzrlib/builtins.py:5687

3676

#: bzrlib/builtins.py:5780

3677

msgid ""

3678

"Two formats are currently supported: \"4\" uses revision bundle format 4 "

3679

"and\n"

3683

"format 1. It is compatible with Bazaar 0.12 - 0.18."

3684

msgstr ""

3685

3686

#: bzrlib/builtins.py:5693

3686

#: bzrlib/builtins.py:5786

3687

msgid ""

3688

"The merge directives created by bzr send may be applied using bzr merge or\n"

3689

"bzr pull by specifying a file containing a merge directive as the location."

3690

msgstr ""

3691

3692

#: bzrlib/builtins.py:5696

3692

#: bzrlib/builtins.py:5789

3693

msgid ""

3694

"bzr send makes extensive use of public locations to map local locations "

3695

"into\n"

3698

msgstr ""

3699

3700

# help of 'output' option of 'send' command

3701

#: bzrlib/builtins.py:5720

3701

#: bzrlib/builtins.py:5813

3702

msgid "Write merge directive to this file or directory; use - for stdout."

3703

msgstr ""

3704

3705

# help of 'strict' option of 'send' command

3706

#: bzrlib/builtins.py:5724

3706

#: bzrlib/builtins.py:5817

3707

msgid ""

3708

"Refuse to send if there are uncommitted changes in the working tree, --no-"

3709

"strict disables the check."

3710

msgstr ""

3711

3712

# help of 'mail-to' option of 'send' command

3713

#: bzrlib/builtins.py:5726

3713

#: bzrlib/builtins.py:5819

3714

msgid "Mail the request to this address."

3715

msgstr ""

3716

3717

# help of 'body' option of 'send' command

3718

#: bzrlib/builtins.py:5730

3718

#: bzrlib/builtins.py:5823

3719

msgid "Body for the email."

3720

msgstr ""

3721

3722

# help of 'no-bundle' option of 'send' command

3723

#: bzrlib/builtins.py:5783

3723

#: bzrlib/builtins.py:5876

3724

msgid "Do not include a bundle in the merge directive."

3725

msgstr ""

3726

3727

# help of 'no-patch' option of 'send' command

3728

#: bzrlib/builtins.py:5784

3728

#: bzrlib/builtins.py:5877

3729

msgid "Do not include a preview patch in the merge directive."

3730

msgstr ""

3731

3732

# help of 'remember' option of 'send' command

3733

#: bzrlib/builtins.py:5787

3733

#: bzrlib/builtins.py:5880

3734

msgid "Remember submit and public branch."

3735

msgstr ""

3736

3737

# help of 'from' option of 'send' command

3738

#: bzrlib/builtins.py:5789

3738

#: bzrlib/builtins.py:5882

3739

msgid ""

3740

"Branch to generate the submission from, rather than the one containing the "

3741

"working directory."

3743

3744

# title of 'format' option of 'send' command

3745

# title of 'format' option of 'version-info' command

3746

#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76

3746

#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76

3747

msgid "format"

3748

msgstr ""

3749

3750

# help of 'format' option of 'send' command

3751

#: bzrlib/builtins.py:5800

3751

#: bzrlib/builtins.py:5893

3752

msgid "Use the specified output format."

3753

msgstr ""

3754

3755

#: bzrlib/builtins.py:5822

3755

#: bzrlib/builtins.py:5915

3756

msgid "Create, remove or modify a tag naming a revision."

3757

msgstr ""

3758

3759

#: bzrlib/builtins.py:5824

3759

#: bzrlib/builtins.py:5917

3760

msgid ""

3761

"Tags give human-meaningful names to revisions. Commands that take a -r\n"

3762

"(--revision) option can be given -rtag:X, where X is any previously\n"

3763

"created tag."

3764

msgstr ""

3765

3766

#: bzrlib/builtins.py:5828

3766

#: bzrlib/builtins.py:5921

3767

msgid ""

3768

"Tags are stored in the branch. Tags are copied from one branch to another\n"

3769

"along when you branch, push, pull or merge."

3770

msgstr ""

3771

3772

#: bzrlib/builtins.py:5831

3772

#: bzrlib/builtins.py:5924

3773

msgid ""

3774

"It is an error to give a tag name that already exists unless you pass\n"

3775

"--force, in which case the tag is moved to point to the new revision."

3776

msgstr ""

3777

3778

#: bzrlib/builtins.py:5834

3778

#: bzrlib/builtins.py:5927

3779

msgid ""

3780

"To rename a tag (change the name but keep it on the same revsion), run "

3781

"``bzr\n"

3782

"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."

3783

msgstr ""

3784

3785

#: bzrlib/builtins.py:5837

3785

#: bzrlib/builtins.py:5930

3786

msgid ""

3787

"If no tag name is specified it will be determined through the \n"

3788

"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"

3791

msgstr ""

3792

3793

# help of 'delete' option of 'tag' command

3794

#: bzrlib/builtins.py:5847

3794

#: bzrlib/builtins.py:5940

3795

msgid "Delete this tag rather than placing it."

3796

msgstr ""

3797

3798

# help of 'directory' option of 'tag' command

3799

#: bzrlib/builtins.py:5850

3799

#: bzrlib/builtins.py:5943

3800

msgid "Branch in which to place the tag."

3801

msgstr ""

3802

3803

# help of 'force' option of 'tag' command

3804

#: bzrlib/builtins.py:5852

3804

#: bzrlib/builtins.py:5945

3805

msgid "Replace existing tags."

3806

msgstr ""

3807

3808

#: bzrlib/builtins.py:5867

3808

#: bzrlib/builtins.py:5960

3809

msgid "No tag specified to delete."

3810

msgstr ""

3811

3812

#: bzrlib/builtins.py:5869

3812

#: bzrlib/builtins.py:5962

3813

#, python-format

3814

msgid "Deleted tag %s."

3815

msgstr ""

3816

3817

#: bzrlib/builtins.py:5883

3817

#: bzrlib/builtins.py:5976

3818

msgid "Please specify a tag name."

3819

msgstr ""

3820

3821

#: bzrlib/builtins.py:5891

3821

#: bzrlib/builtins.py:5984

3822

#, python-format

3823

msgid "Tag %s already exists for that revision."

3824

msgstr ""

3825

3826

#: bzrlib/builtins.py:5895

3826

#: bzrlib/builtins.py:5988

3827

#, python-format

3828

msgid "Created tag %s."

3829

msgstr ""

3830

3831

#: bzrlib/builtins.py:5897

3831

#: bzrlib/builtins.py:5990

3832

#, python-format

3833

msgid "Updated tag %s."

3834

msgstr ""

3835

3836

#: bzrlib/builtins.py:5901

3836

#: bzrlib/builtins.py:5994

3837

msgid "List tags."

3838

msgstr ""

3839

3840

#: bzrlib/builtins.py:5903

3840

#: bzrlib/builtins.py:5996

3841

msgid ""

3842

"This command shows a table of tag names and the revisions they reference."

3843

msgstr ""

3844

3845

# help of 'directory' option of 'tags' command

3846

#: bzrlib/builtins.py:5909

3846

#: bzrlib/builtins.py:6002

3847

msgid "Branch whose tags should be displayed."

3848

msgstr ""

3849

3850

# help of 'sort' option of 'tags' command

3851

#: bzrlib/builtins.py:5911

3851

#: bzrlib/builtins.py:6004

3852

msgid "Sort tags by different criteria."

3853

msgstr ""

3854

3855

# title of 'sort' option of 'tags' command

3856

#: bzrlib/builtins.py:5911

3856

#: bzrlib/builtins.py:6004

3857

msgid "Sorting"

3858

msgstr ""

3859

3860

#: bzrlib/builtins.py:5980

3860

#: bzrlib/builtins.py:6073

3861

msgid "Reconfigure the type of a bzr directory."

3862

msgstr ""

3863

3864

#: bzrlib/builtins.py:5982

3864

#: bzrlib/builtins.py:6075

3865

msgid "A target configuration must be specified."

3866

msgstr ""

3867

3868

#: bzrlib/builtins.py:5984

3868

#: bzrlib/builtins.py:6077

3869

msgid ""

3870

"For checkouts, the bind-to location will be auto-detected if not specified.\n"

3871

"The order of preference is\n"

3877

msgstr ""

3878

3879

# title of 'tree_type' option of 'reconfigure' command

3880

#: bzrlib/builtins.py:5998

3880

#: bzrlib/builtins.py:6091

3881

msgid "Tree type"

3882

msgstr ""

3883

3884

# help of 'tree_type' option of 'reconfigure' command

3885

#: bzrlib/builtins.py:5999

3885

#: bzrlib/builtins.py:6092

3886

msgid "The relation between branch and tree."

3887

msgstr ""

3888

3889

# help of 'tree_type=branch' option of 'reconfigure' command

3890

#: bzrlib/builtins.py:6001

3890

#: bzrlib/builtins.py:6094

3891

msgid "Reconfigure to be an unbound branch with no working tree."

3892

msgstr ""

3893

3894

# help of 'tree_type=tree' option of 'reconfigure' command

3895

#: bzrlib/builtins.py:6002

3895

#: bzrlib/builtins.py:6095

3896

msgid "Reconfigure to be an unbound branch with a working tree."

3897

msgstr ""

3898

3899

# help of 'tree_type=checkout' option of 'reconfigure' command

3900

#: bzrlib/builtins.py:6003

3900

#: bzrlib/builtins.py:6096

3901

msgid "Reconfigure to be a bound branch with a working tree."

3902

msgstr ""

3903

3904

# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command

3905

#: bzrlib/builtins.py:6004

3905

#: bzrlib/builtins.py:6097

3906

msgid "Reconfigure to be a lightweight checkout (with no local history)."

3907

msgstr ""

3908

3909

# title of 'repository_type' option of 'reconfigure' command

3910

#: bzrlib/builtins.py:6009

3910

#: bzrlib/builtins.py:6102

3911

msgid "Repository type"

3912

msgstr ""

3913

3914

# help of 'repository_type' option of 'reconfigure' command

3915

#: bzrlib/builtins.py:6010

3915

#: bzrlib/builtins.py:6103

3916

msgid "Location fo the repository."

3917

msgstr ""

3918

3919

# help of 'repository_type=standalone' option of 'reconfigure' command

3920

#: bzrlib/builtins.py:6012

3920

#: bzrlib/builtins.py:6105

3921

msgid ""

3922

"Reconfigure to be a standalone branch (i.e. stop using shared repository)."

3923

msgstr ""

3924

3925

# help of 'repository_type=use-shared' option of 'reconfigure' command

3926

#: bzrlib/builtins.py:6014

3926

#: bzrlib/builtins.py:6107

3927

msgid "Reconfigure to use a shared repository."

3928

msgstr ""

3929

3930

# title of 'repository_trees' option of 'reconfigure' command

3931

#: bzrlib/builtins.py:6018

3931

#: bzrlib/builtins.py:6111

3932

msgid "Trees in Repository"

3933

msgstr ""

3934

3935

# help of 'repository_trees' option of 'reconfigure' command

3936

#: bzrlib/builtins.py:6019

3936

#: bzrlib/builtins.py:6112

3937

msgid "Whether new branches in the repository have trees."

3938

msgstr ""

3939

3940

# help of 'repository_trees=with-trees' option of 'reconfigure' command

3941

#: bzrlib/builtins.py:6021

3941

#: bzrlib/builtins.py:6114

3942

msgid "Reconfigure repository to create working trees on branches by default."

3943

msgstr ""

3944

3945

# help of 'repository_trees=with-no-trees' option of 'reconfigure' command

3946

#: bzrlib/builtins.py:6023

3946

#: bzrlib/builtins.py:6116

3947

msgid ""

3948

"Reconfigure repository to not create working trees on branches by default."

3949

msgstr ""

3950

3951

# help of 'bind-to' option of 'reconfigure' command

3952

#: bzrlib/builtins.py:6026

3952

#: bzrlib/builtins.py:6119

3953

msgid "Branch to bind checkout to."

3954

msgstr ""

3955

3956

# help of 'force' option of 'reconfigure' command

3957

#: bzrlib/builtins.py:6028

3957

#: bzrlib/builtins.py:6121

3958

msgid "Perform reconfiguration even if local changes will be lost."

3959

msgstr ""

3960

3961

# help of 'stacked-on' option of 'reconfigure' command

3962

#: bzrlib/builtins.py:6031

3962

#: bzrlib/builtins.py:6124

3963

msgid "Reconfigure a branch to be stacked on another branch."

3964

msgstr ""

3965

3966

# help of 'unstacked' option of 'reconfigure' command

3967

#: bzrlib/builtins.py:6035

3967

#: bzrlib/builtins.py:6128

3968

msgid ""

3969

"Reconfigure a branch to be unstacked. This may require copying substantial "

3970

"data into it."

3971

msgstr ""

3972

3973

#: bzrlib/builtins.py:6045

3973

#: bzrlib/builtins.py:6138

3974

msgid "Can't use both --stacked-on and --unstacked"

3975

msgstr ""

3976

3977

#: bzrlib/builtins.py:6059

3977

#: bzrlib/builtins.py:6152

3978

msgid "No target configuration specified"

3979

msgstr ""

3980

3981

#: bzrlib/builtins.py:6094

3981

#: bzrlib/builtins.py:6187

3982

msgid "Set the branch of a checkout and update."

3983

msgstr ""

3984

3985

#: bzrlib/builtins.py:6096

3985

#: bzrlib/builtins.py:6189

3986

msgid ""

3987

"For lightweight checkouts, this changes the branch being referenced.\n"

3988

"For heavyweight checkouts, this checks that there are no local commits\n"

3990

"of the new location and binds to it."

3991

msgstr ""

3992

3993

#: bzrlib/builtins.py:6101

3993

#: bzrlib/builtins.py:6194

3994

msgid ""

3995

"In both cases, the working tree is updated and uncommitted changes\n"

3996

"are merged. The user can commit or revert these as they desire."

3997

msgstr ""

3998

3999

#: bzrlib/builtins.py:6104

3999

#: bzrlib/builtins.py:6197

4000

msgid "Pending merges need to be committed or reverted before using switch."

4001

msgstr ""

4002

4003

#: bzrlib/builtins.py:6106

4003

#: bzrlib/builtins.py:6199

4004

msgid ""

4005

"The path to the branch to switch to can be specified relative to the parent\n"

4006

"directory of the current branch. For example, if you are currently in a\n"

4008

"/path/to/newbranch."

4009

msgstr ""

4010

4011

#: bzrlib/builtins.py:6111

4011

#: bzrlib/builtins.py:6204

4012

msgid ""

4013

"Bound branches use the nickname of its master branch unless it is set\n"

4014

"locally, in which case switching will update the local nickname to be\n"

4016

msgstr ""

4017

4018

# help of 'force' option of 'switch' command

4019

#: bzrlib/builtins.py:6119

4019

#: bzrlib/builtins.py:6212

4020

msgid "Switch even if local commits will be lost."

4021

msgstr ""

4022

4023

# help of 'create-branch' option of 'switch' command

4024

#: bzrlib/builtins.py:6122

4024

#: bzrlib/builtins.py:6215

4025

msgid "Create the target branch from this one before switching to it."

4026

msgstr ""

4027

4028

#: bzrlib/builtins.py:6134

4028

#: bzrlib/builtins.py:6229

4029

msgid "You must supply either a revision or a location"

4030

msgstr ""

4031

4032

#: bzrlib/builtins.py:6145

4032

#: bzrlib/builtins.py:6242

4033

msgid "cannot create branch without source branch"

4034

msgstr ""

4035

4036

#: bzrlib/builtins.py:6209

4036

#: bzrlib/builtins.py:6262

4037

msgid "Manage filtered views."

4038

msgstr ""

4039

4040

#: bzrlib/builtins.py:6211

4040

#: bzrlib/builtins.py:6264

4041

msgid ""

4042

"Views provide a mask over the tree so that users can focus on\n"

4043

"a subset of a tree when doing their work. After creating a view,\n"

4047

"must be within the current view."

4048

msgstr ""

4049

4050

#: bzrlib/builtins.py:6218

4050

#: bzrlib/builtins.py:6271

4051

msgid ""

4052

"In most cases, a view has a short life-span: it is created to make\n"

4053

"a selected change and is deleted once that change is committed.\n"

4055

"and switch between them."

4056

msgstr ""

4057

4058

#: bzrlib/builtins.py:6223

4058

#: bzrlib/builtins.py:6276

4059

msgid ""

4060

"To disable the current view without deleting it, you can switch to\n"

4061

"the pseudo view called ``off``. This can be useful when you need\n"

4063

"want to switch back to your view after that."

4064

msgstr ""

4065

4066

#: bzrlib/builtins.py:6228

4066

#: bzrlib/builtins.py:6281

4067

msgid ""

4068

":Examples:\n"

4069

" To define the current view::"

4070

msgstr ""

4071

4072

#: bzrlib/builtins.py:6231

4072

#: bzrlib/builtins.py:6284

4073

msgid " bzr view file1 dir1 ..."

4074

msgstr ""

4075

4076

#: bzrlib/builtins.py:6233

4076

#: bzrlib/builtins.py:6286

4077

msgid " To list the current view::"

4078

msgstr ""

4079

4080

#: bzrlib/builtins.py:6235

4080

#: bzrlib/builtins.py:6288

4081

msgid " bzr view"

4082

msgstr ""

4083

4084

#: bzrlib/builtins.py:6237

4084

#: bzrlib/builtins.py:6290

4085

msgid " To delete the current view::"

4086

msgstr ""

4087

4088

#: bzrlib/builtins.py:6239

4088

#: bzrlib/builtins.py:6292

4089

msgid " bzr view --delete"

4090

msgstr ""

4091

4092

#: bzrlib/builtins.py:6241

4092

#: bzrlib/builtins.py:6294

4093

msgid " To disable the current view without deleting it::"

4094

msgstr ""

4095

4096

#: bzrlib/builtins.py:6243

4096

#: bzrlib/builtins.py:6296

4097

msgid " bzr view --switch off"

4098

msgstr ""

4099

4100

#: bzrlib/builtins.py:6245

4100

#: bzrlib/builtins.py:6298

4101

msgid " To define a named view and switch to it::"

4102

msgstr ""

4103

4104

#: bzrlib/builtins.py:6247

4104

#: bzrlib/builtins.py:6300

4105

msgid " bzr view --name view-name file1 dir1 ..."

4106

msgstr ""

4107

4108

#: bzrlib/builtins.py:6249

4108

#: bzrlib/builtins.py:6302

4109

msgid " To list a named view::"

4110

msgstr ""

4111

4112

#: bzrlib/builtins.py:6251

4112

#: bzrlib/builtins.py:6304

4113

msgid " bzr view --name view-name"

4114

msgstr ""

4115

4116

#: bzrlib/builtins.py:6253

4116

#: bzrlib/builtins.py:6306

4117

msgid " To delete a named view::"

4118

msgstr ""

4119

4120

#: bzrlib/builtins.py:6255

4120

#: bzrlib/builtins.py:6308

4121

msgid " bzr view --name view-name --delete"

4122

msgstr ""

4123

4124

#: bzrlib/builtins.py:6257

4124

#: bzrlib/builtins.py:6310

4125

msgid " To switch to a named view::"

4126

msgstr ""

4127

4128

#: bzrlib/builtins.py:6259

4128

#: bzrlib/builtins.py:6312

4129

msgid " bzr view --switch view-name"

4130

msgstr ""

4131

4132

#: bzrlib/builtins.py:6261

4132

#: bzrlib/builtins.py:6314

4133

msgid " To list all views defined::"

4134

msgstr ""

4135

4136

#: bzrlib/builtins.py:6263

4136

#: bzrlib/builtins.py:6316

4137

msgid " bzr view --all"

4138

msgstr ""

4139

4140

#: bzrlib/builtins.py:6265

4140

#: bzrlib/builtins.py:6318

4141

msgid " To delete all views::"

4142

msgstr ""

4143

4144

#: bzrlib/builtins.py:6267

4144

#: bzrlib/builtins.py:6320

4145

msgid " bzr view --delete --all"

4146

msgstr ""

4147

4148

# help of 'all' option of 'view' command

4149

#: bzrlib/builtins.py:6274

4149

#: bzrlib/builtins.py:6327

4150

msgid "Apply list or delete action to all views."

4151

msgstr ""

4152

4153

# help of 'delete' option of 'view' command

4154

#: bzrlib/builtins.py:6277

4154

#: bzrlib/builtins.py:6330

4155

msgid "Delete the view."

4156

msgstr ""

4157

4158

# help of 'name' option of 'view' command

4159

#: bzrlib/builtins.py:6280

4159

#: bzrlib/builtins.py:6333

4160

msgid "Name of the view to define, list or delete."

4161

msgstr ""

4162

4163

# help of 'switch' option of 'view' command

4164

#: bzrlib/builtins.py:6284

4164

#: bzrlib/builtins.py:6337

4165

msgid "Name of the view to switch to."

4166

msgstr ""

4167

4168

#: bzrlib/builtins.py:6303

4168

#: bzrlib/builtins.py:6356

4169

msgid "Both --delete and a file list specified"

4170

msgstr ""

4171

4172

#: bzrlib/builtins.py:6306

4172

#: bzrlib/builtins.py:6359

4173

msgid "Both --delete and --switch specified"

4174

msgstr ""

4175

4176

#: bzrlib/builtins.py:6309

4176

#: bzrlib/builtins.py:6362

4177

msgid "Deleted all views.\n"

4178

msgstr ""

4179

4180

#: bzrlib/builtins.py:6311

4180

#: bzrlib/builtins.py:6364

4181

msgid "No current view to delete"

4182

msgstr ""

4183

4184

#: bzrlib/builtins.py:6314

4184

#: bzrlib/builtins.py:6367

4185

#, python-format

4186

msgid "Deleted '%s' view.\n"

4187

msgstr ""

4188

4189

#: bzrlib/builtins.py:6318

4189

#: bzrlib/builtins.py:6371

4190

msgid "Both --switch and a file list specified"

4191

msgstr ""

4192

4193

#: bzrlib/builtins.py:6321

4193

#: bzrlib/builtins.py:6374

4194

msgid "Both --switch and --all specified"

4195

msgstr ""

4196

4197

#: bzrlib/builtins.py:6324

4197

#: bzrlib/builtins.py:6377

4198

msgid "No current view to disable"

4199

msgstr ""

4200

4201

#: bzrlib/builtins.py:6326

4201

#: bzrlib/builtins.py:6379

4202

#, python-format

4203

msgid "Disabled '%s' view.\n"

4204

msgstr ""

4205

4206

#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352

4206

#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405

4207

msgid "Using '{0}' view: {1}\n"

4208

msgstr ""

4209

4210

#: bzrlib/builtins.py:6333

4210

#: bzrlib/builtins.py:6386

4211

msgid "Views defined:\n"

4212

msgstr ""

4213

4214

#: bzrlib/builtins.py:6342

4214

#: bzrlib/builtins.py:6395

4215

msgid "No views defined.\n"

4216

msgstr ""

4217

4218

#: bzrlib/builtins.py:6349

4218

#: bzrlib/builtins.py:6402

4219

msgid "Cannot change the 'off' pseudo view"

4220

msgstr ""

4221

4222

#: bzrlib/builtins.py:6357

4222

#: bzrlib/builtins.py:6410

4223

msgid "No current view.\n"

4224

msgstr ""

4225

4226

#: bzrlib/builtins.py:6360

4226

#: bzrlib/builtins.py:6413

4227

msgid "'{0}' view is: {1}\n"

4228

msgstr ""

4229

4230

#: bzrlib/builtins.py:6380

4230

#: bzrlib/builtins.py:6433

4231

msgid " <no hooks installed>\n"

4232

msgstr ""

4233

4234

#: bzrlib/builtins.py:6384

4234

#: bzrlib/builtins.py:6437

4235

msgid "Remove a branch."

4236

msgstr ""

4237

4238

#: bzrlib/builtins.py:6386

4238

#: bzrlib/builtins.py:6439

4239

msgid ""

4240

"This will remove the branch from the specified location but \n"

4241

"will keep any working tree or repository in place."

4242

msgstr ""

4243

4244

#: bzrlib/builtins.py:6391

4244

#: bzrlib/builtins.py:6444

4245

msgid " Remove the branch at repo/trunk::"

4246

msgstr ""

4247

4248

#: bzrlib/builtins.py:6393

4248

#: bzrlib/builtins.py:6446

4249

msgid " bzr remove-branch repo/trunk"

4250

msgstr ""

4251

4252

# help of 'writer=plain' option of 'shelve' command

4253

#: bzrlib/builtins.py:6408

4253

#: bzrlib/builtins.py:6461

4254

msgid "Plaintext diff output."

4255

msgstr ""

4256

4257

#: bzrlib/builtins.py:6409

4257

#: bzrlib/builtins.py:6462

4258

msgid "Temporarily set aside some changes from the current tree."

4259

msgstr ""

4260

4261

#: bzrlib/builtins.py:6411

4261

#: bzrlib/builtins.py:6464

4262

msgid ""

4263

"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"

4264

"ie. out of the way, until a later time when you can bring them back from\n"

4267

"will they survive its deletion."

4268

msgstr ""

4269

4270

#: bzrlib/builtins.py:6417

4270

#: bzrlib/builtins.py:6470

4271

msgid "If shelve --list is specified, previously-shelved changes are listed."

4272

msgstr ""

4273

4274

#: bzrlib/builtins.py:6419

4274

#: bzrlib/builtins.py:6472

4275

msgid ""

4276

"Shelve is intended to help separate several sets of changes that have\n"

4277

"been inappropriately mingled. If you just want to get rid of all changes\n"

4279

"shelve all text changes at once, use shelve --all."

4280

msgstr ""

4281

4282

#: bzrlib/builtins.py:6424

4282

#: bzrlib/builtins.py:6477

4283

msgid ""

4284

"If filenames are specified, only the changes to those files will be\n"

4285

"shelved. Other files will be left untouched."

4286

msgstr ""

4287

4288

#: bzrlib/builtins.py:6427

4288

#: bzrlib/builtins.py:6480

4289

msgid ""

4290

"If a revision is specified, changes since that revision will be shelved."

4291

msgstr ""

4292

4293

#: bzrlib/builtins.py:6429

4293

#: bzrlib/builtins.py:6482

4294

msgid ""

4295

"You can put multiple items on the shelf, and by default, 'unshelve' will\n"

4296

"restore the most recently shelved changes."

4297

msgstr ""

4298

4299

#: bzrlib/builtins.py:6432

4299

#: bzrlib/builtins.py:6485

4300

msgid ""

4301

"For complicated changes, it is possible to edit the changes in a separate\n"

4302

"editor program to decide what the file remaining in the working copy\n"

4303

"should look like. To do this, add the configuration option"

4304

msgstr ""

4305

4306

#: bzrlib/builtins.py:6436

4306

#: bzrlib/builtins.py:6489

4307

msgid " change_editor = PROGRAM @new_path @old_path"

4308

msgstr ""

4309

4310

#: bzrlib/builtins.py:6438

4310

#: bzrlib/builtins.py:6491

4311

msgid ""

4312

"where @new_path is replaced with the path of the new version of the \n"

4313

"file and @old_path is replaced with the path of the old version of \n"

4317

msgstr ""

4318

4319

# help of 'all' option of 'shelve' command

4320

#: bzrlib/builtins.py:6450

4320

#: bzrlib/builtins.py:6503

4321

msgid "Shelve all changes."

4322

msgstr ""

4323

4324

# help of 'writer' option of 'shelve' command

4325

#: bzrlib/builtins.py:6452

4325

#: bzrlib/builtins.py:6505

4326

msgid "Method to use for writing diffs."

4327

msgstr ""

4328

4329

# title of 'writer' option of 'shelve' command

4330

#: bzrlib/builtins.py:6452

4330

#: bzrlib/builtins.py:6505

4331

msgid "writer"

4332

msgstr ""

4333

4334

# help of 'list' option of 'shelve' command

4335

#: bzrlib/builtins.py:6456

4335

#: bzrlib/builtins.py:6509

4336

msgid "List shelved changes."

4337

msgstr ""

4338

4339

# help of 'destroy' option of 'shelve' command

4340

#: bzrlib/builtins.py:6458

4340

#: bzrlib/builtins.py:6511

4341

msgid "Destroy removed changes instead of shelving them."

4342

msgstr ""

4343

4344

#: bzrlib/builtins.py:6487

4344

#: bzrlib/builtins.py:6540

4345

msgid "No shelved changes."

4346

msgstr ""

4347

4348

#: bzrlib/builtins.py:6498

4348

#: bzrlib/builtins.py:6551

4349

msgid "Restore shelved changes."

4350

msgstr ""

4351

4352

#: bzrlib/builtins.py:6500

4352

#: bzrlib/builtins.py:6553

4353

msgid ""

4354

"By default, the most recently shelved changes are restored. However if you\n"

4355

"specify a shelf by id those changes will be restored instead. This works\n"

4357

msgstr ""

4358

4359

# help of 'action' option of 'unshelve' command

4360

#: bzrlib/builtins.py:6509

4360

#: bzrlib/builtins.py:6562

4361

msgid "The action to perform."

4362

msgstr ""

4363

4364

# title of 'action' option of 'resolve' command

4365

# title of 'action' option of 'unshelve' command

4366

#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694

4366

#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694

4367

msgid "action"

4368

msgstr ""

4369

4370

# help of 'action=apply' option of 'unshelve' command

4371

#: bzrlib/builtins.py:6511

4371

#: bzrlib/builtins.py:6564

4372

msgid "Apply changes and remove from the shelf."

4373

msgstr ""

4374

4375

# help of 'action=dry-run' option of 'unshelve' command

4376

#: bzrlib/builtins.py:6512

4376

#: bzrlib/builtins.py:6565

4377

msgid "Show changes, but do not apply or remove them."

4378

msgstr ""

4379

4380

# help of 'action=preview' option of 'unshelve' command

4381

#: bzrlib/builtins.py:6513

4381

#: bzrlib/builtins.py:6566

4382

msgid ""

4383

"Instead of unshelving the changes, show the diff that would result from "

4384

"unshelving."

4385

msgstr ""

4386

4387

# help of 'action=delete-only' option of 'unshelve' command

4388

#: bzrlib/builtins.py:6515

4388

#: bzrlib/builtins.py:6568

4389

msgid "Delete changes without applying them."

4390

msgstr ""

4391

4392

# help of 'action=keep' option of 'unshelve' command

4393

#: bzrlib/builtins.py:6516

4393

#: bzrlib/builtins.py:6569

4394

msgid "Apply changes but don't delete them."

4395

msgstr ""

4396

4397

#: bzrlib/builtins.py:6531

4397

#: bzrlib/builtins.py:6584

4398

msgid "Remove unwanted files from working tree."

4399

msgstr ""

4400

4401

#: bzrlib/builtins.py:6533

4401

#: bzrlib/builtins.py:6586

4402

msgid ""

4403

"By default, only unknown files, not ignored files, are deleted. Versioned\n"

4404

"files are never deleted."

4405

msgstr ""

4406

4407

#: bzrlib/builtins.py:6536

4407

#: bzrlib/builtins.py:6589

4408

msgid ""

4409

"Another class is 'detritus', which includes files emitted by bzr during\n"

4410

"normal operations and selftests. (The value of these files decreases with\n"

4411

"time.)"

4412

msgstr ""

4413

4414

#: bzrlib/builtins.py:6540

4414

#: bzrlib/builtins.py:6593

4415

msgid ""

4416

"If no options are specified, unknown files are deleted. Otherwise, option\n"

4417

"flags are respected, and may be combined."

4418

msgstr ""

4419

4420

#: bzrlib/builtins.py:6543

4420

#: bzrlib/builtins.py:6596

4421

msgid "To check what clean-tree will do, use --dry-run."

4422

msgstr ""

4423

4424

# help of 'ignored' option of 'clean-tree' command

4425

#: bzrlib/builtins.py:6546

4425

#: bzrlib/builtins.py:6599

4426

msgid "Delete all ignored files."

4427

msgstr ""

4428

4429

# help of 'detritus' option of 'clean-tree' command

4430

#: bzrlib/builtins.py:6547

4430

#: bzrlib/builtins.py:6600

4431

msgid ""

4432

"Delete conflict files, merge and revert backups, and failed selftest dirs."

4433

msgstr ""

4434

4435

# help of 'unknown' option of 'clean-tree' command

4436

#: bzrlib/builtins.py:6550

4436

#: bzrlib/builtins.py:6603

4437

msgid "Delete files unknown to bzr (default)."

4438

msgstr ""

4439

4440

# help of 'dry-run' option of 'clean-tree' command

4441

#: bzrlib/builtins.py:6551

4441

#: bzrlib/builtins.py:6604

4442

msgid "Show files to delete instead of deleting them."

4443

msgstr ""

4444

4445

# help of 'force' option of 'clean-tree' command

4446

#: bzrlib/builtins.py:6553

4446

#: bzrlib/builtins.py:6606

4447

msgid "Do not prompt before deleting."

4448

msgstr ""

4449

4503

msgstr[0] ""

4504

msgstr[1] ""

4505

4506

#: bzrlib/bzrdir.py:489

4506

#: bzrlib/bzrdir.py:490

4507

msgid ""

4508

"making backup of {0}\n"

4509

" to {1}"

4510

msgstr ""

4511

4512

#: bzrlib/bzrdir.py:512

4512

#: bzrlib/bzrdir.py:513

4513

msgid "renamed {0} to {1}"

4514

msgstr ""

4515

4516

#: bzrlib/bzrdir.py:1663

4516

#: bzrlib/bzrdir.py:1652

4517

#, python-format

4518

msgid ""

4519

"Source repository format does not support stacking, using format:\n"

4520

" %s"

4521

msgstr ""

4522

4523

#: bzrlib/bzrdir.py:1683

4523

#: bzrlib/bzrdir.py:1672

4524

#, python-format

4525

msgid ""

4526

"Source branch format does not support stacking, using format:\n"

4527

" %s"

4528

msgstr ""

4529

4530

#: bzrlib/bzrdir.py:1829

4530

#: bzrlib/bzrdir.py:1818

4531

msgid "starting repository conversion"

4532

msgstr ""

4533

4534

#: bzrlib/bzrdir.py:2058

4534

#: bzrlib/bzrdir.py:2039

4535

msgid "Using default stacking branch {0} at {1}"

4536

msgstr ""

4537

4779

msgid "bzr version-info --revision takes exactly one revision specifier"

4780

msgstr ""

4781

4782

#: bzrlib/commands.py:228

4782

#: bzrlib/commands.py:229

4783

#, python-format

4784

msgid "unknown command \"%s\""

4785

msgstr ""

4786

4787

#: bzrlib/commands.py:475

4787

#: bzrlib/commands.py:476

4788

msgid "No help for this command."

4789

msgstr ""

4790

4791

#: bzrlib/commands.py:488

4791

#: bzrlib/commands.py:489

4792

#, python-format

4793

msgid ":Purpose: %s\n"

4794

msgstr ""

4795

4796

#: bzrlib/commands.py:490

4796

#: bzrlib/commands.py:491

4797

#, python-format

4798

msgid ""

4799

":Usage:\n"

4800

"%s\n"

4801

msgstr ""

4802

4803

#: bzrlib/commands.py:492

4803

#: bzrlib/commands.py:493

4804

#, python-format

4805

msgid ":Usage: %s\n"

4806

msgstr ""

4807

4808

#: bzrlib/commands.py:511

4808

#: bzrlib/commands.py:512

4809

#, python-format

4810

msgid ":Options:%s"

4811

msgstr ""

4812

4813

#: bzrlib/commands.py:522

4813

#: bzrlib/commands.py:523

4814

#, python-format

4815

msgid ""

4816

":Description:\n"

4818

"\n"

4819

msgstr ""

4820

4821

#: bzrlib/commands.py:532

4821

#: bzrlib/commands.py:533

4822

#, python-format

4823

msgid ""

4824

"See bzr help %s for more details and examples.\n"

4825

"\n"

4826

msgstr ""

4827

4828

#: bzrlib/commands.py:537

4828

#: bzrlib/commands.py:538

4829

msgid ":Aliases: "

4830

msgstr ""

4831

4832

#: bzrlib/commands.py:541

4832

#: bzrlib/commands.py:542

4833

#, python-format

4834

msgid ":From: plugin \"%s\"\n"

4835

msgstr ""

4836

4837

#: bzrlib/commands.py:553

4837

#: bzrlib/commands.py:554

4838

msgid ":doc:`{0} <{1}-help>`"

4839

msgstr ""

4840

4841

#: bzrlib/commands.py:557

4841

#: bzrlib/commands.py:558

4842

#, python-format

4843

msgid ":See also: %s"

4844

msgstr ""

4845

4846

#: bzrlib/commands.py:815 bzrlib/gpg.py:324

4846

#: bzrlib/commands.py:816 bzrlib/gpg.py:324

4847

msgid "Only ASCII permitted in option names"

4848

msgstr ""

4849

4850

#: bzrlib/commands.py:840 bzrlib/commands.py:848

4850

#: bzrlib/commands.py:841 bzrlib/commands.py:849

4851

msgid "command {0!r} needs one or more {1}"

4852

msgstr ""

4853

4854

#: bzrlib/commands.py:857

4854

#: bzrlib/commands.py:858

4855

msgid "command {0!r} requires argument {1}"

4856

msgstr ""

4857

4858

#: bzrlib/commands.py:864

4858

#: bzrlib/commands.py:865

4859

msgid "extra argument to command {0}: {1}"

4860

msgstr ""

4861

4862

#: bzrlib/commands.py:961

4862

#: bzrlib/commands.py:962

4863

#, python-format

4864

msgid "Profile data written to \"%s\"."

4865

msgstr ""

4962

msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."

4963

msgstr ""

4964

4965

#: bzrlib/config.py:2499

4965

#: bzrlib/config.py:2485

4966

msgid "{0} is not an SI unit."

4967

msgstr ""

4968

4969

#: bzrlib/config.py:2956

4969

#: bzrlib/config.py:2949

4970

msgid ""

4971

"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "

4972

"will be saved."

4973

msgstr ""

4974

4975

#: bzrlib/config.py:3100

4975

#: bzrlib/config.py:3093

4976

#, python-format

4977

msgid "Invalid '%s', should be of the form 'name=value'"

4978

msgstr ""

4979

4980

#: bzrlib/config.py:3969

4980

#: bzrlib/config.py:3962

4981

msgid "Display, set or remove a configuration option."

4982

msgstr ""

4983

4984

#: bzrlib/config.py:3971

4984

#: bzrlib/config.py:3964

4985

msgid "Display the active value for a given option."

4986

msgstr ""

4987

4988

#: bzrlib/config.py:3973

4988

#: bzrlib/config.py:3966

4989

msgid ""

4990

"If --all is specified, NAME is interpreted as a regular expression and all\n"

4991

"matching options are displayed mentioning their scope. The active value\n"

4992

"that bzr will take into account is the first one displayed for each option."

4993

msgstr ""

4994

4995

#: bzrlib/config.py:3977

4995

#: bzrlib/config.py:3970

4996

msgid "If no NAME is given, --all .* is implied."

4997

msgstr ""

4998

4999

#: bzrlib/config.py:3979

4999

#: bzrlib/config.py:3972

5000

msgid ""

5001

"Setting a value is achieved by using name=value without spaces. The value\n"

5002

"is set in the most relevant scope and can be checked by displaying the\n"

5004

msgstr ""

5005

5006

# help of 'scope' option of 'config' command

5007

#: bzrlib/config.py:3991

5007

#: bzrlib/config.py:3984

5008

msgid "Reduce the scope to the specified configuration file."

5009

msgstr ""

5010

5011

# help of 'all' option of 'config' command

5012

#: bzrlib/config.py:3995

5012

#: bzrlib/config.py:3988

5013

msgid "Display all the defined values for the matching options."

5014

msgstr ""

5015

5016

# help of 'remove' option of 'config' command

5017

#: bzrlib/config.py:3997

5017

#: bzrlib/config.py:3990

5018

msgid "Remove the option from the configuration file."

5019

msgstr ""

5020

5100

msgstr[0] ""

5101

msgstr[1] ""

5102

5103

#: bzrlib/controldir.py:698

5103

#: bzrlib/controldir.py:710

5104

msgid "{0} is{1} redirected to {2}"

5105

msgstr ""

5106

5206

msgid "The value '%(value)s' is not a valid value."

5207

msgstr ""

5208

5209

#: bzrlib/errors.py:424

5210

msgid "Bad value \"%(value)s\" for option \"%(name)s\"."

5211

msgstr ""

5212

5209

5213

#: bzrlib/errors.py:443

5210

5214

msgid "Generic path error: %(path)r%(extra)s)"

5211

5215

msgstr ""

5305

5309

msgstr ""

5306

5310

5307

5311

#: bzrlib/errors.py:705

5312

msgid "A control directory already exists: \"%(path)s\"."

5313

msgstr ""

5314

5315

#: bzrlib/errors.py:710

5308

5316

msgid "Already a branch: \"%(path)s\"."

5309

5317

msgstr ""

5310

5318

5311

#: bzrlib/errors.py:711

5319

#: bzrlib/errors.py:715

5320

msgid "Parent branch already exists: \"%(path)s\"."

5321

msgstr ""

5322

5323

#: bzrlib/errors.py:721

5312

5324

msgid ""

5313

5325

"Directory contains a branch, but no working tree (use bzr checkout if you "

5314

5326

"wish to build a working tree): \"%(path)s\""

5315

5327

msgstr ""

5316

5328

5317

#: bzrlib/errors.py:716

5329

#: bzrlib/errors.py:726

5318

5330

msgid ""

5319

5331

"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""

5320

5332

msgstr ""

5321

5333

5322

#: bzrlib/errors.py:726

5334

#: bzrlib/errors.py:736

5323

5335

msgid ""

5324

5336

"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""

5325

5337

msgstr ""

5326

5338

5327

#: bzrlib/errors.py:736

5339

#: bzrlib/errors.py:746

5328

5340

msgid "No repository present: \"%(path)s\""

5329

5341

msgstr ""

5330

5342

5331

#: bzrlib/errors.py:743

5343

#: bzrlib/errors.py:753

5332

5344

msgid ""

5333

5345

"Unsupported branch format: %(format)s\n"

5334

5346

"Please run 'bzr upgrade'"

5335

5347

msgstr ""

5336

5348

5337

#: bzrlib/errors.py:749

5349

#: bzrlib/errors.py:759

5338

5350

msgid "Unknown %(kind)s format: %(format)r"

5339

5351

msgstr ""

5340

5352

5341

#: bzrlib/errors.py:758

5353

#: bzrlib/errors.py:768

5342

5354

msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."

5343

5355

msgstr ""

5344

5356

5345

#: bzrlib/errors.py:768

5357

#: bzrlib/errors.py:778

5346

5358

msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"

5347

5359

msgstr ""

5348

5360

5349

#: bzrlib/errors.py:783

5361

#: bzrlib/errors.py:793

5350

5362

msgid ""

5351

5363

"%(target)s\n"

5352

5364

"is not compatible with\n"

5354

5366

"%(details)s"

5355

5367

msgstr ""

5356

5368

5357

#: bzrlib/errors.py:799

5369

#: bzrlib/errors.py:809

5358

5370

msgid "Revision is not compatible with %(repo_format)s"

5359

5371

msgstr ""

5360

5372

5361

#: bzrlib/errors.py:809

5373

#: bzrlib/errors.py:819

5362

5374

msgid "%(context_info)s%(path)s is already versioned."

5363

5375

msgstr ""

5364

5376

5365

#: bzrlib/errors.py:830

5377

#: bzrlib/errors.py:840

5366

5378

msgid "%(context_info)s%(path)s is not versioned."

5367

5379

msgstr ""

5368

5380

5369

#: bzrlib/errors.py:851

5381

#: bzrlib/errors.py:861

5370

5382

msgid "Path(s) are not versioned: %(paths_as_string)s"

5371

5383

msgstr ""

5372

5384

5373

#: bzrlib/errors.py:862

5385

#: bzrlib/errors.py:872

5374

5386

msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"

5375

5387

msgstr ""

5376

5388

5377

#: bzrlib/errors.py:881

5389

#: bzrlib/errors.py:891

5378

5390

msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""

5379

5391

msgstr ""

5380

5392

5381

#: bzrlib/errors.py:889

5393

#: bzrlib/errors.py:899

5382

5394

msgid ""

5383

5395

"Filename %(filename)r is not valid in your current filesystem encoding "

5384

5396

"%(fs_encoding)s"

5385

5397

msgstr ""

5386

5398

5387

#: bzrlib/errors.py:900

5399

#: bzrlib/errors.py:910

5388

5400

msgid "Cannot operate on \"%(filename)s\" because it is a control file"

5389

5401

msgstr ""

5390

5402

5391

#: bzrlib/errors.py:918

5403

#: bzrlib/errors.py:928

5392

5404

msgid "The lock for '%(lock_description)s' is in use and cannot be broken."

5393

5405

msgstr ""

5394

5406

5395

#: bzrlib/errors.py:957

5407

#: bzrlib/errors.py:967

5396

5408

msgid "Cannot lock %(lock)s: %(why)s"

5397

5409

msgstr ""

5398

5410

5399

#: bzrlib/errors.py:967

5411

#: bzrlib/errors.py:977

5400

5412

msgid ""

5401

5413

"A transaction related operation was attempted after the transaction finished."

5402

5414

msgstr ""

5403

5415

5404

#: bzrlib/errors.py:994

5416

#: bzrlib/errors.py:1004

5405

5417

msgid "Cannot lock: transport is read only: %(transport)s"

5406

5418

msgstr ""

5407

5419

5408

#: bzrlib/errors.py:1002

5420

#: bzrlib/errors.py:1012

5409

5421

msgid "Could not acquire lock \"%(lock)s\": %(msg)s"

5410

5422

msgstr ""

5411

5423

5412

#: bzrlib/errors.py:1013

5424

#: bzrlib/errors.py:1023

5413

5425

msgid "Lock was broken while still open: %(lock)s - check storage consistency!"

5414

5426

msgstr ""

5415

5427

5416

#: bzrlib/errors.py:1024

5428

#: bzrlib/errors.py:1034

5417

5429

msgid ""

5418

5430

"Lock was released and re-acquired before being broken: %(lock)s: held by "

5419

5431

"%(holder)r, wanted to break %(target)r"

5420

5432

msgstr ""

5421

5433

5422

#: bzrlib/errors.py:1036

5434

#: bzrlib/errors.py:1046

5423

5435

msgid ""

5424

5436

"Lock is apparently held, but corrupted: %(corruption_info)s\n"

5425

5437

"Use 'bzr break-lock' to clear it"

5426

5438

msgstr ""

5427

5439

5428

#: bzrlib/errors.py:1049

5440

#: bzrlib/errors.py:1059

5429

5441

msgid "Lock not held: %(lock)s"

5430

5442

msgstr ""

5431

5443

5432

#: bzrlib/errors.py:1078

5444

#: bzrlib/errors.py:1088

5433

5445

msgid "No changes to commit"

5434

5446

msgstr ""

5435

5447

5436

#: bzrlib/errors.py:1083

5448

#: bzrlib/errors.py:1093

5437

5449

msgid ""

5438

5450

"Selected-file commit of merges is not supported yet: files %(files_str)s"

5439

5451

msgstr ""

5440

5452

5441

#: bzrlib/errors.py:1093

5453

#: bzrlib/errors.py:1103

5442

5454

msgid ""

5443

5455

"Excluding paths during commit is not supported by repository at %(repository)"

5444

5456

"r."

5445

5457

msgstr ""

5446

5458

5447

#: bzrlib/errors.py:1102

5459

#: bzrlib/errors.py:1112

5448

5460

msgid ""

5449

5461

"The specified commit message contains characters unsupported by the current "

5450

5462

"encoding."

5451

5463

msgstr ""

5452

5464

5453

#: bzrlib/errors.py:1108

5465

#: bzrlib/errors.py:1118

5454

5466

msgid "Upgrade URL cannot work with readonly URLs."

5455

5467

msgstr ""

5456

5468

5457

#: bzrlib/errors.py:1113

5469

#: bzrlib/errors.py:1123

5458

5470

msgid "The branch format %(format)s is already at the most recent format."

5459

5471

msgstr ""

5460

5472

5461

#: bzrlib/errors.py:1136

5473

#: bzrlib/errors.py:1146

5462

5474

msgid "Option --change does not accept revision ranges"

5463

5475

msgstr ""

5464

5476

5465

#: bzrlib/errors.py:1141

5477

#: bzrlib/errors.py:1151

5466

5478

msgid "No namespace registered for string: %(spec)r"

5467

5479

msgstr ""

5468

5480

5469

#: bzrlib/errors.py:1160

5481

#: bzrlib/errors.py:1170

5470

5482

msgid ""

5471

5483

"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"

5472

5484

"%(extra)s"

5473

5485

msgstr ""

5474

5486

5475

#: bzrlib/errors.py:1174

5487

#: bzrlib/errors.py:1184

5476

5488

msgid ""

5477

5489

"Operation denied because it would change the main history, which is not "

5478

5490

"permitted by the append_revisions_only setting on branch \"%(location)s\"."

5479

5491

msgstr ""

5480

5492

5481

#: bzrlib/errors.py:1185

5493

#: bzrlib/errors.py:1195

5482

5494

msgid ""

5483

5495

"These branches have diverged. Use the missing command to see how.\n"

5484

5496

"Use the merge command to reconcile them."

5485

5497

msgstr ""

5486

5498

5487

#: bzrlib/errors.py:1205

5499

#: bzrlib/errors.py:1215

5488

5500

msgid ""

5489

5501

"Branches have no common ancestor, and no merge base revision was specified."

5490

5502

msgstr ""

5491

5503

5492

#: bzrlib/errors.py:1211

5504

#: bzrlib/errors.py:1221

5493

5505

msgid ""

5494

5506

"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."

5495

5507

msgstr ""

5496

5508

5497

#: bzrlib/errors.py:1217

5509

#: bzrlib/errors.py:1227

5498

5510

msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"

5499

5511

msgstr ""

5500

5512

5501

#: bzrlib/errors.py:1226

5513

#: bzrlib/errors.py:1236

5502

5514

msgid ""

5503

5515

"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."

5504

5516

msgstr ""

5505

5517

5506

#: bzrlib/errors.py:1235

5518

#: bzrlib/errors.py:1245

5507

5519

msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"

5508

5520

msgstr ""

5509

5521

5510

#: bzrlib/errors.py:1244

5522

#: bzrlib/errors.py:1254

5511

5523

msgid "Branch %(branch)s has no commits."

5512

5524

msgstr ""

5513

5525

5514

#: bzrlib/errors.py:1262

5526

#: bzrlib/errors.py:1272

5515

5527

msgid ""

5516

5528

"Bound branch %(branch)s is out of date with master branch %(master)s."

5517

5529

"%(extra_help)s"

5518

5530

msgstr ""

5519

5531

5520

#: bzrlib/errors.py:1274

5532

#: bzrlib/errors.py:1284

5521

5533

msgid ""

5522

5534

"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "

5523

5535

"bound to %(remote)s."

5524

5536

msgstr ""

5525

5537

5526

#: bzrlib/errors.py:1286

5538

#: bzrlib/errors.py:1296

5527

5539

msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"

5528

5540

msgstr ""

5529

5541

5530

#: bzrlib/errors.py:1295

5542

#: bzrlib/errors.py:1305

5531

5543

msgid ""

5532

5544

"Unable to connect to target of bound branch %(branch)s => %(target)s: "

5533

5545

"%(error)s"

5534

5546

msgstr ""

5535

5547

5536

#: bzrlib/errors.py:1307

5548

#: bzrlib/errors.py:1317

5537

5549

msgid "Error in processing weave: %(msg)s"

5538

5550

msgstr ""

5539

5551

5540

#: bzrlib/errors.py:1316

5552

#: bzrlib/errors.py:1326

5541

5553

msgid "Revision {%(revision_id)s} already present in %(weave)s"

5542

5554

msgstr ""

5543

5555

5544

#: bzrlib/errors.py:1327

5556

#: bzrlib/errors.py:1337

5545

5557

msgid "Revision {%(revision_id)s} not present in %(weave)s"

5546

5558

msgstr ""

5547

5559

5548

#: bzrlib/errors.py:1337

5560

#: bzrlib/errors.py:1347

5549

5561

msgid "Weave invariant violated: %(what)s"

5550

5562

msgstr ""

5551

5563

5552

#: bzrlib/errors.py:1346

5564

#: bzrlib/errors.py:1356

5553

5565

msgid "Parents are mismatched between two revisions. %(msg)s"

5554

5566

msgstr ""

5555

5567

5556

#: bzrlib/errors.py:1368

5568

#: bzrlib/errors.py:1378

5557

5569

msgid ""

5558

5570

"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "

5559

5571

"%(weave_b)s"

5560

5572

msgstr ""

5561

5573

5562

#: bzrlib/errors.py:1380

5574

#: bzrlib/errors.py:1390

5563

5575

msgid "Versioned file error"

5564

5576

msgstr ""

5565

5577

5566

#: bzrlib/errors.py:1385

5578

#: bzrlib/errors.py:1395

5567

5579

msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."

5568

5580

msgstr ""

5569

5581

5570

#: bzrlib/errors.py:1395

5582

#: bzrlib/errors.py:1405

5571

5583

msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."

5572

5584

msgstr ""

5573

5585

5574

#: bzrlib/errors.py:1405

5586

#: bzrlib/errors.py:1415

5575

5587

msgid "Text did not match its checksum: %(msg)s"

5576

5588

msgstr ""

5577

5589

5578

#: bzrlib/errors.py:1531

5590

#: bzrlib/errors.py:1541

5579

5591

msgid "Export format %(format)r not supported"

5580

5592

msgstr ""

5581

5593

5582

#: bzrlib/errors.py:1540

5594

#: bzrlib/errors.py:1550

5583

5595

msgid "Transport error: %(msg)s %(orig_error)s"

5584

5596

msgstr ""

5585

5597

5586

#: bzrlib/errors.py:1566

5598

#: bzrlib/errors.py:1576

5587

5599

msgid "Generic bzr smart protocol error: %(details)s"

5588

5600

msgstr ""

5589

5601

5590

#: bzrlib/errors.py:1574

5602

#: bzrlib/errors.py:1584

5591

5603

msgid "Received bad protocol version marker: %(marker)r"

5592

5604

msgstr ""

5593

5605

5594

#: bzrlib/errors.py:1606

5606

#: bzrlib/errors.py:1616

5595

5607

msgid "Transport operation not possible: %(msg)s %(orig_error)s"

5596

5608

msgstr ""

5597

5609

5598

#: bzrlib/errors.py:1611

5610

#: bzrlib/errors.py:1621

5599

5611

msgid "Connection error: %(msg)s %(orig_error)s"

5600

5612

msgstr ""

5601

5613

5602

#: bzrlib/errors.py:1616

5614

#: bzrlib/errors.py:1626

5603

5615

msgid "%(msg)s %(host)s%(port)s%(orig_error)s"

5604

5616

msgstr ""

5605

5617

5606

#: bzrlib/errors.py:1637

5618

#: bzrlib/errors.py:1647

5607

5619

msgid "Connection closed: %(msg)s %(orig_error)s"

5608

5620

msgstr ""

5609

5621

5610

#: bzrlib/errors.py:1642

5622

#: bzrlib/errors.py:1652

5611

5623

msgid "Connection Timeout: %(msg)s%(orig_error)s"

5612

5624

msgstr ""

5613

5625

5614

#: bzrlib/errors.py:1647

5626

#: bzrlib/errors.py:1657

5615

5627

msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"

5616

5628

msgstr ""

5617

5629

5618

#: bzrlib/errors.py:1657

5630

#: bzrlib/errors.py:1667

5619

5631

msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"

5620

5632

msgstr ""

5621

5633

5622

#: bzrlib/errors.py:1672

5634

#: bzrlib/errors.py:1682

5635

msgid "Certificate error: %(error)s"

5636

msgstr ""

5637

5638

#: bzrlib/errors.py:1690

5623

5639

msgid "Invalid http range %(range)r for %(path)s: %(msg)s"

5624

5640

msgstr ""

5625

5641

5626

#: bzrlib/errors.py:1686

5642

#: bzrlib/errors.py:1704

5627

5643

msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"

5628

5644

msgstr ""

5629

5645

5630

#: bzrlib/errors.py:1694

5646

#: bzrlib/errors.py:1712

5631

5647

msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"

5632

5648

msgstr ""

5633

5649

5634

#: bzrlib/errors.py:1703

5650

#: bzrlib/errors.py:1721

5635

5651

msgid "%(source)s is%(permanently)s redirected to %(target)s"

5636

5652

msgstr ""

5637

5653

5638

#: bzrlib/errors.py:1717

5654

#: bzrlib/errors.py:1735

5639

5655

msgid "Too many redirections"

5640

5656

msgstr ""

5641

5657

5642

#: bzrlib/errors.py:1722

5658

#: bzrlib/errors.py:1740

5643

5659

msgid "Working tree has conflicts."

5644

5660

msgstr ""

5645

5661

5646

#: bzrlib/errors.py:1726

5662

#: bzrlib/errors.py:1744

5647

5663

msgid "Config file %(filename)s is not UTF-8 encoded\n"

5648

5664

msgstr ""

5649

5665

5650

#: bzrlib/errors.py:1735

5666

#: bzrlib/errors.py:1753

5651

5667

msgid ""

5652

5668

"Error(s) parsing config file %(filename)s:\n"

5653

5669

"%(errors)s"

5654

5670

msgstr ""

5655

5671

5656

#: bzrlib/errors.py:1746

5657

msgid "Bad value \"%(value)s\" for option \"%(name)s\"."

5672

#: bzrlib/errors.py:1763

5673

msgid ""

5674

"Bad value \"%(value)s\" for option \"%(name)s\".\n"

5675

"See ``bzr help %(name)s``"

5658

5676

msgstr ""

5659

5677

5660

#: bzrlib/errors.py:1754

5678

#: bzrlib/errors.py:1773

5661

5679

msgid "%(username)r does not seem to contain a reasonable email address"

5662

5680

msgstr ""

5663

5681

5664

#: bzrlib/errors.py:1763

5682

#: bzrlib/errors.py:1782

5665

5683

msgid "Failed to GPG sign data with command \"%(command_line)s\""

5666

5684

msgstr ""

5667

5685

5668

#: bzrlib/errors.py:1771

5686

#: bzrlib/errors.py:1790

5669

5687

msgid "Failed to verify GPG signature data with error \"%(error)s\""

5670

5688

msgstr ""

5671

5689

5672

#: bzrlib/errors.py:1779

5690

#: bzrlib/errors.py:1798

5673

5691

msgid "Unable to import library \"%(library)s\": %(error)s"

5674

5692

msgstr ""

5675

5693

5676

#: bzrlib/errors.py:1787

5694

#: bzrlib/errors.py:1806

5677

5695

msgid "python-gpgme is not installed, it is needed to verify signatures"

5678

5696

msgstr ""

5679

5697

5680

#: bzrlib/errors.py:1795

5698

#: bzrlib/errors.py:1814

5681

5699

msgid ""

5682

5700

"The working tree for %(basedir)s has changed since the last commit, but "

5683

5701

"weave merge requires that it be unchanged"

5684

5702

msgstr ""

5685

5703

5686

#: bzrlib/errors.py:1805

5704

#: bzrlib/errors.py:1824

5687

5705

msgid ""

5688

5706

"Can't reprocess and show base, because reprocessing obscures the "

5689

5707

"relationship of conflicting lines to the base"

5690

5708

msgstr ""

5691

5709

5692

#: bzrlib/errors.py:1811

5710

#: bzrlib/errors.py:1830

5693

5711

msgid "Cycle in graph %(graph)r"

5694

5712

msgstr ""

5695

5713

5696

#: bzrlib/errors.py:1839

5714

#: bzrlib/errors.py:1858

5697

5715

msgid "File %(filename)s is not conflicted."

5698

5716

msgstr ""

5699

5717

5700

#: bzrlib/errors.py:1861

5718

#: bzrlib/errors.py:1880

5701

5719

msgid "No bundle was found in \"%(filename)s\"."

5702

5720

msgstr ""

5703

5721

5704

#: bzrlib/errors.py:1870

5722

#: bzrlib/errors.py:1889

5705

5723

msgid "Unable to handle bundle version %(version)s: %(msg)s"

5706

5724

msgstr ""

5707

5725

5708

#: bzrlib/errors.py:1880

5726

#: bzrlib/errors.py:1899

5709

5727

msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"

5710

5728

msgstr ""

5711

5729

5712

#: bzrlib/errors.py:1893

5730

#: bzrlib/errors.py:1912

5713

5731

msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"

5714

5732

msgstr ""

5715

5733

5716

#: bzrlib/errors.py:1903

5734

#: bzrlib/errors.py:1922

5717

5735

msgid "Key %(key)s is already present in map"

5718

5736

msgstr ""

5719

5737

5720

#: bzrlib/errors.py:1908

5738

#: bzrlib/errors.py:1927

5721

5739

msgid "The prefix %(prefix)s is in the help search path twice."

5722

5740

msgstr ""

5723

5741

5724

#: bzrlib/errors.py:1918

5742

#: bzrlib/errors.py:1937

5725

5743

msgid ""

5726

5744

"No final name for trans_id %(trans_id)r\n"

5727

5745

"file-id: %(file_id)r\n"

5728

5746

"root trans-id: %(root_trans_id)r\n"

5729

5747

msgstr ""

5730

5748

5731

#: bzrlib/errors.py:1950

5749

#: bzrlib/errors.py:1969

5732

5750

msgid "Attempt to reuse a transform that has already been applied."

5733

5751

msgstr ""

5734

5752

5735

#: bzrlib/errors.py:1955

5753

#: bzrlib/errors.py:1974

5736

5754

msgid "Moving the root directory is not supported at this time"

5737

5755

msgstr ""

5738

5756

5739

#: bzrlib/errors.py:1960

5757

#: bzrlib/errors.py:1979

5740

5758

msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"

5741

5759

msgstr ""

5742

5760

5743

#: bzrlib/errors.py:1971

5761

#: bzrlib/errors.py:1990

5744

5762

msgid ""

5745

5763

"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5746

5764

msgstr ""

5747

5765

5748

#: bzrlib/errors.py:2007

5766

#: bzrlib/errors.py:2026

5749

5767

msgid ""

5750

5768

"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5751

5769

msgstr ""

5752

5770

5753

#: bzrlib/errors.py:2037

5771

#: bzrlib/errors.py:2056

5754

5772

msgid "Unable to import paramiko (required for sftp support): %(error)s"

5755

5773

msgstr ""

5756

5774

5757

#: bzrlib/errors.py:2045

5775

#: bzrlib/errors.py:2064

5758

5776

msgid "Nothing to merge."

5759

5777

msgstr ""

5760

5778

5761

#: bzrlib/errors.py:2050

5779

#: bzrlib/errors.py:2069

5762

5780

msgid "Format %(format)s cannot be initialised by this version of bzr."

5763

5781

msgstr ""

5764

5782

5765

#: bzrlib/errors.py:2059

5783

#: bzrlib/errors.py:2078

5766

5784

msgid ""

5767

5785

"Cannot convert from format %(from_format)s to format %(format)s. "

5768

5786

"%(problem)s"

5769

5787

msgstr ""

5770

5788

5771

#: bzrlib/errors.py:2071

5789

#: bzrlib/errors.py:2090

5772

5790

msgid "Could not find an appropriate Differ for file \"%(path)s\""

5773

5791

msgstr ""

5774

5792

5775

#: bzrlib/errors.py:2079

5793

#: bzrlib/errors.py:2098

5776

5794

msgid "%(exe_name)s could not be found on this machine"

5777

5795

msgstr ""

5778

5796

5779

#: bzrlib/errors.py:2087

5797

#: bzrlib/errors.py:2106

5780

5798

msgid "Diff is not installed on this machine: %(msg)s"

5781

5799

msgstr ""

5782

5800

5783

#: bzrlib/errors.py:2095

5801

#: bzrlib/errors.py:2114

5784

5802

msgid "Diff3 is not installed on this machine."

5785

5803

msgstr ""

5786

5804

5787

#: bzrlib/errors.py:2101

5805

#: bzrlib/errors.py:2120

5788

5806

msgid "The content being inserted is already present."

5789

5807

msgstr ""

5790

5808

5791

#: bzrlib/errors.py:2106

5809

#: bzrlib/errors.py:2125

5792

5810

msgid ""

5793

5811

"This tree contains left-over files from a failed operation.\n"

5794

5812

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5796

5814

" keep, and delete it when you are done."

5797

5815

msgstr ""

5798

5816

5799

#: bzrlib/errors.py:2117

5817

#: bzrlib/errors.py:2136

5800

5818

msgid ""

5801

5819

"This tree contains left-over files from a failed operation.\n"

5802

5820

" Please examine %(pending_deletion)s to see if it contains any files you\n"

5803

5821

" wish to keep, and delete it when you are done."

5804

5822

msgstr ""

5805

5823

5806

#: bzrlib/errors.py:2127

5824

#: bzrlib/errors.py:2146

5807

5825

msgid ""

5808

5826

"Unable to delete transform temporary directory %(limbo_dir)s.\n"

5809

5827

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5811

5829

" keep, and delete it when you are done."

5812

5830

msgstr ""

5813

5831

5814

#: bzrlib/errors.py:2138

5832

#: bzrlib/errors.py:2157

5815

5833

msgid ""

5816

5834

"Unable to delete transform temporary directory %(pending_deletion)s. Please "

5817

5835

"examine %(pending_deletion)s to see if it contains any files you wish to "

5818

5836

"keep, and delete it when you are done."

5819

5837

msgstr ""

5820

5838

5821

#: bzrlib/errors.py:2148

5839

#: bzrlib/errors.py:2167

5822

5840

msgid "Working tree is out of date, please run 'bzr update'.%(more)s"

5823

5841

msgstr ""

5824

5842

5825

#: bzrlib/errors.py:2162

5843

#: bzrlib/errors.py:2181

5826

5844

msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."

5827

5845

msgstr ""

5828

5846

5829

#: bzrlib/errors.py:2175

5847

#: bzrlib/errors.py:2194

5830

5848

msgid "Error in merge modified format"

5831

5849

msgstr ""

5832

5850

5833

#: bzrlib/errors.py:2180

5851

#: bzrlib/errors.py:2199

5834

5852

msgid "Format error in conflict listings"

5835

5853

msgstr ""

5836

5854

5837

#: bzrlib/errors.py:2184

5855

#: bzrlib/errors.py:2203

5838

5856

msgid ""

5839

5857

"Inconsistency in dirstate file %(dirstate_path)s.\n"

5840

5858

"Error: %(description)s"

5841

5859

msgstr ""

5842

5860

5843

#: bzrlib/errors.py:2195

5861

#: bzrlib/errors.py:2214

5844

5862

msgid ""

5845

5863

"An error has been detected in the repository %(repo_path)s.\n"

5846

5864

"Please run bzr reconcile on this repository."

5847

5865

msgstr ""

5848

5866

5849

#: bzrlib/errors.py:2206

5867

#: bzrlib/errors.py:2225

5850

5868

msgid ""

5851

5869

"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"

5852

5870

"reason: %(reason)s"

5853

5871

msgstr ""

5854

5872

5855

#: bzrlib/errors.py:2219

5873

#: bzrlib/errors.py:2238

5856

5874

msgid ""

5857

5875

"An inconsistent delta was supplied: %(delta)r\n"

5858

5876

"reason: %(reason)s"

5859

5877

msgstr ""

5860

5878

5861

#: bzrlib/errors.py:2231

5879

#: bzrlib/errors.py:2250

5862

5880

msgid "To use this feature you must upgrade your branch at %(path)s."

5863

5881

msgstr ""

5864

5882

5865

#: bzrlib/errors.py:2240

5883

#: bzrlib/errors.py:2259

5866

5884

msgid "To use this feature you must upgrade your repository at %(path)s."

5867

5885

msgstr ""

5868

5886

5869

#: bzrlib/errors.py:2245

5887

#: bzrlib/errors.py:2264

5870

5888

msgid ""

5871

5889

"To use this feature you must upgrade your branch at %(path)s to a format "

5872

5890

"which supports rich roots."

5873

5891

msgstr ""

5874

5892

5875

#: bzrlib/errors.py:2251

5893

#: bzrlib/errors.py:2270

5876

5894

msgid "Cannot perform local-only commits on unbound branches."

5877

5895

msgstr ""

5878

5896

5879

#: bzrlib/errors.py:2256

5897

#: bzrlib/errors.py:2275

5880

5898

msgid "The method %(mname)s is not supported on objects of type %(tname)s."

5881

5899

msgstr ""

5882

5900

5883

#: bzrlib/errors.py:2277

5901

#: bzrlib/errors.py:2296

5884

5902

msgid "Ghost tags not supported by format %(format)r."

5885

5903

msgstr ""

5886

5904

5887

#: bzrlib/errors.py:2285

5905

#: bzrlib/errors.py:2304

5888

5906

msgid "File is binary but should be text."

5889

5907

msgstr ""

5890

5908

5891

#: bzrlib/errors.py:2290

5909

#: bzrlib/errors.py:2309

5892

5910

msgid "The path %(path)s is not permitted on this platform"

5893

5911

msgstr ""

5894

5912

5895

#: bzrlib/errors.py:2299

5913

#: bzrlib/errors.py:2318

5896

5914

msgid ""

5897

5915

"Testament did not match expected value.\n"

5898

5916

" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"

5899

5917

" {%(measured)s}"

5900

5918

msgstr ""

5901

5919

5902

#: bzrlib/errors.py:2311

5920

#: bzrlib/errors.py:2330

5903

5921

msgid "Not a bzr revision-bundle: %(text)r"

5904

5922

msgstr ""

5905

5923

5906

#: bzrlib/errors.py:2320

5924

#: bzrlib/errors.py:2339

5907

5925

msgid "Bad bzr revision-bundle: %(text)r"

5908

5926

msgstr ""

5909

5927

5910

#: bzrlib/errors.py:2329

5928

#: bzrlib/errors.py:2348

5911

5929

msgid "Malformed bzr revision-bundle header: %(text)r"

5912

5930

msgstr ""

5913

5931

5914

#: bzrlib/errors.py:2334

5932

#: bzrlib/errors.py:2353

5915

5933

msgid "Malformed patches in bzr revision-bundle: %(text)r"

5916

5934

msgstr ""

5917

5935

5918

#: bzrlib/errors.py:2339

5936

#: bzrlib/errors.py:2358

5919

5937

msgid "Malformed footer in bzr revision-bundle: %(text)r"

5920

5938

msgstr ""

5921

5939

5922

#: bzrlib/errors.py:2344

5940

#: bzrlib/errors.py:2363

5923

5941

msgid "End of line marker was not \\n in bzr revision-bundle"

5924

5942

msgstr ""

5925

5943

5926

#: bzrlib/errors.py:2354

5944

#: bzrlib/errors.py:2373

5927

5945

msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"

5928

5946

msgstr ""

5929

5947

5930

#: bzrlib/errors.py:2364

5948

#: bzrlib/errors.py:2383

5931

5949

msgid "Root class for inventory serialization errors"

5932

5950

msgstr ""

5933

5951

5934

#: bzrlib/errors.py:2368

5952

#: bzrlib/errors.py:2387

5935

5953

msgid ""

5936

5954

"The inventory was not in the expected format:\n"

5937

5955

" %(msg)s"

5938

5956

msgstr ""

5939

5957

5940

#: bzrlib/errors.py:2377

5958

#: bzrlib/errors.py:2396

5941

5959

msgid "This operation requires rich root data storage"

5942

5960

msgstr ""

5943

5961

5944

#: bzrlib/errors.py:2390

5962

#: bzrlib/errors.py:2409

5945

5963

msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"

5946

5964

msgstr ""

5947

5965

5948

#: bzrlib/errors.py:2399

5966

#: bzrlib/errors.py:2418

5949

5967

msgid ""

5950

5968

"Don't know how to handle SSH connections. Please set BZR_SSH environment "

5951

5969

"variable."

5952

5970

msgstr ""

5953

5971

5954

#: bzrlib/errors.py:2406

5972

#: bzrlib/errors.py:2425

5955

5973

msgid ""

5956

5974

"Could not determine revno for {%(revision_id)s} because its ancestry shows a "

5957

5975

"ghost at {%(ghost_revision_id)s}"

5958

5976

msgstr ""

5959

5977

5960

#: bzrlib/errors.py:2416

5978

#: bzrlib/errors.py:2435

5961

5979

msgid "Ghost revision {%(revision_id)s} cannot be used here."

5962

5980

msgstr ""

5963

5981

5964

#: bzrlib/errors.py:2467

5982

#: bzrlib/errors.py:2486

5965

5983

msgid ""

5966

5984

"A merge directive must provide either a bundle or a public branch location."

5967

5985

msgstr ""

5968

5986

5969

#: bzrlib/errors.py:2474

5987

#: bzrlib/errors.py:2493

5970

5988

msgid "Bad merge directive payload %(start)r"

5971

5989

msgstr ""

5972

5990

5973

#: bzrlib/errors.py:2484

5991

#: bzrlib/errors.py:2503

5974

5992

msgid "Preview patch does not match requested changes."

5975

5993

msgstr ""

5976

5994

5977

#: bzrlib/errors.py:2490

5995

#: bzrlib/errors.py:2509

5978

5996

msgid "Patch_type was %(patch_type)s, but no patch was supplied."

5979

5997

msgstr ""

5980

5998

5981

#: bzrlib/errors.py:2500

5999

#: bzrlib/errors.py:2519

5982

6000

msgid ""

5983

6001

"Your branch does not have all of the revisions required in order to merge "

5984

6002

"this merge directive and the target location specified in the merge "

5985

6003

"directive is not a branch: %(location)s."

5986

6004

msgstr ""

5987

6005

5988

#: bzrlib/errors.py:2512

6006

#: bzrlib/errors.py:2531

5989

6007

msgid "Unsupported entry kind %(kind)s"

5990

6008

msgstr ""

5991

6009

5992

#: bzrlib/errors.py:2520

6010

#: bzrlib/errors.py:2539

5993

6011

msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"

5994

6012

msgstr ""

5995

6013

5996

#: bzrlib/errors.py:2530

6014

#: bzrlib/errors.py:2549

5997

6015

msgid "Subsume target %(other_tree)s needs to be upgraded."

5998

6016

msgstr ""

5999

6017

6000

#: bzrlib/errors.py:2549

6018

#: bzrlib/errors.py:2568

6001

6019

msgid "No such tag: %(tag_name)s"

6002

6020

msgstr ""

6003

6021

6004

#: bzrlib/errors.py:2557

6022

#: bzrlib/errors.py:2576

6005

6023

msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."

6006

6024

msgstr ""

6007

6025

6008

#: bzrlib/errors.py:2566

6026

#: bzrlib/errors.py:2585

6009

6027

msgid "Tag %(tag_name)s already exists."

6010

6028

msgstr ""

6011

6029

6012

#: bzrlib/errors.py:2574

6030

#: bzrlib/errors.py:2593

6013

6031

msgid ""

6014

6032

"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"

6015

6033

"\" for more information on this feature."

6016

6034

msgstr ""

6017

6035

6018

#: bzrlib/errors.py:2584

6036

#: bzrlib/errors.py:2603

6019

6037

msgid ""

6020

6038

"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"

6021

6039

msgstr ""

6022

6040

6023

#: bzrlib/errors.py:2594

6041

#: bzrlib/errors.py:2613

6024

6042

msgid ""

6025

6043

"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"

6026

6044

msgstr ""

6027

6045

6028

#: bzrlib/errors.py:2604

6046

#: bzrlib/errors.py:2623

6029

6047

msgid "Invalid line in bugs property: '%(line)s'"

6030

6048

msgstr ""

6031

6049

6032

#: bzrlib/errors.py:2612

6050

#: bzrlib/errors.py:2631

6033

6051

msgid "Invalid bug status: '%(status)s'"

6034

6052

msgstr ""

6035

6053

6036

#: bzrlib/errors.py:2620

6054

#: bzrlib/errors.py:2639

6037

6055

msgid "Could not understand response from smart server: %(response_tuple)r"

6038

6056

msgstr ""

6039

6057

6040

#: bzrlib/errors.py:2659

6058

#: bzrlib/errors.py:2678

6041

6059

msgid "Server sent an unexpected error: %(error_tuple)r"

6042

6060

msgstr ""

6043

6061

6044

#: bzrlib/errors.py:2678

6062

#: bzrlib/errors.py:2697

6045

6063

msgid "Unrecognised container format: %(container_format)r"

6046

6064

msgstr ""

6047

6065

6048

#: bzrlib/errors.py:2686

6066

#: bzrlib/errors.py:2705

6049

6067

msgid "Unexpected end of container stream"

6050

6068

msgstr ""

6051

6069

6052

#: bzrlib/errors.py:2691

6070

#: bzrlib/errors.py:2710

6053

6071

msgid "Unknown record type: %(record_type)r"

6054

6072

msgstr ""

6055

6073

6056

#: bzrlib/errors.py:2699

6074

#: bzrlib/errors.py:2718

6057

6075

msgid "Invalid record: %(reason)s"

6058

6076

msgstr ""

6059

6077

6060

#: bzrlib/errors.py:2707

6078

#: bzrlib/errors.py:2726

6061

6079

msgid "Container has data after end marker: %(excess)r"

6062

6080

msgstr ""

6063

6081

6064

#: bzrlib/errors.py:2715

6082

#: bzrlib/errors.py:2734

6065

6083

msgid "Container has multiple records with the same name: %(name)s"

6066

6084

msgstr ""

6067

6085

6068

#: bzrlib/errors.py:2728

6086

#: bzrlib/errors.py:2747

6069

6087

msgid "Corrupt or incompatible data stream: %(reason)s"

6070

6088

msgstr ""

6071

6089

6072

#: bzrlib/errors.py:2736

6090

#: bzrlib/errors.py:2755

6073

6091

msgid "SMTP error: %(error)s"

6074

6092

msgstr ""

6075

6093

6076

#: bzrlib/errors.py:2744

6094

#: bzrlib/errors.py:2763

6077

6095

msgid "No message supplied."

6078

6096

msgstr ""

6079

6097

6080

#: bzrlib/errors.py:2749

6098

#: bzrlib/errors.py:2768

6081

6099

msgid "No mail-to address (--mail-to) or output (-o) specified."

6082

6100

msgstr ""

6083

6101

6084

#: bzrlib/errors.py:2754

6102

#: bzrlib/errors.py:2773

6085

6103

msgid "Unknown mail client: %(mail_client)s"

6086

6104

msgstr ""

6087

6105

6088

#: bzrlib/errors.py:2762

6106

#: bzrlib/errors.py:2781

6089

6107

msgid ""

6090

6108

"Unable to find mail client with the following names: "

6091

6109

"%(mail_command_list_string)s"

6092

6110

msgstr ""

6093

6111

6094

#: bzrlib/errors.py:2772

6112

#: bzrlib/errors.py:2791

6095

6113

msgid "SMTP connection to %(host)s refused"

6096

6114

msgstr ""

6097

6115

6098

#: bzrlib/errors.py:2781

6116

#: bzrlib/errors.py:2800

6099

6117

msgid "Please specify smtp_server. No server at default %(host)s."

6100

6118

msgstr ""

6101

6119

6102

#: bzrlib/errors.py:2795

6120

#: bzrlib/errors.py:2814

6103

6121

msgid ""

6104

6122

"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"

6105

6123

"reconfigure."

6106

6124

msgstr ""

6107

6125

6108

#: bzrlib/errors.py:2807

6126

#: bzrlib/errors.py:2826

6109

6127

msgid "'%(display_url)s' is already a branch."

6110

6128

msgstr ""

6111

6129

6112

#: bzrlib/errors.py:2812

6130

#: bzrlib/errors.py:2831

6113

6131

msgid "'%(display_url)s' is already a tree."

6114

6132

msgstr ""

6115

6133

6116

#: bzrlib/errors.py:2817

6134

#: bzrlib/errors.py:2836

6117

6135

msgid "'%(display_url)s' is already a checkout."

6118

6136

msgstr ""

6119

6137

6120

#: bzrlib/errors.py:2822

6138

#: bzrlib/errors.py:2841

6121

6139

msgid "'%(display_url)s' is already a lightweight checkout."

6122

6140

msgstr ""

6123

6141

6124

#: bzrlib/errors.py:2827

6142

#: bzrlib/errors.py:2846

6125

6143

msgid "'%(display_url)s' is already using a shared repository."

6126

6144

msgstr ""

6127

6145

6128

#: bzrlib/errors.py:2832

6146

#: bzrlib/errors.py:2851

6129

6147

msgid "'%(display_url)s' is already standalone."

6130

6148

msgstr ""

6131

6149

6132

#: bzrlib/errors.py:2837

6150

#: bzrlib/errors.py:2856

6133

6151

msgid "Shared repository '%(display_url)s' already creates working trees."

6134

6152

msgstr ""

6135

6153

6136

#: bzrlib/errors.py:2843

6154

#: bzrlib/errors.py:2862

6137

6155

msgid ""

6138

6156

"Shared repository '%(display_url)s' already doesn't create working trees."

6139

6157

msgstr ""

6140

6158

6141

#: bzrlib/errors.py:2849

6159

#: bzrlib/errors.py:2868

6142

6160

msgid "Requested reconfiguration of '%(display_url)s' is not supported."

6143

6161

msgstr ""

6144

6162

6145

#: bzrlib/errors.py:2854

6163

#: bzrlib/errors.py:2873

6146

6164

msgid "No location could be found to bind to at %(display_url)s."

6147

6165

msgstr ""

6148

6166

6149

#: bzrlib/errors.py:2859

6167

#: bzrlib/errors.py:2878

6150

6168

msgid ""

6151

6169

"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."

6152

6170

"%(more)s"

6153

6171

msgstr ""

6154

6172

6155

#: bzrlib/errors.py:2878

6173

#: bzrlib/errors.py:2897

6156

6174

msgid ""

6157

6175

"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."

6158

6176

"%(more)s"

6159

6177

msgstr ""

6160

6178

6161

#: bzrlib/errors.py:2884

6179

#: bzrlib/errors.py:2903

6162

6180

msgid "Variable {%(name)s} is not available."

6163

6181

msgstr ""

6164

6182

6165

#: bzrlib/errors.py:2892

6183

#: bzrlib/errors.py:2911

6166

6184

msgid "No template specified."

6167

6185

msgstr ""

6168

6186

6169

#: bzrlib/errors.py:2897

6187

#: bzrlib/errors.py:2916

6170

6188

msgid "Unable to create symlink %(path_str)son this platform"

6171

6189

msgstr ""

6172

6190

6173

#: bzrlib/errors.py:2912

6191

#: bzrlib/errors.py:2931

6174

6192

msgid ""

6175

6193

"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"

6176

6194

"\", \"local\"."

6177

6195

msgstr ""

6178

6196

6179

#: bzrlib/errors.py:2946

6197

#: bzrlib/errors.py:2965

6180

6198

msgid ""

6181

6199

"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"

6182

6200

msgstr ""

6183

6201

6184

#: bzrlib/errors.py:2958

6202

#: bzrlib/errors.py:2977

6185

6203

msgid "The \"%(config_id)s\" configuration does not exist."

6186

6204

msgstr ""

6187

6205

6188

#: bzrlib/errors.py:2966

6206

#: bzrlib/errors.py:2985

6189

6207

msgid "The \"%(option_name)s\" configuration option does not exist."

6190

6208

msgstr ""

6191

6209

6192

#: bzrlib/errors.py:2974

6210

#: bzrlib/errors.py:2993

6193

6211

msgid "The alias \"%(alias_name)s\" does not exist."

6194

6212

msgstr ""

6195

6213

6196

#: bzrlib/errors.py:2988

6214

#: bzrlib/errors.py:3007

6197

6215

msgid "\"%(alias_name)s\" is not a valid location alias."

6198

6216

msgstr ""

6199

6217

6200

#: bzrlib/errors.py:2996

6218

#: bzrlib/errors.py:3015

6201

6219

msgid "No %(alias_name)s location assigned."

6202

6220

msgstr ""

6203

6221

6204

#: bzrlib/errors.py:3004

6222

#: bzrlib/errors.py:3023

6205

6223

msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."

6206

6224

msgstr ""

6207

6225

6208

#: bzrlib/errors.py:3014

6226

#: bzrlib/errors.py:3033

6209

6227

msgid "Unknown rules detected: %(unknowns_str)s."

6210

6228

msgstr ""

6211

6229

6212

#: bzrlib/errors.py:3025

6230

#: bzrlib/errors.py:3044

6213

6231

msgid "Tip change rejected: %(msg)s"

6214

6232

msgstr ""

6215

6233

6216

#: bzrlib/errors.py:3033

6234

#: bzrlib/errors.py:3052

6217

6235

msgid "Shelf corrupt."

6218

6236

msgstr ""

6219

6237

6220

#: bzrlib/errors.py:3038

6238

#: bzrlib/errors.py:3057

6221

6239

msgid "Corruption while decompressing repository file%(orig_error)s"

6222

6240

msgstr ""

6223

6241

6224

#: bzrlib/errors.py:3050

6242

#: bzrlib/errors.py:3069

6225

6243

msgid "No changes are shelved with id \"%(shelf_id)d\"."

6226

6244

msgstr ""

6227

6245

6228

#: bzrlib/errors.py:3058

6246

#: bzrlib/errors.py:3077

6229

6247

msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."

6230

6248

msgstr ""

6231

6249

6232

#: bzrlib/errors.py:3066

6250

#: bzrlib/errors.py:3085

6233

6251

msgid "An attempt to access a url outside the server jail was made: '%(url)s'."

6234

6252

msgstr ""

6235

6253

6236

#: bzrlib/errors.py:3074

6254

#: bzrlib/errors.py:3093

6237

6255

msgid "The user aborted the operation."

6238

6256

msgstr ""

6239

6257

6240

#: bzrlib/errors.py:3079

6258

#: bzrlib/errors.py:3098

6241

6259

msgid "Branching '%(url)s'(%(format)s) must create a working tree."

6242

6260

msgstr ""

6243

6261

6244

#: bzrlib/errors.py:3089

6262

#: bzrlib/errors.py:3108

6245

6263

msgid "No such view: %(view_name)s."

6246

6264

msgstr ""

6247

6265

6248

#: bzrlib/errors.py:3099

6266

#: bzrlib/errors.py:3118

6249

6267

msgid ""

6250

6268

"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "

6251

6269

"to a later format."

6252

6270

msgstr ""

6253

6271

6254

#: bzrlib/errors.py:3108

6272

#: bzrlib/errors.py:3127

6255

6273

msgid ""

6256

6274

"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"

6257

6275

msgstr ""

6258

6276

6259

#: bzrlib/errors.py:3175

6277

#: bzrlib/errors.py:3194

6260

6278

msgid "%(bzrdir)r does not support co-located branches."

6261

6279

msgstr ""

6262

6280

6263

#: bzrlib/errors.py:3181

6281

#: bzrlib/errors.py:3200

6264

6282

msgid ""

6265

6283

"Unable to determine your name.\n"

6266

6284

"Please, set your name with the 'whoami' command.\n"

6267

6285

"E.g. bzr whoami \"Your Name <name@example.com>\""

6268

6286

msgstr ""

6269

6287

6270

#: bzrlib/errors.py:3190

6288

#: bzrlib/errors.py:3209

6271

6289

msgid "Invalid pattern(s) found. %(msg)s"

6272

6290

msgstr ""

6273

6291

6274

#: bzrlib/errors.py:3198

6292

#: bzrlib/errors.py:3217

6275

6293

msgid ""

6276

6294

"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "

6277

6295

"unbind` to fix."

6278

6296

msgstr ""

6279

6297

6280

#: bzrlib/errors.py:3209

6298

#: bzrlib/errors.py:3228

6281

6299

msgid "Loop involving %(refs)r while expanding \"%(string)s\"."

6282

6300

msgstr ""

6283

6301

6284

#: bzrlib/errors.py:3218

6302

#: bzrlib/errors.py:3237

6285

6303

msgid "Option %(name)s is not defined while expanding \"%(string)s\"."

6286

6304

msgstr ""

6287

6305

6288

#: bzrlib/errors.py:3227

6306

#: bzrlib/errors.py:3246

6289

6307

msgid ""

6290

6308

"No compatible object available for operations from %(source)r to %(target)r."

6291

6309

msgstr ""

6292

6310

6293

#: bzrlib/errors.py:3237

6311

#: bzrlib/errors.py:3256

6294

6312

msgid ""

6295

6313

"VFS requests over the smart server are not allowed. Encountered: %(method)s, "

6296

6314

"%(arguments)s."

6297

6315

msgstr ""

6298

6316

6299

#: bzrlib/errors.py:3247

6317

#: bzrlib/errors.py:3266

6300

6318

msgid ""

6301

6319

"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "

6302

6320

"format %(format)r"

6303

6321

msgstr ""

6304

6322

6305

#: bzrlib/errors.py:3259

6323

#: bzrlib/errors.py:3278

6306

6324

msgid ""

6307

6325

"Missing feature %(feature)s not provided by this version of Bazaar or any "

6308

6326

"plugin."

6309

6327

msgstr ""

6310

6328

6311

#: bzrlib/errors.py:3272

6329

#: bzrlib/errors.py:3291

6312

6330

msgid "Binary files section encountered."

6313

6331

msgstr ""

6314

6332

6315

#: bzrlib/errors.py:3280

6333

#: bzrlib/errors.py:3299

6316

6334

msgid ""

6317

6335

"Malformed patch header. %(desc)s\n"

6318

6336

"%(line)r"

6319

6337

msgstr ""

6320

6338

6321

#: bzrlib/errors.py:3289

6339

#: bzrlib/errors.py:3308

6322

6340

msgid ""

6323

6341

"Malformed hunk header. %(desc)s\n"

6324

6342

"%(line)r"

6325

6343

msgstr ""

6326

6344

6327

#: bzrlib/errors.py:3298

6345

#: bzrlib/errors.py:3317

6328

6346

msgid ""

6329

6347

"Malformed line. %(desc)s\n"

6330

6348

"%(line)r"

6331

6349

msgstr ""

6332

6350

6333

#: bzrlib/errors.py:3308

6351

#: bzrlib/errors.py:3327

6334

6352

msgid ""

6335

6353

"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "

6336

6354

"but patch says it should be \"%(patch_line)s\""

6337

6355

msgstr ""

6338

6356

6339

#: bzrlib/errors.py:3319

6357

#: bzrlib/errors.py:3338

6340

6358

msgid "The feature %(feature)s has already been registered."

6341

6359

msgstr ""

6342

6360

6693

6711

msgid "lstat/stat of ({0!r}): {1!r}"

6694

6712

msgstr ""

6695

6713

6696

#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008

6714

#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019

6697

6715

#, python-format

6698

6716

msgid "sorry, %r not allowed in path"

6699

6717

msgstr ""

6700

6718

6701

#: bzrlib/osutils.py:1226

6719

#: bzrlib/osutils.py:1237

6702

6720

#, python-format

6703

6721

msgid "%r is too short to calculate a relative path"

6704

6722

msgstr ""

7158

7176

msgid "Created new branch."

7159

7177

msgstr ""

7160

7178

7161

#: bzrlib/push.py:98

7179

#: bzrlib/push.py:97

7162

7180

#, python-format

7163

7181

msgid ""

7164

7182

"Target directory %s already contains a .bzr directory, but it is not valid."

7285

7303

msgid "%s is now not stacked\n"

7286

7304

msgstr ""

7287

7305

7288

#: bzrlib/remote.py:1180 bzrlib/repository.py:289

7306

#: bzrlib/remote.py:1228 bzrlib/repository.py:289

7289

7307

#, python-format

7290

7308

msgid "bzr: ERROR (ignored): %s"

7291

7309

msgstr ""

7292

7310

7293

#: bzrlib/remote.py:2493

7311

#: bzrlib/remote.py:2541

7294

7312

msgid "Copying repository content as tarball..."

7295

7313

msgstr ""

7296

7314

7505

7523

msgid "listening on port: %s"

7506

7524

msgstr ""

7507

7525

7508

#: bzrlib/switch.py:69

7526

#: bzrlib/switch.py:73

7509

7527

msgid "Pending merges must be committed or reverted before using switch."

7510

7528

msgstr ""

7511

7529

7512

#: bzrlib/switch.py:96

7530

#: bzrlib/switch.py:100

7513

7531

msgid ""

7514

7532

"Cannot switch as local commits found in the checkout. Commit these to the "

7515

7533

"bound branch or use --force to throw them away."

7516

7534

msgstr ""

7517

7535

7518

#: bzrlib/switch.py:101

7536

#: bzrlib/switch.py:105

7519

7537

#, python-format

7520

7538

msgid ""

7521

7539

"Unable to connect to current master branch %(target)s: %(error)s To switch "

7522

7540

"anyway, use --force."

7523

7541

msgstr ""

7524

7542

7525

#: bzrlib/switch.py:110

7543

#: bzrlib/switch.py:125

7526

7544

msgid "Cannot switch a branch, only a checkout."

7527

7545

msgstr ""

7528

7546

7529

#: bzrlib/switch.py:146

7547

#: bzrlib/switch.py:163

7530

7548

#, python-format

7531

7549

msgid "Tree is up to date at revision %d."

7532

7550

msgstr ""

7533

7551

7534

#: bzrlib/switch.py:152

7552

#: bzrlib/switch.py:169

7535

7553

#, python-format

7536

7554

msgid "Updated to revision %d."

7537

7555

msgstr ""

7538

7556

7539

#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743

7557

#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747

7540

7558

msgid "Apply phase"

7541

7559

msgstr ""

7542

7560

7543

#: bzrlib/transform.py:1769 bzrlib/transform.py:1837

7561

#: bzrlib/transform.py:1773 bzrlib/transform.py:1841

7544

7562

msgid "removing file"

7545

7563

msgstr ""

7546

7564

7547

#: bzrlib/transform.py:1787 bzrlib/transform.py:1872

7565

#: bzrlib/transform.py:1791 bzrlib/transform.py:1876

7548

7566

msgid "adding file"

7549

7567

msgstr ""

7550

7568

7551

#: bzrlib/transform.py:2587

7569

#: bzrlib/transform.py:2591

7552

7570

msgid "Building tree"

7553

7571

msgstr ""

7554

7572

7555

#: bzrlib/transform.py:2677 bzrlib/transform.py:2704

7573

#: bzrlib/transform.py:2681 bzrlib/transform.py:2708

7556

7574

msgid "Adding file contents"

7557

7575

msgstr ""

7558

7576

7559

#: bzrlib/transform.py:3024

7577

#: bzrlib/transform.py:3028

7560

7578

msgid "Resolution pass"

7561

7579

msgstr ""

7562

7580

7705

7723

7706

7724

#: dummy/help_topics/basic/detail.txt:1

7707

7725

msgid ""

7708

"Bazaar 2.5b5 -- a free distributed version-control tool\n"

7726

"Bazaar 2.5b6 -- a free distributed version-control tool\n"

7709

7727

"http://bazaar.canonical.com/"

7710

7728

msgstr ""

7711

7729

11966

11984

"~~~~~~~~~~~~~~~~~~~~~~"

11967

11985

msgstr ""

11968

11986

11969

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402

11987

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418

11970

11988

msgid "Introduced in: 1.4"

11971

11989

msgstr ""

11972

11990

12158

12176

msgstr ""

12159

12177

12160

12178

#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196

12161

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448

12179

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464

12162

12180

msgid "Introduced in: 1.17"

12163

12181

msgstr ""

12164

12182

12214

12232

#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226

12215

12233

#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241

12216

12234

#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370

12217

#: en/help_topics/hooks.txt:427

12235

#: en/help_topics/hooks.txt:443

12218

12236

msgid "Introduced in: 2.4"

12219

12237

msgstr ""

12220

12238

12315

12333

msgstr ""

12316

12334

12317

12335

#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297

12318

#: en/help_topics/hooks.txt:505

12336

#: en/help_topics/hooks.txt:521

12319

12337

msgid "Introduced in: 1.15"

12320

12338

msgstr ""

12321

12339

12395

12413

msgstr ""

12396

12414

12397

12415

#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334

12398

#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493

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

12399

12418

msgid "Introduced in: 2.5"

12400

12419

msgstr ""

12401

12420

12514

12533

12515

12534

#: en/help_topics/hooks.txt:399

12516

12535

msgid ""

12536

"post_transform\n"

12537

"~~~~~~~~~~~~~~"

12538

msgstr ""

12539

12540

#: en/help_topics/hooks.txt:404

12541

msgid ""

12542

"Called after a tree transform has been performed on a tree. The hook\n"

12543

"is called with the tree that is being transformed and the transform."

12544

msgstr ""

12545

12546

#: en/help_topics/hooks.txt:407

12547

msgid ""

12548

"pre_transform\n"

12549

"~~~~~~~~~~~~~"

12550

msgstr ""

12551

12552

#: en/help_topics/hooks.txt:412

12553

msgid ""

12554

"Called before a tree transform on this tree. The hook is called with\n"

12555

"the tree that is being transformed and the transform."

12556

msgstr ""

12557

12558

#: en/help_topics/hooks.txt:415

12559

msgid ""

12517

12560

"start_commit\n"

12518

12561

"~~~~~~~~~~~~"

12519

12562

msgstr ""

12520

12563

12521

#: en/help_topics/hooks.txt:404

12564

#: en/help_topics/hooks.txt:420

12522

12565

msgid ""

12523

12566

"Called before a commit is performed on a tree. The start commit hook\n"

12524

12567

"is able to change the tree before the commit takes place. start_commit\n"

12526

12569

"being performed on."

12527

12570

msgstr ""

12528

12571

12529

#: en/help_topics/hooks.txt:409

12572

#: en/help_topics/hooks.txt:425

12530

12573

msgid ""

12531

12574

"SmartClientHooks\n"

12532

12575

"----------------"

12533

12576

msgstr ""

12534

12577

12535

#: en/help_topics/hooks.txt:412

12578

#: en/help_topics/hooks.txt:428

12536

12579

msgid ""

12537

12580

"call\n"

12538

12581

"~~~~"

12539

12582

msgstr ""

12540

12583

12541

#: en/help_topics/hooks.txt:415

12584

#: en/help_topics/hooks.txt:431

12542

12585

msgid "Introduced in: unknown"

12543

12586

msgstr ""

12544

12587

12545

#: en/help_topics/hooks.txt:417

12588

#: en/help_topics/hooks.txt:433

12546

12589

msgid ""

12547

12590

"Called when the smart client is submitting a request to the smart\n"

12548

12591

"server. Called with a bzrlib.smart.client.CallHookParams object.\n"

12549

12592

"Streaming request bodies, and responses, are not accessible."

12550

12593

msgstr ""

12551

12594

12552

#: en/help_topics/hooks.txt:421

12595

#: en/help_topics/hooks.txt:437

12553

12596

msgid ""

12554

12597

"SmartServerHooks\n"

12555

12598

"----------------"

12556

12599

msgstr ""

12557

12600

12558

#: en/help_topics/hooks.txt:424

12601

#: en/help_topics/hooks.txt:440

12559

12602

msgid ""

12560

12603

"server_exception\n"

12561

12604

"~~~~~~~~~~~~~~~~"

12562

12605

msgstr ""

12563

12606

12564

#: en/help_topics/hooks.txt:429

12607

#: en/help_topics/hooks.txt:445

12565

12608

msgid ""

12566

12609

"Called by the bzr server when an exception occurs. server_exception is\n"

12567

12610

"called with the sys.exc_info() tuple return true for the hook if the\n"

12569

12612

"normally."

12570

12613

msgstr ""

12571

12614

12572

#: en/help_topics/hooks.txt:434

12615

#: en/help_topics/hooks.txt:450

12573

12616

msgid ""

12574

12617

"server_started\n"

12575

12618

"~~~~~~~~~~~~~~"

12576

12619

msgstr ""

12577

12620

12578

#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456

12621

#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472

12579

12622

msgid "Introduced in: 0.16"

12580

12623

msgstr ""

12581

12624

12582

#: en/help_topics/hooks.txt:439

12625

#: en/help_topics/hooks.txt:455

12583

12626

msgid ""

12584

12627

"Called by the bzr server when it starts serving a directory.\n"

12585

12628

"server_started is called with (backing urls, public url), where\n"

12588

12631

"served."

12589

12632

msgstr ""

12590

12633

12591

#: en/help_topics/hooks.txt:445

12634

#: en/help_topics/hooks.txt:461

12592

12635

msgid ""

12593

12636

"server_started_ex\n"

12594

12637

"~~~~~~~~~~~~~~~~~"

12595

12638

msgstr ""

12596

12639

12597

#: en/help_topics/hooks.txt:450

12640

#: en/help_topics/hooks.txt:466

12598

12641

msgid ""

12599

12642

"Called by the bzr server when it starts serving a directory.\n"

12600

12643

"server_started is called with (backing_urls, server_obj)."

12601

12644

msgstr ""

12602

12645

12603

#: en/help_topics/hooks.txt:453

12646

#: en/help_topics/hooks.txt:469

12604

12647

msgid ""

12605

12648

"server_stopped\n"

12606

12649

"~~~~~~~~~~~~~~"

12607

12650

msgstr ""

12608

12651

12609

#: en/help_topics/hooks.txt:458

12652

#: en/help_topics/hooks.txt:474

12610

12653

msgid ""

12611

12654

"Called by the bzr server when it stops serving a directory.\n"

12612

12655

"server_stopped is called with the same parameters as the\n"

12613

12656

"server_started hook: (backing_urls, public_url)."

12614

12657

msgstr ""

12615

12658

12616

#: en/help_topics/hooks.txt:462

12659

#: en/help_topics/hooks.txt:478

12617

12660

msgid ""

12618

12661

"StatusHooks\n"

12619

12662

"-----------"

12620

12663

msgstr ""

12621

12664

12622

#: en/help_topics/hooks.txt:465

12665

#: en/help_topics/hooks.txt:481

12623

12666

msgid ""

12624

12667

"post_status\n"

12625

12668

"~~~~~~~~~~~"

12626

12669

msgstr ""

12627

12670

12628

#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479

12671

#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495

12629

12672

msgid "Introduced in: 2.3"

12630

12673

msgstr ""

12631

12674

12632

#: en/help_topics/hooks.txt:470

12675

#: en/help_topics/hooks.txt:486

12633

12676

msgid ""

12634

12677

"Called with argument StatusHookParams after Bazaar has displayed the\n"

12635

12678

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12638

12681

"status command. to_file is the output stream for writing."

12639

12682

msgstr ""

12640

12683

12641

#: en/help_topics/hooks.txt:476

12684

#: en/help_topics/hooks.txt:492

12642

12685

msgid ""

12643

12686

"pre_status\n"

12644

12687

"~~~~~~~~~~"

12645

12688

msgstr ""

12646

12689

12647

#: en/help_topics/hooks.txt:481

12690

#: en/help_topics/hooks.txt:497

12648

12691

msgid ""

12649

12692

"Called with argument StatusHookParams before Bazaar displays the\n"

12650

12693

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12653

12696

"status command. to_file is the output stream for writing."

12654

12697

msgstr ""

12655

12698

12656

#: en/help_topics/hooks.txt:487

12699

#: en/help_topics/hooks.txt:503

12657

12700

msgid ""

12658

12701

"TransportHooks\n"

12659

12702

"--------------"

12660

12703

msgstr ""

12661

12704

12662

#: en/help_topics/hooks.txt:490

12705

#: en/help_topics/hooks.txt:506

12663

12706

msgid ""

12664

12707

"post_connect\n"

12665

12708

"~~~~~~~~~~~~"

12666

12709

msgstr ""

12667

12710

12668

#: en/help_topics/hooks.txt:495

12711

#: en/help_topics/hooks.txt:511

12669

12712

msgid ""

12670

12713

"Called after a new connection is established or a reconnect occurs.\n"

12671

12714

"The sole argument passed is either the connected transport or smart\n"

12672

12715

"medium instance."

12673

12716

msgstr ""

12674

12717

12675

#: en/help_topics/hooks.txt:499

12718

#: en/help_topics/hooks.txt:515

12676

12719

msgid ""

12677

12720

"RioVersionInfoBuilderHooks\n"

12678

12721

"--------------------------"

12679

12722

msgstr ""

12680

12723

12681

#: en/help_topics/hooks.txt:502

12724

#: en/help_topics/hooks.txt:518

12682

12725

msgid ""

12683

12726

"revision\n"

12684

12727

"~~~~~~~~"

12685

12728

msgstr ""

12686

12729

12687

#: en/help_topics/hooks.txt:507

12730

#: en/help_topics/hooks.txt:523

12688

12731

msgid ""

12689

12732

"Invoked when adding information about a revision to the RIO stanza\n"

12690

12733

"that is printed. revision is called with a revision object and a RIO\n"