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

7

msgstr ""

8

"Project-Id-Version: bzr\n"

9

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

10

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

10

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

11

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

12

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

13

"Language-Team: Scots <sco@li.org>\n"

15

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

16

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

17

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

18

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

19

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

18

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

19

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

20

21

#: bzrlib/add.py:95

22

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

26

msgid "Unstacking"

27

msgstr ""

28

29

#: bzrlib/branch.py:3183

29

#: bzrlib/branch.py:3205

30

#, python-format

31

msgid "Pushed up to revision %d."

32

msgstr ""

33

34

#: bzrlib/branch.py:3185

34

#: bzrlib/branch.py:3207

35

#, python-format

36

msgid "%d tag updated."

37

msgid_plural "%d tags updated."

38

msgstr[0] ""

39

msgstr[1] ""

40

41

#: bzrlib/branch.py:3188

41

#: bzrlib/branch.py:3210

42

msgid "No new revisions or tags to push."

43

msgstr ""

44

45

#: bzrlib/branch.py:3190

45

#: bzrlib/branch.py:3212

46

msgid "No new revisions to push."

47

msgstr ""

48

49

#: bzrlib/branch.py:3210

49

#: bzrlib/branch.py:3232

50

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

51

msgstr ""

52

53

#: bzrlib/branch.py:3213

53

#: bzrlib/branch.py:3235

54

#, python-format

55

msgid "found error:%s"

56

msgstr ""

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

77

"This report on versioned and unkent files, reporting them\n"

78

"grouped by state. Possible states are:"

79

80

#: bzrlib/builtins.py:220

80

#: bzrlib/builtins.py:308

81

msgid ""

82

"added\n"

83

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

84

msgstr ""

85

86

#: bzrlib/builtins.py:223

86

#: bzrlib/builtins.py:311

87

msgid ""

88

"removed\n"

89

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

90

" in the working copy."

91

msgstr ""

92

93

#: bzrlib/builtins.py:227

93

#: bzrlib/builtins.py:315

94

msgid ""

95

"renamed\n"

96

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

98

" parent directory was renamed."

99

msgstr ""

100

101

#: bzrlib/builtins.py:232

101

#: bzrlib/builtins.py:320

102

msgid ""

103

"modified\n"

104

" Text has changed since the previous revision."

105

msgstr ""

106

107

#: bzrlib/builtins.py:235

107

#: bzrlib/builtins.py:323

108

msgid ""

109

"kind changed\n"

110

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

111

msgstr ""

112

113

#: bzrlib/builtins.py:238

113

#: bzrlib/builtins.py:326

114

msgid ""

115

"unknown\n"

116

" Not versioned and not matching an ignore pattern."

117

msgstr ""

118

119

#: bzrlib/builtins.py:241

119

#: bzrlib/builtins.py:329

120

msgid ""

121

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

122

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

124

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

125

msgstr ""

126

127

#: bzrlib/builtins.py:246

127

#: bzrlib/builtins.py:334

128

msgid ""

129

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

130

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

131

msgstr ""

132

133

#: bzrlib/builtins.py:249

133

#: bzrlib/builtins.py:337

134

msgid ""

135

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

136

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

137

"use bzr status -SV."

138

msgstr ""

139

140

#: bzrlib/builtins.py:253

140

#: bzrlib/builtins.py:341

141

msgid ""

142

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

143

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

145

"is reported for everything inside that directory."

146

msgstr ""

147

148

#: bzrlib/builtins.py:258

148

#: bzrlib/builtins.py:346

149

msgid ""

150

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

151

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

153

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

154

msgstr ""

155

156

#: bzrlib/builtins.py:263

156

#: bzrlib/builtins.py:351

157

msgid ""

158

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

159

"single revision to the revision argument."

160

msgstr ""

161

162

#: bzrlib/builtins.py:266

162

#: bzrlib/builtins.py:354

163

msgid ""

164

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

165

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

166

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

167

msgstr ""

168

169

#: bzrlib/builtins.py:275

169

#: bzrlib/builtins.py:363

170

msgid "Use short status indicators."

171

msgstr ""

172

173

#: bzrlib/builtins.py:277

173

#: bzrlib/builtins.py:365

174

msgid "Only show versioned files."

175

msgstr ""

176

177

#: bzrlib/builtins.py:279

177

#: bzrlib/builtins.py:367

178

msgid "Don't show pending merges."

179

msgstr ""

180

181

#: bzrlib/builtins.py:282

181

#: bzrlib/builtins.py:370

182

msgid "Do not mark object type using indicator."

183

msgstr ""

184

185

#: bzrlib/builtins.py:297

185

#: bzrlib/builtins.py:385

186

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

187

msgstr ""

188

189

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

189

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

190

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

191

msgstr ""

192

193

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

193

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

194

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

195

msgstr ""

196

197

#: bzrlib/builtins.py:351

197

#: bzrlib/builtins.py:439

198

#, python-format

199

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

200

msgstr ""

201

202

#: bzrlib/builtins.py:362

202

#: bzrlib/builtins.py:450

203

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

204

msgstr ""

205

206

#: bzrlib/builtins.py:369

206

#: bzrlib/builtins.py:457

207

msgid "You cannot specify a NULL revision."

208

msgstr ""

209

210

#: bzrlib/builtins.py:461

210

#: bzrlib/builtins.py:549

211

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

212

msgstr "Remove the working tree frae a gien branch/checkoot."

213

214

#: bzrlib/builtins.py:463

214

#: bzrlib/builtins.py:551

215

msgid ""

216

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

217

"this will refuse to run against one."

218

msgstr ""

219

220

#: bzrlib/builtins.py:466

220

#: bzrlib/builtins.py:554

221

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

222

msgstr ""

223

224

#: bzrlib/builtins.py:472

224

#: bzrlib/builtins.py:560

225

msgid ""

226

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

227

msgstr ""

228

229

#: bzrlib/builtins.py:486

229

#: bzrlib/builtins.py:574

230

msgid "No working tree to remove"

231

msgstr ""

232

233

#: bzrlib/builtins.py:488

233

#: bzrlib/builtins.py:576

234

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

235

msgstr ""

236

237

#: bzrlib/builtins.py:497

237

#: bzrlib/builtins.py:585

238

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

239

msgstr ""

240

241

#: bzrlib/builtins.py:537

241

#: bzrlib/builtins.py:625

242

msgid ""

243

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

244

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

245

msgstr ""

246

247

#: bzrlib/builtins.py:548

247

#: bzrlib/builtins.py:636

248

msgid ""

249

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

250

"commit"

251

msgstr ""

252

253

#: bzrlib/builtins.py:552

253

#: bzrlib/builtins.py:640

254

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

255

msgstr ""

256

257

#: bzrlib/builtins.py:556

257

#: bzrlib/builtins.py:644

258

msgid "Show current revision number."

259

msgstr ""

260

261

#: bzrlib/builtins.py:558

261

#: bzrlib/builtins.py:646

262

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

263

msgstr ""

264

265

#: bzrlib/builtins.py:571

265

#: bzrlib/builtins.py:659

266

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

267

msgstr ""

268

269

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

269

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

270

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

271

msgstr ""

272

273

#: bzrlib/builtins.py:612

273

#: bzrlib/builtins.py:700

274

msgid "Show revno of working tree."

275

msgstr ""

276

277

#: bzrlib/builtins.py:660

277

#: bzrlib/builtins.py:748

278

msgid "Add specified files or directories."

279

msgstr ""

280

281

#: bzrlib/builtins.py:662

281

#: bzrlib/builtins.py:750

282

msgid ""

283

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

284

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

285

"any of the named files are already versioned."

286

msgstr ""

287

288

#: bzrlib/builtins.py:666

288

#: bzrlib/builtins.py:754

289

msgid ""

290

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

291

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

296

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

297

msgstr ""

298

299

#: bzrlib/builtins.py:674

299

#: bzrlib/builtins.py:762

300

msgid ""

301

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

302

"unless they are explicitly ignored."

303

msgstr ""

304

305

#: bzrlib/builtins.py:677

305

#: bzrlib/builtins.py:765

306

msgid ""

307

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

308

"are currently unknown."

309

msgstr ""

310

311

#: bzrlib/builtins.py:680

311

#: bzrlib/builtins.py:768

312

msgid ""

313

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

314

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

316

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

317

msgstr ""

318

319

#: bzrlib/builtins.py:685

319

#: bzrlib/builtins.py:773

320

msgid ""

321

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

322

"add them."

323

msgstr ""

324

325

#: bzrlib/builtins.py:688

325

#: bzrlib/builtins.py:776

326

msgid ""

327

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

328

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

333

"into a subdirectory of this one."

334

msgstr ""

335

336

#: bzrlib/builtins.py:696

336

#: bzrlib/builtins.py:784

337

msgid ""

338

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

339

"unless they are explicitly mentioned."

340

msgstr ""

341

342

#: bzrlib/builtins.py:699

342

#: bzrlib/builtins.py:787

343

msgid ""

344

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

345

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

346

"to file size."

347

msgstr ""

348

349

#: bzrlib/builtins.py:706

349

#: bzrlib/builtins.py:794

350

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

351

msgstr ""

352

353

#: bzrlib/builtins.py:712

353

#: bzrlib/builtins.py:800

354

msgid "Lookup file ids from this tree."

355

msgstr ""

356

357

#: bzrlib/builtins.py:748

357

#: bzrlib/builtins.py:836

358

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

359

msgstr ""

360

361

#: bzrlib/builtins.py:753

361

#: bzrlib/builtins.py:841

362

msgid "Create a new versioned directory."

363

msgstr ""

364

365

#: bzrlib/builtins.py:755

365

#: bzrlib/builtins.py:843

366

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

367

msgstr ""

368

369

#: bzrlib/builtins.py:762

369

#: bzrlib/builtins.py:850

370

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

371

msgstr ""

372

373

#: bzrlib/builtins.py:796

373

#: bzrlib/builtins.py:884

374

#, python-format

375

msgid "added %s\n"

376

msgstr ""

377

378

#: bzrlib/builtins.py:838

378

#: bzrlib/builtins.py:926

379

#, python-format

380

msgid "invalid kind %r specified"

381

msgstr ""

382

383

#: bzrlib/builtins.py:875

383

#: bzrlib/builtins.py:963

384

msgid "Move or rename a file."

385

msgstr ""

386

387

#: bzrlib/builtins.py:877

387

#: bzrlib/builtins.py:965

388

msgid " bzr mv SOURCE... DESTINATION"

389

msgstr ""

390

391

#: bzrlib/builtins.py:879

391

#: bzrlib/builtins.py:967

392

msgid ""

393

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

394

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

395

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

396

msgstr ""

397

398

#: bzrlib/builtins.py:883

398

#: bzrlib/builtins.py:971

399

msgid ""

400

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

401

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

404

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

405

msgstr ""

406

407

#: bzrlib/builtins.py:889

407

#: bzrlib/builtins.py:977

408

msgid "Files cannot be moved between branches."

409

msgstr ""

410

411

#: bzrlib/builtins.py:896

411

#: bzrlib/builtins.py:984

412

msgid ""

413

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

414

"moved."

415

msgstr ""

416

417

#: bzrlib/builtins.py:898

417

#: bzrlib/builtins.py:986

418

msgid "Automatically guess renames."

419

msgstr ""

420

421

#: bzrlib/builtins.py:899

421

#: bzrlib/builtins.py:987

422

msgid "Avoid making changes when guessing renames."

423

msgstr ""

424

425

#: bzrlib/builtins.py:908

425

#: bzrlib/builtins.py:996

426

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

427

msgstr ""

428

429

#: bzrlib/builtins.py:912

429

#: bzrlib/builtins.py:1000

430

msgid "missing file argument"

431

msgstr ""

432

433

#: bzrlib/builtins.py:916

433

#: bzrlib/builtins.py:1004

434

msgid "can not move root of branch"

435

msgstr ""

436

437

#: bzrlib/builtins.py:922

437

#: bzrlib/builtins.py:1010

438

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

439

msgstr ""

440

441

#: bzrlib/builtins.py:925

441

#: bzrlib/builtins.py:1013

442

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

443

msgstr ""

444

445

#: bzrlib/builtins.py:962

445

#: bzrlib/builtins.py:1050

446

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

447

msgstr ""

448

449

#: bzrlib/builtins.py:1014

449

#: bzrlib/builtins.py:1102

450

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

451

msgstr ""

452

453

#: bzrlib/builtins.py:1016

453

#: bzrlib/builtins.py:1104

454

msgid ""

455

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

456

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

458

"parent."

459

msgstr ""

460

461

#: bzrlib/builtins.py:1021

461

#: bzrlib/builtins.py:1109

462

msgid ""

463

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

464

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

465

"be able to pull it again."

466

msgstr ""

467

468

#: bzrlib/builtins.py:1025

468

#: bzrlib/builtins.py:1113

469

msgid ""

470

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

471

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

472

"branches have diverged."

473

msgstr ""

474

475

#: bzrlib/builtins.py:1029

475

#: bzrlib/builtins.py:1117

476

msgid ""

477

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

478

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

480

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

481

msgstr ""

482

483

#: bzrlib/builtins.py:1034

483

#: bzrlib/builtins.py:1122

484

msgid ""

485

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

486

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

487

"-Olog_format=<other_format>."

488

msgstr ""

489

490

#: bzrlib/builtins.py:1038

490

#: bzrlib/builtins.py:1126

491

msgid ""

492

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

493

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

494

"with bzr send."

495

msgstr ""

496

497

#: bzrlib/builtins.py:1046

497

#: bzrlib/builtins.py:1134

498

msgid "Show logs of pulled revisions."

499

msgstr ""

500

501

#: bzrlib/builtins.py:1048

501

#: bzrlib/builtins.py:1136

502

msgid ""

503

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

504

msgstr ""

505

506

#: bzrlib/builtins.py:1051

506

#: bzrlib/builtins.py:1139

507

msgid ""

508

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

509

"master branch."

510

msgstr ""

511

512

#: bzrlib/builtins.py:1080

512

#: bzrlib/builtins.py:1168

513

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

514

msgstr ""

515

516

#: bzrlib/builtins.py:1096

516

#: bzrlib/builtins.py:1184

517

msgid "No pull location known or specified."

518

msgstr ""

519

520

#: bzrlib/builtins.py:1102

520

#: bzrlib/builtins.py:1190

521

#, python-format

522

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

523

msgstr ""

524

525

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

525

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

526

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

527

msgstr ""

528

529

#: bzrlib/builtins.py:1150

529

#: bzrlib/builtins.py:1238

530

msgid "Update a mirror of this branch."

531

msgstr ""

532

533

#: bzrlib/builtins.py:1152

533

#: bzrlib/builtins.py:1240

534

msgid ""

535

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

536

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

537

msgstr ""

538

539

#: bzrlib/builtins.py:1155

539

#: bzrlib/builtins.py:1243

540

msgid ""

541

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

542

"the future."

543

msgstr ""

544

545

#: bzrlib/builtins.py:1158

545

#: bzrlib/builtins.py:1246

546

msgid ""

547

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

548

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

549

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

550

msgstr ""

551

552

#: bzrlib/builtins.py:1162

552

#: bzrlib/builtins.py:1250

553

msgid ""

554

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

555

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

556

msgstr ""

557

558

#: bzrlib/builtins.py:1165

558

#: bzrlib/builtins.py:1253

559

msgid ""

560

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

561

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

562

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

563

msgstr ""

564

565

#: bzrlib/builtins.py:1169

565

#: bzrlib/builtins.py:1257

566

msgid ""

567

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

568

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

570

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

571

msgstr ""

572

573

#: bzrlib/builtins.py:1174

573

#: bzrlib/builtins.py:1262

574

msgid ""

575

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

576

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

577

"-Olog_format=<other_format>."

578

msgstr ""

579

580

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

580

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

581

msgid ""

582

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

583

msgstr ""

584

585

#: bzrlib/builtins.py:1188

585

#: bzrlib/builtins.py:1276

586

msgid ""

587

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

588

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

589

msgstr ""

590

591

#: bzrlib/builtins.py:1193

591

#: bzrlib/builtins.py:1281

592

msgid ""

593

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

594

"branch."

595

msgstr ""

596

597

#: bzrlib/builtins.py:1196

597

#: bzrlib/builtins.py:1284

598

msgid ""

599

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

600

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

601

"the branch created."

602

msgstr ""

603

604

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

604

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

605

msgid ""

606

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

607

"strict disables the check."

608

msgstr ""

609

610

#: bzrlib/builtins.py:1204

610

#: bzrlib/builtins.py:1292

611

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

612

msgstr ""

613

614

#: bzrlib/builtins.py:1248

614

#: bzrlib/builtins.py:1336

615

msgid "Could not determine branch to refer to."

616

msgstr ""

617

618

#: bzrlib/builtins.py:1257

618

#: bzrlib/builtins.py:1345

619

#, python-format

620

msgid ""

621

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

622

"use 'bzr push :parent'."

623

msgstr ""

624

625

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

625

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

626

msgid "No push location known or specified."

627

msgstr ""

628

629

#: bzrlib/builtins.py:1267

629

#: bzrlib/builtins.py:1355

630

#, python-format

631

msgid "Using saved push location: %s"

632

msgstr ""

633

634

#: bzrlib/builtins.py:1277

634

#: bzrlib/builtins.py:1365

635

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

636

msgstr ""

637

638

#: bzrlib/builtins.py:1279

638

#: bzrlib/builtins.py:1367

639

msgid ""

640

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

641

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

646

"create ./foo-bar."

647

msgstr ""

648

649

#: bzrlib/builtins.py:1286

649

#: bzrlib/builtins.py:1374

650

msgid ""

651

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

652

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

653

msgstr ""

654

655

#: bzrlib/builtins.py:1289

655

#: bzrlib/builtins.py:1377

656

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

657

msgstr ""

658

659

#: bzrlib/builtins.py:1299

659

#: bzrlib/builtins.py:1387

660

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

661

msgstr ""

662

663

#: bzrlib/builtins.py:1301

663

#: bzrlib/builtins.py:1389

664

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

665

msgstr ""

666

667

#: bzrlib/builtins.py:1304

667

#: bzrlib/builtins.py:1392

668

msgid ""

669

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

670

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

671

msgstr ""

672

673

#: bzrlib/builtins.py:1308

673

#: bzrlib/builtins.py:1396

674

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

675

msgstr ""

676

677

#: bzrlib/builtins.py:1310

677

#: bzrlib/builtins.py:1398

678

msgid ""

679

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

680

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

681

msgstr ""

682

683

#: bzrlib/builtins.py:1315

683

#: bzrlib/builtins.py:1403

684

msgid "Bind new branch to from location."

685

msgstr ""

686

687

#: bzrlib/builtins.py:1362

687

#: bzrlib/builtins.py:1450

688

#, python-format

689

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

690

msgstr ""

691

692

#: bzrlib/builtins.py:1374

692

#: bzrlib/builtins.py:1462

693

#, python-format

694

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

695

msgstr ""

696

697

#: bzrlib/builtins.py:1393

697

#: bzrlib/builtins.py:1481

698

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

699

msgstr ""

700

701

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

701

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

702

#, python-format

703

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

704

msgstr ""

705

706

#: bzrlib/builtins.py:1407

706

#: bzrlib/builtins.py:1500

707

#, python-format

708

msgid "Branched %d revision."

709

msgid_plural "Branched %d revisions."

710

msgstr[0] ""

711

msgstr[1] ""

712

713

#: bzrlib/builtins.py:1412

713

#: bzrlib/builtins.py:1505

714

#, python-format

715

msgid "New branch bound to %s"

716

msgstr ""

717

718

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

718

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

719

#, python-format

720

msgid "Switched to branch: %s"

721

msgstr ""

722

723

#: bzrlib/builtins.py:1422

723

#: bzrlib/builtins.py:1515

724

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

725

msgstr ""

726

727

#: bzrlib/builtins.py:1424

727

#: bzrlib/builtins.py:1517

728

msgid ""

729

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

730

"location."

731

msgstr ""

732

733

#: bzrlib/builtins.py:1431

733

#: bzrlib/builtins.py:1524

734

msgid ""

735

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

736

"location."

737

msgstr ""

738

739

#: bzrlib/builtins.py:1461

739

#: bzrlib/builtins.py:1554

740

msgid "(default)"

741

msgstr ""

742

743

#: bzrlib/builtins.py:1473

743

#: bzrlib/builtins.py:1566

744

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

745

msgstr ""

746

747

#: bzrlib/builtins.py:1475

747

#: bzrlib/builtins.py:1568

748

msgid ""

749

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

750

"for\n"

754

"location using SFTP."

755

msgstr ""

756

757

#: bzrlib/builtins.py:1480

757

#: bzrlib/builtins.py:1573

758

msgid ""

759

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

760

"will\n"

766

"create ./foo-bar."

767

msgstr ""

768

769

#: bzrlib/builtins.py:1487

769

#: bzrlib/builtins.py:1580

770

msgid ""

771

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

772

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

776

"code.)"

777

msgstr ""

778

779

#: bzrlib/builtins.py:1497

779

#: bzrlib/builtins.py:1590

780

msgid ""

781

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

782

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

784

"commits."

785

msgstr ""

786

787

#: bzrlib/builtins.py:1504

787

#: bzrlib/builtins.py:1597

788

msgid "Get file contents from this tree."

789

msgstr ""

790

791

#: bzrlib/builtins.py:1506

791

#: bzrlib/builtins.py:1599

792

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

793

msgstr ""

794

795

#: bzrlib/builtins.py:1547

795

#: bzrlib/builtins.py:1640

796

msgid ""

797

"Show list of renamed files.\n"

798

" "

799

msgstr ""

800

801

#: bzrlib/builtins.py:1577

801

#: bzrlib/builtins.py:1670

802

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

803

msgstr ""

804

805

#: bzrlib/builtins.py:1579

805

#: bzrlib/builtins.py:1672

806

msgid ""

807

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

808

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

809

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

810

msgstr ""

811

812

#: bzrlib/builtins.py:1583

812

#: bzrlib/builtins.py:1676

813

msgid ""

814

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

815

"that is out of date from its branch."

816

msgstr ""

817

818

#: bzrlib/builtins.py:1586

818

#: bzrlib/builtins.py:1679

819

msgid ""

820

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

821

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

823

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

824

msgstr ""

825

826

#: bzrlib/builtins.py:1591

826

#: bzrlib/builtins.py:1684

827

msgid ""

828

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

829

"the branch from the master."

830

msgstr ""

831

832

#: bzrlib/builtins.py:1594

832

#: bzrlib/builtins.py:1687

833

msgid ""

834

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

835

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

839

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

840

msgstr ""

841

842

#: bzrlib/builtins.py:1601

842

#: bzrlib/builtins.py:1694

843

msgid ""

844

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

845

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

846

"current working directory is used."

847

msgstr ""

848

849

#: bzrlib/builtins.py:1617

849

#: bzrlib/builtins.py:1710

850

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

851

msgstr ""

852

853

#: bzrlib/builtins.py:1625

853

#: bzrlib/builtins.py:1718

854

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

855

msgstr ""

856

857

#: bzrlib/builtins.py:1656

857

#: bzrlib/builtins.py:1749

858

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

859

msgstr ""

860

861

#: bzrlib/builtins.py:1672

861

#: bzrlib/builtins.py:1765

862

#, python-format

863

msgid ""

864

"branch has no revision %s\n"

865

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

866

msgstr ""

867

868

#: bzrlib/builtins.py:1678

868

#: bzrlib/builtins.py:1771

869

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

870

msgstr ""

871

872

#: bzrlib/builtins.py:1682

872

#: bzrlib/builtins.py:1775

873

msgid ""

874

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

875

"can be committed with 'bzr commit'."

876

msgstr ""

877

878

#: bzrlib/builtins.py:1691

878

#: bzrlib/builtins.py:1784

879

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

880

msgstr ""

881

882

#: bzrlib/builtins.py:1693

882

#: bzrlib/builtins.py:1786

883

msgid ""

884

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

885

"tree, branch or repository."

886

msgstr ""

887

888

#: bzrlib/builtins.py:1696

888

#: bzrlib/builtins.py:1789

889

msgid ""

890

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

891

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

892

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

893

msgstr ""

894

895

#: bzrlib/builtins.py:1700

895

#: bzrlib/builtins.py:1793

896

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

897

msgstr ""

898

899

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

900

#: bzrlib/builtins.py:6389

899

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

900

#: bzrlib/builtins.py:6442

901

msgid ":Examples:"

902

msgstr ""

903

904

#: bzrlib/builtins.py:1704

904

#: bzrlib/builtins.py:1797

905

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

906

msgstr ""

907

908

#: bzrlib/builtins.py:1706

908

#: bzrlib/builtins.py:1799

909

msgid " bzr info"

910

msgstr ""

911

912

#: bzrlib/builtins.py:1708

912

#: bzrlib/builtins.py:1801

913

msgid ""

914

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

915

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

916

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

917

msgstr ""

918

919

#: bzrlib/builtins.py:1712

919

#: bzrlib/builtins.py:1805

920

msgid " bzr info -v"

921

msgstr ""

922

923

#: bzrlib/builtins.py:1714

923

#: bzrlib/builtins.py:1807

924

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

925

msgstr ""

926

927

#: bzrlib/builtins.py:1716

927

#: bzrlib/builtins.py:1809

928

msgid " bzr info -vv"

929

msgstr ""

930

931

#: bzrlib/builtins.py:1735

931

#: bzrlib/builtins.py:1828

932

msgid "Remove files or directories."

933

msgstr ""

934

935

#: bzrlib/builtins.py:1737

935

#: bzrlib/builtins.py:1830

936

msgid ""

937

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

938

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

941

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

942

msgstr ""

943

944

#: bzrlib/builtins.py:1745

944

#: bzrlib/builtins.py:1838

945

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

946

msgstr ""

947

948

#: bzrlib/builtins.py:1747

948

#: bzrlib/builtins.py:1840

949

msgid "The file deletion mode to be used."

950

msgstr ""

951

952

#: bzrlib/builtins.py:1748

952

#: bzrlib/builtins.py:1841

953

msgid "Deletion Strategy"

954

msgstr ""

955

956

#: bzrlib/builtins.py:1749

956

#: bzrlib/builtins.py:1842

957

msgid "Backup changed files (default)."

958

msgstr ""

959

960

#: bzrlib/builtins.py:1750

960

#: bzrlib/builtins.py:1843

961

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

962

msgstr ""

963

964

#: bzrlib/builtins.py:1751

964

#: bzrlib/builtins.py:1844

965

msgid "Don't backup changed files."

966

msgstr ""

967

968

#: bzrlib/builtins.py:1752

968

#: bzrlib/builtins.py:1845

969

msgid ""

970

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

971

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

972

msgstr ""

973

974

#: bzrlib/builtins.py:1761

974

#: bzrlib/builtins.py:1854

975

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

976

msgstr ""

977

978

#: bzrlib/builtins.py:1778

978

#: bzrlib/builtins.py:1871

979

msgid "No matching files."

980

msgstr ""

981

982

#: bzrlib/builtins.py:1839

982

#: bzrlib/builtins.py:1932

983

msgid "Reconcile bzr metadata in a branch."

984

msgstr ""

985

986

#: bzrlib/builtins.py:1841

986

#: bzrlib/builtins.py:1934

987

msgid ""

988

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

989

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

991

"advises you to run it."

992

msgstr ""

993

994

#: bzrlib/builtins.py:1846

994

#: bzrlib/builtins.py:1939

995

msgid ""

996

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

997

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

999

"correctly in both branches."

1000

msgstr ""

1001

1002

#: bzrlib/builtins.py:1851

1002

#: bzrlib/builtins.py:1944

1003

msgid ""

1004

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

1005

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

1006

msgstr ""

1007

1008

#: bzrlib/builtins.py:1854

1008

#: bzrlib/builtins.py:1947

1009

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

1010

msgstr ""

1011

1012

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

1012

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

1013

msgid ""

1014

"Format for the bzr 2.0 series.\n"

1015

"Uses group-compress storage.\n"

1016

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

1017

msgstr ""

1018

1019

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

1019

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

1020

msgid ""

1021

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

1022

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

1023

msgstr ""

1024

1025

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

1025

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

1026

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

1027

msgstr ""

1028

1029

#: bzrlib/builtins.py:1922

1029

#: bzrlib/builtins.py:2015

1030

msgid "Make a directory into a versioned branch."

1031

msgstr ""

1032

1033

#: bzrlib/builtins.py:1924

1033

#: bzrlib/builtins.py:2017

1034

msgid ""

1035

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

1036

"existing project."

1037

msgstr ""

1038

1039

#: bzrlib/builtins.py:1927

1039

#: bzrlib/builtins.py:2020

1040

msgid ""

1041

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

1042

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

1044

"in the .bzr directory."

1045

msgstr ""

1046

1047

#: bzrlib/builtins.py:1932

1047

#: bzrlib/builtins.py:2025

1048

msgid ""

1049

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

1050

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

1051

msgstr ""

1052

1053

#: bzrlib/builtins.py:1935

1053

#: bzrlib/builtins.py:2028

1054

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

1055

msgstr ""

1056

1057

#: bzrlib/builtins.py:1937

1057

#: bzrlib/builtins.py:2030

1058

msgid ""

1059

" cd ~/project\n"

1060

" bzr init\n"

1063

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

1064

msgstr ""

1065

1066

#: bzrlib/builtins.py:1948

1066

#: bzrlib/builtins.py:2041

1067

msgid ""

1068

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

1069

msgstr ""

1070

1071

#: bzrlib/builtins.py:1951

1071

#: bzrlib/builtins.py:2044

1072

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

1073

msgstr ""

1074

1075

#: bzrlib/builtins.py:1959

1075

#: bzrlib/builtins.py:2052

1076

msgid ""

1077

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

1078

msgstr ""

1079

1080

#: bzrlib/builtins.py:1962

1080

#: bzrlib/builtins.py:2055

1081

msgid "Create a branch without a working tree."

1082

msgstr ""

1083

1084

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

1084

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

1085

#, python-format

1086

msgid ""

1087

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

1088

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

1089

msgstr ""

1090

1091

#: bzrlib/builtins.py:2016

1091

#: bzrlib/builtins.py:2109

1092

msgid ""

1093

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

1094

msgstr ""

1095

1096

#: bzrlib/builtins.py:2027

1096

#: bzrlib/builtins.py:2120

1097

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

1098

msgstr ""

1099

1100

#: bzrlib/builtins.py:2036

1100

#: bzrlib/builtins.py:2129

1101

#, python-format

1102

msgid "Using shared repository: %s\n"

1103

msgstr ""

1104

1105

#: bzrlib/builtins.py:2040

1105

#: bzrlib/builtins.py:2133

1106

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

1107

msgstr ""

1108

1109

#: bzrlib/builtins.py:2042

1109

#: bzrlib/builtins.py:2135

1110

msgid ""

1111

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

1112

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

1114

"speeds up the creation of new branches."

1115

msgstr ""

1116

1117

#: bzrlib/builtins.py:2047

1117

#: bzrlib/builtins.py:2140

1118

msgid ""

1119

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

1120

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

1124

"branches, such as on a server."

1125

msgstr ""

1126

1127

#: bzrlib/builtins.py:2054

1127

#: bzrlib/builtins.py:2147

1128

msgid ""

1129

":Examples:\n"

1130

" Create a shared repository holding just branches::"

1131

msgstr ""

1132

1133

#: bzrlib/builtins.py:2057

1133

#: bzrlib/builtins.py:2150

1134

msgid ""

1135

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

1136

" bzr init repo/trunk"

1137

msgstr ""

1138

1139

#: bzrlib/builtins.py:2060

1139

#: bzrlib/builtins.py:2153

1140

msgid " Make a lightweight checkout elsewhere::"

1141

msgstr ""

1142

1143

#: bzrlib/builtins.py:2062

1143

#: bzrlib/builtins.py:2155

1144

msgid ""

1145

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

1146

" cd trunk-checkout\n"

1147

" (add files here)"

1148

msgstr ""

1149

1150

#: bzrlib/builtins.py:2070

1150

#: bzrlib/builtins.py:2163

1151

msgid ""

1152

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

1153

msgstr ""

1154

1155

#: bzrlib/builtins.py:2074

1155

#: bzrlib/builtins.py:2167

1156

msgid "Repository format"

1157

msgstr ""

1158

1159

#: bzrlib/builtins.py:2076

1159

#: bzrlib/builtins.py:2169

1160

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

1161

msgstr ""

1162

1163

#: bzrlib/builtins.py:2102

1163

#: bzrlib/builtins.py:2195

1164

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

1165

msgstr ""

1166

1167

#: bzrlib/builtins.py:2104

1167

#: bzrlib/builtins.py:2197

1168

msgid ""

1169

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

1170

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

1174

"given."

1175

msgstr ""

1176

1177

#: bzrlib/builtins.py:2111

1177

#: bzrlib/builtins.py:2204

1178

msgid ""

1179

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

1180

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

1181

msgstr ""

1182

1183

#: bzrlib/builtins.py:2114

1183

#: bzrlib/builtins.py:2207

1184

msgid ""

1185

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

1186

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

1190

"in the range."

1191

msgstr ""

1192

1193

#: bzrlib/builtins.py:2121

1193

#: bzrlib/builtins.py:2214

1194

msgid ""

1195

":Exit values:\n"

1196

" 1 - changed\n"

1199

" 0 - no change"

1200

msgstr ""

1201

1202

#: bzrlib/builtins.py:2127

1202

#: bzrlib/builtins.py:2220

1203

msgid ""

1204

":Examples:\n"

1205

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

1206

msgstr ""

1207

1208

#: bzrlib/builtins.py:2130

1208

#: bzrlib/builtins.py:2223

1209

msgid " bzr diff"

1210

msgstr ""

1211

1212

#: bzrlib/builtins.py:2132

1212

#: bzrlib/builtins.py:2225

1213

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

1214

msgstr ""

1215

1216

#: bzrlib/builtins.py:2134

1216

#: bzrlib/builtins.py:2227

1217

msgid " bzr diff -r1"

1218

msgstr ""

1219

1220

#: bzrlib/builtins.py:2136

1220

#: bzrlib/builtins.py:2229

1221

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

1222

msgstr ""

1223

1224

#: bzrlib/builtins.py:2138

1224

#: bzrlib/builtins.py:2231

1225

msgid " bzr diff -r1..3"

1226

msgstr ""

1227

1228

#: bzrlib/builtins.py:2140

1228

#: bzrlib/builtins.py:2233

1229

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

1230

msgstr ""

1231

1232

#: bzrlib/builtins.py:2142

1232

#: bzrlib/builtins.py:2235

1233

msgid " bzr diff -r1..3 xxx"

1234

msgstr ""

1235

1236

#: bzrlib/builtins.py:2144

1236

#: bzrlib/builtins.py:2237

1237

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

1238

msgstr ""

1239

1240

#: bzrlib/builtins.py:2146

1240

#: bzrlib/builtins.py:2239

1241

msgid " bzr diff -c2"

1242

msgstr ""

1243

1244

#: bzrlib/builtins.py:2148

1244

#: bzrlib/builtins.py:2241

1245

msgid ""

1246

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

1247

" \n"

1248

" bzr diff -cX"

1249

msgstr ""

1250

1251

#: bzrlib/builtins.py:2152

1251

#: bzrlib/builtins.py:2245

1252

msgid ""

1253

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

1254

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

1255

" another parent, use::"

1256

msgstr ""

1257

1258

#: bzrlib/builtins.py:2156

1258

#: bzrlib/builtins.py:2249

1259

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

1260

msgstr ""

1261

1262

#: bzrlib/builtins.py:2158

1262

#: bzrlib/builtins.py:2251

1263

msgid ""

1264

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

1265

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

1266

msgstr ""

1267

1268

#: bzrlib/builtins.py:2161

1268

#: bzrlib/builtins.py:2254

1269

msgid " bzr diff -r-2.."

1270

msgstr ""

1271

1272

#: bzrlib/builtins.py:2163

1272

#: bzrlib/builtins.py:2256

1273

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

1274

msgstr ""

1275

1276

#: bzrlib/builtins.py:2165

1276

#: bzrlib/builtins.py:2258

1277

msgid " bzr diff NEWS"

1278

msgstr ""

1279

1280

#: bzrlib/builtins.py:2167

1280

#: bzrlib/builtins.py:2260

1281

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

1282

msgstr ""

1283

1284

#: bzrlib/builtins.py:2169

1284

#: bzrlib/builtins.py:2262

1285

msgid " bzr diff xxx/NEWS"

1286

msgstr ""

1287

1288

#: bzrlib/builtins.py:2171

1288

#: bzrlib/builtins.py:2264

1289

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

1290

msgstr ""

1291

1292

#: bzrlib/builtins.py:2173

1292

#: bzrlib/builtins.py:2266

1293

msgid " bzr diff --old xxx"

1294

msgstr ""

1295

1296

#: bzrlib/builtins.py:2175

1296

#: bzrlib/builtins.py:2268

1297

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

1298

msgstr ""

1299

1300

#: bzrlib/builtins.py:2177

1300

#: bzrlib/builtins.py:2270

1301

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

1302

msgstr ""

1303

1304

#: bzrlib/builtins.py:2179

1304

#: bzrlib/builtins.py:2272

1305

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

1306

msgstr ""

1307

1308

#: bzrlib/builtins.py:2181

1308

#: bzrlib/builtins.py:2274

1309

msgid ""

1310

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

1311

" \n"

1314

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

1315

msgstr ""

1316

1317

#: bzrlib/builtins.py:2191

1317

#: bzrlib/builtins.py:2284

1318

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

1319

msgstr ""

1320

1321

#: bzrlib/builtins.py:2194

1321

#: bzrlib/builtins.py:2287

1322

msgid ""

1323

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

1324

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

1325

msgstr ""

1326

1327

#: bzrlib/builtins.py:2197

1327

#: bzrlib/builtins.py:2290

1328

msgid "Branch/tree to compare from."

1329

msgstr ""

1330

1331

#: bzrlib/builtins.py:2201

1331

#: bzrlib/builtins.py:2294

1332

msgid "Branch/tree to compare to."

1333

msgstr ""

1334

1335

#: bzrlib/builtins.py:2207

1335

#: bzrlib/builtins.py:2300

1336

msgid "Use this command to compare files."

1337

msgstr ""

1338

1339

#: bzrlib/builtins.py:2212

1339

#: bzrlib/builtins.py:2305

1340

msgid "Diff format to use."

1341

msgstr ""

1342

1343

#: bzrlib/builtins.py:2214

1343

#: bzrlib/builtins.py:2307

1344

msgid "Diff format"

1345

msgstr ""

1346

1347

#: bzrlib/builtins.py:2236

1347

#: bzrlib/builtins.py:2329

1348

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

1349

msgstr ""

1350

1351

#: bzrlib/builtins.py:2240

1351

#: bzrlib/builtins.py:2333

1352

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

1353

msgstr ""

1354

1355

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

1356

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

1355

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

1356

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

1357

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

1358

msgstr ""

1359

1360

#: bzrlib/builtins.py:2265

1360

#: bzrlib/builtins.py:2358

1361

msgid ""

1362

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

1363

" "

1364

msgstr ""

1365

1366

#: bzrlib/builtins.py:2343

1366

#: bzrlib/builtins.py:2436

1367

msgid "Show the tree root directory."

1368

msgstr ""

1369

1370

#: bzrlib/builtins.py:2345

1370

#: bzrlib/builtins.py:2438

1371

msgid ""

1372

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

1373

"directory."

1374

msgstr ""

1375

1376

#: bzrlib/builtins.py:2360

1376

#: bzrlib/builtins.py:2453

1377

msgid "The limit argument must be an integer."

1378

msgstr ""

1379

1380

#: bzrlib/builtins.py:2368

1380

#: bzrlib/builtins.py:2461

1381

msgid "The levels argument must be an integer."

1382

msgstr ""

1383

1384

#: bzrlib/builtins.py:2373

1384

#: bzrlib/builtins.py:2466

1385

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

1386

msgstr ""

1387

1388

#: bzrlib/builtins.py:2375

1388

#: bzrlib/builtins.py:2468

1389

msgid ""

1390

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

1391

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

1393

"Here are some simple examples::"

1394

msgstr ""

1395

1396

#: bzrlib/builtins.py:2380

1396

#: bzrlib/builtins.py:2473

1397

msgid ""

1398

" bzr log log the current branch\n"

1399

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

1400

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

1401

msgstr ""

1402

1403

#: bzrlib/builtins.py:2384

1403

#: bzrlib/builtins.py:2477

1404

msgid ""

1405

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

1406

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

1410

"were merged."

1411

msgstr ""

1412

1413

#: bzrlib/builtins.py:2391

1413

#: bzrlib/builtins.py:2484

1414

msgid ":Output control:"

1415

msgstr ""

1416

1417

#: bzrlib/builtins.py:2393

1417

#: bzrlib/builtins.py:2486

1418

msgid ""

1419

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

1420

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

1422

" for more details on log formats."

1423

msgstr ""

1424

1425

#: bzrlib/builtins.py:2398

1425

#: bzrlib/builtins.py:2491

1426

msgid ""

1427

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

1428

" displayed::"

1429

msgstr ""

1430

1431

#: bzrlib/builtins.py:2401

1431

#: bzrlib/builtins.py:2494

1432

msgid ""

1433

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

1434

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

1437

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

1438

msgstr ""

1439

1440

#: bzrlib/builtins.py:2407

1440

#: bzrlib/builtins.py:2500

1441

msgid ""

1442

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

1443

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

1444

" just the top level (mainline)."

1445

msgstr ""

1446

1447

#: bzrlib/builtins.py:2411

1447

#: bzrlib/builtins.py:2504

1448

msgid ""

1449

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

1450

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

1451

" instead, use the -vv option."

1452

msgstr ""

1453

1454

#: bzrlib/builtins.py:2415

1454

#: bzrlib/builtins.py:2508

1455

msgid ":Ordering control:"

1456

msgstr ""

1457

1458

#: bzrlib/builtins.py:2417

1458

#: bzrlib/builtins.py:2510

1459

msgid ""

1460

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

1461

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

1463

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

1464

msgstr ""

1465

1466

#: bzrlib/builtins.py:2422

1466

#: bzrlib/builtins.py:2515

1467

msgid ":Revision filtering:"

1468

msgstr ""

1469

1470

#: bzrlib/builtins.py:2424

1470

#: bzrlib/builtins.py:2517

1471

msgid ""

1472

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

1473

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

1474

msgstr ""

1475

1476

#: bzrlib/builtins.py:2427

1476

#: bzrlib/builtins.py:2520

1477

msgid ""

1478

" -rX display revision X\n"

1479

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

1481

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

1482

msgstr ""

1483

1484

#: bzrlib/builtins.py:2432

1484

#: bzrlib/builtins.py:2525

1485

msgid ""

1486

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

1487

" Some common examples are given below::"

1488

msgstr ""

1489

1490

#: bzrlib/builtins.py:2435

1490

#: bzrlib/builtins.py:2528

1491

msgid ""

1492

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

1493

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

1497

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

1498

msgstr ""

1499

1500

#: bzrlib/builtins.py:2442

1500

#: bzrlib/builtins.py:2535

1501

msgid ""

1502

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

1503

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

1507

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

1508

msgstr ""

1509

1510

#: bzrlib/builtins.py:2449

1510

#: bzrlib/builtins.py:2542

1511

msgid ":Path filtering:"

1512

msgstr ""

1513

1514

#: bzrlib/builtins.py:2451

1514

#: bzrlib/builtins.py:2544

1515

msgid ""

1516

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

1517

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

1518

" nominated files or directories."

1519

msgstr ""

1520

1521

#: bzrlib/builtins.py:2455

1521

#: bzrlib/builtins.py:2548

1522

msgid ""

1523

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

1524

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

1525

" the end or start of the range."

1526

msgstr ""

1527

1528

#: bzrlib/builtins.py:2459

1528

#: bzrlib/builtins.py:2552

1529

msgid ""

1530

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

1531

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

1532

msgstr ""

1533

1534

#: bzrlib/builtins.py:2462

1534

#: bzrlib/builtins.py:2555

1535

msgid ""

1536

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

1537

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

1538

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

1539

msgstr ""

1540

1541

#: bzrlib/builtins.py:2466

1541

#: bzrlib/builtins.py:2559

1542

msgid " In this case:"

1543

msgstr ""

1544

1545

#: bzrlib/builtins.py:2468

1545

#: bzrlib/builtins.py:2561

1546

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

1547

msgstr ""

1548

1549

#: bzrlib/builtins.py:2470

1549

#: bzrlib/builtins.py:2563

1550

msgid ""

1551

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

1552

msgstr ""

1553

1554

#: bzrlib/builtins.py:2472

1554

#: bzrlib/builtins.py:2565

1555

msgid ""

1556

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

1557

" the original file in revision 2."

1558

msgstr ""

1559

1560

#: bzrlib/builtins.py:2475

1560

#: bzrlib/builtins.py:2568

1561

msgid ""

1562

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

1563

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

1564

msgstr ""

1565

1566

#: bzrlib/builtins.py:2478

1566

#: bzrlib/builtins.py:2571

1567

msgid ""

1568

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

1569

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

1570

" until it was last renamed)."

1571

msgstr ""

1572

1573

#: bzrlib/builtins.py:2482

1573

#: bzrlib/builtins.py:2575

1574

msgid ":Other filtering:"

1575

msgstr ""

1576

1577

#: bzrlib/builtins.py:2484

1577

#: bzrlib/builtins.py:2577

1578

msgid ""

1579

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

1580

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

1583

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

1584

msgstr ""

1585

1586

#: bzrlib/builtins.py:2490

1586

#: bzrlib/builtins.py:2583

1587

msgid ":Tips & tricks:"

1588

msgstr ""

1589

1590

#: bzrlib/builtins.py:2492

1590

#: bzrlib/builtins.py:2585

1591

msgid ""

1592

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

1593

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

1596

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

1597

msgstr ""

1598

1599

#: bzrlib/builtins.py:2498

1599

#: bzrlib/builtins.py:2591

1600

msgid ""

1601

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

1602

msgstr ""

1603

1604

#: bzrlib/builtins.py:2500

1604

#: bzrlib/builtins.py:2593

1605

msgid ""

1606

" [ALIASES]\n"

1607

" tip = log -r-1\n"

1609

" show = log -v -p"

1610

msgstr ""

1611

1612

#: bzrlib/builtins.py:2505

1612

#: bzrlib/builtins.py:2598

1613

msgid ""

1614

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

1615

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

1616

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

1617

msgstr ""

1618

1619

#: bzrlib/builtins.py:2509

1619

#: bzrlib/builtins.py:2602

1620

msgid ""

1621

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

1622

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

1623

msgstr ""

1624

1625

#: bzrlib/builtins.py:2512

1625

#: bzrlib/builtins.py:2605

1626

msgid ""

1627

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

1628

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

1630

" be given when using the -v option."

1631

msgstr ""

1632

1633

#: bzrlib/builtins.py:2517

1633

#: bzrlib/builtins.py:2610

1634

msgid ""

1635

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

1636

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

1638

" a list of words but not others."

1639

msgstr ""

1640

1641

#: bzrlib/builtins.py:2522

1641

#: bzrlib/builtins.py:2615

1642

msgid ""

1643

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

1644

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

1646

" trading disk space for faster speed."

1647

msgstr ""

1648

1649

#: bzrlib/builtins.py:2531

1649

#: bzrlib/builtins.py:2624

1650

msgid "Show from oldest to newest."

1651

msgstr ""

1652

1653

#: bzrlib/builtins.py:2534

1653

#: bzrlib/builtins.py:2627

1654

msgid "Show files changed in each revision."

1655

msgstr ""

1656

1657

#: bzrlib/builtins.py:2540

1657

#: bzrlib/builtins.py:2633

1658

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

1659

msgstr ""

1660

1661

#: bzrlib/builtins.py:2544

1661

#: bzrlib/builtins.py:2637

1662

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

1663

msgstr ""

1664

1665

#: bzrlib/builtins.py:2545

1665

#: bzrlib/builtins.py:2638

1666

msgid "Authors"

1667

msgstr ""

1668

1669

#: bzrlib/builtins.py:2550

1669

#: bzrlib/builtins.py:2643

1670

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

1671

msgstr ""

1672

1673

#: bzrlib/builtins.py:2560

1673

#: bzrlib/builtins.py:2653

1674

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

1675

msgstr ""

1676

1677

#: bzrlib/builtins.py:2565

1677

#: bzrlib/builtins.py:2658

1678

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

1679

msgstr ""

1680

1681

#: bzrlib/builtins.py:2567

1681

#: bzrlib/builtins.py:2660

1682

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

1683

msgstr ""

1684

1685

#: bzrlib/builtins.py:2571

1685

#: bzrlib/builtins.py:2664

1686

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

1687

msgstr ""

1688

1689

#: bzrlib/builtins.py:2573

1689

#: bzrlib/builtins.py:2666

1690

msgid ""

1691

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

1692

"rX..Y)."

1693

msgstr ""

1694

1695

#: bzrlib/builtins.py:2577

1695

#: bzrlib/builtins.py:2670

1696

msgid "Show digital signature validity."

1697

msgstr ""

1698

1699

#: bzrlib/builtins.py:2580

1699

#: bzrlib/builtins.py:2673

1700

msgid "Show revisions whose properties match this expression."

1701

msgstr ""

1702

1703

#: bzrlib/builtins.py:2584

1703

#: bzrlib/builtins.py:2677

1704

msgid "Show revisions whose message matches this expression."

1705

msgstr ""

1706

1707

#: bzrlib/builtins.py:2588

1707

#: bzrlib/builtins.py:2681

1708

msgid "Show revisions whose committer matches this expression."

1709

msgstr ""

1710

1711

#: bzrlib/builtins.py:2592

1711

#: bzrlib/builtins.py:2685

1712

msgid "Show revisions whose authors match this expression."

1713

msgstr ""

1714

1715

#: bzrlib/builtins.py:2596

1715

#: bzrlib/builtins.py:2689

1716

msgid "Show revisions whose bugs match this expression."

1717

msgstr ""

1718

1719

#: bzrlib/builtins.py:2650

1719

#: bzrlib/builtins.py:2743

1720

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

1721

msgstr ""

1722

1723

#: bzrlib/builtins.py:2678

1723

#: bzrlib/builtins.py:2771

1724

#, python-format

1725

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

1726

msgstr ""

1727

1728

#: bzrlib/builtins.py:2795

1728

#: bzrlib/builtins.py:2888

1729

#, python-format

1730

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

1731

msgstr ""

1732

1733

#: bzrlib/builtins.py:2811

1733

#: bzrlib/builtins.py:2904

1734

#, python-format

1735

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

1736

msgstr ""

1737

1738

#: bzrlib/builtins.py:2856

1738

#: bzrlib/builtins.py:2949

1739

msgid ""

1740

"List files in a tree.\n"

1741

" "

1742

msgstr ""

1743

1744

#: bzrlib/builtins.py:2865

1744

#: bzrlib/builtins.py:2958

1745

msgid "Recurse into subdirectories."

1746

msgstr ""

1747

1748

#: bzrlib/builtins.py:2867

1748

#: bzrlib/builtins.py:2960

1749

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

1750

msgstr ""

1751

1752

#: bzrlib/builtins.py:2869

1752

#: bzrlib/builtins.py:2962

1753

msgid "Print unknown files."

1754

msgstr ""

1755

1756

#: bzrlib/builtins.py:2870

1756

#: bzrlib/builtins.py:2963

1757

msgid "Print versioned files."

1758

msgstr ""

1759

1760

#: bzrlib/builtins.py:2873

1760

#: bzrlib/builtins.py:2966

1761

msgid "Print ignored files."

1762

msgstr ""

1763

1764

#: bzrlib/builtins.py:2875

1764

#: bzrlib/builtins.py:2968

1765

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

1766

msgstr ""

1767

1768

#: bzrlib/builtins.py:2888

1768

#: bzrlib/builtins.py:2981

1769

msgid "invalid kind specified"

1770

msgstr ""

1771

1772

#: bzrlib/builtins.py:2891

1772

#: bzrlib/builtins.py:2984

1773

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

1774

msgstr ""

1775

1776

#: bzrlib/builtins.py:2900

1776

#: bzrlib/builtins.py:2993

1777

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

1778

msgstr ""

1779

1780

#: bzrlib/builtins.py:2987

1780

#: bzrlib/builtins.py:3080

1781

msgid "Ignore specified files or patterns."

1782

msgstr ""

1783

1784

#: bzrlib/builtins.py:2989

1784

#: bzrlib/builtins.py:3082

1785

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

1786

msgstr ""

1787

1788

#: bzrlib/builtins.py:2991

1788

#: bzrlib/builtins.py:3084

1789

msgid ""

1790

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

1791

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

1794

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

1795

msgstr ""

1796

1797

#: bzrlib/builtins.py:2997

1797

#: bzrlib/builtins.py:3090

1798

msgid ""

1799

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

1800

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

1802

"it."

1803

msgstr ""

1804

1805

#: bzrlib/builtins.py:3002

1805

#: bzrlib/builtins.py:3095

1806

msgid ""

1807

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

1808

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

1811

"can be edited directly using an editor."

1812

msgstr ""

1813

1814

#: bzrlib/builtins.py:3008

1814

#: bzrlib/builtins.py:3101

1815

msgid ""

1816

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

1817

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

1818

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

1819

msgstr ""

1820

1821

#: bzrlib/builtins.py:3012

1821

#: bzrlib/builtins.py:3105

1822

msgid ""

1823

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

1824

"precedence over the '!' exception patterns."

1825

msgstr ""

1826

1827

#: bzrlib/builtins.py:3015

1827

#: bzrlib/builtins.py:3108

1828

msgid ""

1829

":Notes: \n"

1830

" \n"

1832

" the shell on Unix."

1833

msgstr ""

1834

1835

#: bzrlib/builtins.py:3020

1835

#: bzrlib/builtins.py:3113

1836

msgid ""

1837

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

1838

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

1839

msgstr ""

1840

1841

#: bzrlib/builtins.py:3023

1841

#: bzrlib/builtins.py:3116

1842

msgid ""

1843

":Examples:\n"

1844

" Ignore the top level Makefile::"

1845

msgstr ""

1846

1847

#: bzrlib/builtins.py:3026

1847

#: bzrlib/builtins.py:3119

1848

msgid " bzr ignore ./Makefile"

1849

msgstr ""

1850

1851

#: bzrlib/builtins.py:3028

1851

#: bzrlib/builtins.py:3121

1852

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

1853

msgstr ""

1854

1855

#: bzrlib/builtins.py:3030

1855

#: bzrlib/builtins.py:3123

1856

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

1857

msgstr ""

1858

1859

#: bzrlib/builtins.py:3032

1859

#: bzrlib/builtins.py:3125

1860

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

1861

msgstr ""

1862

1863

#: bzrlib/builtins.py:3034

1863

#: bzrlib/builtins.py:3127

1864

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

1865

msgstr ""

1866

1867

#: bzrlib/builtins.py:3036

1867

#: bzrlib/builtins.py:3129

1868

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

1869

msgstr ""

1870

1871

#: bzrlib/builtins.py:3038

1871

#: bzrlib/builtins.py:3131

1872

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

1873

msgstr ""

1874

1875

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

1875

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

1876

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

1877

msgstr ""

1878

1879

#: bzrlib/builtins.py:3042

1879

#: bzrlib/builtins.py:3135

1880

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

1881

msgstr ""

1882

1883

#: bzrlib/builtins.py:3046

1883

#: bzrlib/builtins.py:3139

1884

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

1885

msgstr ""

1886

1887

#: bzrlib/builtins.py:3048

1887

#: bzrlib/builtins.py:3141

1888

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

1889

msgstr ""

1890

1891

#: bzrlib/builtins.py:3050

1891

#: bzrlib/builtins.py:3143

1892

msgid ""

1893

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

1894

" \n"

1900

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

1901

msgstr ""

1902

1903

#: bzrlib/builtins.py:3064

1903

#: bzrlib/builtins.py:3157

1904

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

1905

msgstr ""

1906

1907

#: bzrlib/builtins.py:3076

1907

#: bzrlib/builtins.py:3169

1908

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

1909

msgstr ""

1910

1911

#: bzrlib/builtins.py:3087

1911

#: bzrlib/builtins.py:3180

1912

#, python-format

1913

msgid "Invalid ignore pattern found. %s"

1914

msgid_plural "Invalid ignore patterns found. %s"

1915

msgstr[0] ""

1916

msgstr[1] ""

1917

1918

#: bzrlib/builtins.py:3096

1918

#: bzrlib/builtins.py:3189

1919

msgid "NAME_PATTERN should not be an absolute path"

1920

msgstr ""

1921

1922

#: bzrlib/builtins.py:3109

1922

#: bzrlib/builtins.py:3202

1923

#, python-format

1924

msgid ""

1925

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

1929

"them.\n"

1930

msgstr ""

1931

1932

#: bzrlib/builtins.py:3116

1932

#: bzrlib/builtins.py:3209

1933

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

1934

msgstr ""

1935

1936

#: bzrlib/builtins.py:3118

1936

#: bzrlib/builtins.py:3211

1937

msgid ""

1938

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

1939

"be ignored."

1940

msgstr ""

1941

1942

#: bzrlib/builtins.py:3121

1942

#: bzrlib/builtins.py:3214

1943

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

1944

msgstr ""

1945

1946

#: bzrlib/builtins.py:3123

1946

#: bzrlib/builtins.py:3216

1947

msgid " bzr ls --ignored"

1948

msgstr ""

1949

1950

#: bzrlib/builtins.py:3157

1950

#: bzrlib/builtins.py:3250

1951

#, python-format

1952

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

1953

msgstr ""

1954

1955

#: bzrlib/builtins.py:3164

1955

#: bzrlib/builtins.py:3257

1956

msgid ""

1957

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

1958

msgstr ""

1959

1960

#: bzrlib/builtins.py:3166

1960

#: bzrlib/builtins.py:3259

1961

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

1962

msgstr ""

1963

1964

#: bzrlib/builtins.py:3168

1964

#: bzrlib/builtins.py:3261

1965

msgid ""

1966

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

1967

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

1968

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

1969

msgstr ""

1970

1971

#: bzrlib/builtins.py:3172

1971

#: bzrlib/builtins.py:3265

1972

msgid ""

1973

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

1974

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

1975

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

1976

msgstr ""

1977

1978

#: bzrlib/builtins.py:3176

1978

#: bzrlib/builtins.py:3269

1979

msgid ""

1980

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

1981

"directory will be used."

1982

msgstr ""

1983

1984

#: bzrlib/builtins.py:3179

1984

#: bzrlib/builtins.py:3272

1985

msgid ""

1986

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

1987

msgstr ""

1988

1989

#: bzrlib/builtins.py:3181

1989

#: bzrlib/builtins.py:3274

1990

msgid ""

1991

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

1992

" Supported formats Autodetected by extension\n"

1999

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

2000

msgstr ""

2001

2002

#: bzrlib/builtins.py:3195

2002

#: bzrlib/builtins.py:3288

2003

msgid "Type of file to export to."

2004

msgstr ""

2005

2006

#: bzrlib/builtins.py:3198

2006

#: bzrlib/builtins.py:3291

2007

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

2008

msgstr ""

2009

2010

#: bzrlib/builtins.py:3202

2010

#: bzrlib/builtins.py:3295

2011

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

2012

msgstr ""

2013

2014

#: bzrlib/builtins.py:3204

2014

#: bzrlib/builtins.py:3297

2015

msgid ""

2016

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

2017

"changed."

2018

msgstr ""

2019

2020

#: bzrlib/builtins.py:3207

2020

#: bzrlib/builtins.py:3300

2021

msgid ""

2022

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

2023

msgstr ""

2024

2025

#: bzrlib/builtins.py:3226

2025

#: bzrlib/builtins.py:3319

2026

msgid "--uncommitted requires a working tree"

2027

msgstr ""

2028

2029

#: bzrlib/builtins.py:3235

2029

#: bzrlib/builtins.py:3328

2030

#, python-format

2031

msgid "Unsupported export format: %s"

2032

msgstr ""

2033

2034

#: bzrlib/builtins.py:3239

2034

#: bzrlib/builtins.py:3332

2035

msgid ""

2036

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

2037

msgstr ""

2038

2039

#: bzrlib/builtins.py:3241

2039

#: bzrlib/builtins.py:3334

2040

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

2041

msgstr ""

2042

2043

#: bzrlib/builtins.py:3243

2043

#: bzrlib/builtins.py:3336

2044

msgid ""

2045

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

2046

"binary file."

2047

msgstr ""

2048

2049

#: bzrlib/builtins.py:3249

2049

#: bzrlib/builtins.py:3342

2050

msgid "The path name in the old tree."

2051

msgstr ""

2052

2053

#: bzrlib/builtins.py:3250

2053

#: bzrlib/builtins.py:3343

2054

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

2055

msgstr ""

2056

2057

#: bzrlib/builtins.py:3261

2057

#: bzrlib/builtins.py:3354

2058

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

2059

msgstr ""

2060

2061

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

2061

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

2062

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

2063

msgstr ""

2064

2065

#: bzrlib/builtins.py:3321

2065

#: bzrlib/builtins.py:3414

2066

msgid "Commit changes into a new revision."

2067

msgstr ""

2068

2069

#: bzrlib/builtins.py:3323

2069

#: bzrlib/builtins.py:3416

2070

msgid ""

2071

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

2072

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

2076

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

2077

msgstr ""

2078

2079

#: bzrlib/builtins.py:3330

2079

#: bzrlib/builtins.py:3423

2080

msgid ""

2081

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

2082

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

2083

"as explained below."

2084

msgstr ""

2085

2086

#: bzrlib/builtins.py:3334

2086

#: bzrlib/builtins.py:3427

2087

msgid ":Selective commits:"

2088

msgstr ""

2089

2090

#: bzrlib/builtins.py:3336

2090

#: bzrlib/builtins.py:3429

2091

msgid ""

2092

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

2093

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

2094

" everything within it is committed."

2095

msgstr ""

2096

2097

#: bzrlib/builtins.py:3340

2097

#: bzrlib/builtins.py:3433

2098

msgid ""

2099

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

2100

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

2101

" within foo/bar::"

2102

msgstr ""

2103

2104

#: bzrlib/builtins.py:3344

2104

#: bzrlib/builtins.py:3437

2105

msgid " bzr commit foo -x foo/bar"

2106

msgstr ""

2107

2108

#: bzrlib/builtins.py:3346

2108

#: bzrlib/builtins.py:3439

2109

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

2110

msgstr ""

2111

2112

#: bzrlib/builtins.py:3348

2112

#: bzrlib/builtins.py:3441

2113

msgid ":Custom authors:"

2114

msgstr ""

2115

2116

#: bzrlib/builtins.py:3350

2116

#: bzrlib/builtins.py:3443

2117

msgid ""

2118

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

2119

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

2123

" author."

2124

msgstr ""

2125

2126

#: bzrlib/builtins.py:3357

2126

#: bzrlib/builtins.py:3450

2127

msgid ":Checks:"

2128

msgstr ""

2129

2130

#: bzrlib/builtins.py:3359

2130

#: bzrlib/builtins.py:3452

2131

msgid ""

2132

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

2133

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

2136

" for details."

2137

msgstr ""

2138

2139

#: bzrlib/builtins.py:3365

2139

#: bzrlib/builtins.py:3458

2140

msgid ":Things to note:"

2141

msgstr ""

2142

2143

#: bzrlib/builtins.py:3367

2143

#: bzrlib/builtins.py:3460

2144

msgid ""

2145

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

2146

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

2147

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

2148

msgstr ""

2149

2150

#: bzrlib/builtins.py:3371

2150

#: bzrlib/builtins.py:3464

2151

msgid ""

2152

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

2153

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

2155

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

2156

msgstr ""

2157

2158

#: bzrlib/builtins.py:3381

2158

#: bzrlib/builtins.py:3474

2159

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

2160

msgstr ""

2161

2162

#: bzrlib/builtins.py:3384

2162

#: bzrlib/builtins.py:3477

2163

msgid "Description of the new revision."

2164

msgstr ""

2165

2166

#: bzrlib/builtins.py:3387

2166

#: bzrlib/builtins.py:3480

2167

msgid "Commit even if nothing has changed."

2168

msgstr ""

2169

2170

#: bzrlib/builtins.py:3391

2170

#: bzrlib/builtins.py:3484

2171

msgid "Take commit message from this file."

2172

msgstr ""

2173

2174

#: bzrlib/builtins.py:3393

2174

#: bzrlib/builtins.py:3486

2175

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

2176

msgstr ""

2177

2178

#: bzrlib/builtins.py:3396

2178

#: bzrlib/builtins.py:3489

2179

msgid ""

2180

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

2181

"08:00:00 +0100'."

2182

msgstr ""

2183

2184

#: bzrlib/builtins.py:3399

2184

#: bzrlib/builtins.py:3492

2185

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

2186

msgstr ""

2187

2188

#: bzrlib/builtins.py:3402

2188

#: bzrlib/builtins.py:3495

2189

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

2190

msgstr ""

2191

2192

#: bzrlib/builtins.py:3405

2192

#: bzrlib/builtins.py:3498

2193

msgid ""

2194

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

2195

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

2196

msgstr ""

2197

2198

#: bzrlib/builtins.py:3411

2198

#: bzrlib/builtins.py:3504

2199

msgid ""

2200

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

2201

"the message editor."

2202

msgstr ""

2203

2204

#: bzrlib/builtins.py:3414

2204

#: bzrlib/builtins.py:3507

2205

msgid ""

2206

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

2207

"can not be natively represented."

2208

msgstr ""

2209

2210

#: bzrlib/builtins.py:3432

2210

#: bzrlib/builtins.py:3525

2211

#, python-format

2212

msgid ""

2213

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

2215

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

2216

msgstr ""

2217

2218

#: bzrlib/builtins.py:3441

2218

#: bzrlib/builtins.py:3534

2219

#, python-format

2220

msgid ""

2221

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

2223

"Commit refused."

2224

msgstr ""

2225

2226

#: bzrlib/builtins.py:3450

2226

#: bzrlib/builtins.py:3543

2227

#, python-format

2228

msgid "Unrecognized bug %s. Commit refused."

2229

msgstr ""

2230

2231

#: bzrlib/builtins.py:3453

2231

#: bzrlib/builtins.py:3546

2232

#, python-format

2233

msgid ""

2234

"%s\n"

2235

"Commit refused."

2236

msgstr ""

2237

2238

#: bzrlib/builtins.py:3477

2238

#: bzrlib/builtins.py:3570

2239

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

2240

msgstr ""

2241

2242

#: bzrlib/builtins.py:3517

2242

#: bzrlib/builtins.py:3610

2243

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

2244

msgstr ""

2245

2246

#: bzrlib/builtins.py:3546

2246

#: bzrlib/builtins.py:3639

2247

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

2248

msgstr ""

2249

2250

#: bzrlib/builtins.py:3549

2250

#: bzrlib/builtins.py:3642

2251

msgid ""

2252

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

2253

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

2254

msgstr ""

2255

2256

#: bzrlib/builtins.py:3569

2256

#: bzrlib/builtins.py:3662

2257

msgid ""

2258

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

2259

"-unchanged to force an empty commit."

2260

msgstr ""

2261

2262

#: bzrlib/builtins.py:3573

2262

#: bzrlib/builtins.py:3666

2263

msgid ""

2264

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

2265

"resolve FILE\" to resolve."

2266

msgstr ""

2267

2268

#: bzrlib/builtins.py:3577

2268

#: bzrlib/builtins.py:3670

2269

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

2270

msgstr ""

2271

2272

#: bzrlib/builtins.py:3580

2272

#: bzrlib/builtins.py:3673

2273

msgid ""

2274

"\n"

2275

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

2276

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

2277

msgstr ""

2278

2279

#: bzrlib/builtins.py:3588

2279

#: bzrlib/builtins.py:3681

2280

msgid ""

2281

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

2282

msgstr ""

2283

2284

#: bzrlib/builtins.py:3590

2284

#: bzrlib/builtins.py:3683

2285

msgid ""

2286

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

2287

"to detect data corruption or bzr bugs."

2288

msgstr ""

2289

2290

#: bzrlib/builtins.py:3593

2290

#: bzrlib/builtins.py:3686

2291

msgid ""

2292

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

2293

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

2294

msgstr ""

2295

2296

#: bzrlib/builtins.py:3596

2296

#: bzrlib/builtins.py:3689

2297

msgid ""

2298

"revisions\n"

2299

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

2300

" indicate a problem."

2301

msgstr ""

2302

2303

#: bzrlib/builtins.py:3600

2303

#: bzrlib/builtins.py:3693

2304

msgid ""

2305

"versionedfiles\n"

2306

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

2307

" doesn't indicate a problem."

2308

msgstr ""

2309

2310

#: bzrlib/builtins.py:3604

2310

#: bzrlib/builtins.py:3697

2311

msgid ""

2312

"unreferenced ancestors\n"

2313

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

2315

" subtle problem that Bazaar can work around."

2316

msgstr ""

2317

2318

#: bzrlib/builtins.py:3609

2318

#: bzrlib/builtins.py:3702

2319

msgid ""

2320

"unique file texts\n"

2321

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

2322

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

2323

msgstr ""

2324

2325

#: bzrlib/builtins.py:3613

2325

#: bzrlib/builtins.py:3706

2326

msgid ""

2327

"repeated file texts\n"

2328

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

2331

" indicate a problem."

2332

msgstr ""

2333

2334

#: bzrlib/builtins.py:3619

2334

#: bzrlib/builtins.py:3712

2335

msgid ""

2336

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

2337

"given\n"

2338

"location will be checked."

2339

msgstr ""

2340

2341

#: bzrlib/builtins.py:3624

2341

#: bzrlib/builtins.py:3717

2342

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

2343

msgstr ""

2344

2345

#: bzrlib/builtins.py:3626

2345

#: bzrlib/builtins.py:3719

2346

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

2347

msgstr ""

2348

2349

#: bzrlib/builtins.py:3628

2349

#: bzrlib/builtins.py:3721

2350

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

2351

msgstr ""

2352

2353

#: bzrlib/builtins.py:3630

2353

#: bzrlib/builtins.py:3723

2354

msgid " bzr check --repo bar"

2355

msgstr ""

2356

2357

#: bzrlib/builtins.py:3632

2357

#: bzrlib/builtins.py:3725

2358

msgid " Check everything at 'baz'::"

2359

msgstr ""

2360

2361

#: bzrlib/builtins.py:3634

2361

#: bzrlib/builtins.py:3727

2362

msgid " bzr check baz"

2363

msgstr ""

2364

2365

#: bzrlib/builtins.py:3640

2365

#: bzrlib/builtins.py:3733

2366

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

2367

msgstr ""

2368

2369

#: bzrlib/builtins.py:3642

2369

#: bzrlib/builtins.py:3735

2370

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

2371

msgstr ""

2372

2373

#: bzrlib/builtins.py:3644

2373

#: bzrlib/builtins.py:3737

2374

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

2375

msgstr ""

2376

2377

#: bzrlib/builtins.py:3658

2377

#: bzrlib/builtins.py:3751

2378

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

2379

msgstr ""

2380

2381

#: bzrlib/builtins.py:3660

2381

#: bzrlib/builtins.py:3753

2382

msgid ""

2383

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

2384

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

2387

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

2388

msgstr ""

2389

2390

#: bzrlib/builtins.py:3666

2390

#: bzrlib/builtins.py:3759

2391

msgid ""

2392

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

2393

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

2397

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

2398

msgstr ""

2399

2400

#: bzrlib/builtins.py:3673

2400

#: bzrlib/builtins.py:3766

2401

msgid ""

2402

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

2403

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

2408

"afterwards."

2409

msgstr ""

2410

2411

#: bzrlib/builtins.py:3681

2411

#: bzrlib/builtins.py:3774

2412

msgid ""

2413

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

2414

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

2416

"tried."

2417

msgstr ""

2418

2419

#: bzrlib/builtins.py:3686

2419

#: bzrlib/builtins.py:3779

2420

msgid ""

2421

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

2422

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

2423

msgstr ""

2424

2425

#: bzrlib/builtins.py:3694

2425

#: bzrlib/builtins.py:3787

2426

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

2427

msgstr ""

2428

2429

#: bzrlib/builtins.py:3698

2429

#: bzrlib/builtins.py:3791

2430

msgid "Branch format"

2431

msgstr ""

2432

2433

#: bzrlib/builtins.py:3700

2433

#: bzrlib/builtins.py:3793

2434

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

2435

msgstr ""

2436

2437

#: bzrlib/builtins.py:3702

2437

#: bzrlib/builtins.py:3795

2438

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

2439

msgstr ""

2440

2441

#: bzrlib/builtins.py:3717

2441

#: bzrlib/builtins.py:3810

2442

msgid "Show or set bzr user id."

2443

msgstr ""

2444

2445

#: bzrlib/builtins.py:3719

2445

#: bzrlib/builtins.py:3812

2446

msgid ""

2447

":Examples:\n"

2448

" Show the email of the current user::"

2449

msgstr ""

2450

2451

#: bzrlib/builtins.py:3722

2451

#: bzrlib/builtins.py:3815

2452

msgid " bzr whoami --email"

2453

msgstr ""

2454

2455

#: bzrlib/builtins.py:3724

2455

#: bzrlib/builtins.py:3817

2456

msgid " Set the current user::"

2457

msgstr ""

2458

2459

#: bzrlib/builtins.py:3726

2459

#: bzrlib/builtins.py:3819

2460

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

2461

msgstr ""

2462

2463

#: bzrlib/builtins.py:3730

2463

#: bzrlib/builtins.py:3823

2464

msgid "Display email address only."

2465

msgstr ""

2466

2467

#: bzrlib/builtins.py:3732

2467

#: bzrlib/builtins.py:3825

2468

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

2469

msgstr ""

2470

2471

#: bzrlib/builtins.py:3758

2471

#: bzrlib/builtins.py:3851

2472

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

2473

msgstr ""

2474

2475

#: bzrlib/builtins.py:3780

2475

#: bzrlib/builtins.py:3873

2476

msgid "Print or set the branch nickname."

2477

msgstr ""

2478

2479

#: bzrlib/builtins.py:3782

2479

#: bzrlib/builtins.py:3875

2480

msgid ""

2481

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

2482

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

2483

msgstr ""

2484

2485

#: bzrlib/builtins.py:3785

2485

#: bzrlib/builtins.py:3878

2486

msgid ""

2487

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

2488

"locally."

2489

msgstr ""

2490

2491

#: bzrlib/builtins.py:3805

2491

#: bzrlib/builtins.py:3898

2492

msgid "Set/unset and display aliases."

2493

msgstr ""

2494

2495

#: bzrlib/builtins.py:3807

2495

#: bzrlib/builtins.py:3900

2496

msgid ""

2497

":Examples:\n"

2498

" Show the current aliases::"

2499

msgstr ""

2500

2501

#: bzrlib/builtins.py:3810

2501

#: bzrlib/builtins.py:3903

2502

msgid " bzr alias"

2503

msgstr ""

2504

2505

#: bzrlib/builtins.py:3812

2505

#: bzrlib/builtins.py:3905

2506

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

2507

msgstr ""

2508

2509

#: bzrlib/builtins.py:3814

2509

#: bzrlib/builtins.py:3907

2510

msgid " bzr alias ll"

2511

msgstr ""

2512

2513

#: bzrlib/builtins.py:3816

2513

#: bzrlib/builtins.py:3909

2514

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

2515

msgstr ""

2516

2517

#: bzrlib/builtins.py:3818

2517

#: bzrlib/builtins.py:3911

2518

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

2519

msgstr ""

2520

2521

#: bzrlib/builtins.py:3820

2521

#: bzrlib/builtins.py:3913

2522

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

2523

msgstr ""

2524

2525

#: bzrlib/builtins.py:3822

2525

#: bzrlib/builtins.py:3915

2526

msgid " bzr alias --remove ll"

2527

msgstr ""

2528

2529

#: bzrlib/builtins.py:3827

2529

#: bzrlib/builtins.py:3920

2530

msgid "Remove the alias."

2531

msgstr ""

2532

2533

#: bzrlib/builtins.py:3845

2533

#: bzrlib/builtins.py:3938

2534

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

2535

msgstr ""

2536

2537

#: bzrlib/builtins.py:4026

2537

#: bzrlib/builtins.py:4119

2538

msgid ""

2539

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

2540

msgstr ""

2541

2542

#: bzrlib/builtins.py:4043

2542

#: bzrlib/builtins.py:4136

2543

msgid ""

2544

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

2545

msgstr ""

2546

2547

#: bzrlib/builtins.py:4090

2547

#: bzrlib/builtins.py:4183

2548

msgid "Show version of bzr."

2549

msgstr ""

2550

2551

#: bzrlib/builtins.py:4094

2551

#: bzrlib/builtins.py:4187

2552

msgid "Print just the version number."

2553

msgstr ""

2554

2555

#: bzrlib/builtins.py:4113

2555

#: bzrlib/builtins.py:4206

2556

msgid "It sure does!\n"

2557

msgstr ""

2558

2559

#: bzrlib/builtins.py:4137

2559

#: bzrlib/builtins.py:4230

2560

#, python-format

2561

msgid "merge base is revision %s\n"

2562

msgstr ""

2563

2564

#: bzrlib/builtins.py:4141

2564

#: bzrlib/builtins.py:4234

2565

msgid "Perform a three-way merge."

2566

msgstr ""

2567

2568

#: bzrlib/builtins.py:4143

2568

#: bzrlib/builtins.py:4236

2569

msgid ""

2570

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

2571

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

2576

"the current working tree."

2577

msgstr ""

2578

2579

#: bzrlib/builtins.py:4151

2579

#: bzrlib/builtins.py:4244

2580

msgid ""

2581

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

2582

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

2583

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

2584

msgstr ""

2585

2586

#: bzrlib/builtins.py:4155

2586

#: bzrlib/builtins.py:4248

2587

msgid ""

2588

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

2589

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

2590

msgstr ""

2591

2592

#: bzrlib/builtins.py:4158

2592

#: bzrlib/builtins.py:4251

2593

msgid ""

2594

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

2595

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

2600

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

2601

msgstr ""

2602

2603

#: bzrlib/builtins.py:4166

2603

#: bzrlib/builtins.py:4259

2604

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

2605

msgstr ""

2606

2607

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

2607

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

2608

msgid ""

2609

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

2610

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

2611

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

2612

"before you should commit."

2612

"before you can commit."

2613

msgstr ""

2614

2615

#: bzrlib/builtins.py:4173

2615

#: bzrlib/builtins.py:4266

2616

msgid ""

2617

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

2618

msgstr ""

2619

2620

#: bzrlib/builtins.py:4175

2620

#: bzrlib/builtins.py:4268

2621

msgid ""

2622

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

2623

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

2625

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

2626

msgstr ""

2627

2628

#: bzrlib/builtins.py:4180

2628

#: bzrlib/builtins.py:4273

2629

msgid ""

2630

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

2631

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

2632

"committed to record the result of the merge."

2633

msgstr ""

2634

2635

#: bzrlib/builtins.py:4184

2635

#: bzrlib/builtins.py:4277

2636

msgid ""

2637

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

2638

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

2641

"merge revision which has more than two parents."

2642

msgstr ""

2643

2644

#: bzrlib/builtins.py:4190

2644

#: bzrlib/builtins.py:4283

2645

msgid ""

2646

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

2647

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

2648

"can be given."

2649

msgstr ""

2650

2651

#: bzrlib/builtins.py:4194

2651

#: bzrlib/builtins.py:4287

2652

msgid ""

2653

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

2654

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

2655

msgstr ""

2656

2657

#: bzrlib/builtins.py:4197

2657

#: bzrlib/builtins.py:4290

2658

msgid ""

2659

":Examples:\n"

2660

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

2661

msgstr ""

2662

2663

#: bzrlib/builtins.py:4200

2663

#: bzrlib/builtins.py:4293

2664

msgid " bzr merge ../bzr.dev"

2665

msgstr ""

2666

2667

#: bzrlib/builtins.py:4202

2667

#: bzrlib/builtins.py:4295

2668

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

2669

msgstr ""

2670

2671

#: bzrlib/builtins.py:4204

2671

#: bzrlib/builtins.py:4297

2672

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

2673

msgstr ""

2674

2675

#: bzrlib/builtins.py:4206

2675

#: bzrlib/builtins.py:4299

2676

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

2677

msgstr ""

2678

2679

#: bzrlib/builtins.py:4208

2679

#: bzrlib/builtins.py:4301

2680

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

2681

msgstr ""

2682

2683

#: bzrlib/builtins.py:4210

2683

#: bzrlib/builtins.py:4303

2684

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

2685

msgstr ""

2686

2687

#: bzrlib/builtins.py:4212

2687

#: bzrlib/builtins.py:4305

2688

msgid " bzr merge /tmp/merge"

2689

msgstr ""

2690

2691

#: bzrlib/builtins.py:4214

2691

#: bzrlib/builtins.py:4307

2692

msgid ""

2693

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

2694

" feature1a and feature1b:"

2695

msgstr ""

2696

2697

#: bzrlib/builtins.py:4217

2697

#: bzrlib/builtins.py:4310

2698

msgid ""

2699

" bzr merge ../feature1a\n"

2700

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

2701

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

2702

msgstr ""

2703

2704

#: bzrlib/builtins.py:4229

2704

#: bzrlib/builtins.py:4322

2705

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

2706

msgstr ""

2707

2708

#: bzrlib/builtins.py:4235

2708

#: bzrlib/builtins.py:4328

2709

msgid ""

2710

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

2711

msgstr ""

2712

2713

#: bzrlib/builtins.py:4237

2713

#: bzrlib/builtins.py:4330

2714

msgid ""

2715

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

2716

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

2717

"commit the result."

2718

msgstr ""

2719

2720

#: bzrlib/builtins.py:4242

2720

#: bzrlib/builtins.py:4335

2721

msgid ""

2722

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

2723

msgstr ""

2724

2725

#: bzrlib/builtins.py:4244

2725

#: bzrlib/builtins.py:4337

2726

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

2727

msgstr ""

2728

2729

#: bzrlib/builtins.py:4246

2729

#: bzrlib/builtins.py:4339

2730

msgid "Select changes interactively."

2731

msgstr ""

2732

2733

#: bzrlib/builtins.py:4268

2733

#: bzrlib/builtins.py:4361

2734

msgid ""

2735

"Merging into empty branches not currently supported, "

2736

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

2737

msgstr ""

2738

2739

#: bzrlib/builtins.py:4295

2739

#: bzrlib/builtins.py:4388

2740

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

2741

msgstr ""

2742

2743

#: bzrlib/builtins.py:4306

2743

#: bzrlib/builtins.py:4399

2744

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

2745

msgstr ""

2746

2747

#: bzrlib/builtins.py:4326

2747

#: bzrlib/builtins.py:4419

2748

msgid "merger: "

2749

msgstr ""

2750

2751

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

2751

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

2752

msgid "Nothing to do."

2753

msgstr ""

2754

2755

#: bzrlib/builtins.py:4332

2755

#: bzrlib/builtins.py:4425

2756

msgid "Cannot pull individual files"

2757

msgstr ""

2758

2759

#: bzrlib/builtins.py:4340

2759

#: bzrlib/builtins.py:4433

2760

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

2761

msgstr ""

2762

2763

#: bzrlib/builtins.py:4398

2763

#: bzrlib/builtins.py:4491

2764

#, python-format

2765

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

2766

msgstr ""

2767

2768

#: bzrlib/builtins.py:4407

2768

#: bzrlib/builtins.py:4500

2769

#, python-format

2770

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

2771

msgstr ""

2772

2773

#: bzrlib/builtins.py:4411

2773

#: bzrlib/builtins.py:4504

2774

msgid "Cannot do conflict reduction and show base."

2775

msgstr ""

2776

2777

#: bzrlib/builtins.py:4522

2777

#: bzrlib/builtins.py:4615

2778

msgid "No location specified or remembered"

2779

msgstr ""

2780

2781

#: bzrlib/builtins.py:4524

2781

#: bzrlib/builtins.py:4617

2782

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

2783

msgstr ""

2784

2785

#: bzrlib/builtins.py:4530

2785

#: bzrlib/builtins.py:4623

2786

msgid "Redo a merge."

2787

msgstr ""

2788

2789

#: bzrlib/builtins.py:4532

2789

#: bzrlib/builtins.py:4625

2790

msgid ""

2791

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

2792

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

2793

"lets you try different ones on different files."

2794

msgstr ""

2795

2796

#: bzrlib/builtins.py:4536

2796

#: bzrlib/builtins.py:4629

2797

msgid ""

2798

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

2799

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

2800

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

2801

msgstr ""

2802

2803

#: bzrlib/builtins.py:4540

2803

#: bzrlib/builtins.py:4633

2804

msgid ""

2805

":Examples:\n"

2806

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

2807

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

2808

msgstr ""

2809

2810

#: bzrlib/builtins.py:4544

2810

#: bzrlib/builtins.py:4637

2811

msgid " bzr remerge --show-base"

2812

msgstr ""

2813

2814

#: bzrlib/builtins.py:4546

2814

#: bzrlib/builtins.py:4639

2815

msgid ""

2816

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

2817

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

2818

msgstr ""

2819

2820

#: bzrlib/builtins.py:4549

2820

#: bzrlib/builtins.py:4642

2821

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

2822

msgstr ""

2823

2824

#: bzrlib/builtins.py:4556

2824

#: bzrlib/builtins.py:4649

2825

msgid "Show base revision text in conflicts."

2826

msgstr ""

2827

2828

#: bzrlib/builtins.py:4568

2828

#: bzrlib/builtins.py:4661

2829

msgid ""

2830

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

2831

"merges."

2832

msgstr ""

2833

2834

#: bzrlib/builtins.py:4624

2834

#: bzrlib/builtins.py:4717

2835

msgid "Revert files to a previous revision."

2836

msgstr ""

2837

2838

#: bzrlib/builtins.py:4626

2838

#: bzrlib/builtins.py:4719

2839

msgid ""

2840

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

2841

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

2842

"last committed revision is used."

2843

msgstr ""

2844

2845

#: bzrlib/builtins.py:4630

2845

#: bzrlib/builtins.py:4723

2846

msgid ""

2847

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

2848

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

2851

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

2852

msgstr ""

2853

2854

#: bzrlib/builtins.py:4636

2854

#: bzrlib/builtins.py:4729

2855

msgid ""

2856

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

2857

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

2858

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

2859

msgstr ""

2860

2861

#: bzrlib/builtins.py:4640

2861

#: bzrlib/builtins.py:4733

2862

msgid ""

2863

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

2864

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

2866

"reverted."

2867

msgstr ""

2868

2869

#: bzrlib/builtins.py:4645

2869

#: bzrlib/builtins.py:4738

2870

msgid ""

2871

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

2872

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

2874

"deleted."

2875

msgstr ""

2876

2877

#: bzrlib/builtins.py:4650

2877

#: bzrlib/builtins.py:4743

2878

msgid ""

2879

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

2880

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

2886

"reverting any files."

2887

msgstr ""

2888

2889

#: bzrlib/builtins.py:4659

2889

#: bzrlib/builtins.py:4752

2890

msgid ""

2891

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

2892

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

2900

"target branches."

2901

msgstr ""

2902

2903

#: bzrlib/builtins.py:4673

2903

#: bzrlib/builtins.py:4766

2904

msgid "Do not save backups of reverted files."

2905

msgstr ""

2906

2907

#: bzrlib/builtins.py:4675

2907

#: bzrlib/builtins.py:4768

2908

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

2909

msgstr ""

2910

2911

#: bzrlib/builtins.py:4706

2911

#: bzrlib/builtins.py:4799

2912

msgid ""

2913

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

2914

" "

2915

msgstr ""

2916

2917

#: bzrlib/builtins.py:4711

2917

#: bzrlib/builtins.py:4804

2918

msgid "Show help on all commands."

2919

msgstr ""

2920

2921

#: bzrlib/builtins.py:4740

2921

#: bzrlib/builtins.py:4833

2922

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

2923

msgstr ""

2924

2925

#: bzrlib/builtins.py:4742

2925

#: bzrlib/builtins.py:4835

2926

msgid "OTHER_BRANCH may be local or remote."

2927

msgstr ""

2928

2929

#: bzrlib/builtins.py:4744

2929

#: bzrlib/builtins.py:4837

2930

msgid ""

2931

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

2932

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

2937

" 0 - no missing revisions"

2938

msgstr ""

2939

2940

#: bzrlib/builtins.py:4754

2940

#: bzrlib/builtins.py:4847

2941

msgid ""

2942

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

2943

" remembered pull location::"

2944

msgstr ""

2945

2946

#: bzrlib/builtins.py:4757

2946

#: bzrlib/builtins.py:4850

2947

msgid " bzr missing"

2948

msgstr ""

2949

2950

#: bzrlib/builtins.py:4759

2950

#: bzrlib/builtins.py:4852

2951

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

2952

msgstr ""

2953

2954

#: bzrlib/builtins.py:4761

2954

#: bzrlib/builtins.py:4854

2955

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

2956

msgstr ""

2957

2958

#: bzrlib/builtins.py:4763

2958

#: bzrlib/builtins.py:4856

2959

msgid ""

2960

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

2961

" branch::"

2962

msgstr ""

2963

2964

#: bzrlib/builtins.py:4766

2964

#: bzrlib/builtins.py:4859

2965

msgid " bzr missing -r ..-10"

2966

msgstr ""

2967

2968

#: bzrlib/builtins.py:4768

2968

#: bzrlib/builtins.py:4861

2969

msgid ""

2970

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

2971

" branch::"

2972

msgstr ""

2973

2974

#: bzrlib/builtins.py:4771

2974

#: bzrlib/builtins.py:4864

2975

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

2976

msgstr ""

2977

2978

#: bzrlib/builtins.py:4778

2978

#: bzrlib/builtins.py:4871

2979

msgid "Reverse the order of revisions."

2980

msgstr ""

2981

2982

#: bzrlib/builtins.py:4780

2982

#: bzrlib/builtins.py:4873

2983

msgid "Display changes in the local branch only."

2984

msgstr ""

2985

2986

#: bzrlib/builtins.py:4781

2986

#: bzrlib/builtins.py:4874

2987

msgid "Same as --mine-only."

2988

msgstr ""

2989

2990

#: bzrlib/builtins.py:4783

2990

#: bzrlib/builtins.py:4876

2991

msgid "Display changes in the remote branch only."

2992

msgstr ""

2993

2994

#: bzrlib/builtins.py:4784

2994

#: bzrlib/builtins.py:4877

2995

msgid "Same as --theirs-only."

2996

msgstr ""

2997

2998

#: bzrlib/builtins.py:4789

2998

#: bzrlib/builtins.py:4882

2999

msgid ""

3000

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

3001

"details."

3002

msgstr ""

3003

3004

#: bzrlib/builtins.py:4793

3004

#: bzrlib/builtins.py:4886

3005

msgid ""

3006

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

3007

"details."

3008

msgstr ""

3009

3010

#: bzrlib/builtins.py:4796

3010

#: bzrlib/builtins.py:4889

3011

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

3012

msgstr ""

3013

3014

#: bzrlib/builtins.py:4850

3014

#: bzrlib/builtins.py:4943

3015

msgid "No peer location known or specified."

3016

msgstr ""

3017

3018

#: bzrlib/builtins.py:4854

3018

#: bzrlib/builtins.py:4947

3019

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

3020

msgstr ""

3021

3022

#: bzrlib/builtins.py:4887

3022

#: bzrlib/builtins.py:4980

3023

#, python-format

3024

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

3025

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

3026

msgstr[0] ""

3027

msgstr[1] ""

3028

3029

#: bzrlib/builtins.py:4903

3029

#: bzrlib/builtins.py:4996

3030

#, python-format

3031

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

3032

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

3033

msgstr[0] ""

3034

msgstr[1] ""

3035

3036

#: bzrlib/builtins.py:4915

3036

#: bzrlib/builtins.py:5008

3037

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

3038

msgstr ""

3039

3040

#: bzrlib/builtins.py:4918

3040

#: bzrlib/builtins.py:5011

3041

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

3042

msgstr ""

3043

3044

#: bzrlib/builtins.py:4923

3044

#: bzrlib/builtins.py:5016

3045

msgid "Branches are up to date.\n"

3046

msgstr ""

3047

3048

#: bzrlib/builtins.py:4934

3048

#: bzrlib/builtins.py:5027

3049

msgid "Compress the data within a repository."

3050

msgstr ""

3051

3052

#: bzrlib/builtins.py:4936

3052

#: bzrlib/builtins.py:5029

3053

msgid ""

3054

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

3055

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

3056

"normally not required to be done manually."

3057

msgstr ""

3058

3059

#: bzrlib/builtins.py:4940

3059

#: bzrlib/builtins.py:5033

3060

msgid ""

3061

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

3062

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

3065

"used."

3066

msgstr ""

3067

3068

#: bzrlib/builtins.py:4946

3068

#: bzrlib/builtins.py:5039

3069

msgid ""

3070

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

3071

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

3073

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

3074

msgstr ""

3075

3076

#: bzrlib/builtins.py:4955

3076

#: bzrlib/builtins.py:5048

3077

msgid "Delete obsolete packs to save disk space."

3078

msgstr ""

3079

3080

#: bzrlib/builtins.py:4969

3080

#: bzrlib/builtins.py:5062

3081

msgid "List the installed plugins."

3082

msgstr ""

3083

3084

#: bzrlib/builtins.py:4971

3084

#: bzrlib/builtins.py:5064

3085

msgid ""

3086

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

3087

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

3088

msgstr ""

3089

3090

#: bzrlib/builtins.py:4974

3090

#: bzrlib/builtins.py:5067

3091

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

3092

msgstr ""

3093

3094

#: bzrlib/builtins.py:4976

3094

#: bzrlib/builtins.py:5069

3095

msgid ""

3096

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

3097

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

3100

"customizing log output."

3101

msgstr ""

3102

3103

#: bzrlib/builtins.py:4982

3103

#: bzrlib/builtins.py:5075

3104

msgid ""

3105

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

3106

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

3108

"plugins using the Python programming language."

3109

msgstr ""

3110

3111

#: bzrlib/builtins.py:4998

3111

#: bzrlib/builtins.py:5091

3112

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

3113

msgstr ""

3114

3115

#: bzrlib/builtins.py:5001

3115

#: bzrlib/builtins.py:5094

3116

msgid "Produce long-format testament."

3117

msgstr ""

3118

3119

#: bzrlib/builtins.py:5003

3119

#: bzrlib/builtins.py:5096

3120

msgid "Produce a strict-format testament."

3121

msgstr ""

3122

3123

#: bzrlib/builtins.py:5029

3123

#: bzrlib/builtins.py:5122

3124

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

3125

msgstr ""

3126

3127

#: bzrlib/builtins.py:5031

3127

#: bzrlib/builtins.py:5124

3128

msgid ""

3129

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

3130

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

3131

msgstr ""

3132

3133

#: bzrlib/builtins.py:5034

3133

#: bzrlib/builtins.py:5127

3134

msgid ""

3135

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

3136

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

3137

msgstr ""

3138

3139

#: bzrlib/builtins.py:5042

3139

#: bzrlib/builtins.py:5135

3140

msgid "Show annotations on all lines."

3141

msgstr ""

3142

3143

#: bzrlib/builtins.py:5043

3143

#: bzrlib/builtins.py:5136

3144

msgid "Show commit date in annotations."

3145

msgstr ""

3146

3147

#: bzrlib/builtins.py:5130

3147

#: bzrlib/builtins.py:5223

3148

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

3149

msgstr ""

3150

3151

#: bzrlib/builtins.py:5142

3151

#: bzrlib/builtins.py:5235

3152

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

3153

msgstr ""

3154

3155

#: bzrlib/builtins.py:5146

3155

#: bzrlib/builtins.py:5239

3156

msgid ""

3157

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

3158

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

3159

msgstr ""

3160

3161

#: bzrlib/builtins.py:5149

3161

#: bzrlib/builtins.py:5242

3162

msgid ""

3163

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

3164

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

3165

msgstr ""

3166

3167

#: bzrlib/builtins.py:5152

3167

#: bzrlib/builtins.py:5245

3168

msgid ""

3169

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

3170

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

3171

"that of the master."

3172

msgstr ""

3173

3174

#: bzrlib/builtins.py:5167

3174

#: bzrlib/builtins.py:5260

3175

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

3176

msgstr ""

3177

3178

#: bzrlib/builtins.py:5172

3178

#: bzrlib/builtins.py:5265

3179

msgid "Branch is already bound"

3180

msgstr ""

3181

3182

#: bzrlib/builtins.py:5174

3182

#: bzrlib/builtins.py:5267

3183

msgid "No location supplied and no previous location known"

3184

msgstr ""

3185

3186

#: bzrlib/builtins.py:5180

3186

#: bzrlib/builtins.py:5273

3187

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

3188

msgstr ""

3189

3190

#: bzrlib/builtins.py:5187

3190

#: bzrlib/builtins.py:5280

3191

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

3192

msgstr ""

3193

3194

#: bzrlib/builtins.py:5189

3194

#: bzrlib/builtins.py:5282

3195

msgid ""

3196

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

3197

"commits will be local only."

3198

msgstr ""

3199

3200

#: bzrlib/builtins.py:5200

3200

#: bzrlib/builtins.py:5293

3201

msgid "Local branch is not bound"

3202

msgstr ""

3203

3204

#: bzrlib/builtins.py:5204

3204

#: bzrlib/builtins.py:5297

3205

msgid "Remove the last committed revision."

3206

msgstr ""

3207

3208

#: bzrlib/builtins.py:5206

3208

#: bzrlib/builtins.py:5299

3209

msgid ""

3210

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

3211

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

3212

"remove anything."

3213

msgstr ""

3214

3215

#: bzrlib/builtins.py:5210

3215

#: bzrlib/builtins.py:5303

3216

msgid ""

3217

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

3218

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

3219

"branch at revision 15."

3220

msgstr ""

3221

3222

#: bzrlib/builtins.py:5214

3222

#: bzrlib/builtins.py:5307

3223

msgid ""

3224

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

3225

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

3226

"the commit."

3227

msgstr ""

3228

3229

#: bzrlib/builtins.py:5225

3229

#: bzrlib/builtins.py:5318

3230

msgid "Don't actually make changes."

3231

msgstr ""

3232

3233

#: bzrlib/builtins.py:5226

3233

#: bzrlib/builtins.py:5319

3234

msgid "Say yes to all questions."

3235

msgstr ""

3236

3237

#: bzrlib/builtins.py:5228

3237

#: bzrlib/builtins.py:5321

3238

msgid "Keep tags that point to removed revisions."

3239

msgstr ""

3240

3241

#: bzrlib/builtins.py:5230

3241

#: bzrlib/builtins.py:5323

3242

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

3243

msgstr ""

3244

3245

#: bzrlib/builtins.py:5279

3245

#: bzrlib/builtins.py:5372

3246

msgid "No revisions to uncommit.\n"

3247

msgstr ""

3248

3249

#: bzrlib/builtins.py:5294

3249

#: bzrlib/builtins.py:5387

3250

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

3251

msgstr ""

3252

3253

#: bzrlib/builtins.py:5297

3253

#: bzrlib/builtins.py:5390

3254

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

3255

msgstr ""

3256

3257

#: bzrlib/builtins.py:5301

3257

#: bzrlib/builtins.py:5394

3258

msgid "Uncommit these revisions"

3259

msgstr ""

3260

3261

#: bzrlib/builtins.py:5304

3261

#: bzrlib/builtins.py:5397

3262

msgid "Canceled\n"

3263

msgstr ""

3264

3265

#: bzrlib/builtins.py:5311

3265

#: bzrlib/builtins.py:5404

3266

#, python-format

3267

msgid ""

3268

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

3269

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

3270

msgstr ""

3271

3272

#: bzrlib/builtins.py:5316

3272

#: bzrlib/builtins.py:5409

3273

msgid "Break a dead lock."

3274

msgstr ""

3275

3276

#: bzrlib/builtins.py:5318

3276

#: bzrlib/builtins.py:5411

3277

msgid ""

3278

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

3279

"config file."

3280

msgstr ""

3281

3282

#: bzrlib/builtins.py:5321

3282

#: bzrlib/builtins.py:5414

3283

msgid ""

3284

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

3285

"holding the lock has been stopped."

3286

msgstr ""

3287

3288

#: bzrlib/builtins.py:5324

3288

#: bzrlib/builtins.py:5417

3289

msgid ""

3290

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

3291

"[location]' command."

3292

msgstr ""

3293

3294

#: bzrlib/builtins.py:5327

3294

#: bzrlib/builtins.py:5420

3295

msgid ""

3296

":Examples:\n"

3297

" bzr break-lock\n"

3299

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

3300

msgstr ""

3301

3302

#: bzrlib/builtins.py:5336

3302

#: bzrlib/builtins.py:5429

3303

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

3304

msgstr ""

3305

3306

#: bzrlib/builtins.py:5338

3306

#: bzrlib/builtins.py:5431

3307

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

3308

msgstr ""

3309

3310

#: bzrlib/builtins.py:5373

3310

#: bzrlib/builtins.py:5466

3311

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

3312

msgstr ""

3313

3314

#: bzrlib/builtins.py:5374

3314

#: bzrlib/builtins.py:5467

3315

msgid "Run the bzr server."

3316

msgstr ""

3317

3318

#: bzrlib/builtins.py:5380

3318

#: bzrlib/builtins.py:5473

3319

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

3320

msgstr ""

3321

3322

#: bzrlib/builtins.py:5381

3322

#: bzrlib/builtins.py:5474

3323

msgid "protocol"

3324

msgstr ""

3325

3326

#: bzrlib/builtins.py:5382

3326

#: bzrlib/builtins.py:5475

3327

msgid "Protocol to serve."

3328

msgstr ""

3329

3330

#: bzrlib/builtins.py:5386

3330

#: bzrlib/builtins.py:5479

3331

msgid ""

3332

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

3333

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

3334

"The default port depends on the protocol."

3335

msgstr ""

3336

3337

#: bzrlib/builtins.py:5392

3337

#: bzrlib/builtins.py:5485

3338

msgid "Serve contents of this directory."

3339

msgstr ""

3340

3341

#: bzrlib/builtins.py:5394

3341

#: bzrlib/builtins.py:5487

3342

msgid ""

3343

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

3344

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

3347

"uncontrolled write access to your file system."

3348

msgstr ""

3349

3350

#: bzrlib/builtins.py:5403

3350

#: bzrlib/builtins.py:5496

3351

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

3352

msgstr ""

3353

3354

#: bzrlib/builtins.py:5453

3354

#: bzrlib/builtins.py:5546

3355

msgid "Combine a tree into its containing tree."

3356

msgstr ""

3357

3358

#: bzrlib/builtins.py:5455

3358

#: bzrlib/builtins.py:5548

3359

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

3360

msgstr ""

3361

3362

#: bzrlib/builtins.py:5457

3362

#: bzrlib/builtins.py:5550

3363

msgid ""

3364

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

3365

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

3366

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

3367

msgstr ""

3368

3369

#: bzrlib/builtins.py:5461

3369

#: bzrlib/builtins.py:5554

3370

msgid ""

3371

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

3372

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

3373

"and all history is preserved."

3374

msgstr ""

3375

3376

#: bzrlib/builtins.py:5479

3376

#: bzrlib/builtins.py:5572

3377

#, python-format

3378

msgid ""

3379

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

3380

"You can use bzr upgrade on the repository."

3381

msgstr ""

3382

3383

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

3383

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

3384

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

3385

msgstr ""

3386

3387

#: bzrlib/builtins.py:5499

3387

#: bzrlib/builtins.py:5592

3388

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

3389

msgstr ""

3390

3391

#: bzrlib/builtins.py:5501

3391

#: bzrlib/builtins.py:5594

3392

msgid ""

3393

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

3394

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

3395

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

3396

msgstr ""

3397

3398

#: bzrlib/builtins.py:5505

3398

#: bzrlib/builtins.py:5598

3399

msgid ""

3400

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

3401

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

3402

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

3403

msgstr ""

3404

3405

#: bzrlib/builtins.py:5585

3405

#: bzrlib/builtins.py:5678

3406

msgid "No submit branch specified or known"

3407

msgstr ""

3408

3409

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

3409

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

3410

msgid "No public branch specified or known"

3411

msgstr ""

3412

3413

#: bzrlib/builtins.py:5598

3413

#: bzrlib/builtins.py:5691

3414

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

3415

msgstr ""

3416

3417

#: bzrlib/builtins.py:5607

3417

#: bzrlib/builtins.py:5700

3418

msgid "No revisions to bundle."

3419

msgstr ""

3420

3421

#: bzrlib/builtins.py:5626

3421

#: bzrlib/builtins.py:5719

3422

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

3423

msgstr ""

3424

3425

#: bzrlib/builtins.py:5628

3425

#: bzrlib/builtins.py:5721

3426

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

3427

msgstr ""

3428

3429

#: bzrlib/builtins.py:5630

3429

#: bzrlib/builtins.py:5723

3430

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

3431

msgstr ""

3432

3433

#: bzrlib/builtins.py:5632

3433

#: bzrlib/builtins.py:5725

3434

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

3435

msgstr ""

3436

3437

#: bzrlib/builtins.py:5634

3437

#: bzrlib/builtins.py:5727

3438

msgid ""

3439

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

3440

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

3441

" branch."

3442

msgstr ""

3443

3444

#: bzrlib/builtins.py:5638

3444

#: bzrlib/builtins.py:5731

3445

msgid ""

3446

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

3447

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

3448

msgstr ""

3449

3450

#: bzrlib/builtins.py:5641

3450

#: bzrlib/builtins.py:5734

3451

msgid ""

3452

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

3453

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

3454

"the source branch."

3455

msgstr ""

3456

3457

#: bzrlib/builtins.py:5645

3457

#: bzrlib/builtins.py:5738

3458

msgid ""

3459

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

3460

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

3463

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

3464

msgstr ""

3465

3466

#: bzrlib/builtins.py:5651

3466

#: bzrlib/builtins.py:5744

3467

msgid ""

3468

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

3469

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

3472

"be changed using --from."

3473

msgstr ""

3474

3475

#: bzrlib/builtins.py:5657

3475

#: bzrlib/builtins.py:5750

3476

msgid ""

3477

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

3478

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

3481

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

3482

msgstr ""

3483

3484

#: bzrlib/builtins.py:5663

3484

#: bzrlib/builtins.py:5756

3485

msgid ""

3486

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

3487

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

3489

"in the merge directive."

3490

msgstr ""

3491

3492

#: bzrlib/builtins.py:5668

3492

#: bzrlib/builtins.py:5761

3493

msgid ""

3494

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

3495

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

3496

msgstr ""

3497

3498

#: bzrlib/builtins.py:5671

3498

#: bzrlib/builtins.py:5764

3499

msgid ""

3500

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

3501

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

3502

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

3503

msgstr ""

3504

3505

#: bzrlib/builtins.py:5675

3505

#: bzrlib/builtins.py:5768

3506

msgid ""

3507

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

3508

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

3514

"supported clients."

3515

msgstr ""

3516

3517

#: bzrlib/builtins.py:5682

3517

#: bzrlib/builtins.py:5775

3518

msgid ""

3519

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

3520

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

3522

"in the submit branch."

3523

msgstr ""

3524

3525

#: bzrlib/builtins.py:5687

3525

#: bzrlib/builtins.py:5780

3526

msgid ""

3527

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

3528

"and\n"

3532

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

3533

msgstr ""

3534

3535

#: bzrlib/builtins.py:5693

3535

#: bzrlib/builtins.py:5786

3536

msgid ""

3537

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

3538

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

3539

msgstr ""

3540

3541

#: bzrlib/builtins.py:5696

3541

#: bzrlib/builtins.py:5789

3542

msgid ""

3543

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

3544

"into\n"

3546

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

3547

msgstr ""

3548

3549

#: bzrlib/builtins.py:5720

3549

#: bzrlib/builtins.py:5813

3550

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

3551

msgstr ""

3552

3553

#: bzrlib/builtins.py:5724

3553

#: bzrlib/builtins.py:5817

3554

msgid ""

3555

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

3556

"strict disables the check."

3557

msgstr ""

3558

3559

#: bzrlib/builtins.py:5726

3559

#: bzrlib/builtins.py:5819

3560

msgid "Mail the request to this address."

3561

msgstr ""

3562

3563

#: bzrlib/builtins.py:5730

3563

#: bzrlib/builtins.py:5823

3564

msgid "Body for the email."

3565

msgstr ""

3566

3567

#: bzrlib/builtins.py:5783

3567

#: bzrlib/builtins.py:5876

3568

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

3569

msgstr ""

3570

3571

#: bzrlib/builtins.py:5784

3571

#: bzrlib/builtins.py:5877

3572

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

3573

msgstr ""

3574

3575

#: bzrlib/builtins.py:5787

3575

#: bzrlib/builtins.py:5880

3576

msgid "Remember submit and public branch."

3577

msgstr ""

3578

3579

#: bzrlib/builtins.py:5789

3579

#: bzrlib/builtins.py:5882

3580

msgid ""

3581

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

3582

"working directory."

3583

msgstr ""

3584

3585

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

3585

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

3586

msgid "format"

3587

msgstr ""

3588

3589

#: bzrlib/builtins.py:5800

3589

#: bzrlib/builtins.py:5893

3590

msgid "Use the specified output format."

3591

msgstr ""

3592

3593

#: bzrlib/builtins.py:5822

3593

#: bzrlib/builtins.py:5915

3594

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

3595

msgstr ""

3596

3597

#: bzrlib/builtins.py:5824

3597

#: bzrlib/builtins.py:5917

3598

msgid ""

3599

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

3600

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

3601

"created tag."

3602

msgstr ""

3603

3604

#: bzrlib/builtins.py:5828

3604

#: bzrlib/builtins.py:5921

3605

msgid ""

3606

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

3607

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

3608

msgstr ""

3609

3610

#: bzrlib/builtins.py:5831

3610

#: bzrlib/builtins.py:5924

3611

msgid ""

3612

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

3613

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

3614

msgstr ""

3615

3616

#: bzrlib/builtins.py:5834

3616

#: bzrlib/builtins.py:5927

3617

msgid ""

3618

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

3619

"``bzr\n"

3620

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

3621

msgstr ""

3622

3623

#: bzrlib/builtins.py:5837

3623

#: bzrlib/builtins.py:5930

3624

msgid ""

3625

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

3626

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

3628

"details."

3629

msgstr ""

3630

3631

#: bzrlib/builtins.py:5847

3631

#: bzrlib/builtins.py:5940

3632

msgid "Delete this tag rather than placing it."

3633

msgstr ""

3634

3635

#: bzrlib/builtins.py:5850

3635

#: bzrlib/builtins.py:5943

3636

msgid "Branch in which to place the tag."

3637

msgstr ""

3638

3639

#: bzrlib/builtins.py:5852

3639

#: bzrlib/builtins.py:5945

3640

msgid "Replace existing tags."

3641

msgstr ""

3642

3643

#: bzrlib/builtins.py:5867

3643

#: bzrlib/builtins.py:5960

3644

msgid "No tag specified to delete."

3645

msgstr ""

3646

3647

#: bzrlib/builtins.py:5869

3647

#: bzrlib/builtins.py:5962

3648

#, python-format

3649

msgid "Deleted tag %s."

3650

msgstr ""

3651

3652

#: bzrlib/builtins.py:5883

3652

#: bzrlib/builtins.py:5976

3653

msgid "Please specify a tag name."

3654

msgstr ""

3655

3656

#: bzrlib/builtins.py:5891

3656

#: bzrlib/builtins.py:5984

3657

#, python-format

3658

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

3659

msgstr ""

3660

3661

#: bzrlib/builtins.py:5895

3661

#: bzrlib/builtins.py:5988

3662

#, python-format

3663

msgid "Created tag %s."

3664

msgstr ""

3665

3666

#: bzrlib/builtins.py:5897

3666

#: bzrlib/builtins.py:5990

3667

#, python-format

3668

msgid "Updated tag %s."

3669

msgstr ""

3670

3671

#: bzrlib/builtins.py:5901

3671

#: bzrlib/builtins.py:5994

3672

msgid "List tags."

3673

msgstr ""

3674

3675

#: bzrlib/builtins.py:5903

3675

#: bzrlib/builtins.py:5996

3676

msgid ""

3677

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

3678

msgstr ""

3679

3680

#: bzrlib/builtins.py:5909

3680

#: bzrlib/builtins.py:6002

3681

msgid "Branch whose tags should be displayed."

3682

msgstr ""

3683

3684

#: bzrlib/builtins.py:5911

3684

#: bzrlib/builtins.py:6004

3685

msgid "Sort tags by different criteria."

3686

msgstr ""

3687

3688

#: bzrlib/builtins.py:5911

3688

#: bzrlib/builtins.py:6004

3689

msgid "Sorting"

3690

msgstr ""

3691

3692

#: bzrlib/builtins.py:5980

3692

#: bzrlib/builtins.py:6073

3693

msgid "Reconfigure the type of a bzr directory."

3694

msgstr ""

3695

3696

#: bzrlib/builtins.py:5982

3696

#: bzrlib/builtins.py:6075

3697

msgid "A target configuration must be specified."

3698

msgstr ""

3699

3700

#: bzrlib/builtins.py:5984

3700

#: bzrlib/builtins.py:6077

3701

msgid ""

3702

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

3703

"The order of preference is\n"

3708

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

3709

msgstr ""

3710

3711

#: bzrlib/builtins.py:5998

3711

#: bzrlib/builtins.py:6091

3712

msgid "Tree type"

3713

msgstr ""

3714

3715

#: bzrlib/builtins.py:5999

3715

#: bzrlib/builtins.py:6092

3716

msgid "The relation between branch and tree."

3717

msgstr ""

3718

3719

#: bzrlib/builtins.py:6001

3719

#: bzrlib/builtins.py:6094

3720

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

3721

msgstr ""

3722

3723

#: bzrlib/builtins.py:6002

3723

#: bzrlib/builtins.py:6095

3724

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

3725

msgstr ""

3726

3727

#: bzrlib/builtins.py:6003

3727

#: bzrlib/builtins.py:6096

3728

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

3729

msgstr ""

3730

3731

#: bzrlib/builtins.py:6004

3731

#: bzrlib/builtins.py:6097

3732

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

3733

msgstr ""

3734

3735

#: bzrlib/builtins.py:6009

3735

#: bzrlib/builtins.py:6102

3736

msgid "Repository type"

3737

msgstr ""

3738

3739

#: bzrlib/builtins.py:6010

3739

#: bzrlib/builtins.py:6103

3740

msgid "Location fo the repository."

3741

msgstr ""

3742

3743

#: bzrlib/builtins.py:6012

3743

#: bzrlib/builtins.py:6105

3744

msgid ""

3745

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

3746

msgstr ""

3747

3748

#: bzrlib/builtins.py:6014

3748

#: bzrlib/builtins.py:6107

3749

msgid "Reconfigure to use a shared repository."

3750

msgstr ""

3751

3752

#: bzrlib/builtins.py:6018

3752

#: bzrlib/builtins.py:6111

3753

msgid "Trees in Repository"

3754

msgstr ""

3755

3756

#: bzrlib/builtins.py:6019

3756

#: bzrlib/builtins.py:6112

3757

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

3758

msgstr ""

3759

3760

#: bzrlib/builtins.py:6021

3760

#: bzrlib/builtins.py:6114

3761

msgid ""

3762

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

3763

msgstr ""

3764

3765

#: bzrlib/builtins.py:6023

3765

#: bzrlib/builtins.py:6116

3766

msgid ""

3767

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

3768

msgstr ""

3769

3770

#: bzrlib/builtins.py:6026

3770

#: bzrlib/builtins.py:6119

3771

msgid "Branch to bind checkout to."

3772

msgstr ""

3773

3774

#: bzrlib/builtins.py:6028

3774

#: bzrlib/builtins.py:6121

3775

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

3776

msgstr ""

3777

3778

#: bzrlib/builtins.py:6031

3778

#: bzrlib/builtins.py:6124

3779

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

3780

msgstr ""

3781

3782

#: bzrlib/builtins.py:6035

3782

#: bzrlib/builtins.py:6128

3783

msgid ""

3784

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

3785

"data into it."

3786

msgstr ""

3787

3788

#: bzrlib/builtins.py:6045

3788

#: bzrlib/builtins.py:6138

3789

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

3790

msgstr ""

3791

3792

#: bzrlib/builtins.py:6059

3792

#: bzrlib/builtins.py:6152

3793

msgid "No target configuration specified"

3794

msgstr ""

3795

3796

#: bzrlib/builtins.py:6094

3796

#: bzrlib/builtins.py:6187

3797

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

3798

msgstr ""

3799

3800

#: bzrlib/builtins.py:6096

3800

#: bzrlib/builtins.py:6189

3801

msgid ""

3802

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

3803

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

3805

"of the new location and binds to it."

3806

msgstr ""

3807

3808

#: bzrlib/builtins.py:6101

3808

#: bzrlib/builtins.py:6194

3809

msgid ""

3810

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

3811

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

3812

msgstr ""

3813

3814

#: bzrlib/builtins.py:6104

3814

#: bzrlib/builtins.py:6197

3815

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

3816

msgstr ""

3817

3818

#: bzrlib/builtins.py:6106

3818

#: bzrlib/builtins.py:6199

3819

msgid ""

3820

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

3821

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

3823

"/path/to/newbranch."

3824

msgstr ""

3825

3826

#: bzrlib/builtins.py:6111

3826

#: bzrlib/builtins.py:6204

3827

msgid ""

3828

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

3829

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

3830

"that of the master."

3831

msgstr ""

3832

3833

#: bzrlib/builtins.py:6119

3833

#: bzrlib/builtins.py:6212

3834

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

3835

msgstr ""

3836

3837

#: bzrlib/builtins.py:6122

3837

#: bzrlib/builtins.py:6215

3838

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

3839

msgstr ""

3840

3841

#: bzrlib/builtins.py:6134

3841

#: bzrlib/builtins.py:6229

3842

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

3843

msgstr ""

3844

3845

#: bzrlib/builtins.py:6145

3845

#: bzrlib/builtins.py:6242

3846

msgid "cannot create branch without source branch"

3847

msgstr ""

3848

3849

#: bzrlib/builtins.py:6209

3849

#: bzrlib/builtins.py:6262

3850

msgid "Manage filtered views."

3851

msgstr ""

3852

3853

#: bzrlib/builtins.py:6211

3853

#: bzrlib/builtins.py:6264

3854

msgid ""

3855

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

3856

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

3860

"must be within the current view."

3861

msgstr ""

3862

3863

#: bzrlib/builtins.py:6218

3863

#: bzrlib/builtins.py:6271

3864

msgid ""

3865

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

3866

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

3868

"and switch between them."

3869

msgstr ""

3870

3871

#: bzrlib/builtins.py:6223

3871

#: bzrlib/builtins.py:6276

3872

msgid ""

3873

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

3874

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

3876

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

3877

msgstr ""

3878

3879

#: bzrlib/builtins.py:6228

3879

#: bzrlib/builtins.py:6281

3880

msgid ""

3881

":Examples:\n"

3882

" To define the current view::"

3883

msgstr ""

3884

3885

#: bzrlib/builtins.py:6231

3885

#: bzrlib/builtins.py:6284

3886

msgid " bzr view file1 dir1 ..."

3887

msgstr ""

3888

3889

#: bzrlib/builtins.py:6233

3889

#: bzrlib/builtins.py:6286

3890

msgid " To list the current view::"

3891

msgstr ""

3892

3893

#: bzrlib/builtins.py:6235

3893

#: bzrlib/builtins.py:6288

3894

msgid " bzr view"

3895

msgstr ""

3896

3897

#: bzrlib/builtins.py:6237

3897

#: bzrlib/builtins.py:6290

3898

msgid " To delete the current view::"

3899

msgstr ""

3900

3901

#: bzrlib/builtins.py:6239

3901

#: bzrlib/builtins.py:6292

3902

msgid " bzr view --delete"

3903

msgstr ""

3904

3905

#: bzrlib/builtins.py:6241

3905

#: bzrlib/builtins.py:6294

3906

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

3907

msgstr ""

3908

3909

#: bzrlib/builtins.py:6243

3909

#: bzrlib/builtins.py:6296

3910

msgid " bzr view --switch off"

3911

msgstr ""

3912

3913

#: bzrlib/builtins.py:6245

3913

#: bzrlib/builtins.py:6298

3914

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

3915

msgstr ""

3916

3917

#: bzrlib/builtins.py:6247

3917

#: bzrlib/builtins.py:6300

3918

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

3919

msgstr ""

3920

3921

#: bzrlib/builtins.py:6249

3921

#: bzrlib/builtins.py:6302

3922

msgid " To list a named view::"

3923

msgstr ""

3924

3925

#: bzrlib/builtins.py:6251

3925

#: bzrlib/builtins.py:6304

3926

msgid " bzr view --name view-name"

3927

msgstr ""

3928

3929

#: bzrlib/builtins.py:6253

3929

#: bzrlib/builtins.py:6306

3930

msgid " To delete a named view::"

3931

msgstr ""

3932

3933

#: bzrlib/builtins.py:6255

3933

#: bzrlib/builtins.py:6308

3934

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

3935

msgstr ""

3936

3937

#: bzrlib/builtins.py:6257

3937

#: bzrlib/builtins.py:6310

3938

msgid " To switch to a named view::"

3939

msgstr ""

3940

3941

#: bzrlib/builtins.py:6259

3941

#: bzrlib/builtins.py:6312

3942

msgid " bzr view --switch view-name"

3943

msgstr ""

3944

3945

#: bzrlib/builtins.py:6261

3945

#: bzrlib/builtins.py:6314

3946

msgid " To list all views defined::"

3947

msgstr ""

3948

3949

#: bzrlib/builtins.py:6263

3949

#: bzrlib/builtins.py:6316

3950

msgid " bzr view --all"

3951

msgstr ""

3952

3953

#: bzrlib/builtins.py:6265

3953

#: bzrlib/builtins.py:6318

3954

msgid " To delete all views::"

3955

msgstr ""

3956

3957

#: bzrlib/builtins.py:6267

3957

#: bzrlib/builtins.py:6320

3958

msgid " bzr view --delete --all"

3959

msgstr ""

3960

3961

#: bzrlib/builtins.py:6274

3961

#: bzrlib/builtins.py:6327

3962

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

3963

msgstr ""

3964

3965

#: bzrlib/builtins.py:6277

3965

#: bzrlib/builtins.py:6330

3966

msgid "Delete the view."

3967

msgstr ""

3968

3969

#: bzrlib/builtins.py:6280

3969

#: bzrlib/builtins.py:6333

3970

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

3971

msgstr ""

3972

3973

#: bzrlib/builtins.py:6284

3973

#: bzrlib/builtins.py:6337

3974

msgid "Name of the view to switch to."

3975

msgstr ""

3976

3977

#: bzrlib/builtins.py:6303

3977

#: bzrlib/builtins.py:6356

3978

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

3979

msgstr ""

3980

3981

#: bzrlib/builtins.py:6306

3981

#: bzrlib/builtins.py:6359

3982

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

3983

msgstr ""

3984

3985

#: bzrlib/builtins.py:6309

3985

#: bzrlib/builtins.py:6362

3986

msgid "Deleted all views.\n"

3987

msgstr ""

3988

3989

#: bzrlib/builtins.py:6311

3989

#: bzrlib/builtins.py:6364

3990

msgid "No current view to delete"

3991

msgstr ""

3992

3993

#: bzrlib/builtins.py:6314

3993

#: bzrlib/builtins.py:6367

3994

#, python-format

3995

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

3996

msgstr ""

3997

3998

#: bzrlib/builtins.py:6318

3998

#: bzrlib/builtins.py:6371

3999

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

4000

msgstr ""

4001

4002

#: bzrlib/builtins.py:6321

4002

#: bzrlib/builtins.py:6374

4003

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

4004

msgstr ""

4005

4006

#: bzrlib/builtins.py:6324

4006

#: bzrlib/builtins.py:6377

4007

msgid "No current view to disable"

4008

msgstr ""

4009

4010

#: bzrlib/builtins.py:6326

4010

#: bzrlib/builtins.py:6379

4011

#, python-format

4012

msgid "Disabled '%s' view.\n"

4013

msgstr ""

4014

4015

#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352

4015

#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405

4016

msgid "Using '{0}' view: {1}\n"

4017

msgstr ""

4018

4019

#: bzrlib/builtins.py:6333

4019

#: bzrlib/builtins.py:6386

4020

msgid "Views defined:\n"

4021

msgstr ""

4022

4023

#: bzrlib/builtins.py:6342

4023

#: bzrlib/builtins.py:6395

4024

msgid "No views defined.\n"

4025

msgstr ""

4026

4027

#: bzrlib/builtins.py:6349

4027

#: bzrlib/builtins.py:6402

4028

msgid "Cannot change the 'off' pseudo view"

4029

msgstr ""

4030

4031

#: bzrlib/builtins.py:6357

4031

#: bzrlib/builtins.py:6410

4032

msgid "No current view.\n"

4033

msgstr ""

4034

4035

#: bzrlib/builtins.py:6360

4035

#: bzrlib/builtins.py:6413

4036

msgid "'{0}' view is: {1}\n"

4037

msgstr ""

4038

4039

#: bzrlib/builtins.py:6380

4039

#: bzrlib/builtins.py:6433

4040

msgid " <no hooks installed>\n"

4041

msgstr ""

4042

4043

#: bzrlib/builtins.py:6384

4043

#: bzrlib/builtins.py:6437

4044

msgid "Remove a branch."

4045

msgstr ""

4046

4047

#: bzrlib/builtins.py:6386

4047

#: bzrlib/builtins.py:6439

4048

msgid ""

4049

"This will remove the branch from the specified location but \n"

4050

"will keep any working tree or repository in place."

4051

msgstr ""

4052

4053

#: bzrlib/builtins.py:6391

4053

#: bzrlib/builtins.py:6444

4054

msgid " Remove the branch at repo/trunk::"

4055

msgstr ""

4056

4057

#: bzrlib/builtins.py:6393

4057

#: bzrlib/builtins.py:6446

4058

msgid " bzr remove-branch repo/trunk"

4059

msgstr ""

4060

4061

#: bzrlib/builtins.py:6408

4061

#: bzrlib/builtins.py:6461

4062

msgid "Plaintext diff output."

4063

msgstr ""

4064

4065

#: bzrlib/builtins.py:6409

4065

#: bzrlib/builtins.py:6462

4066

msgid "Temporarily set aside some changes from the current tree."

4067

msgstr ""

4068

4069

#: bzrlib/builtins.py:6411

4069

#: bzrlib/builtins.py:6464

4070

msgid ""

4071

"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"

4072

"ie. out of the way, until a later time when you can bring them back from\n"

4075

"will they survive its deletion."

4076

msgstr ""

4077

4078

#: bzrlib/builtins.py:6417

4078

#: bzrlib/builtins.py:6470

4079

msgid "If shelve --list is specified, previously-shelved changes are listed."

4080

msgstr ""

4081

4082

#: bzrlib/builtins.py:6419

4082

#: bzrlib/builtins.py:6472

4083

msgid ""

4084

"Shelve is intended to help separate several sets of changes that have\n"

4085

"been inappropriately mingled. If you just want to get rid of all changes\n"

4087

"shelve all text changes at once, use shelve --all."

4088

msgstr ""

4089

4090

#: bzrlib/builtins.py:6424

4090

#: bzrlib/builtins.py:6477

4091

msgid ""

4092

"If filenames are specified, only the changes to those files will be\n"

4093

"shelved. Other files will be left untouched."

4094

msgstr ""

4095

4096

#: bzrlib/builtins.py:6427

4096

#: bzrlib/builtins.py:6480

4097

msgid ""

4098

"If a revision is specified, changes since that revision will be shelved."

4099

msgstr ""

4100

4101

#: bzrlib/builtins.py:6429

4101

#: bzrlib/builtins.py:6482

4102

msgid ""

4103

"You can put multiple items on the shelf, and by default, 'unshelve' will\n"

4104

"restore the most recently shelved changes."

4105

msgstr ""

4106

4107

#: bzrlib/builtins.py:6432

4107

#: bzrlib/builtins.py:6485

4108

msgid ""

4109

"For complicated changes, it is possible to edit the changes in a separate\n"

4110

"editor program to decide what the file remaining in the working copy\n"

4111

"should look like. To do this, add the configuration option"

4112

msgstr ""

4113

4114

#: bzrlib/builtins.py:6436

4114

#: bzrlib/builtins.py:6489

4115

msgid " change_editor = PROGRAM @new_path @old_path"

4116

msgstr ""

4117

4118

#: bzrlib/builtins.py:6438

4118

#: bzrlib/builtins.py:6491

4119

msgid ""

4120

"where @new_path is replaced with the path of the new version of the \n"

4121

"file and @old_path is replaced with the path of the old version of \n"

4124

" "

4125

msgstr ""

4126

4127

#: bzrlib/builtins.py:6450

4127

#: bzrlib/builtins.py:6503

4128

msgid "Shelve all changes."

4129

msgstr ""

4130

4131

#: bzrlib/builtins.py:6452

4131

#: bzrlib/builtins.py:6505

4132

msgid "Method to use for writing diffs."

4133

msgstr ""

4134

4135

#: bzrlib/builtins.py:6452

4135

#: bzrlib/builtins.py:6505

4136

msgid "writer"

4137

msgstr ""

4138

4139

#: bzrlib/builtins.py:6456

4139

#: bzrlib/builtins.py:6509

4140

msgid "List shelved changes."

4141

msgstr ""

4142

4143

#: bzrlib/builtins.py:6458

4143

#: bzrlib/builtins.py:6511

4144

msgid "Destroy removed changes instead of shelving them."

4145

msgstr ""

4146

4147

#: bzrlib/builtins.py:6487

4147

#: bzrlib/builtins.py:6540

4148

msgid "No shelved changes."

4149

msgstr ""

4150

4151

#: bzrlib/builtins.py:6498

4151

#: bzrlib/builtins.py:6551

4152

msgid "Restore shelved changes."

4153

msgstr ""

4154

4155

#: bzrlib/builtins.py:6500

4155

#: bzrlib/builtins.py:6553

4156

msgid ""

4157

"By default, the most recently shelved changes are restored. However if you\n"

4158

"specify a shelf by id those changes will be restored instead. This works\n"

4159

"best when the changes don't depend on each other."

4160

msgstr ""

4161

4162

#: bzrlib/builtins.py:6509

4162

#: bzrlib/builtins.py:6562

4163

msgid "The action to perform."

4164

msgstr ""

4165

4166

#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694

4166

#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694

4167

msgid "action"

4168

msgstr ""

4169

4170

#: bzrlib/builtins.py:6511

4170

#: bzrlib/builtins.py:6564

4171

msgid "Apply changes and remove from the shelf."

4172

msgstr ""

4173

4174

#: bzrlib/builtins.py:6512

4174

#: bzrlib/builtins.py:6565

4175

msgid "Show changes, but do not apply or remove them."

4176

msgstr ""

4177

4178

#: bzrlib/builtins.py:6513

4178

#: bzrlib/builtins.py:6566

4179

msgid ""

4180

"Instead of unshelving the changes, show the diff that would result from "

4181

"unshelving."

4182

msgstr ""

4183

4184

#: bzrlib/builtins.py:6515

4184

#: bzrlib/builtins.py:6568

4185

msgid "Delete changes without applying them."

4186

msgstr ""

4187

4188

#: bzrlib/builtins.py:6516

4188

#: bzrlib/builtins.py:6569

4189

msgid "Apply changes but don't delete them."

4190

msgstr ""

4191

4192

#: bzrlib/builtins.py:6531

4192

#: bzrlib/builtins.py:6584

4193

msgid "Remove unwanted files from working tree."

4194

msgstr ""

4195

4196

#: bzrlib/builtins.py:6533

4196

#: bzrlib/builtins.py:6586

4197

msgid ""

4198

"By default, only unknown files, not ignored files, are deleted. Versioned\n"

4199

"files are never deleted."

4200

msgstr ""

4201

4202

#: bzrlib/builtins.py:6536

4202

#: bzrlib/builtins.py:6589

4203

msgid ""

4204

"Another class is 'detritus', which includes files emitted by bzr during\n"

4205

"normal operations and selftests. (The value of these files decreases with\n"

4206

"time.)"

4207

msgstr ""

4208

4209

#: bzrlib/builtins.py:6540

4209

#: bzrlib/builtins.py:6593

4210

msgid ""

4211

"If no options are specified, unknown files are deleted. Otherwise, option\n"

4212

"flags are respected, and may be combined."

4213

msgstr ""

4214

4215

#: bzrlib/builtins.py:6543

4215

#: bzrlib/builtins.py:6596

4216

msgid "To check what clean-tree will do, use --dry-run."

4217

msgstr ""

4218

4219

#: bzrlib/builtins.py:6546

4219

#: bzrlib/builtins.py:6599

4220

msgid "Delete all ignored files."

4221

msgstr ""

4222

4223

#: bzrlib/builtins.py:6547

4223

#: bzrlib/builtins.py:6600

4224

msgid ""

4225

"Delete conflict files, merge and revert backups, and failed selftest dirs."

4226

msgstr ""

4227

4228

#: bzrlib/builtins.py:6550

4228

#: bzrlib/builtins.py:6603

4229

msgid "Delete files unknown to bzr (default)."

4230

msgstr ""

4231

4232

#: bzrlib/builtins.py:6551

4232

#: bzrlib/builtins.py:6604

4233

msgid "Show files to delete instead of deleting them."

4234

msgstr ""

4235

4236

#: bzrlib/builtins.py:6553

4236

#: bzrlib/builtins.py:6606

4237

msgid "Do not prompt before deleting."

4238

msgstr ""

4239

4293

msgstr[0] ""

4294

msgstr[1] ""

4295

4296

#: bzrlib/bzrdir.py:489

4296

#: bzrlib/bzrdir.py:490

4297

msgid ""

4298

"making backup of {0}\n"

4299

" to {1}"

4300

msgstr ""

4301

4302

#: bzrlib/bzrdir.py:512

4302

#: bzrlib/bzrdir.py:513

4303

msgid "renamed {0} to {1}"

4304

msgstr ""

4305

4306

#: bzrlib/bzrdir.py:1663

4306

#: bzrlib/bzrdir.py:1652

4307

#, python-format

4308

msgid ""

4309

"Source repository format does not support stacking, using format:\n"

4310

" %s"

4311

msgstr ""

4312

4313

#: bzrlib/bzrdir.py:1683

4313

#: bzrlib/bzrdir.py:1672

4314

#, python-format

4315

msgid ""

4316

"Source branch format does not support stacking, using format:\n"

4317

" %s"

4318

msgstr ""

4319

4320

#: bzrlib/bzrdir.py:1829

4320

#: bzrlib/bzrdir.py:1818

4321

msgid "starting repository conversion"

4322

msgstr ""

4323

4324

#: bzrlib/bzrdir.py:2058

4324

#: bzrlib/bzrdir.py:2039

4325

msgid "Using default stacking branch {0} at {1}"

4326

msgstr ""

4327

4560

msgid "bzr version-info --revision takes exactly one revision specifier"

4561

msgstr ""

4562

4563

#: bzrlib/commands.py:228

4563

#: bzrlib/commands.py:229

4564

#, python-format

4565

msgid "unknown command \"%s\""

4566

msgstr ""

4567

4568

#: bzrlib/commands.py:475

4568

#: bzrlib/commands.py:476

4569

msgid "No help for this command."

4570

msgstr ""

4571

4572

#: bzrlib/commands.py:488

4572

#: bzrlib/commands.py:489

4573

#, python-format

4574

msgid ":Purpose: %s\n"

4575

msgstr ""

4576

4577

#: bzrlib/commands.py:490

4577

#: bzrlib/commands.py:491

4578

#, python-format

4579

msgid ""

4580

":Usage:\n"

4581

"%s\n"

4582

msgstr ""

4583

4584

#: bzrlib/commands.py:492

4584

#: bzrlib/commands.py:493

4585

#, python-format

4586

msgid ":Usage: %s\n"

4587

msgstr ""

4588

4589

#: bzrlib/commands.py:511

4589

#: bzrlib/commands.py:512

4590

#, python-format

4591

msgid ":Options:%s"

4592

msgstr ""

4593

4594

#: bzrlib/commands.py:522

4594

#: bzrlib/commands.py:523

4595

#, python-format

4596

msgid ""

4597

":Description:\n"

4599

"\n"

4600

msgstr ""

4601

4602

#: bzrlib/commands.py:532

4602

#: bzrlib/commands.py:533

4603

#, python-format

4604

msgid ""

4605

"See bzr help %s for more details and examples.\n"

4606

"\n"

4607

msgstr ""

4608

4609

#: bzrlib/commands.py:537

4609

#: bzrlib/commands.py:538

4610

msgid ":Aliases: "

4611

msgstr ""

4612

4613

#: bzrlib/commands.py:541

4613

#: bzrlib/commands.py:542

4614

#, python-format

4615

msgid ":From: plugin \"%s\"\n"

4616

msgstr ""

4617

4618

#: bzrlib/commands.py:553

4618

#: bzrlib/commands.py:554

4619

msgid ":doc:`{0} <{1}-help>`"

4620

msgstr ""

4621

4622

#: bzrlib/commands.py:557

4622

#: bzrlib/commands.py:558

4623

#, python-format

4624

msgid ":See also: %s"

4625

msgstr ""

4626

4627

#: bzrlib/commands.py:815 bzrlib/gpg.py:324

4627

#: bzrlib/commands.py:816 bzrlib/gpg.py:324

4628

msgid "Only ASCII permitted in option names"

4629

msgstr ""

4630

4631

#: bzrlib/commands.py:840 bzrlib/commands.py:848

4631

#: bzrlib/commands.py:841 bzrlib/commands.py:849

4632

msgid "command {0!r} needs one or more {1}"

4633

msgstr ""

4634

4635

#: bzrlib/commands.py:857

4635

#: bzrlib/commands.py:858

4636

msgid "command {0!r} requires argument {1}"

4637

msgstr ""

4638

4639

#: bzrlib/commands.py:864

4639

#: bzrlib/commands.py:865

4640

msgid "extra argument to command {0}: {1}"

4641

msgstr ""

4642

4643

#: bzrlib/commands.py:961

4643

#: bzrlib/commands.py:962

4644

#, python-format

4645

msgid "Profile data written to \"%s\"."

4646

msgstr ""

4742

msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."

4743

msgstr ""

4744

4745

#: bzrlib/config.py:2499

4745

#: bzrlib/config.py:2485

4746

msgid "{0} is not an SI unit."

4747

msgstr ""

4748

4749

#: bzrlib/config.py:2956

4749

#: bzrlib/config.py:2949

4750

msgid ""

4751

"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "

4752

"will be saved."

4753

msgstr ""

4754

4755

#: bzrlib/config.py:3100

4755

#: bzrlib/config.py:3093

4756

#, python-format

4757

msgid "Invalid '%s', should be of the form 'name=value'"

4758

msgstr ""

4759

4760

#: bzrlib/config.py:3969

4760

#: bzrlib/config.py:3962

4761

msgid "Display, set or remove a configuration option."

4762

msgstr ""

4763

4764

#: bzrlib/config.py:3971

4764

#: bzrlib/config.py:3964

4765

msgid "Display the active value for a given option."

4766

msgstr ""

4767

4768

#: bzrlib/config.py:3973

4768

#: bzrlib/config.py:3966

4769

msgid ""

4770

"If --all is specified, NAME is interpreted as a regular expression and all\n"

4771

"matching options are displayed mentioning their scope. The active value\n"

4772

"that bzr will take into account is the first one displayed for each option."

4773

msgstr ""

4774

4775

#: bzrlib/config.py:3977

4775

#: bzrlib/config.py:3970

4776

msgid "If no NAME is given, --all .* is implied."

4777

msgstr ""

4778

4779

#: bzrlib/config.py:3979

4779

#: bzrlib/config.py:3972

4780

msgid ""

4781

"Setting a value is achieved by using name=value without spaces. The value\n"

4782

"is set in the most relevant scope and can be checked by displaying the\n"

4783

"option again."

4784

msgstr ""

4785

4786

#: bzrlib/config.py:3991

4786

#: bzrlib/config.py:3984

4787

msgid "Reduce the scope to the specified configuration file."

4788

msgstr ""

4789

4790

#: bzrlib/config.py:3995

4790

#: bzrlib/config.py:3988

4791

msgid "Display all the defined values for the matching options."

4792

msgstr ""

4793

4794

#: bzrlib/config.py:3997

4794

#: bzrlib/config.py:3990

4795

msgid "Remove the option from the configuration file."

4796

msgstr ""

4797

4871

msgstr[0] ""

4872

msgstr[1] ""

4873

4874

#: bzrlib/controldir.py:698

4874

#: bzrlib/controldir.py:710

4875

msgid "{0} is{1} redirected to {2}"

4876

msgstr ""

4877

4977

msgid "The value '%(value)s' is not a valid value."

4978

msgstr ""

4979

4980

#: bzrlib/errors.py:424

4981

msgid "Bad value \"%(value)s\" for option \"%(name)s\"."

4982

msgstr ""

4983

4980

4984

#: bzrlib/errors.py:443

4981

4985

msgid "Generic path error: %(path)r%(extra)s)"

4982

4986

msgstr ""

5076

5080

msgstr ""

5077

5081

5078

5082

#: bzrlib/errors.py:705

5083

msgid "A control directory already exists: \"%(path)s\"."

5084

msgstr ""

5085

5086

#: bzrlib/errors.py:710

5079

5087

msgid "Already a branch: \"%(path)s\"."

5080

5088

msgstr ""

5081

5089

5082

#: bzrlib/errors.py:711

5090

#: bzrlib/errors.py:715

5091

msgid "Parent branch already exists: \"%(path)s\"."

5092

msgstr ""

5093

5094

#: bzrlib/errors.py:721

5083

5095

msgid ""

5084

5096

"Directory contains a branch, but no working tree (use bzr checkout if you "

5085

5097

"wish to build a working tree): \"%(path)s\""

5086

5098

msgstr ""

5087

5099

5088

#: bzrlib/errors.py:716

5100

#: bzrlib/errors.py:726

5089

5101

msgid ""

5090

5102

"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""

5091

5103

msgstr ""

5092

5104

5093

#: bzrlib/errors.py:726

5105

#: bzrlib/errors.py:736

5094

5106

msgid ""

5095

5107

"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""

5096

5108

msgstr ""

5097

5109

5098

#: bzrlib/errors.py:736

5110

#: bzrlib/errors.py:746

5099

5111

msgid "No repository present: \"%(path)s\""

5100

5112

msgstr ""

5101

5113

5102

#: bzrlib/errors.py:743

5114

#: bzrlib/errors.py:753

5103

5115

msgid ""

5104

5116

"Unsupported branch format: %(format)s\n"

5105

5117

"Please run 'bzr upgrade'"

5106

5118

msgstr ""

5107

5119

5108

#: bzrlib/errors.py:749

5120

#: bzrlib/errors.py:759

5109

5121

msgid "Unknown %(kind)s format: %(format)r"

5110

5122

msgstr ""

5111

5123

5112

#: bzrlib/errors.py:758

5124

#: bzrlib/errors.py:768

5113

5125

msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."

5114

5126

msgstr ""

5115

5127

5116

#: bzrlib/errors.py:768

5128

#: bzrlib/errors.py:778

5117

5129

msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"

5118

5130

msgstr ""

5119

5131

5120

#: bzrlib/errors.py:783

5132

#: bzrlib/errors.py:793

5121

5133

msgid ""

5122

5134

"%(target)s\n"

5123

5135

"is not compatible with\n"

5125

5137

"%(details)s"

5126

5138

msgstr ""

5127

5139

5128

#: bzrlib/errors.py:799

5140

#: bzrlib/errors.py:809

5129

5141

msgid "Revision is not compatible with %(repo_format)s"

5130

5142

msgstr ""

5131

5143

5132

#: bzrlib/errors.py:809

5144

#: bzrlib/errors.py:819

5133

5145

msgid "%(context_info)s%(path)s is already versioned."

5134

5146

msgstr ""

5135

5147

5136

#: bzrlib/errors.py:830

5148

#: bzrlib/errors.py:840

5137

5149

msgid "%(context_info)s%(path)s is not versioned."

5138

5150

msgstr ""

5139

5151

5140

#: bzrlib/errors.py:851

5152

#: bzrlib/errors.py:861

5141

5153

msgid "Path(s) are not versioned: %(paths_as_string)s"

5142

5154

msgstr ""

5143

5155

5144

#: bzrlib/errors.py:862

5156

#: bzrlib/errors.py:872

5145

5157

msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"

5146

5158

msgstr ""

5147

5159

5148

#: bzrlib/errors.py:881

5160

#: bzrlib/errors.py:891

5149

5161

msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""

5150

5162

msgstr ""

5151

5163

5152

#: bzrlib/errors.py:889

5164

#: bzrlib/errors.py:899

5153

5165

msgid ""

5154

5166

"Filename %(filename)r is not valid in your current filesystem encoding "

5155

5167

"%(fs_encoding)s"

5156

5168

msgstr ""

5157

5169

5158

#: bzrlib/errors.py:900

5170

#: bzrlib/errors.py:910

5159

5171

msgid "Cannot operate on \"%(filename)s\" because it is a control file"

5160

5172

msgstr ""

5161

5173

5162

#: bzrlib/errors.py:918

5174

#: bzrlib/errors.py:928

5163

5175

msgid "The lock for '%(lock_description)s' is in use and cannot be broken."

5164

5176

msgstr ""

5165

5177

5166

#: bzrlib/errors.py:957

5178

#: bzrlib/errors.py:967

5167

5179

msgid "Cannot lock %(lock)s: %(why)s"

5168

5180

msgstr ""

5169

5181

5170

#: bzrlib/errors.py:967

5182

#: bzrlib/errors.py:977

5171

5183

msgid ""

5172

5184

"A transaction related operation was attempted after the transaction finished."

5173

5185

msgstr ""

5174

5186

5175

#: bzrlib/errors.py:994

5187

#: bzrlib/errors.py:1004

5176

5188

msgid "Cannot lock: transport is read only: %(transport)s"

5177

5189

msgstr ""

5178

5190

5179

#: bzrlib/errors.py:1002

5191

#: bzrlib/errors.py:1012

5180

5192

msgid "Could not acquire lock \"%(lock)s\": %(msg)s"

5181

5193

msgstr ""

5182

5194

5183

#: bzrlib/errors.py:1013

5195

#: bzrlib/errors.py:1023

5184

5196

msgid ""

5185

5197

"Lock was broken while still open: %(lock)s - check storage consistency!"

5186

5198

msgstr ""

5187

5199

5188

#: bzrlib/errors.py:1024

5200

#: bzrlib/errors.py:1034

5189

5201

msgid ""

5190

5202

"Lock was released and re-acquired before being broken: %(lock)s: held by "

5191

5203

"%(holder)r, wanted to break %(target)r"

5192

5204

msgstr ""

5193

5205

5194

#: bzrlib/errors.py:1036

5206

#: bzrlib/errors.py:1046

5195

5207

msgid ""

5196

5208

"Lock is apparently held, but corrupted: %(corruption_info)s\n"

5197

5209

"Use 'bzr break-lock' to clear it"

5198

5210

msgstr ""

5199

5211

5200

#: bzrlib/errors.py:1049

5212

#: bzrlib/errors.py:1059

5201

5213

msgid "Lock not held: %(lock)s"

5202

5214

msgstr ""

5203

5215

5204

#: bzrlib/errors.py:1078

5216

#: bzrlib/errors.py:1088

5205

5217

msgid "No changes to commit"

5206

5218

msgstr ""

5207

5219

5208

#: bzrlib/errors.py:1083

5220

#: bzrlib/errors.py:1093

5209

5221

msgid ""

5210

5222

"Selected-file commit of merges is not supported yet: files %(files_str)s"

5211

5223

msgstr ""

5212

5224

5213

#: bzrlib/errors.py:1093

5225

#: bzrlib/errors.py:1103

5214

5226

msgid ""

5215

5227

"Excluding paths during commit is not supported by repository at "

5216

5228

"%(repository)r."

5217

5229

msgstr ""

5218

5230

5219

#: bzrlib/errors.py:1102

5231

#: bzrlib/errors.py:1112

5220

5232

msgid ""

5221

5233

"The specified commit message contains characters unsupported by the current "

5222

5234

"encoding."

5223

5235

msgstr ""

5224

5236

5225

#: bzrlib/errors.py:1108

5237

#: bzrlib/errors.py:1118

5226

5238

msgid "Upgrade URL cannot work with readonly URLs."

5227

5239

msgstr ""

5228

5240

5229

#: bzrlib/errors.py:1113

5241

#: bzrlib/errors.py:1123

5230

5242

msgid "The branch format %(format)s is already at the most recent format."

5231

5243

msgstr ""

5232

5244

5233

#: bzrlib/errors.py:1136

5245

#: bzrlib/errors.py:1146

5234

5246

msgid "Option --change does not accept revision ranges"

5235

5247

msgstr ""

5236

5248

5237

#: bzrlib/errors.py:1141

5249

#: bzrlib/errors.py:1151

5238

5250

msgid "No namespace registered for string: %(spec)r"

5239

5251

msgstr ""

5240

5252

5241

#: bzrlib/errors.py:1160

5253

#: bzrlib/errors.py:1170

5242

5254

msgid ""

5243

5255

"Requested revision: '%(spec)s' does not exist in branch: "

5244

5256

"%(branch_url)s%(extra)s"

5245

5257

msgstr ""

5246

5258

5247

#: bzrlib/errors.py:1174

5259

#: bzrlib/errors.py:1184

5248

5260

msgid ""

5249

5261

"Operation denied because it would change the main history, which is not "

5250

5262

"permitted by the append_revisions_only setting on branch \"%(location)s\"."

5251

5263

msgstr ""

5252

5264

5253

#: bzrlib/errors.py:1185

5265

#: bzrlib/errors.py:1195

5254

5266

msgid ""

5255

5267

"These branches have diverged. Use the missing command to see how.\n"

5256

5268

"Use the merge command to reconcile them."

5257

5269

msgstr ""

5258

5270

5259

#: bzrlib/errors.py:1205

5271

#: bzrlib/errors.py:1215

5260

5272

msgid ""

5261

5273

"Branches have no common ancestor, and no merge base revision was specified."

5262

5274

msgstr ""

5263

5275

5264

#: bzrlib/errors.py:1211

5276

#: bzrlib/errors.py:1221

5265

5277

msgid ""

5266

5278

"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."

5267

5279

msgstr ""

5268

5280

5269

#: bzrlib/errors.py:1217

5281

#: bzrlib/errors.py:1227

5270

5282

msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"

5271

5283

msgstr ""

5272

5284

5273

#: bzrlib/errors.py:1226

5285

#: bzrlib/errors.py:1236

5274

5286

msgid ""

5275

5287

"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."

5276

5288

msgstr ""

5277

5289

5278

#: bzrlib/errors.py:1235

5290

#: bzrlib/errors.py:1245

5279

5291

msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"

5280

5292

msgstr ""

5281

5293

5282

#: bzrlib/errors.py:1244

5294

#: bzrlib/errors.py:1254

5283

5295

msgid "Branch %(branch)s has no commits."

5284

5296

msgstr ""

5285

5297

5286

#: bzrlib/errors.py:1262

5298

#: bzrlib/errors.py:1272

5287

5299

msgid ""

5288

5300

"Bound branch %(branch)s is out of date with master branch "

5289

5301

"%(master)s.%(extra_help)s"

5290

5302

msgstr ""

5291

5303

5292

#: bzrlib/errors.py:1274

5304

#: bzrlib/errors.py:1284

5293

5305

msgid ""

5294

5306

"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "

5295

5307

"bound to %(remote)s."

5296

5308

msgstr ""

5297

5309

5298

#: bzrlib/errors.py:1286

5310

#: bzrlib/errors.py:1296

5299

5311

msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"

5300

5312

msgstr ""

5301

5313

5302

#: bzrlib/errors.py:1295

5314

#: bzrlib/errors.py:1305

5303

5315

msgid ""

5304

5316

"Unable to connect to target of bound branch %(branch)s => %(target)s: "

5305

5317

"%(error)s"

5306

5318

msgstr ""

5307

5319

5308

#: bzrlib/errors.py:1307

5320

#: bzrlib/errors.py:1317

5309

5321

msgid "Error in processing weave: %(msg)s"

5310

5322

msgstr ""

5311

5323

5312

#: bzrlib/errors.py:1316

5324

#: bzrlib/errors.py:1326

5313

5325

msgid "Revision {%(revision_id)s} already present in %(weave)s"

5314

5326

msgstr ""

5315

5327

5316

#: bzrlib/errors.py:1327

5328

#: bzrlib/errors.py:1337

5317

5329

msgid "Revision {%(revision_id)s} not present in %(weave)s"

5318

5330

msgstr ""

5319

5331

5320

#: bzrlib/errors.py:1337

5332

#: bzrlib/errors.py:1347

5321

5333

msgid "Weave invariant violated: %(what)s"

5322

5334

msgstr ""

5323

5335

5324

#: bzrlib/errors.py:1346

5336

#: bzrlib/errors.py:1356

5325

5337

msgid "Parents are mismatched between two revisions. %(msg)s"

5326

5338

msgstr ""

5327

5339

5328

#: bzrlib/errors.py:1368

5340

#: bzrlib/errors.py:1378

5329

5341

msgid ""

5330

5342

"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "

5331

5343

"%(weave_b)s"

5332

5344

msgstr ""

5333

5345

5334

#: bzrlib/errors.py:1380

5346

#: bzrlib/errors.py:1390

5335

5347

msgid "Versioned file error"

5336

5348

msgstr ""

5337

5349

5338

#: bzrlib/errors.py:1385

5350

#: bzrlib/errors.py:1395

5339

5351

msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."

5340

5352

msgstr ""

5341

5353

5342

#: bzrlib/errors.py:1395

5354

#: bzrlib/errors.py:1405

5343

5355

msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."

5344

5356

msgstr ""

5345

5357

5346

#: bzrlib/errors.py:1405

5358

#: bzrlib/errors.py:1415

5347

5359

msgid "Text did not match its checksum: %(msg)s"

5348

5360

msgstr ""

5349

5361

5350

#: bzrlib/errors.py:1531

5362

#: bzrlib/errors.py:1541

5351

5363

msgid "Export format %(format)r not supported"

5352

5364

msgstr ""

5353

5365

5354

#: bzrlib/errors.py:1540

5366

#: bzrlib/errors.py:1550

5355

5367

msgid "Transport error: %(msg)s %(orig_error)s"

5356

5368

msgstr ""

5357

5369

5358

#: bzrlib/errors.py:1566

5370

#: bzrlib/errors.py:1576

5359

5371

msgid "Generic bzr smart protocol error: %(details)s"

5360

5372

msgstr ""

5361

5373

5362

#: bzrlib/errors.py:1574

5374

#: bzrlib/errors.py:1584

5363

5375

msgid "Received bad protocol version marker: %(marker)r"

5364

5376

msgstr ""

5365

5377

5366

#: bzrlib/errors.py:1606

5378

#: bzrlib/errors.py:1616

5367

5379

msgid "Transport operation not possible: %(msg)s %(orig_error)s"

5368

5380

msgstr ""

5369

5381

5370

#: bzrlib/errors.py:1611

5382

#: bzrlib/errors.py:1621

5371

5383

msgid "Connection error: %(msg)s %(orig_error)s"

5372

5384

msgstr ""

5373

5385

5374

#: bzrlib/errors.py:1616

5386

#: bzrlib/errors.py:1626

5375

5387

msgid "%(msg)s %(host)s%(port)s%(orig_error)s"

5376

5388

msgstr ""

5377

5389

5378

#: bzrlib/errors.py:1637

5390

#: bzrlib/errors.py:1647

5379

5391

msgid "Connection closed: %(msg)s %(orig_error)s"

5380

5392

msgstr ""

5381

5393

5382

#: bzrlib/errors.py:1642

5394

#: bzrlib/errors.py:1652

5383

5395

msgid "Connection Timeout: %(msg)s%(orig_error)s"

5384

5396

msgstr ""

5385

5397

5386

#: bzrlib/errors.py:1647

5398

#: bzrlib/errors.py:1657

5387

5399

msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"

5388

5400

msgstr ""

5389

5401

5390

#: bzrlib/errors.py:1657

5402

#: bzrlib/errors.py:1667

5391

5403

msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"

5392

5404

msgstr ""

5393

5405

5394

#: bzrlib/errors.py:1672

5406

#: bzrlib/errors.py:1682

5407

msgid "Certificate error: %(error)s"

5408

msgstr ""

5409

5410

#: bzrlib/errors.py:1690

5395

5411

msgid "Invalid http range %(range)r for %(path)s: %(msg)s"

5396

5412

msgstr ""

5397

5413

5398

#: bzrlib/errors.py:1686

5414

#: bzrlib/errors.py:1704

5399

5415

msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"

5400

5416

msgstr ""

5401

5417

5402

#: bzrlib/errors.py:1694

5418

#: bzrlib/errors.py:1712

5403

5419

msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"

5404

5420

msgstr ""

5405

5421

5406

#: bzrlib/errors.py:1703

5422

#: bzrlib/errors.py:1721

5407

5423

msgid "%(source)s is%(permanently)s redirected to %(target)s"

5408

5424

msgstr ""

5409

5425

5410

#: bzrlib/errors.py:1717

5426

#: bzrlib/errors.py:1735

5411

5427

msgid "Too many redirections"

5412

5428

msgstr ""

5413

5429

5414

#: bzrlib/errors.py:1722

5430

#: bzrlib/errors.py:1740

5415

5431

msgid "Working tree has conflicts."

5416

5432

msgstr ""

5417

5433

5418

#: bzrlib/errors.py:1726

5434

#: bzrlib/errors.py:1744

5419

5435

msgid "Config file %(filename)s is not UTF-8 encoded\n"

5420

5436

msgstr ""

5421

5437

5422

#: bzrlib/errors.py:1735

5438

#: bzrlib/errors.py:1753

5423

5439

msgid ""

5424

5440

"Error(s) parsing config file %(filename)s:\n"

5425

5441

"%(errors)s"

5426

5442

msgstr ""

5427

5443

5428

#: bzrlib/errors.py:1746

5429

msgid "Bad value \"%(value)s\" for option \"%(name)s\"."

5444

#: bzrlib/errors.py:1763

5445

msgid ""

5446

"Bad value \"%(value)s\" for option \"%(name)s\".\n"

5447

"See ``bzr help %(name)s``"

5430

5448

msgstr ""

5431

5449

5432

#: bzrlib/errors.py:1754

5450

#: bzrlib/errors.py:1773

5433

5451

msgid "%(username)r does not seem to contain a reasonable email address"

5434

5452

msgstr ""

5435

5453

5436

#: bzrlib/errors.py:1763

5454

#: bzrlib/errors.py:1782

5437

5455

msgid "Failed to GPG sign data with command \"%(command_line)s\""

5438

5456

msgstr ""

5439

5457

5440

#: bzrlib/errors.py:1771

5458

#: bzrlib/errors.py:1790

5441

5459

msgid "Failed to verify GPG signature data with error \"%(error)s\""

5442

5460

msgstr ""

5443

5461

5444

#: bzrlib/errors.py:1779

5462

#: bzrlib/errors.py:1798

5445

5463

msgid "Unable to import library \"%(library)s\": %(error)s"

5446

5464

msgstr ""

5447

5465

5448

#: bzrlib/errors.py:1787

5466

#: bzrlib/errors.py:1806

5449

5467

msgid "python-gpgme is not installed, it is needed to verify signatures"

5450

5468

msgstr ""

5451

5469

5452

#: bzrlib/errors.py:1795

5470

#: bzrlib/errors.py:1814

5453

5471

msgid ""

5454

5472

"The working tree for %(basedir)s has changed since the last commit, but "

5455

5473

"weave merge requires that it be unchanged"

5456

5474

msgstr ""

5457

5475

5458

#: bzrlib/errors.py:1805

5476

#: bzrlib/errors.py:1824

5459

5477

msgid ""

5460

5478

"Can't reprocess and show base, because reprocessing obscures the "

5461

5479

"relationship of conflicting lines to the base"

5462

5480

msgstr ""

5463

5481

5464

#: bzrlib/errors.py:1811

5482

#: bzrlib/errors.py:1830

5465

5483

msgid "Cycle in graph %(graph)r"

5466

5484

msgstr ""

5467

5485

5468

#: bzrlib/errors.py:1839

5486

#: bzrlib/errors.py:1858

5469

5487

msgid "File %(filename)s is not conflicted."

5470

5488

msgstr ""

5471

5489

5472

#: bzrlib/errors.py:1861

5490

#: bzrlib/errors.py:1880

5473

5491

msgid "No bundle was found in \"%(filename)s\"."

5474

5492

msgstr ""

5475

5493

5476

#: bzrlib/errors.py:1870

5494

#: bzrlib/errors.py:1889

5477

5495

msgid "Unable to handle bundle version %(version)s: %(msg)s"

5478

5496

msgstr ""

5479

5497

5480

#: bzrlib/errors.py:1880

5498

#: bzrlib/errors.py:1899

5481

5499

msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"

5482

5500

msgstr ""

5483

5501

5484

#: bzrlib/errors.py:1893

5502

#: bzrlib/errors.py:1912

5485

5503

msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"

5486

5504

msgstr ""

5487

5505

5488

#: bzrlib/errors.py:1903

5506

#: bzrlib/errors.py:1922

5489

5507

msgid "Key %(key)s is already present in map"

5490

5508

msgstr ""

5491

5509

5492

#: bzrlib/errors.py:1908

5510

#: bzrlib/errors.py:1927

5493

5511

msgid "The prefix %(prefix)s is in the help search path twice."

5494

5512

msgstr ""

5495

5513

5496

#: bzrlib/errors.py:1918

5514

#: bzrlib/errors.py:1937

5497

5515

msgid ""

5498

5516

"No final name for trans_id %(trans_id)r\n"

5499

5517

"file-id: %(file_id)r\n"

5500

5518

"root trans-id: %(root_trans_id)r\n"

5501

5519

msgstr ""

5502

5520

5503

#: bzrlib/errors.py:1950

5521

#: bzrlib/errors.py:1969

5504

5522

msgid "Attempt to reuse a transform that has already been applied."

5505

5523

msgstr ""

5506

5524

5507

#: bzrlib/errors.py:1955

5525

#: bzrlib/errors.py:1974

5508

5526

msgid "Moving the root directory is not supported at this time"

5509

5527

msgstr ""

5510

5528

5511

#: bzrlib/errors.py:1960

5529

#: bzrlib/errors.py:1979

5512

5530

msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"

5513

5531

msgstr ""

5514

5532

5515

#: bzrlib/errors.py:1971

5533

#: bzrlib/errors.py:1990

5516

5534

msgid ""

5517

5535

"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5518

5536

msgstr ""

5519

5537

5520

#: bzrlib/errors.py:2007

5538

#: bzrlib/errors.py:2026

5521

5539

msgid ""

5522

5540

"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5523

5541

msgstr ""

5524

5542

5525

#: bzrlib/errors.py:2037

5543

#: bzrlib/errors.py:2056

5526

5544

msgid "Unable to import paramiko (required for sftp support): %(error)s"

5527

5545

msgstr ""

5528

5546

5529

#: bzrlib/errors.py:2045

5547

#: bzrlib/errors.py:2064

5530

5548

msgid "Nothing to merge."

5531

5549

msgstr ""

5532

5550

5533

#: bzrlib/errors.py:2050

5551

#: bzrlib/errors.py:2069

5534

5552

msgid "Format %(format)s cannot be initialised by this version of bzr."

5535

5553

msgstr ""

5536

5554

5537

#: bzrlib/errors.py:2059

5555

#: bzrlib/errors.py:2078

5538

5556

msgid ""

5539

5557

"Cannot convert from format %(from_format)s to format %(format)s. "

5540

5558

"%(problem)s"

5541

5559

msgstr ""

5542

5560

5543

#: bzrlib/errors.py:2071

5561

#: bzrlib/errors.py:2090

5544

5562

msgid "Could not find an appropriate Differ for file \"%(path)s\""

5545

5563

msgstr ""

5546

5564

5547

#: bzrlib/errors.py:2079

5565

#: bzrlib/errors.py:2098

5548

5566

msgid "%(exe_name)s could not be found on this machine"

5549

5567

msgstr ""

5550

5568

5551

#: bzrlib/errors.py:2087

5569

#: bzrlib/errors.py:2106

5552

5570

msgid "Diff is not installed on this machine: %(msg)s"

5553

5571

msgstr ""

5554

5572

5555

#: bzrlib/errors.py:2095

5573

#: bzrlib/errors.py:2114

5556

5574

msgid "Diff3 is not installed on this machine."

5557

5575

msgstr ""

5558

5576

5559

#: bzrlib/errors.py:2101

5577

#: bzrlib/errors.py:2120

5560

5578

msgid "The content being inserted is already present."

5561

5579

msgstr ""

5562

5580

5563

#: bzrlib/errors.py:2106

5581

#: bzrlib/errors.py:2125

5564

5582

msgid ""

5565

5583

"This tree contains left-over files from a failed operation.\n"

5566

5584

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5568

5586

" keep, and delete it when you are done."

5569

5587

msgstr ""

5570

5588

5571

#: bzrlib/errors.py:2117

5589

#: bzrlib/errors.py:2136

5572

5590

msgid ""

5573

5591

"This tree contains left-over files from a failed operation.\n"

5574

5592

" Please examine %(pending_deletion)s to see if it contains any files you\n"

5575

5593

" wish to keep, and delete it when you are done."

5576

5594

msgstr ""

5577

5595

5578

#: bzrlib/errors.py:2127

5596

#: bzrlib/errors.py:2146

5579

5597

msgid ""

5580

5598

"Unable to delete transform temporary directory %(limbo_dir)s.\n"

5581

5599

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5583

5601

" keep, and delete it when you are done."

5584

5602

msgstr ""

5585

5603

5586

#: bzrlib/errors.py:2138

5604

#: bzrlib/errors.py:2157

5587

5605

msgid ""

5588

5606

"Unable to delete transform temporary directory %(pending_deletion)s. Please "

5589

5607

"examine %(pending_deletion)s to see if it contains any files you wish to "

5590

5608

"keep, and delete it when you are done."

5591

5609

msgstr ""

5592

5610

5593

#: bzrlib/errors.py:2148

5611

#: bzrlib/errors.py:2167

5594

5612

msgid "Working tree is out of date, please run 'bzr update'.%(more)s"

5595

5613

msgstr ""

5596

5614

5597

#: bzrlib/errors.py:2162

5615

#: bzrlib/errors.py:2181

5598

5616

msgid ""

5599

5617

"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."

5600

5618

msgstr ""

5601

5619

5602

#: bzrlib/errors.py:2175

5620

#: bzrlib/errors.py:2194

5603

5621

msgid "Error in merge modified format"

5604

5622

msgstr ""

5605

5623

5606

#: bzrlib/errors.py:2180

5624

#: bzrlib/errors.py:2199

5607

5625

msgid "Format error in conflict listings"

5608

5626

msgstr ""

5609

5627

5610

#: bzrlib/errors.py:2184

5628

#: bzrlib/errors.py:2203

5611

5629

msgid ""

5612

5630

"Inconsistency in dirstate file %(dirstate_path)s.\n"

5613

5631

"Error: %(description)s"

5614

5632

msgstr ""

5615

5633

5616

#: bzrlib/errors.py:2195

5634

#: bzrlib/errors.py:2214

5617

5635

msgid ""

5618

5636

"An error has been detected in the repository %(repo_path)s.\n"

5619

5637

"Please run bzr reconcile on this repository."

5620

5638

msgstr ""

5621

5639

5622

#: bzrlib/errors.py:2206

5640

#: bzrlib/errors.py:2225

5623

5641

msgid ""

5624

5642

"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"

5625

5643

"reason: %(reason)s"

5626

5644

msgstr ""

5627

5645

5628

#: bzrlib/errors.py:2219

5646

#: bzrlib/errors.py:2238

5629

5647

msgid ""

5630

5648

"An inconsistent delta was supplied: %(delta)r\n"

5631

5649

"reason: %(reason)s"

5632

5650

msgstr ""

5633

5651

5634

#: bzrlib/errors.py:2231

5652

#: bzrlib/errors.py:2250

5635

5653

msgid "To use this feature you must upgrade your branch at %(path)s."

5636

5654

msgstr ""

5637

5655

5638

#: bzrlib/errors.py:2240

5656

#: bzrlib/errors.py:2259

5639

5657

msgid "To use this feature you must upgrade your repository at %(path)s."

5640

5658

msgstr ""

5641

5659

5642

#: bzrlib/errors.py:2245

5660

#: bzrlib/errors.py:2264

5643

5661

msgid ""

5644

5662

"To use this feature you must upgrade your branch at %(path)s to a format "

5645

5663

"which supports rich roots."

5646

5664

msgstr ""

5647

5665

5648

#: bzrlib/errors.py:2251

5666

#: bzrlib/errors.py:2270

5649

5667

msgid "Cannot perform local-only commits on unbound branches."

5650

5668

msgstr ""

5651

5669

5652

#: bzrlib/errors.py:2256

5670

#: bzrlib/errors.py:2275

5653

5671

msgid "The method %(mname)s is not supported on objects of type %(tname)s."

5654

5672

msgstr ""

5655

5673

5656

#: bzrlib/errors.py:2277

5674

#: bzrlib/errors.py:2296

5657

5675

msgid "Ghost tags not supported by format %(format)r."

5658

5676

msgstr ""

5659

5677

5660

#: bzrlib/errors.py:2285

5678

#: bzrlib/errors.py:2304

5661

5679

msgid "File is binary but should be text."

5662

5680

msgstr ""

5663

5681

5664

#: bzrlib/errors.py:2290

5682

#: bzrlib/errors.py:2309

5665

5683

msgid "The path %(path)s is not permitted on this platform"

5666

5684

msgstr ""

5667

5685

5668

#: bzrlib/errors.py:2299

5686

#: bzrlib/errors.py:2318

5669

5687

msgid ""

5670

5688

"Testament did not match expected value.\n"

5671

5689

" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"

5672

5690

" {%(measured)s}"

5673

5691

msgstr ""

5674

5692

5675

#: bzrlib/errors.py:2311

5693

#: bzrlib/errors.py:2330

5676

5694

msgid "Not a bzr revision-bundle: %(text)r"

5677

5695

msgstr ""

5678

5696

5679

#: bzrlib/errors.py:2320

5697

#: bzrlib/errors.py:2339

5680

5698

msgid "Bad bzr revision-bundle: %(text)r"

5681

5699

msgstr ""

5682

5700

5683

#: bzrlib/errors.py:2329

5701

#: bzrlib/errors.py:2348

5684

5702

msgid "Malformed bzr revision-bundle header: %(text)r"

5685

5703

msgstr ""

5686

5704

5687

#: bzrlib/errors.py:2334

5705

#: bzrlib/errors.py:2353

5688

5706

msgid "Malformed patches in bzr revision-bundle: %(text)r"

5689

5707

msgstr ""

5690

5708

5691

#: bzrlib/errors.py:2339

5709

#: bzrlib/errors.py:2358

5692

5710

msgid "Malformed footer in bzr revision-bundle: %(text)r"

5693

5711

msgstr ""

5694

5712

5695

#: bzrlib/errors.py:2344

5713

#: bzrlib/errors.py:2363

5696

5714

msgid "End of line marker was not \\n in bzr revision-bundle"

5697

5715

msgstr ""

5698

5716

5699

#: bzrlib/errors.py:2354

5717

#: bzrlib/errors.py:2373

5700

5718

msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"

5701

5719

msgstr ""

5702

5720

5703

#: bzrlib/errors.py:2364

5721

#: bzrlib/errors.py:2383

5704

5722

msgid "Root class for inventory serialization errors"

5705

5723

msgstr ""

5706

5724

5707

#: bzrlib/errors.py:2368

5725

#: bzrlib/errors.py:2387

5708

5726

msgid ""

5709

5727

"The inventory was not in the expected format:\n"

5710

5728

" %(msg)s"

5711

5729

msgstr ""

5712

5730

5713

#: bzrlib/errors.py:2377

5731

#: bzrlib/errors.py:2396

5714

5732

msgid "This operation requires rich root data storage"

5715

5733

msgstr ""

5716

5734

5717

#: bzrlib/errors.py:2390

5735

#: bzrlib/errors.py:2409

5718

5736

msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"

5719

5737

msgstr ""

5720

5738

5721

#: bzrlib/errors.py:2399

5739

#: bzrlib/errors.py:2418

5722

5740

msgid ""

5723

5741

"Don't know how to handle SSH connections. Please set BZR_SSH environment "

5724

5742

"variable."

5725

5743

msgstr ""

5726

5744

5727

#: bzrlib/errors.py:2406

5745

#: bzrlib/errors.py:2425

5728

5746

msgid ""

5729

5747

"Could not determine revno for {%(revision_id)s} because its ancestry shows a "

5730

5748

"ghost at {%(ghost_revision_id)s}"

5731

5749

msgstr ""

5732

5750

5733

#: bzrlib/errors.py:2416

5751

#: bzrlib/errors.py:2435

5734

5752

msgid "Ghost revision {%(revision_id)s} cannot be used here."

5735

5753

msgstr ""

5736

5754

5737

#: bzrlib/errors.py:2467

5755

#: bzrlib/errors.py:2486

5738

5756

msgid ""

5739

5757

"A merge directive must provide either a bundle or a public branch location."

5740

5758

msgstr ""

5741

5759

5742

#: bzrlib/errors.py:2474

5760

#: bzrlib/errors.py:2493

5743

5761

msgid "Bad merge directive payload %(start)r"

5744

5762

msgstr ""

5745

5763

5746

#: bzrlib/errors.py:2484

5764

#: bzrlib/errors.py:2503

5747

5765

msgid "Preview patch does not match requested changes."

5748

5766

msgstr ""

5749

5767

5750

#: bzrlib/errors.py:2490

5768

#: bzrlib/errors.py:2509

5751

5769

msgid "Patch_type was %(patch_type)s, but no patch was supplied."

5752

5770

msgstr ""

5753

5771

5754

#: bzrlib/errors.py:2500

5772

#: bzrlib/errors.py:2519

5755

5773

msgid ""

5756

5774

"Your branch does not have all of the revisions required in order to merge "

5757

5775

"this merge directive and the target location specified in the merge "

5758

5776

"directive is not a branch: %(location)s."

5759

5777

msgstr ""

5760

5778

5761

#: bzrlib/errors.py:2512

5779

#: bzrlib/errors.py:2531

5762

5780

msgid "Unsupported entry kind %(kind)s"

5763

5781

msgstr ""

5764

5782

5765

#: bzrlib/errors.py:2520

5783

#: bzrlib/errors.py:2539

5766

5784

msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"

5767

5785

msgstr ""

5768

5786

5769

#: bzrlib/errors.py:2530

5787

#: bzrlib/errors.py:2549

5770

5788

msgid "Subsume target %(other_tree)s needs to be upgraded."

5771

5789

msgstr ""

5772

5790

5773

#: bzrlib/errors.py:2549

5791

#: bzrlib/errors.py:2568

5774

5792

msgid "No such tag: %(tag_name)s"

5775

5793

msgstr ""

5776

5794

5777

#: bzrlib/errors.py:2557

5795

#: bzrlib/errors.py:2576

5778

5796

msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."

5779

5797

msgstr ""

5780

5798

5781

#: bzrlib/errors.py:2566

5799

#: bzrlib/errors.py:2585

5782

5800

msgid "Tag %(tag_name)s already exists."

5783

5801

msgstr ""

5784

5802

5785

#: bzrlib/errors.py:2574

5803

#: bzrlib/errors.py:2593

5786

5804

msgid ""

5787

5805

"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "

5788

5806

"bugs\" for more information on this feature."

5789

5807

msgstr ""

5790

5808

5791

#: bzrlib/errors.py:2584

5809

#: bzrlib/errors.py:2603

5792

5810

msgid ""

5793

5811

"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"

5794

5812

msgstr ""

5795

5813

5796

#: bzrlib/errors.py:2594

5814

#: bzrlib/errors.py:2613

5797

5815

msgid ""

5798

5816

"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"

5799

5817

msgstr ""

5800

5818

5801

#: bzrlib/errors.py:2604

5819

#: bzrlib/errors.py:2623

5802

5820

msgid "Invalid line in bugs property: '%(line)s'"

5803

5821

msgstr ""

5804

5822

5805

#: bzrlib/errors.py:2612

5823

#: bzrlib/errors.py:2631

5806

5824

msgid "Invalid bug status: '%(status)s'"

5807

5825

msgstr ""

5808

5826

5809

#: bzrlib/errors.py:2620

5827

#: bzrlib/errors.py:2639

5810

5828

msgid "Could not understand response from smart server: %(response_tuple)r"

5811

5829

msgstr ""

5812

5830

5813

#: bzrlib/errors.py:2659

5831

#: bzrlib/errors.py:2678

5814

5832

msgid "Server sent an unexpected error: %(error_tuple)r"

5815

5833

msgstr ""

5816

5834

5817

#: bzrlib/errors.py:2678

5835

#: bzrlib/errors.py:2697

5818

5836

msgid "Unrecognised container format: %(container_format)r"

5819

5837

msgstr ""

5820

5838

5821

#: bzrlib/errors.py:2686

5839

#: bzrlib/errors.py:2705

5822

5840

msgid "Unexpected end of container stream"

5823

5841

msgstr ""

5824

5842

5825

#: bzrlib/errors.py:2691

5843

#: bzrlib/errors.py:2710

5826

5844

msgid "Unknown record type: %(record_type)r"

5827

5845

msgstr ""

5828

5846

5829

#: bzrlib/errors.py:2699

5847

#: bzrlib/errors.py:2718

5830

5848

msgid "Invalid record: %(reason)s"

5831

5849

msgstr ""

5832

5850

5833

#: bzrlib/errors.py:2707

5851

#: bzrlib/errors.py:2726

5834

5852

msgid "Container has data after end marker: %(excess)r"

5835

5853

msgstr ""

5836

5854

5837

#: bzrlib/errors.py:2715

5855

#: bzrlib/errors.py:2734

5838

5856

msgid "Container has multiple records with the same name: %(name)s"

5839

5857

msgstr ""

5840

5858

5841

#: bzrlib/errors.py:2728

5859

#: bzrlib/errors.py:2747

5842

5860

msgid "Corrupt or incompatible data stream: %(reason)s"

5843

5861

msgstr ""

5844

5862

5845

#: bzrlib/errors.py:2736

5863

#: bzrlib/errors.py:2755

5846

5864

msgid "SMTP error: %(error)s"

5847

5865

msgstr ""

5848

5866

5849

#: bzrlib/errors.py:2744

5867

#: bzrlib/errors.py:2763

5850

5868

msgid "No message supplied."

5851

5869

msgstr ""

5852

5870

5853

#: bzrlib/errors.py:2749

5871

#: bzrlib/errors.py:2768

5854

5872

msgid "No mail-to address (--mail-to) or output (-o) specified."

5855

5873

msgstr ""

5856

5874

5857

#: bzrlib/errors.py:2754

5875

#: bzrlib/errors.py:2773

5858

5876

msgid "Unknown mail client: %(mail_client)s"

5859

5877

msgstr ""

5860

5878

5861

#: bzrlib/errors.py:2762

5879

#: bzrlib/errors.py:2781

5862

5880

msgid ""

5863

5881

"Unable to find mail client with the following names: "

5864

5882

"%(mail_command_list_string)s"

5865

5883

msgstr ""

5866

5884

5867

#: bzrlib/errors.py:2772

5885

#: bzrlib/errors.py:2791

5868

5886

msgid "SMTP connection to %(host)s refused"

5869

5887

msgstr ""

5870

5888

5871

#: bzrlib/errors.py:2781

5889

#: bzrlib/errors.py:2800

5872

5890

msgid "Please specify smtp_server. No server at default %(host)s."

5873

5891

msgstr ""

5874

5892

5875

#: bzrlib/errors.py:2795

5893

#: bzrlib/errors.py:2814

5876

5894

msgid ""

5877

5895

"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"

5878

5896

"reconfigure."

5879

5897

msgstr ""

5880

5898

5881

#: bzrlib/errors.py:2807

5899

#: bzrlib/errors.py:2826

5882

5900

msgid "'%(display_url)s' is already a branch."

5883

5901

msgstr ""

5884

5902

5885

#: bzrlib/errors.py:2812

5903

#: bzrlib/errors.py:2831

5886

5904

msgid "'%(display_url)s' is already a tree."

5887

5905

msgstr ""

5888

5906

5889

#: bzrlib/errors.py:2817

5907

#: bzrlib/errors.py:2836

5890

5908

msgid "'%(display_url)s' is already a checkout."

5891

5909

msgstr ""

5892

5910

5893

#: bzrlib/errors.py:2822

5911

#: bzrlib/errors.py:2841

5894

5912

msgid "'%(display_url)s' is already a lightweight checkout."

5895

5913

msgstr ""

5896

5914

5897

#: bzrlib/errors.py:2827

5915

#: bzrlib/errors.py:2846

5898

5916

msgid "'%(display_url)s' is already using a shared repository."

5899

5917

msgstr ""

5900

5918

5901

#: bzrlib/errors.py:2832

5919

#: bzrlib/errors.py:2851

5902

5920

msgid "'%(display_url)s' is already standalone."

5903

5921

msgstr ""

5904

5922

5905

#: bzrlib/errors.py:2837

5923

#: bzrlib/errors.py:2856

5906

5924

msgid "Shared repository '%(display_url)s' already creates working trees."

5907

5925

msgstr ""

5908

5926

5909

#: bzrlib/errors.py:2843

5927

#: bzrlib/errors.py:2862

5910

5928

msgid ""

5911

5929

"Shared repository '%(display_url)s' already doesn't create working trees."

5912

5930

msgstr ""

5913

5931

5914

#: bzrlib/errors.py:2849

5932

#: bzrlib/errors.py:2868

5915

5933

msgid "Requested reconfiguration of '%(display_url)s' is not supported."

5916

5934

msgstr ""

5917

5935

5918

#: bzrlib/errors.py:2854

5936

#: bzrlib/errors.py:2873

5919

5937

msgid "No location could be found to bind to at %(display_url)s."

5920

5938

msgstr ""

5921

5939

5922

#: bzrlib/errors.py:2859

5940

#: bzrlib/errors.py:2878

5923

5941

msgid ""

5924

5942

"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "

5925

5943

"status).%(more)s"

5926

5944

msgstr ""

5927

5945

5928

#: bzrlib/errors.py:2878

5946

#: bzrlib/errors.py:2897

5929

5947

msgid ""

5930

5948

"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"

5931

5949

"list).%(more)s"

5932

5950

msgstr ""

5933

5951

5934

#: bzrlib/errors.py:2884

5952

#: bzrlib/errors.py:2903

5935

5953

msgid "Variable {%(name)s} is not available."

5936

5954

msgstr ""

5937

5955

5938

#: bzrlib/errors.py:2892

5956

#: bzrlib/errors.py:2911

5939

5957

msgid "No template specified."

5940

5958

msgstr ""

5941

5959

5942

#: bzrlib/errors.py:2897

5960

#: bzrlib/errors.py:2916

5943

5961

msgid "Unable to create symlink %(path_str)son this platform"

5944

5962

msgstr ""

5945

5963

5946

#: bzrlib/errors.py:2912

5964

#: bzrlib/errors.py:2931

5947

5965

msgid ""

5948

5966

"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "

5949

5967

"\"original\", \"local\"."

5950

5968

msgstr ""

5951

5969

5952

#: bzrlib/errors.py:2946

5970

#: bzrlib/errors.py:2965

5953

5971

msgid ""

5954

5972

"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"

5955

5973

msgstr ""

5956

5974

5957

#: bzrlib/errors.py:2958

5975

#: bzrlib/errors.py:2977

5958

5976

msgid "The \"%(config_id)s\" configuration does not exist."

5959

5977

msgstr ""

5960

5978

5961

#: bzrlib/errors.py:2966

5979

#: bzrlib/errors.py:2985

5962

5980

msgid "The \"%(option_name)s\" configuration option does not exist."

5963

5981

msgstr ""

5964

5982

5965

#: bzrlib/errors.py:2974

5983

#: bzrlib/errors.py:2993

5966

5984

msgid "The alias \"%(alias_name)s\" does not exist."

5967

5985

msgstr ""

5968

5986

5969

#: bzrlib/errors.py:2988

5987

#: bzrlib/errors.py:3007

5970

5988

msgid "\"%(alias_name)s\" is not a valid location alias."

5971

5989

msgstr ""

5972

5990

5973

#: bzrlib/errors.py:2996

5991

#: bzrlib/errors.py:3015

5974

5992

msgid "No %(alias_name)s location assigned."

5975

5993

msgstr ""

5976

5994

5977

#: bzrlib/errors.py:3004

5995

#: bzrlib/errors.py:3023

5978

5996

msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."

5979

5997

msgstr ""

5980

5998

5981

#: bzrlib/errors.py:3014

5999

#: bzrlib/errors.py:3033

5982

6000

msgid "Unknown rules detected: %(unknowns_str)s."

5983

6001

msgstr ""

5984

6002

5985

#: bzrlib/errors.py:3025

6003

#: bzrlib/errors.py:3044

5986

6004

msgid "Tip change rejected: %(msg)s"

5987

6005

msgstr ""

5988

6006

5989

#: bzrlib/errors.py:3033

6007

#: bzrlib/errors.py:3052

5990

6008

msgid "Shelf corrupt."

5991

6009

msgstr ""

5992

6010

5993

#: bzrlib/errors.py:3038

6011

#: bzrlib/errors.py:3057

5994

6012

msgid "Corruption while decompressing repository file%(orig_error)s"

5995

6013

msgstr ""

5996

6014

5997

#: bzrlib/errors.py:3050

6015

#: bzrlib/errors.py:3069

5998

6016

msgid "No changes are shelved with id \"%(shelf_id)d\"."

5999

6017

msgstr ""

6000

6018

6001

#: bzrlib/errors.py:3058

6019

#: bzrlib/errors.py:3077

6002

6020

msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."

6003

6021

msgstr ""

6004

6022

6005

#: bzrlib/errors.py:3066

6023

#: bzrlib/errors.py:3085

6006

6024

msgid ""

6007

6025

"An attempt to access a url outside the server jail was made: '%(url)s'."

6008

6026

msgstr ""

6009

6027

6010

#: bzrlib/errors.py:3074

6028

#: bzrlib/errors.py:3093

6011

6029

msgid "The user aborted the operation."

6012

6030

msgstr ""

6013

6031

6014

#: bzrlib/errors.py:3079

6032

#: bzrlib/errors.py:3098

6015

6033

msgid "Branching '%(url)s'(%(format)s) must create a working tree."

6016

6034

msgstr ""

6017

6035

6018

#: bzrlib/errors.py:3089

6036

#: bzrlib/errors.py:3108

6019

6037

msgid "No such view: %(view_name)s."

6020

6038

msgstr ""

6021

6039

6022

#: bzrlib/errors.py:3099

6040

#: bzrlib/errors.py:3118

6023

6041

msgid ""

6024

6042

"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "

6025

6043

"to a later format."

6026

6044

msgstr ""

6027

6045

6028

#: bzrlib/errors.py:3108

6046

#: bzrlib/errors.py:3127

6029

6047

msgid ""

6030

6048

"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"

6031

6049

msgstr ""

6032

6050

6033

#: bzrlib/errors.py:3175

6051

#: bzrlib/errors.py:3194

6034

6052

msgid "%(bzrdir)r does not support co-located branches."

6035

6053

msgstr ""

6036

6054

6037

#: bzrlib/errors.py:3181

6055

#: bzrlib/errors.py:3200

6038

6056

msgid ""

6039

6057

"Unable to determine your name.\n"

6040

6058

"Please, set your name with the 'whoami' command.\n"

6041

6059

"E.g. bzr whoami \"Your Name <name@example.com>\""

6042

6060

msgstr ""

6043

6061

6044

#: bzrlib/errors.py:3190

6062

#: bzrlib/errors.py:3209

6045

6063

msgid "Invalid pattern(s) found. %(msg)s"

6046

6064

msgstr ""

6047

6065

6048

#: bzrlib/errors.py:3198

6066

#: bzrlib/errors.py:3217

6049

6067

msgid ""

6050

6068

"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "

6051

6069

"unbind` to fix."

6052

6070

msgstr ""

6053

6071

6054

#: bzrlib/errors.py:3209

6072

#: bzrlib/errors.py:3228

6055

6073

msgid "Loop involving %(refs)r while expanding \"%(string)s\"."

6056

6074

msgstr ""

6057

6075

6058

#: bzrlib/errors.py:3218

6076

#: bzrlib/errors.py:3237

6059

6077

msgid "Option %(name)s is not defined while expanding \"%(string)s\"."

6060

6078

msgstr ""

6061

6079

6062

#: bzrlib/errors.py:3227

6080

#: bzrlib/errors.py:3246

6063

6081

msgid ""

6064

6082

"No compatible object available for operations from %(source)r to %(target)r."

6065

6083

msgstr ""

6066

6084

6067

#: bzrlib/errors.py:3237

6085

#: bzrlib/errors.py:3256

6068

6086

msgid ""

6069

6087

"VFS requests over the smart server are not allowed. Encountered: %(method)s, "

6070

6088

"%(arguments)s."

6071

6089

msgstr ""

6072

6090

6073

#: bzrlib/errors.py:3247

6091

#: bzrlib/errors.py:3266

6074

6092

msgid ""

6075

6093

"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "

6076

6094

"format %(format)r"

6077

6095

msgstr ""

6078

6096

6079

#: bzrlib/errors.py:3259

6097

#: bzrlib/errors.py:3278

6080

6098

msgid ""

6081

6099

"Missing feature %(feature)s not provided by this version of Bazaar or any "

6082

6100

"plugin."

6083

6101

msgstr ""

6084

6102

6085

#: bzrlib/errors.py:3272

6103

#: bzrlib/errors.py:3291

6086

6104

msgid "Binary files section encountered."

6087

6105

msgstr ""

6088

6106

6089

#: bzrlib/errors.py:3280

6107

#: bzrlib/errors.py:3299

6090

6108

msgid ""

6091

6109

"Malformed patch header. %(desc)s\n"

6092

6110

"%(line)r"

6093

6111

msgstr ""

6094

6112

6095

#: bzrlib/errors.py:3289

6113

#: bzrlib/errors.py:3308

6096

6114

msgid ""

6097

6115

"Malformed hunk header. %(desc)s\n"

6098

6116

"%(line)r"

6099

6117

msgstr ""

6100

6118

6101

#: bzrlib/errors.py:3298

6119

#: bzrlib/errors.py:3317

6102

6120

msgid ""

6103

6121

"Malformed line. %(desc)s\n"

6104

6122

"%(line)r"

6105

6123

msgstr ""

6106

6124

6107

#: bzrlib/errors.py:3308

6125

#: bzrlib/errors.py:3327

6108

6126

msgid ""

6109

6127

"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "

6110

6128

"but patch says it should be \"%(patch_line)s\""

6111

6129

msgstr ""

6112

6130

6113

#: bzrlib/errors.py:3319

6131

#: bzrlib/errors.py:3338

6114

6132

msgid "The feature %(feature)s has already been registered."

6115

6133

msgstr ""

6116

6134

6440

6458

msgid "lstat/stat of ({0!r}): {1!r}"

6441

6459

msgstr ""

6442

6460

6443

#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008

6461

#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019

6444

6462

#, python-format

6445

6463

msgid "sorry, %r not allowed in path"

6446

6464

msgstr ""

6447

6465

6448

#: bzrlib/osutils.py:1226

6466

#: bzrlib/osutils.py:1237

6449

6467

#, python-format

6450

6468

msgid "%r is too short to calculate a relative path"

6451

6469

msgstr ""

6889

6907

msgid "Created new branch."

6890

6908

msgstr ""

6891

6909

6892

#: bzrlib/push.py:98

6910

#: bzrlib/push.py:97

6893

6911

#, python-format

6894

6912

msgid ""

6895

6913

"Target directory %s already contains a .bzr directory, but it is not valid."

7016

7034

msgid "%s is now not stacked\n"

7017

7035

msgstr ""

7018

7036

7019

#: bzrlib/remote.py:1180 bzrlib/repository.py:289

7037

#: bzrlib/remote.py:1228 bzrlib/repository.py:289

7020

7038

#, python-format

7021

7039

msgid "bzr: ERROR (ignored): %s"

7022

7040

msgstr ""

7023

7041

7024

#: bzrlib/remote.py:2493

7042

#: bzrlib/remote.py:2541

7025

7043

msgid "Copying repository content as tarball..."

7026

7044

msgstr ""

7027

7045

7236

7254

msgid "listening on port: %s"

7237

7255

msgstr ""

7238

7256

7239

#: bzrlib/switch.py:69

7257

#: bzrlib/switch.py:73

7240

7258

msgid "Pending merges must be committed or reverted before using switch."

7241

7259

msgstr ""

7242

7260

7243

#: bzrlib/switch.py:96

7261

#: bzrlib/switch.py:100

7244

7262

msgid ""

7245

7263

"Cannot switch as local commits found in the checkout. Commit these to the "

7246

7264

"bound branch or use --force to throw them away."

7247

7265

msgstr ""

7248

7266

7249

#: bzrlib/switch.py:101

7267

#: bzrlib/switch.py:105

7250

7268

#, python-format

7251

7269

msgid ""

7252

7270

"Unable to connect to current master branch %(target)s: %(error)s To switch "

7253

7271

"anyway, use --force."

7254

7272

msgstr ""

7255

7273

7256

#: bzrlib/switch.py:110

7274

#: bzrlib/switch.py:125

7257

7275

msgid "Cannot switch a branch, only a checkout."

7258

7276

msgstr ""

7259

7277

7260

#: bzrlib/switch.py:146

7278

#: bzrlib/switch.py:163

7261

7279

#, python-format

7262

7280

msgid "Tree is up to date at revision %d."

7263

7281

msgstr ""

7264

7282

7265

#: bzrlib/switch.py:152

7283

#: bzrlib/switch.py:169

7266

7284

#, python-format

7267

7285

msgid "Updated to revision %d."

7268

7286

msgstr ""

7269

7287

7270

#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743

7288

#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747

7271

7289

msgid "Apply phase"

7272

7290

msgstr ""

7273

7291

7274

#: bzrlib/transform.py:1769 bzrlib/transform.py:1837

7292

#: bzrlib/transform.py:1773 bzrlib/transform.py:1841

7275

7293

msgid "removing file"

7276

7294

msgstr ""

7277

7295

7278

#: bzrlib/transform.py:1787 bzrlib/transform.py:1872

7296

#: bzrlib/transform.py:1791 bzrlib/transform.py:1876

7279

7297

msgid "adding file"

7280

7298

msgstr ""

7281

7299

7282

#: bzrlib/transform.py:2587

7300

#: bzrlib/transform.py:2591

7283

7301

msgid "Building tree"

7284

7302

msgstr ""

7285

7303

7286

#: bzrlib/transform.py:2677 bzrlib/transform.py:2704

7304

#: bzrlib/transform.py:2681 bzrlib/transform.py:2708

7287

7305

msgid "Adding file contents"

7288

7306

msgstr ""

7289

7307

7290

#: bzrlib/transform.py:3024

7308

#: bzrlib/transform.py:3028

7291

7309

msgid "Resolution pass"

7292

7310

msgstr ""

7293

7311

7436

7454

7437

7455

#: dummy/help_topics/basic/detail.txt:1

7438

7456

msgid ""

7439

"Bazaar 2.5b5 -- a free distributed version-control tool\n"

7457

"Bazaar 2.5b6 -- a free distributed version-control tool\n"

7440

7458

"http://bazaar.canonical.com/"

7441

7459

msgstr ""

7442

7460

11702

11720

"~~~~~~~~~~~~~~~~~~~~~~"

11703

11721

msgstr ""

11704

11722

11705

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402

11723

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418

11706

11724

msgid "Introduced in: 1.4"

11707

11725

msgstr ""

11708

11726

11894

11912

msgstr ""

11895

11913

11896

11914

#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196

11897

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448

11915

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464

11898

11916

msgid "Introduced in: 1.17"

11899

11917

msgstr ""

11900

11918

11950

11968

#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226

11951

11969

#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241

11952

11970

#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370

11953

#: en/help_topics/hooks.txt:427

11971

#: en/help_topics/hooks.txt:443

11954

11972

msgid "Introduced in: 2.4"

11955

11973

msgstr ""

11956

11974

12051

12069

msgstr ""

12052

12070

12053

12071

#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297

12054

#: en/help_topics/hooks.txt:505

12072

#: en/help_topics/hooks.txt:521

12055

12073

msgid "Introduced in: 1.15"

12056

12074

msgstr ""

12057

12075

12133

12151

msgstr ""

12134

12152

12135

12153

#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334

12136

#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493

12154

#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402

12155

#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509

12137

12156

msgid "Introduced in: 2.5"

12138

12157

msgstr ""

12139

12158

12252

12271

12253

12272

#: en/help_topics/hooks.txt:399

12254

12273

msgid ""

12274

"post_transform\n"

12275

"~~~~~~~~~~~~~~"

12276

msgstr ""

12277

12278

#: en/help_topics/hooks.txt:404

12279

msgid ""

12280

"Called after a tree transform has been performed on a tree. The hook\n"

12281

"is called with the tree that is being transformed and the transform."

12282

msgstr ""

12283

12284

#: en/help_topics/hooks.txt:407

12285

msgid ""

12286

"pre_transform\n"

12287

"~~~~~~~~~~~~~"

12288

msgstr ""

12289

12290

#: en/help_topics/hooks.txt:412

12291

msgid ""

12292

"Called before a tree transform on this tree. The hook is called with\n"

12293

"the tree that is being transformed and the transform."

12294

msgstr ""

12295

12296

#: en/help_topics/hooks.txt:415

12297

msgid ""

12255

12298

"start_commit\n"

12256

12299

"~~~~~~~~~~~~"

12257

12300

msgstr ""

12258

12301

12259

#: en/help_topics/hooks.txt:404

12302

#: en/help_topics/hooks.txt:420

12260

12303

msgid ""

12261

12304

"Called before a commit is performed on a tree. The start commit hook\n"

12262

12305

"is able to change the tree before the commit takes place. start_commit\n"

12264

12307

"being performed on."

12265

12308

msgstr ""

12266

12309

12267

#: en/help_topics/hooks.txt:409

12310

#: en/help_topics/hooks.txt:425

12268

12311

msgid ""

12269

12312

"SmartClientHooks\n"

12270

12313

"----------------"

12271

12314

msgstr ""

12272

12315

12273

#: en/help_topics/hooks.txt:412

12316

#: en/help_topics/hooks.txt:428

12274

12317

msgid ""

12275

12318

"call\n"

12276

12319

"~~~~"

12277

12320

msgstr ""

12278

12321

12279

#: en/help_topics/hooks.txt:415

12322

#: en/help_topics/hooks.txt:431

12280

12323

msgid "Introduced in: unknown"

12281

12324

msgstr ""

12282

12325

12283

#: en/help_topics/hooks.txt:417

12326

#: en/help_topics/hooks.txt:433

12284

12327

msgid ""

12285

12328

"Called when the smart client is submitting a request to the smart\n"

12286

12329

"server. Called with a bzrlib.smart.client.CallHookParams object.\n"

12287

12330

"Streaming request bodies, and responses, are not accessible."

12288

12331

msgstr ""

12289

12332

12290

#: en/help_topics/hooks.txt:421

12333

#: en/help_topics/hooks.txt:437

12291

12334

msgid ""

12292

12335

"SmartServerHooks\n"

12293

12336

"----------------"

12294

12337

msgstr ""

12295

12338

12296

#: en/help_topics/hooks.txt:424

12339

#: en/help_topics/hooks.txt:440

12297

12340

msgid ""

12298

12341

"server_exception\n"

12299

12342

"~~~~~~~~~~~~~~~~"

12300

12343

msgstr ""

12301

12344

12302

#: en/help_topics/hooks.txt:429

12345

#: en/help_topics/hooks.txt:445

12303

12346

msgid ""

12304

12347

"Called by the bzr server when an exception occurs. server_exception is\n"

12305

12348

"called with the sys.exc_info() tuple return true for the hook if the\n"

12307

12350

"normally."

12308

12351

msgstr ""

12309

12352

12310

#: en/help_topics/hooks.txt:434

12353

#: en/help_topics/hooks.txt:450

12311

12354

msgid ""

12312

12355

"server_started\n"

12313

12356

"~~~~~~~~~~~~~~"

12314

12357

msgstr ""

12315

12358

12316

#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456

12359

#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472

12317

12360

msgid "Introduced in: 0.16"

12318

12361

msgstr ""

12319

12362

12320

#: en/help_topics/hooks.txt:439

12363

#: en/help_topics/hooks.txt:455

12321

12364

msgid ""

12322

12365

"Called by the bzr server when it starts serving a directory.\n"

12323

12366

"server_started is called with (backing urls, public url), where\n"

12326

12369

"served."

12327

12370

msgstr ""

12328

12371

12329

#: en/help_topics/hooks.txt:445

12372

#: en/help_topics/hooks.txt:461

12330

12373

msgid ""

12331

12374

"server_started_ex\n"

12332

12375

"~~~~~~~~~~~~~~~~~"

12333

12376

msgstr ""

12334

12377

12335

#: en/help_topics/hooks.txt:450

12378

#: en/help_topics/hooks.txt:466

12336

12379

msgid ""

12337

12380

"Called by the bzr server when it starts serving a directory.\n"

12338

12381

"server_started is called with (backing_urls, server_obj)."

12339

12382

msgstr ""

12340

12383

12341

#: en/help_topics/hooks.txt:453

12384

#: en/help_topics/hooks.txt:469

12342

12385

msgid ""

12343

12386

"server_stopped\n"

12344

12387

"~~~~~~~~~~~~~~"

12345

12388

msgstr ""

12346

12389

12347

#: en/help_topics/hooks.txt:458

12390

#: en/help_topics/hooks.txt:474

12348

12391

msgid ""

12349

12392

"Called by the bzr server when it stops serving a directory.\n"

12350

12393

"server_stopped is called with the same parameters as the\n"

12351

12394

"server_started hook: (backing_urls, public_url)."

12352

12395

msgstr ""

12353

12396

12354

#: en/help_topics/hooks.txt:462

12397

#: en/help_topics/hooks.txt:478

12355

12398

msgid ""

12356

12399

"StatusHooks\n"

12357

12400

"-----------"

12358

12401

msgstr ""

12359

12402

12360

#: en/help_topics/hooks.txt:465

12403

#: en/help_topics/hooks.txt:481

12361

12404

msgid ""

12362

12405

"post_status\n"

12363

12406

"~~~~~~~~~~~"

12364

12407

msgstr ""

12365

12408

12366

#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479

12409

#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495

12367

12410

msgid "Introduced in: 2.3"

12368

12411

msgstr ""

12369

12412

12370

#: en/help_topics/hooks.txt:470

12413

#: en/help_topics/hooks.txt:486

12371

12414

msgid ""

12372

12415

"Called with argument StatusHookParams after Bazaar has displayed the\n"

12373

12416

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12376

12419

"status command. to_file is the output stream for writing."

12377

12420

msgstr ""

12378

12421

12379

#: en/help_topics/hooks.txt:476

12422

#: en/help_topics/hooks.txt:492

12380

12423

msgid ""

12381

12424

"pre_status\n"

12382

12425

"~~~~~~~~~~"

12383

12426

msgstr ""

12384

12427

12385

#: en/help_topics/hooks.txt:481

12428

#: en/help_topics/hooks.txt:497

12386

12429

msgid ""

12387

12430

"Called with argument StatusHookParams before Bazaar displays the\n"

12388

12431

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12391

12434

"status command. to_file is the output stream for writing."

12392

12435

msgstr ""

12393

12436

12394

#: en/help_topics/hooks.txt:487

12437

#: en/help_topics/hooks.txt:503

12395

12438

msgid ""

12396

12439

"TransportHooks\n"

12397

12440

"--------------"

12398

12441

msgstr ""

12399

12442

12400

#: en/help_topics/hooks.txt:490

12443

#: en/help_topics/hooks.txt:506

12401

12444

msgid ""

12402

12445

"post_connect\n"

12403

12446

"~~~~~~~~~~~~"

12404

12447

msgstr ""

12405

12448

12406

#: en/help_topics/hooks.txt:495

12449

#: en/help_topics/hooks.txt:511

12407

12450

msgid ""

12408

12451

"Called after a new connection is established or a reconnect occurs.\n"

12409

12452

"The sole argument passed is either the connected transport or smart\n"

12410

12453

"medium instance."

12411

12454

msgstr ""

12412

12455

12413

#: en/help_topics/hooks.txt:499

12456

#: en/help_topics/hooks.txt:515

12414

12457

msgid ""

12415

12458

"RioVersionInfoBuilderHooks\n"

12416

12459

"--------------------------"

12417

12460

msgstr ""

12418

12461

12419

#: en/help_topics/hooks.txt:502

12462

#: en/help_topics/hooks.txt:518

12420

12463

msgid ""

12421

12464

"revision\n"

12422

12465

"~~~~~~~~"

12423

12466

msgstr ""

12424

12467

12425

#: en/help_topics/hooks.txt:507

12468

#: en/help_topics/hooks.txt:523

12426

12469

msgid ""

12427

12470

"Invoked when adding information about a revision to the RIO stanza\n"

12428

12471

"that is printed. revision is called with a revision object and a RIO\n"