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

7

msgstr ""

8

"Project-Id-Version: bzr\n"

9

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

10

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

11

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

10

"POT-Creation-Date: 2012-03-15 10:20+0100\n"

11

"PO-Revision-Date: 2012-01-09 22:20+0000\n"

12

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

13

"Language-Team: Faroese <fo@li.org>\n"

14

"MIME-Version: 1.0\n"

15

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

16

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

17

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

18

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

19

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

18

"X-Launchpad-Export-Date: 2012-03-16 04:31+0000\n"

19

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

20

21

#: bzrlib/add.py:95

21

#: bzrlib/add.py:93

22

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

23

msgstr ""

24

25

#: bzrlib/branch.py:872

25

#: bzrlib/branch.py:854

26

msgid "Unstacking"

27

msgstr ""

28

29

#: bzrlib/branch.py:3205

29

#: bzrlib/branch.py:3121

30

#, python-format

31

msgid "Pushed up to revision %d."

32

msgstr ""

33

34

#: bzrlib/branch.py:3207

34

#: bzrlib/branch.py:3123

35

#, python-format

36

msgid "%d tag updated."

37

msgid_plural "%d tags updated."

38

msgstr[0] ""

39

msgstr[1] ""

40

41

#: bzrlib/branch.py:3210

41

#: bzrlib/branch.py:3126

42

msgid "No new revisions or tags to push."

43

msgstr ""

44

45

#: bzrlib/branch.py:3212

45

#: bzrlib/branch.py:3128

46

msgid "No new revisions to push."

47

msgstr ""

48

49

#: bzrlib/branch.py:3232

49

#: bzrlib/branch.py:3148

50

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

51

msgstr ""

52

53

#: bzrlib/branch.py:3235

53

#: bzrlib/branch.py:3151

54

#, python-format

55

msgid "found error:%s"

56

msgstr ""

57

58

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

58

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

59

#, python-format

60

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

61

msgstr ""

62

63

#: bzrlib/builtins.py:218

63

#: bzrlib/builtins.py:260

64

#, python-format

65

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

66

msgstr ""

67

68

#: bzrlib/builtins.py:303

68

#: bzrlib/builtins.py:315

69

msgid "Display status summary."

70

msgstr ""

71

72

#: bzrlib/builtins.py:305

72

#: bzrlib/builtins.py:317

73

msgid ""

74

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

75

"grouped by state. Possible states are:"

76

msgstr ""

77

78

#: bzrlib/builtins.py:308

78

#: bzrlib/builtins.py:320

79

msgid ""

80

"added\n"

81

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

82

msgstr ""

83

84

#: bzrlib/builtins.py:311

84

#: bzrlib/builtins.py:323

85

msgid ""

86

"removed\n"

87

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

88

" in the working copy."

89

msgstr ""

90

91

#: bzrlib/builtins.py:315

91

#: bzrlib/builtins.py:327

92

msgid ""

93

"renamed\n"

94

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

96

" parent directory was renamed."

97

msgstr ""

98

99

#: bzrlib/builtins.py:320

99

#: bzrlib/builtins.py:332

100

msgid ""

101

"modified\n"

102

" Text has changed since the previous revision."

103

msgstr ""

104

105

#: bzrlib/builtins.py:323

105

#: bzrlib/builtins.py:335

106

msgid ""

107

"kind changed\n"

108

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

109

msgstr ""

110

111

#: bzrlib/builtins.py:326

111

#: bzrlib/builtins.py:338

112

msgid ""

113

"unknown\n"

114

" Not versioned and not matching an ignore pattern."

115

msgstr ""

116

117

#: bzrlib/builtins.py:329

117

#: bzrlib/builtins.py:341

118

msgid ""

119

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

120

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

122

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

123

msgstr ""

124

125

#: bzrlib/builtins.py:334

125

#: bzrlib/builtins.py:346

126

msgid ""

127

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

128

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

129

msgstr ""

130

131

#: bzrlib/builtins.py:337

131

#: bzrlib/builtins.py:349

132

msgid ""

133

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

134

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

135

"use bzr status -SV."

136

msgstr ""

137

138

#: bzrlib/builtins.py:341

138

#: bzrlib/builtins.py:353

139

msgid ""

140

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

141

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

143

"is reported for everything inside that directory."

144

msgstr ""

145

146

#: bzrlib/builtins.py:346

146

#: bzrlib/builtins.py:358

147

msgid ""

148

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

149

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

151

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

152

msgstr ""

153

154

#: bzrlib/builtins.py:351

154

#: bzrlib/builtins.py:363

155

msgid ""

156

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

157

"single revision to the revision argument."

158

msgstr ""

159

160

#: bzrlib/builtins.py:354

160

#: bzrlib/builtins.py:366

161

msgid ""

162

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

163

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

164

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

165

msgstr ""

166

167

#: bzrlib/builtins.py:363

167

#: bzrlib/builtins.py:375

168

msgid "Use short status indicators."

169

msgstr ""

170

171

#: bzrlib/builtins.py:365

171

#: bzrlib/builtins.py:377

172

msgid "Only show versioned files."

173

msgstr ""

174

175

#: bzrlib/builtins.py:367

175

#: bzrlib/builtins.py:379

176

msgid "Don't show pending merges."

177

msgstr ""

178

179

#: bzrlib/builtins.py:370

179

#: bzrlib/builtins.py:382

180

msgid "Do not mark object type using indicator."

181

msgstr ""

182

183

#: bzrlib/builtins.py:385

183

#: bzrlib/builtins.py:397

184

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

185

msgstr ""

186

187

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

187

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

188

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

189

msgstr ""

190

191

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

191

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

192

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

193

msgstr ""

194

195

#: bzrlib/builtins.py:439

195

#: bzrlib/builtins.py:451

196

#, python-format

197

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

198

msgstr ""

199

200

#: bzrlib/builtins.py:450

200

#: bzrlib/builtins.py:462

201

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

202

msgstr ""

203

204

#: bzrlib/builtins.py:457

204

#: bzrlib/builtins.py:469

205

msgid "You cannot specify a NULL revision."

206

msgstr ""

207

208

#: bzrlib/builtins.py:549

208

#: bzrlib/builtins.py:561

209

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

210

msgstr ""

211

212

#: bzrlib/builtins.py:551

212

#: bzrlib/builtins.py:563

213

msgid ""

214

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

215

"this will refuse to run against one."

216

msgstr ""

217

218

#: bzrlib/builtins.py:554

218

#: bzrlib/builtins.py:566

219

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

220

msgstr ""

221

222

#: bzrlib/builtins.py:560

222

#: bzrlib/builtins.py:572

223

msgid ""

224

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

225

msgstr ""

226

227

#: bzrlib/builtins.py:574

227

#: bzrlib/builtins.py:586

228

msgid "No working tree to remove"

229

msgstr ""

230

231

#: bzrlib/builtins.py:576

231

#: bzrlib/builtins.py:588

232

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

233

msgstr ""

234

235

#: bzrlib/builtins.py:585

235

#: bzrlib/builtins.py:597

236

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

237

msgstr ""

238

239

#: bzrlib/builtins.py:625

239

#: bzrlib/builtins.py:637

240

msgid ""

241

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

242

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

243

msgstr ""

244

245

#: bzrlib/builtins.py:636

245

#: bzrlib/builtins.py:648

246

msgid ""

247

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

248

"commit"

249

msgstr ""

250

251

#: bzrlib/builtins.py:640

251

#: bzrlib/builtins.py:652

252

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

253

msgstr ""

254

255

#: bzrlib/builtins.py:644

255

#: bzrlib/builtins.py:656

256

msgid "Show current revision number."

257

msgstr ""

258

259

#: bzrlib/builtins.py:646

259

#: bzrlib/builtins.py:658

260

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

261

msgstr ""

262

263

#: bzrlib/builtins.py:659

263

#: bzrlib/builtins.py:671

264

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

265

msgstr ""

266

267

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

267

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

268

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

269

msgstr ""

270

271

#: bzrlib/builtins.py:700

271

#: bzrlib/builtins.py:712

272

msgid "Show revno of working tree."

273

msgstr ""

274

275

#: bzrlib/builtins.py:748

275

#: bzrlib/builtins.py:760

276

msgid "Add specified files or directories."

277

msgstr ""

278

279

#: bzrlib/builtins.py:750

279

#: bzrlib/builtins.py:762

280

msgid ""

281

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

282

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

283

"any of the named files are already versioned."

284

msgstr ""

285

286

#: bzrlib/builtins.py:754

286

#: bzrlib/builtins.py:766

287

msgid ""

288

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

289

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

294

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

295

msgstr ""

296

297

#: bzrlib/builtins.py:762

297

#: bzrlib/builtins.py:774

298

msgid ""

299

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

300

"unless they are explicitly ignored."

301

msgstr ""

302

303

#: bzrlib/builtins.py:765

303

#: bzrlib/builtins.py:777

304

msgid ""

305

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

306

"are currently unknown."

307

msgstr ""

308

309

#: bzrlib/builtins.py:768

309

#: bzrlib/builtins.py:780

310

msgid ""

311

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

312

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

314

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

315

msgstr ""

316

317

#: bzrlib/builtins.py:773

317

#: bzrlib/builtins.py:785

318

msgid ""

319

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

320

"add them."

321

msgstr ""

322

323

#: bzrlib/builtins.py:776

323

#: bzrlib/builtins.py:788

324

msgid ""

325

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

326

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

331

"into a subdirectory of this one."

332

msgstr ""

333

334

#: bzrlib/builtins.py:784

334

#: bzrlib/builtins.py:796

335

msgid ""

336

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

337

"unless they are explicitly mentioned."

338

msgstr ""

339

340

#: bzrlib/builtins.py:787

340

#: bzrlib/builtins.py:799

341

msgid ""

342

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

343

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

344

"to file size."

345

msgstr ""

346

347

#: bzrlib/builtins.py:794

347

#: bzrlib/builtins.py:806

348

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

349

msgstr ""

350

351

#: bzrlib/builtins.py:800

351

#: bzrlib/builtins.py:813

352

msgid "Lookup file ids from this tree."

353

msgstr ""

354

355

#: bzrlib/builtins.py:836

355

#: bzrlib/builtins.py:849

356

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

357

msgstr ""

358

359

#: bzrlib/builtins.py:841

359

#: bzrlib/builtins.py:854

360

msgid "Create a new versioned directory."

361

msgstr ""

362

363

#: bzrlib/builtins.py:843

363

#: bzrlib/builtins.py:856

364

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

365

msgstr ""

366

367

#: bzrlib/builtins.py:850

367

#: bzrlib/builtins.py:863

368

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

369

msgstr ""

370

371

#: bzrlib/builtins.py:884

371

#: bzrlib/builtins.py:897

372

#, python-format

373

msgid "added %s\n"

374

msgstr ""

375

376

#: bzrlib/builtins.py:926

376

#: bzrlib/builtins.py:939

377

#, python-format

378

msgid "invalid kind %r specified"

379

msgstr ""

380

381

#: bzrlib/builtins.py:963

381

#: bzrlib/builtins.py:976

382

msgid "Move or rename a file."

383

msgstr ""

384

385

#: bzrlib/builtins.py:965

385

#: bzrlib/builtins.py:978

386

msgid " bzr mv SOURCE... DESTINATION"

387

msgstr ""

388

389

#: bzrlib/builtins.py:967

389

#: bzrlib/builtins.py:980

390

msgid ""

391

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

392

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

393

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

394

msgstr ""

395

396

#: bzrlib/builtins.py:971

396

#: bzrlib/builtins.py:984

397

msgid ""

398

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

399

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

402

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

403

msgstr ""

404

405

#: bzrlib/builtins.py:977

405

#: bzrlib/builtins.py:990

406

msgid "Files cannot be moved between branches."

407

msgstr ""

408

409

#: bzrlib/builtins.py:984

409

#: bzrlib/builtins.py:997

410

msgid ""

411

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

412

"moved."

413

msgstr ""

414

415

#: bzrlib/builtins.py:986

415

#: bzrlib/builtins.py:999

416

msgid "Automatically guess renames."

417

msgstr ""

418

419

#: bzrlib/builtins.py:987

419

#: bzrlib/builtins.py:1000

420

msgid "Avoid making changes when guessing renames."

421

msgstr ""

422

423

#: bzrlib/builtins.py:996

423

#: bzrlib/builtins.py:1009

424

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

425

msgstr ""

426

427

#: bzrlib/builtins.py:1000

427

#: bzrlib/builtins.py:1013

428

msgid "missing file argument"

429

msgstr ""

430

431

#: bzrlib/builtins.py:1004

431

#: bzrlib/builtins.py:1017

432

msgid "can not move root of branch"

433

msgstr ""

434

435

#: bzrlib/builtins.py:1010

435

#: bzrlib/builtins.py:1023

436

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

437

msgstr ""

438

439

#: bzrlib/builtins.py:1013

439

#: bzrlib/builtins.py:1026

440

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

441

msgstr ""

442

443

#: bzrlib/builtins.py:1050

443

#: bzrlib/builtins.py:1062

444

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

445

msgstr ""

446

447

#: bzrlib/builtins.py:1102

447

#: bzrlib/builtins.py:1114

448

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

449

msgstr ""

450

451

#: bzrlib/builtins.py:1104

451

#: bzrlib/builtins.py:1116

452

msgid ""

453

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

454

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

456

"parent."

457

msgstr ""

458

459

#: bzrlib/builtins.py:1109

459

#: bzrlib/builtins.py:1121

460

msgid ""

461

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

462

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

463

"be able to pull it again."

464

msgstr ""

465

466

#: bzrlib/builtins.py:1113

466

#: bzrlib/builtins.py:1125

467

msgid ""

468

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

469

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

470

"branches have diverged."

471

msgstr ""

472

473

#: bzrlib/builtins.py:1117

473

#: bzrlib/builtins.py:1129

474

msgid ""

475

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

476

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

478

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

479

msgstr ""

480

481

#: bzrlib/builtins.py:1122

481

#: bzrlib/builtins.py:1134

482

msgid ""

483

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

484

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

485

"-Olog_format=<other_format>."

486

msgstr ""

487

488

#: bzrlib/builtins.py:1126

488

#: bzrlib/builtins.py:1138

489

msgid ""

490

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

491

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

492

"with bzr send."

493

msgstr ""

494

495

#: bzrlib/builtins.py:1134

495

#: bzrlib/builtins.py:1146

496

msgid "Show logs of pulled revisions."

497

msgstr ""

498

499

#: bzrlib/builtins.py:1136

499

#: bzrlib/builtins.py:1148

500

msgid ""

501

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

502

msgstr ""

503

504

#: bzrlib/builtins.py:1139

504

#: bzrlib/builtins.py:1151

505

msgid ""

506

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

507

"master branch."

508

msgstr ""

509

510

#: bzrlib/builtins.py:1168

510

#: bzrlib/builtins.py:1180

511

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

512

msgstr ""

513

514

#: bzrlib/builtins.py:1184

514

#: bzrlib/builtins.py:1196

515

msgid "No pull location known or specified."

516

msgstr ""

517

518

#: bzrlib/builtins.py:1190

518

#: bzrlib/builtins.py:1202

519

#, python-format

520

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

521

msgstr ""

522

523

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

523

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

524

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

525

msgstr ""

526

527

#: bzrlib/builtins.py:1238

527

#: bzrlib/builtins.py:1252

528

msgid "Update a mirror of this branch."

529

msgstr ""

530

531

#: bzrlib/builtins.py:1240

531

#: bzrlib/builtins.py:1254

532

msgid ""

533

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

534

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

535

msgstr ""

536

537

#: bzrlib/builtins.py:1243

537

#: bzrlib/builtins.py:1257

538

msgid ""

539

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

540

"the future."

541

msgstr ""

542

543

#: bzrlib/builtins.py:1246

543

#: bzrlib/builtins.py:1260

544

msgid ""

545

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

546

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

547

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

548

msgstr ""

549

550

#: bzrlib/builtins.py:1250

550

#: bzrlib/builtins.py:1264

551

msgid ""

552

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

553

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

554

msgstr ""

555

556

#: bzrlib/builtins.py:1253

556

#: bzrlib/builtins.py:1267

557

msgid ""

558

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

559

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

560

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

561

msgstr ""

562

563

#: bzrlib/builtins.py:1257

563

#: bzrlib/builtins.py:1271

564

msgid ""

565

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

566

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

568

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

569

msgstr ""

570

571

#: bzrlib/builtins.py:1262

571

#: bzrlib/builtins.py:1276

572

msgid ""

573

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

574

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

575

"-Olog_format=<other_format>."

576

msgstr ""

577

578

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

578

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

579

msgid ""

580

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

581

msgstr ""

582

583

#: bzrlib/builtins.py:1276

583

#: bzrlib/builtins.py:1290

584

msgid ""

585

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

586

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

587

msgstr ""

588

589

#: bzrlib/builtins.py:1281

589

#: bzrlib/builtins.py:1295

590

msgid ""

591

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

592

"branch."

593

msgstr ""

594

595

#: bzrlib/builtins.py:1284

595

#: bzrlib/builtins.py:1298

596

msgid ""

597

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

598

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

599

"the branch created."

600

msgstr ""

601

602

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

602

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

603

msgid ""

604

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

605

"strict disables the check."

606

msgstr ""

607

608

#: bzrlib/builtins.py:1292

608

#: bzrlib/builtins.py:1306

609

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

610

msgstr ""

611

612

#: bzrlib/builtins.py:1336

612

#: bzrlib/builtins.py:1350

613

msgid "Could not determine branch to refer to."

614

msgstr ""

615

616

#: bzrlib/builtins.py:1345

616

#: bzrlib/builtins.py:1359

617

#, python-format

618

msgid ""

619

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

620

"use 'bzr push :parent'."

621

msgstr ""

622

623

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

623

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

624

msgid "No push location known or specified."

625

msgstr ""

626

627

#: bzrlib/builtins.py:1355

627

#: bzrlib/builtins.py:1369

628

#, python-format

629

msgid "Using saved push location: %s"

630

msgstr ""

631

632

#: bzrlib/builtins.py:1365

632

#: bzrlib/builtins.py:1379

633

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

634

msgstr ""

635

636

#: bzrlib/builtins.py:1367

636

#: bzrlib/builtins.py:1381

637

msgid ""

638

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

639

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

644

"create ./foo-bar."

645

msgstr ""

646

647

#: bzrlib/builtins.py:1374

647

#: bzrlib/builtins.py:1388

648

msgid ""

649

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

650

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

651

msgstr ""

652

653

#: bzrlib/builtins.py:1377

653

#: bzrlib/builtins.py:1391

654

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

655

msgstr ""

656

657

#: bzrlib/builtins.py:1387

657

#: bzrlib/builtins.py:1401

658

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

659

msgstr ""

660

661

#: bzrlib/builtins.py:1389

661

#: bzrlib/builtins.py:1403

662

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

663

msgstr ""

664

665

#: bzrlib/builtins.py:1392

665

#: bzrlib/builtins.py:1406

666

msgid ""

667

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

668

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

669

msgstr ""

670

671

#: bzrlib/builtins.py:1396

671

#: bzrlib/builtins.py:1410

672

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

673

msgstr ""

674

675

#: bzrlib/builtins.py:1398

675

#: bzrlib/builtins.py:1412

676

msgid ""

677

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

678

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

679

msgstr ""

680

681

#: bzrlib/builtins.py:1403

681

#: bzrlib/builtins.py:1417

682

msgid "Bind new branch to from location."

683

msgstr ""

684

685

#: bzrlib/builtins.py:1450

685

#: bzrlib/builtins.py:1464

686

#, python-format

687

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

688

msgstr ""

689

690

#: bzrlib/builtins.py:1462

690

#: bzrlib/builtins.py:1476

691

#, python-format

692

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

693

msgstr ""

694

695

#: bzrlib/builtins.py:1481

695

#: bzrlib/builtins.py:1495

696

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

697

msgstr ""

698

699

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

699

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

700

#, python-format

701

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

702

msgstr ""

703

704

#: bzrlib/builtins.py:1500

704

#: bzrlib/builtins.py:1514

705

#, python-format

706

msgid "Branched %d revision."

707

msgid_plural "Branched %d revisions."

708

msgstr[0] ""

709

msgstr[1] ""

710

711

#: bzrlib/builtins.py:1505

711

#: bzrlib/builtins.py:1519

712

#, python-format

713

msgid "New branch bound to %s"

714

msgstr ""

715

716

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

716

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

717

#, python-format

718

msgid "Switched to branch: %s"

719

msgstr ""

720

721

#: bzrlib/builtins.py:1515

721

#: bzrlib/builtins.py:1529

722

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

723

msgstr ""

724

725

#: bzrlib/builtins.py:1517

725

#: bzrlib/builtins.py:1531

726

msgid ""

727

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

728

"location."

729

msgstr ""

730

731

#: bzrlib/builtins.py:1524

731

#: bzrlib/builtins.py:1538

732

msgid ""

733

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

734

"location."

735

msgstr ""

736

737

#: bzrlib/builtins.py:1554

737

#: bzrlib/builtins.py:1567

738

msgid "(default)"

739

msgstr ""

740

741

#: bzrlib/builtins.py:1566

741

#: bzrlib/builtins.py:1579

742

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

743

msgstr ""

744

745

#: bzrlib/builtins.py:1568

745

#: bzrlib/builtins.py:1581

746

msgid ""

747

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

748

"for\n"

752

"location using SFTP."

753

msgstr ""

754

755

#: bzrlib/builtins.py:1573

755

#: bzrlib/builtins.py:1586

756

msgid ""

757

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

758

"will\n"

764

"create ./foo-bar."

765

msgstr ""

766

767

#: bzrlib/builtins.py:1580

767

#: bzrlib/builtins.py:1593

768

msgid ""

769

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

770

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

774

"code.)"

775

msgstr ""

776

777

#: bzrlib/builtins.py:1590

777

#: bzrlib/builtins.py:1603

778

msgid ""

779

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

780

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

782

"commits."

783

msgstr ""

784

785

#: bzrlib/builtins.py:1597

785

#: bzrlib/builtins.py:1610

786

msgid "Get file contents from this tree."

787

msgstr ""

788

789

#: bzrlib/builtins.py:1599

789

#: bzrlib/builtins.py:1612

790

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

791

msgstr ""

792

793

#: bzrlib/builtins.py:1640

793

#: bzrlib/builtins.py:1653

794

msgid ""

795

"Show list of renamed files.\n"

796

" "

797

msgstr ""

798

799

#: bzrlib/builtins.py:1670

799

#: bzrlib/builtins.py:1681

800

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

801

msgstr ""

802

803

#: bzrlib/builtins.py:1672

803

#: bzrlib/builtins.py:1683

804

msgid ""

805

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

806

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

807

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

808

msgstr ""

809

810

#: bzrlib/builtins.py:1676

810

#: bzrlib/builtins.py:1687

811

msgid ""

812

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

813

"that is out of date from its branch."

814

msgstr ""

815

816

#: bzrlib/builtins.py:1679

816

#: bzrlib/builtins.py:1690

817

msgid ""

818

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

819

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

821

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

822

msgstr ""

823

824

#: bzrlib/builtins.py:1684

824

#: bzrlib/builtins.py:1695

825

msgid ""

826

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

827

"the branch from the master."

828

msgstr ""

829

830

#: bzrlib/builtins.py:1687

830

#: bzrlib/builtins.py:1698

831

msgid ""

832

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

833

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

837

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

838

msgstr ""

839

840

#: bzrlib/builtins.py:1694

840

#: bzrlib/builtins.py:1705

841

msgid ""

842

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

843

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

844

"current working directory is used."

845

msgstr ""

846

847

#: bzrlib/builtins.py:1710

847

#: bzrlib/builtins.py:1721

848

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

849

msgstr ""

850

851

#: bzrlib/builtins.py:1718

851

#: bzrlib/builtins.py:1729

852

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

853

msgstr ""

854

855

#: bzrlib/builtins.py:1749

855

#: bzrlib/builtins.py:1760

856

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

857

msgstr ""

858

859

#: bzrlib/builtins.py:1765

859

#: bzrlib/builtins.py:1776

860

#, python-format

861

msgid ""

862

"branch has no revision %s\n"

863

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

864

msgstr ""

865

866

#: bzrlib/builtins.py:1771

866

#: bzrlib/builtins.py:1782

867

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

868

msgstr ""

869

870

#: bzrlib/builtins.py:1775

870

#: bzrlib/builtins.py:1786

871

msgid ""

872

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

873

"can be committed with 'bzr commit'."

874

msgstr ""

875

876

#: bzrlib/builtins.py:1784

876

#: bzrlib/builtins.py:1795

877

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

878

msgstr ""

879

880

#: bzrlib/builtins.py:1786

880

#: bzrlib/builtins.py:1797

881

msgid ""

882

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

883

"tree, branch or repository."

884

msgstr ""

885

886

#: bzrlib/builtins.py:1789

886

#: bzrlib/builtins.py:1800

887

msgid ""

888

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

889

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

890

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

891

msgstr ""

892

893

#: bzrlib/builtins.py:1793

893

#: bzrlib/builtins.py:1804

894

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

895

msgstr ""

896

897

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

898

#: bzrlib/builtins.py:6442

897

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

898

#: bzrlib/builtins.py:6433

899

msgid ":Examples:"

900

msgstr ""

901

902

#: bzrlib/builtins.py:1797

902

#: bzrlib/builtins.py:1808

903

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

904

msgstr ""

905

906

#: bzrlib/builtins.py:1799

906

#: bzrlib/builtins.py:1810

907

msgid " bzr info"

908

msgstr ""

909

910

#: bzrlib/builtins.py:1801

910

#: bzrlib/builtins.py:1812

911

msgid ""

912

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

913

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

914

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

915

msgstr ""

916

917

#: bzrlib/builtins.py:1805

917

#: bzrlib/builtins.py:1816

918

msgid " bzr info -v"

919

msgstr ""

920

921

#: bzrlib/builtins.py:1807

921

#: bzrlib/builtins.py:1818

922

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

923

msgstr ""

924

925

#: bzrlib/builtins.py:1809

925

#: bzrlib/builtins.py:1820

926

msgid " bzr info -vv"

927

msgstr ""

928

929

#: bzrlib/builtins.py:1828

929

#: bzrlib/builtins.py:1839

930

msgid "Remove files or directories."

931

msgstr ""

932

933

#: bzrlib/builtins.py:1830

933

#: bzrlib/builtins.py:1841

934

msgid ""

935

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

936

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

939

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

940

msgstr ""

941

942

#: bzrlib/builtins.py:1838

942

#: bzrlib/builtins.py:1849

943

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

944

msgstr ""

945

946

#: bzrlib/builtins.py:1840

946

#: bzrlib/builtins.py:1851

947

msgid "The file deletion mode to be used."

948

msgstr ""

949

950

#: bzrlib/builtins.py:1841

950

#: bzrlib/builtins.py:1852

951

msgid "Deletion Strategy"

952

msgstr ""

953

954

#: bzrlib/builtins.py:1842

954

#: bzrlib/builtins.py:1853

955

msgid "Backup changed files (default)."

956

msgstr ""

957

958

#: bzrlib/builtins.py:1843

958

#: bzrlib/builtins.py:1854

959

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

960

msgstr ""

961

962

#: bzrlib/builtins.py:1844

962

#: bzrlib/builtins.py:1855

963

msgid "Don't backup changed files."

964

msgstr ""

965

966

#: bzrlib/builtins.py:1845

966

#: bzrlib/builtins.py:1856

967

msgid ""

968

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

969

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

970

msgstr ""

971

972

#: bzrlib/builtins.py:1854

972

#: bzrlib/builtins.py:1865

973

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

974

msgstr ""

975

976

#: bzrlib/builtins.py:1871

976

#: bzrlib/builtins.py:1882

977

msgid "No matching files."

978

msgstr ""

979

980

#: bzrlib/builtins.py:1932

980

#: bzrlib/builtins.py:1943

981

msgid "Reconcile bzr metadata in a branch."

982

msgstr ""

983

984

#: bzrlib/builtins.py:1934

984

#: bzrlib/builtins.py:1945

985

msgid ""

986

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

987

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

989

"advises you to run it."

990

msgstr ""

991

992

#: bzrlib/builtins.py:1939

992

#: bzrlib/builtins.py:1950

993

msgid ""

994

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

995

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

997

"correctly in both branches."

998

msgstr ""

999

1000

#: bzrlib/builtins.py:1944

1000

#: bzrlib/builtins.py:1955

1001

msgid ""

1002

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

1003

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

1004

msgstr ""

1005

1006

#: bzrlib/builtins.py:1947

1006

#: bzrlib/builtins.py:1958

1007

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

1008

msgstr ""

1009

1010

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

1010

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

1011

msgid ""

1012

"Format for the bzr 2.0 series.\n"

1013

"Uses group-compress storage.\n"

1014

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

1015

msgstr ""

1016

1017

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

1017

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

1018

msgid ""

1019

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

1020

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

1021

msgstr ""

1022

1023

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

1023

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

1024

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

1025

msgstr ""

1026

1027

#: bzrlib/builtins.py:2015

1027

#: bzrlib/builtins.py:2026

1028

msgid "Make a directory into a versioned branch."

1029

msgstr ""

1030

1031

#: bzrlib/builtins.py:2017

1031

#: bzrlib/builtins.py:2028

1032

msgid ""

1033

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

1034

"existing project."

1035

msgstr ""

1036

1037

#: bzrlib/builtins.py:2020

1037

#: bzrlib/builtins.py:2031

1038

msgid ""

1039

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

1040

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

1042

"in the .bzr directory."

1043

msgstr ""

1044

1045

#: bzrlib/builtins.py:2025

1045

#: bzrlib/builtins.py:2036

1046

msgid ""

1047

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

1048

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

1049

msgstr ""

1050

1051

#: bzrlib/builtins.py:2028

1051

#: bzrlib/builtins.py:2039

1052

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

1053

msgstr ""

1054

1055

#: bzrlib/builtins.py:2030

1055

#: bzrlib/builtins.py:2041

1056

msgid ""

1057

" cd ~/project\n"

1058

" bzr init\n"

1061

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

1062

msgstr ""

1063

1064

#: bzrlib/builtins.py:2041

1064

#: bzrlib/builtins.py:2052

1065

msgid ""

1066

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

1067

msgstr ""

1068

1069

#: bzrlib/builtins.py:2044

1069

#: bzrlib/builtins.py:2055

1070

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

1071

msgstr ""

1072

1073

#: bzrlib/builtins.py:2052

1073

#: bzrlib/builtins.py:2063

1074

msgid ""

1075

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

1076

msgstr ""

1077

1078

#: bzrlib/builtins.py:2055

1078

#: bzrlib/builtins.py:2066

1079

msgid "Create a branch without a working tree."

1080

msgstr ""

1081

1082

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

1082

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

1083

#, python-format

1084

msgid ""

1085

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

1086

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

1087

msgstr ""

1088

1089

#: bzrlib/builtins.py:2109

1089

#: bzrlib/builtins.py:2120

1090

msgid ""

1091

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

1092

msgstr ""

1093

1094

#: bzrlib/builtins.py:2120

1094

#: bzrlib/builtins.py:2131

1095

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

1096

msgstr ""

1097

1098

#: bzrlib/builtins.py:2129

1098

#: bzrlib/builtins.py:2140

1099

#, python-format

1100

msgid "Using shared repository: %s\n"

1101

msgstr ""

1102

1103

#: bzrlib/builtins.py:2133

1103

#: bzrlib/builtins.py:2144

1104

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

1105

msgstr ""

1106

1107

#: bzrlib/builtins.py:2135

1107

#: bzrlib/builtins.py:2146

1108

msgid ""

1109

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

1110

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

1112

"speeds up the creation of new branches."

1113

msgstr ""

1114

1115

#: bzrlib/builtins.py:2140

1115

#: bzrlib/builtins.py:2151

1116

msgid ""

1117

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

1118

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

1122

"branches, such as on a server."

1123

msgstr ""

1124

1125

#: bzrlib/builtins.py:2147

1125

#: bzrlib/builtins.py:2158

1126

msgid ""

1127

":Examples:\n"

1128

" Create a shared repository holding just branches::"

1129

msgstr ""

1130

1131

#: bzrlib/builtins.py:2150

1131

#: bzrlib/builtins.py:2161

1132

msgid ""

1133

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

1134

" bzr init repo/trunk"

1135

msgstr ""

1136

1137

#: bzrlib/builtins.py:2153

1137

#: bzrlib/builtins.py:2164

1138

msgid " Make a lightweight checkout elsewhere::"

1139

msgstr ""

1140

1141

#: bzrlib/builtins.py:2155

1141

#: bzrlib/builtins.py:2166

1142

msgid ""

1143

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

1144

" cd trunk-checkout\n"

1145

" (add files here)"

1146

msgstr ""

1147

1148

#: bzrlib/builtins.py:2163

1148

#: bzrlib/builtins.py:2174

1149

msgid ""

1150

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

1151

msgstr ""

1152

1153

#: bzrlib/builtins.py:2167

1153

#: bzrlib/builtins.py:2178

1154

msgid "Repository format"

1155

msgstr ""

1156

1157

#: bzrlib/builtins.py:2169

1157

#: bzrlib/builtins.py:2180

1158

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

1159

msgstr ""

1160

1161

#: bzrlib/builtins.py:2195

1161

#: bzrlib/builtins.py:2206

1162

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

1163

msgstr ""

1164

1165

#: bzrlib/builtins.py:2197

1165

#: bzrlib/builtins.py:2208

1166

msgid ""

1167

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

1168

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

1172

"given."

1173

msgstr ""

1174

1175

#: bzrlib/builtins.py:2204

1175

#: bzrlib/builtins.py:2215

1176

msgid ""

1177

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

1178

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

1179

msgstr ""

1180

1181

#: bzrlib/builtins.py:2207

1181

#: bzrlib/builtins.py:2218

1182

msgid ""

1183

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

1184

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

1188

"in the range."

1189

msgstr ""

1190

1191

#: bzrlib/builtins.py:2214

1191

#: bzrlib/builtins.py:2225

1192

msgid ""

1193

":Exit values:\n"

1194

" 1 - changed\n"

1197

" 0 - no change"

1198

msgstr ""

1199

1200

#: bzrlib/builtins.py:2220

1200

#: bzrlib/builtins.py:2231

1201

msgid ""

1202

":Examples:\n"

1203

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

1204

msgstr ""

1205

1206

#: bzrlib/builtins.py:2223

1206

#: bzrlib/builtins.py:2234

1207

msgid " bzr diff"

1208

msgstr ""

1209

1210

#: bzrlib/builtins.py:2225

1210

#: bzrlib/builtins.py:2236

1211

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

1212

msgstr ""

1213

1214

#: bzrlib/builtins.py:2227

1214

#: bzrlib/builtins.py:2238

1215

msgid " bzr diff -r1"

1216

msgstr ""

1217

1218

#: bzrlib/builtins.py:2229

1218

#: bzrlib/builtins.py:2240

1219

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

1220

msgstr ""

1221

1222

#: bzrlib/builtins.py:2231

1222

#: bzrlib/builtins.py:2242

1223

msgid " bzr diff -r1..3"

1224

msgstr ""

1225

1226

#: bzrlib/builtins.py:2233

1226

#: bzrlib/builtins.py:2244

1227

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

1228

msgstr ""

1229

1230

#: bzrlib/builtins.py:2235

1230

#: bzrlib/builtins.py:2246

1231

msgid " bzr diff -r1..3 xxx"

1232

msgstr ""

1233

1234

#: bzrlib/builtins.py:2237

1234

#: bzrlib/builtins.py:2248

1235

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

1236

msgstr ""

1237

1238

#: bzrlib/builtins.py:2239

1238

#: bzrlib/builtins.py:2250

1239

msgid " bzr diff -c2"

1240

msgstr ""

1241

1242

#: bzrlib/builtins.py:2241

1242

#: bzrlib/builtins.py:2252

1243

msgid ""

1244

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

1245

" \n"

1246

" bzr diff -cX"

1247

msgstr ""

1248

1249

#: bzrlib/builtins.py:2245

1249

#: bzrlib/builtins.py:2256

1250

msgid ""

1251

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

1252

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

1253

" another parent, use::"

1254

msgstr ""

1255

1256

#: bzrlib/builtins.py:2249

1256

#: bzrlib/builtins.py:2260

1257

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

1258

msgstr ""

1259

1260

#: bzrlib/builtins.py:2251

1260

#: bzrlib/builtins.py:2262

1261

msgid ""

1262

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

1263

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

1264

msgstr ""

1265

1266

#: bzrlib/builtins.py:2254

1266

#: bzrlib/builtins.py:2265

1267

msgid " bzr diff -r-2.."

1268

msgstr ""

1269

1270

#: bzrlib/builtins.py:2256

1270

#: bzrlib/builtins.py:2267

1271

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

1272

msgstr ""

1273

1274

#: bzrlib/builtins.py:2258

1274

#: bzrlib/builtins.py:2269

1275

msgid " bzr diff NEWS"

1276

msgstr ""

1277

1278

#: bzrlib/builtins.py:2260

1278

#: bzrlib/builtins.py:2271

1279

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

1280

msgstr ""

1281

1282

#: bzrlib/builtins.py:2262

1282

#: bzrlib/builtins.py:2273

1283

msgid " bzr diff xxx/NEWS"

1284

msgstr ""

1285

1286

#: bzrlib/builtins.py:2264

1286

#: bzrlib/builtins.py:2275

1287

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

1288

msgstr ""

1289

1290

#: bzrlib/builtins.py:2266

1290

#: bzrlib/builtins.py:2277

1291

msgid " bzr diff --old xxx"

1292

msgstr ""

1293

1294

#: bzrlib/builtins.py:2268

1294

#: bzrlib/builtins.py:2279

1295

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

1296

msgstr ""

1297

1298

#: bzrlib/builtins.py:2270

1298

#: bzrlib/builtins.py:2281

1299

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

1300

msgstr ""

1301

1302

#: bzrlib/builtins.py:2272

1302

#: bzrlib/builtins.py:2283

1303

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

1304

msgstr ""

1305

1306

#: bzrlib/builtins.py:2274

1306

#: bzrlib/builtins.py:2285

1307

msgid ""

1308

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

1309

" \n"

1312

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

1313

msgstr ""

1314

1315

#: bzrlib/builtins.py:2284

1315

#: bzrlib/builtins.py:2295

1316

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

1317

msgstr ""

1318

1319

#: bzrlib/builtins.py:2287

1319

#: bzrlib/builtins.py:2298

1320

msgid ""

1321

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

1322

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

1323

msgstr ""

1324

1325

#: bzrlib/builtins.py:2290

1325

#: bzrlib/builtins.py:2301

1326

msgid "Branch/tree to compare from."

1327

msgstr ""

1328

1329

#: bzrlib/builtins.py:2294

1329

#: bzrlib/builtins.py:2305

1330

msgid "Branch/tree to compare to."

1331

msgstr ""

1332

1333

#: bzrlib/builtins.py:2300

1333

#: bzrlib/builtins.py:2311

1334

msgid "Use this command to compare files."

1335

msgstr ""

1336

1337

#: bzrlib/builtins.py:2305

1337

#: bzrlib/builtins.py:2316

1338

msgid "Diff format to use."

1339

msgstr ""

1340

1341

#: bzrlib/builtins.py:2307

1341

#: bzrlib/builtins.py:2318

1342

msgid "Diff format"

1343

msgstr ""

1344

1345

#: bzrlib/builtins.py:2329

1345

#: bzrlib/builtins.py:2340

1346

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

1347

msgstr ""

1348

1349

#: bzrlib/builtins.py:2333

1349

#: bzrlib/builtins.py:2344

1350

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

1351

msgstr ""

1352

1353

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

1354

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

1353

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

1354

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

1355

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

1356

msgstr ""

1357

1358

#: bzrlib/builtins.py:2358

1358

#: bzrlib/builtins.py:2369

1359

msgid ""

1360

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

1361

" "

1362

msgstr ""

1363

1364

#: bzrlib/builtins.py:2436

1364

#: bzrlib/builtins.py:2446

1365

msgid "Show the tree root directory."

1366

msgstr ""

1367

1368

#: bzrlib/builtins.py:2438

1368

#: bzrlib/builtins.py:2448

1369

msgid ""

1370

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

1371

"directory."

1372

msgstr ""

1373

1374

#: bzrlib/builtins.py:2453

1374

#: bzrlib/builtins.py:2463

1375

msgid "The limit argument must be an integer."

1376

msgstr ""

1377

1378

#: bzrlib/builtins.py:2461

1378

#: bzrlib/builtins.py:2471

1379

msgid "The levels argument must be an integer."

1380

msgstr ""

1381

1382

#: bzrlib/builtins.py:2466

1382

#: bzrlib/builtins.py:2476

1383

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

1384

msgstr ""

1385

1386

#: bzrlib/builtins.py:2468

1386

#: bzrlib/builtins.py:2478

1387

msgid ""

1388

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

1389

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

1391

"Here are some simple examples::"

1392

msgstr ""

1393

1394

#: bzrlib/builtins.py:2473

1394

#: bzrlib/builtins.py:2483

1395

msgid ""

1396

" bzr log log the current branch\n"

1397

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

1398

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

1399

msgstr ""

1400

1401

#: bzrlib/builtins.py:2477

1401

#: bzrlib/builtins.py:2487

1402

msgid ""

1403

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

1404

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

1408

"were merged."

1409

msgstr ""

1410

1411

#: bzrlib/builtins.py:2484

1411

#: bzrlib/builtins.py:2494

1412

msgid ":Output control:"

1413

msgstr ""

1414

1415

#: bzrlib/builtins.py:2486

1415

#: bzrlib/builtins.py:2496

1416

msgid ""

1417

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

1418

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

1420

" for more details on log formats."

1421

msgstr ""

1422

1423

#: bzrlib/builtins.py:2491

1423

#: bzrlib/builtins.py:2501

1424

msgid ""

1425

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

1426

" displayed::"

1427

msgstr ""

1428

1429

#: bzrlib/builtins.py:2494

1429

#: bzrlib/builtins.py:2504

1430

msgid ""

1431

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

1432

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

1435

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

1436

msgstr ""

1437

1438

#: bzrlib/builtins.py:2500

1438

#: bzrlib/builtins.py:2510

1439

msgid ""

1440

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

1441

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

1442

" just the top level (mainline)."

1443

msgstr ""

1444

1445

#: bzrlib/builtins.py:2504

1445

#: bzrlib/builtins.py:2514

1446

msgid ""

1447

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

1448

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

1449

" instead, use the -vv option."

1450

msgstr ""

1451

1452

#: bzrlib/builtins.py:2508

1452

#: bzrlib/builtins.py:2518

1453

msgid ":Ordering control:"

1454

msgstr ""

1455

1456

#: bzrlib/builtins.py:2510

1456

#: bzrlib/builtins.py:2520

1457

msgid ""

1458

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

1459

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

1461

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

1462

msgstr ""

1463

1464

#: bzrlib/builtins.py:2515

1464

#: bzrlib/builtins.py:2525

1465

msgid ":Revision filtering:"

1466

msgstr ""

1467

1468

#: bzrlib/builtins.py:2517

1468

#: bzrlib/builtins.py:2527

1469

msgid ""

1470

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

1471

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

1472

msgstr ""

1473

1474

#: bzrlib/builtins.py:2520

1474

#: bzrlib/builtins.py:2530

1475

msgid ""

1476

" -rX display revision X\n"

1477

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

1479

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

1480

msgstr ""

1481

1482

#: bzrlib/builtins.py:2525

1482

#: bzrlib/builtins.py:2535

1483

msgid ""

1484

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

1485

" Some common examples are given below::"

1486

msgstr ""

1487

1488

#: bzrlib/builtins.py:2528

1488

#: bzrlib/builtins.py:2538

1489

msgid ""

1490

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

1491

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

1495

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

1496

msgstr ""

1497

1498

#: bzrlib/builtins.py:2535

1498

#: bzrlib/builtins.py:2545

1499

msgid ""

1500

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

1501

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

1505

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

1506

msgstr ""

1507

1508

#: bzrlib/builtins.py:2542

1508

#: bzrlib/builtins.py:2552

1509

msgid ":Path filtering:"

1510

msgstr ""

1511

1512

#: bzrlib/builtins.py:2544

1512

#: bzrlib/builtins.py:2554

1513

msgid ""

1514

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

1515

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

1516

" nominated files or directories."

1517

msgstr ""

1518

1519

#: bzrlib/builtins.py:2548

1519

#: bzrlib/builtins.py:2558

1520

msgid ""

1521

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

1522

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

1523

" the end or start of the range."

1524

msgstr ""

1525

1526

#: bzrlib/builtins.py:2552

1526

#: bzrlib/builtins.py:2562

1527

msgid ""

1528

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

1529

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

1530

msgstr ""

1531

1532

#: bzrlib/builtins.py:2555

1532

#: bzrlib/builtins.py:2565

1533

msgid ""

1534

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

1535

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

1536

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

1537

msgstr ""

1538

1539

#: bzrlib/builtins.py:2559

1539

#: bzrlib/builtins.py:2569

1540

msgid " In this case:"

1541

msgstr ""

1542

1543

#: bzrlib/builtins.py:2561

1543

#: bzrlib/builtins.py:2571

1544

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

1545

msgstr ""

1546

1547

#: bzrlib/builtins.py:2563

1547

#: bzrlib/builtins.py:2573

1548

msgid ""

1549

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

1550

msgstr ""

1551

1552

#: bzrlib/builtins.py:2565

1552

#: bzrlib/builtins.py:2575

1553

msgid ""

1554

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

1555

" the original file in revision 2."

1556

msgstr ""

1557

1558

#: bzrlib/builtins.py:2568

1558

#: bzrlib/builtins.py:2578

1559

msgid ""

1560

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

1561

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

1562

msgstr ""

1563

1564

#: bzrlib/builtins.py:2571

1564

#: bzrlib/builtins.py:2581

1565

msgid ""

1566

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

1567

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

1568

" until it was last renamed)."

1569

msgstr ""

1570

1571

#: bzrlib/builtins.py:2575

1571

#: bzrlib/builtins.py:2585

1572

msgid ":Other filtering:"

1573

msgstr ""

1574

1575

#: bzrlib/builtins.py:2577

1575

#: bzrlib/builtins.py:2587

1576

msgid ""

1577

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

1578

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

1581

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

1582

msgstr ""

1583

1584

#: bzrlib/builtins.py:2583

1584

#: bzrlib/builtins.py:2593

1585

msgid ":Tips & tricks:"

1586

msgstr ""

1587

1588

#: bzrlib/builtins.py:2585

1588

#: bzrlib/builtins.py:2595

1589

msgid ""

1590

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

1591

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

1594

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

1595

msgstr ""

1596

1597

#: bzrlib/builtins.py:2591

1597

#: bzrlib/builtins.py:2601

1598

msgid ""

1599

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

1600

msgstr ""

1601

1602

#: bzrlib/builtins.py:2593

1602

#: bzrlib/builtins.py:2603

1603

msgid ""

1604

" [ALIASES]\n"

1605

" tip = log -r-1\n"

1607

" show = log -v -p"

1608

msgstr ""

1609

1610

#: bzrlib/builtins.py:2598

1610

#: bzrlib/builtins.py:2608

1611

msgid ""

1612

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

1613

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

1614

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

1615

msgstr ""

1616

1617

#: bzrlib/builtins.py:2602

1617

#: bzrlib/builtins.py:2612

1618

msgid ""

1619

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

1620

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

1621

msgstr ""

1622

1623

#: bzrlib/builtins.py:2605

1623

#: bzrlib/builtins.py:2615

1624

msgid ""

1625

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

1626

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

1628

" be given when using the -v option."

1629

msgstr ""

1630

1631

#: bzrlib/builtins.py:2610

1631

#: bzrlib/builtins.py:2620

1632

msgid ""

1633

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

1634

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

1636

" a list of words but not others."

1637

msgstr ""

1638

1639

#: bzrlib/builtins.py:2615

1639

#: bzrlib/builtins.py:2625

1640

msgid ""

1641

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

1642

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

1644

" trading disk space for faster speed."

1645

msgstr ""

1646

1647

#: bzrlib/builtins.py:2624

1647

#: bzrlib/builtins.py:2634

1648

msgid "Show from oldest to newest."

1649

msgstr ""

1650

1651

#: bzrlib/builtins.py:2627

1651

#: bzrlib/builtins.py:2637

1652

msgid "Show files changed in each revision."

1653

msgstr ""

1654

1655

#: bzrlib/builtins.py:2633

1655

#: bzrlib/builtins.py:2643

1656

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

1657

msgstr ""

1658

1659

#: bzrlib/builtins.py:2637

1659

#: bzrlib/builtins.py:2647

1660

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

1661

msgstr ""

1662

1663

#: bzrlib/builtins.py:2638

1663

#: bzrlib/builtins.py:2648

1664

msgid "Authors"

1665

msgstr ""

1666

1667

#: bzrlib/builtins.py:2643

1667

#: bzrlib/builtins.py:2653

1668

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

1669

msgstr ""

1670

1671

#: bzrlib/builtins.py:2653

1671

#: bzrlib/builtins.py:2663

1672

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

1673

msgstr ""

1674

1675

#: bzrlib/builtins.py:2658

1675

#: bzrlib/builtins.py:2668

1676

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

1677

msgstr ""

1678

1679

#: bzrlib/builtins.py:2660

1679

#: bzrlib/builtins.py:2670

1680

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

1681

msgstr ""

1682

1683

#: bzrlib/builtins.py:2664

1683

#: bzrlib/builtins.py:2674

1684

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

1685

msgstr ""

1686

1687

#: bzrlib/builtins.py:2666

1687

#: bzrlib/builtins.py:2676

1688

msgid ""

1689

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

1690

"rX..Y)."

1691

msgstr ""

1692

1693

#: bzrlib/builtins.py:2670

1693

#: bzrlib/builtins.py:2680

1694

msgid "Show digital signature validity."

1695

msgstr ""

1696

1697

#: bzrlib/builtins.py:2673

1697

#: bzrlib/builtins.py:2683

1698

msgid "Show revisions whose properties match this expression."

1699

msgstr ""

1700

1701

#: bzrlib/builtins.py:2677

1701

#: bzrlib/builtins.py:2687

1702

msgid "Show revisions whose message matches this expression."

1703

msgstr ""

1704

1705

#: bzrlib/builtins.py:2681

1705

#: bzrlib/builtins.py:2691

1706

msgid "Show revisions whose committer matches this expression."

1707

msgstr ""

1708

1709

#: bzrlib/builtins.py:2685

1709

#: bzrlib/builtins.py:2695

1710

msgid "Show revisions whose authors match this expression."

1711

msgstr ""

1712

1713

#: bzrlib/builtins.py:2689

1713

#: bzrlib/builtins.py:2699

1714

msgid "Show revisions whose bugs match this expression."

1715

msgstr ""

1716

1717

#: bzrlib/builtins.py:2743

1717

#: bzrlib/builtins.py:2753

1718

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

1719

msgstr ""

1720

1721

#: bzrlib/builtins.py:2771

1721

#: bzrlib/builtins.py:2781

1722

#, python-format

1723

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

1724

msgstr ""

1725

1726

#: bzrlib/builtins.py:2888

1726

#: bzrlib/builtins.py:2898

1727

#, python-format

1728

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

1729

msgstr ""

1730

1731

#: bzrlib/builtins.py:2904

1731

#: bzrlib/builtins.py:2914

1732

#, python-format

1733

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

1734

msgstr ""

1735

1736

#: bzrlib/builtins.py:2949

1736

#: bzrlib/builtins.py:2959

1737

msgid ""

1738

"List files in a tree.\n"

1739

" "

1740

msgstr ""

1741

1742

#: bzrlib/builtins.py:2958

1742

#: bzrlib/builtins.py:2968

1743

msgid "Recurse into subdirectories."

1744

msgstr ""

1745

1746

#: bzrlib/builtins.py:2960

1746

#: bzrlib/builtins.py:2970

1747

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

1748

msgstr ""

1749

1750

#: bzrlib/builtins.py:2962

1750

#: bzrlib/builtins.py:2972

1751

msgid "Print unknown files."

1752

msgstr ""

1753

1754

#: bzrlib/builtins.py:2963

1754

#: bzrlib/builtins.py:2973

1755

msgid "Print versioned files."

1756

msgstr ""

1757

1758

#: bzrlib/builtins.py:2966

1758

#: bzrlib/builtins.py:2976

1759

msgid "Print ignored files."

1760

msgstr ""

1761

1762

#: bzrlib/builtins.py:2968

1762

#: bzrlib/builtins.py:2978

1763

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

1764

msgstr ""

1765

1766

#: bzrlib/builtins.py:2981

1766

#: bzrlib/builtins.py:2991

1767

msgid "invalid kind specified"

1768

msgstr ""

1769

1770

#: bzrlib/builtins.py:2984

1770

#: bzrlib/builtins.py:2994

1771

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

1772

msgstr ""

1773

1774

#: bzrlib/builtins.py:2993

1774

#: bzrlib/builtins.py:3003

1775

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

1776

msgstr ""

1777

1778

#: bzrlib/builtins.py:3080

1778

#: bzrlib/builtins.py:3090

1779

msgid "Ignore specified files or patterns."

1780

msgstr ""

1781

1782

#: bzrlib/builtins.py:3082

1782

#: bzrlib/builtins.py:3092

1783

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

1784

msgstr ""

1785

1786

#: bzrlib/builtins.py:3084

1786

#: bzrlib/builtins.py:3094

1787

msgid ""

1788

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

1789

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

1792

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

1793

msgstr ""

1794

1795

#: bzrlib/builtins.py:3090

1795

#: bzrlib/builtins.py:3100

1796

msgid ""

1797

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

1798

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

1800

"it."

1801

msgstr ""

1802

1803

#: bzrlib/builtins.py:3095

1803

#: bzrlib/builtins.py:3105

1804

msgid ""

1805

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

1806

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

1809

"can be edited directly using an editor."

1810

msgstr ""

1811

1812

#: bzrlib/builtins.py:3101

1812

#: bzrlib/builtins.py:3111

1813

msgid ""

1814

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

1815

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

1816

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

1817

msgstr ""

1818

1819

#: bzrlib/builtins.py:3105

1819

#: bzrlib/builtins.py:3115

1820

msgid ""

1821

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

1822

"precedence over the '!' exception patterns."

1823

msgstr ""

1824

1825

#: bzrlib/builtins.py:3108

1825

#: bzrlib/builtins.py:3118

1826

msgid ""

1827

":Notes: \n"

1828

" \n"

1830

" the shell on Unix."

1831

msgstr ""

1832

1833

#: bzrlib/builtins.py:3113

1833

#: bzrlib/builtins.py:3123

1834

msgid ""

1835

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

1836

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

1837

msgstr ""

1838

1839

#: bzrlib/builtins.py:3116

1839

#: bzrlib/builtins.py:3126

1840

msgid ""

1841

":Examples:\n"

1842

" Ignore the top level Makefile::"

1843

msgstr ""

1844

1845

#: bzrlib/builtins.py:3119

1845

#: bzrlib/builtins.py:3129

1846

msgid " bzr ignore ./Makefile"

1847

msgstr ""

1848

1849

#: bzrlib/builtins.py:3121

1849

#: bzrlib/builtins.py:3131

1850

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

1851

msgstr ""

1852

1853

#: bzrlib/builtins.py:3123

1853

#: bzrlib/builtins.py:3133

1854

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

1855

msgstr ""

1856

1857

#: bzrlib/builtins.py:3125

1857

#: bzrlib/builtins.py:3135

1858

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

1859

msgstr ""

1860

1861

#: bzrlib/builtins.py:3127

1861

#: bzrlib/builtins.py:3137

1862

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

1863

msgstr ""

1864

1865

#: bzrlib/builtins.py:3129

1865

#: bzrlib/builtins.py:3139

1866

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

1867

msgstr ""

1868

1869

#: bzrlib/builtins.py:3131

1869

#: bzrlib/builtins.py:3141

1870

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

1871

msgstr ""

1872

1873

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

1873

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

1874

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

1875

msgstr ""

1876

1877

#: bzrlib/builtins.py:3135

1877

#: bzrlib/builtins.py:3145

1878

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

1879

msgstr ""

1880

1881

#: bzrlib/builtins.py:3139

1881

#: bzrlib/builtins.py:3149

1882

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

1883

msgstr ""

1884

1885

#: bzrlib/builtins.py:3141

1885

#: bzrlib/builtins.py:3151

1886

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

1887

msgstr ""

1888

1889

#: bzrlib/builtins.py:3143

1889

#: bzrlib/builtins.py:3153

1890

msgid ""

1891

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

1892

" \n"

1898

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

1899

msgstr ""

1900

1901

#: bzrlib/builtins.py:3157

1901

#: bzrlib/builtins.py:3167

1902

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

1903

msgstr ""

1904

1905

#: bzrlib/builtins.py:3169

1905

#: bzrlib/builtins.py:3179

1906

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

1907

msgstr ""

1908

1909

#: bzrlib/builtins.py:3180

1909

#: bzrlib/builtins.py:3190

1910

#, python-format

1911

msgid "Invalid ignore pattern found. %s"

1912

msgid_plural "Invalid ignore patterns found. %s"

1913

msgstr[0] ""

1914

msgstr[1] ""

1915

1916

#: bzrlib/builtins.py:3189

1916

#: bzrlib/builtins.py:3199

1917

msgid "NAME_PATTERN should not be an absolute path"

1918

msgstr ""

1919

1920

#: bzrlib/builtins.py:3202

1920

#: bzrlib/builtins.py:3212

1921

#, python-format

1922

msgid ""

1923

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

1927

"them.\n"

1928

msgstr ""

1929

1930

#: bzrlib/builtins.py:3209

1930

#: bzrlib/builtins.py:3219

1931

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

1932

msgstr ""

1933

1934

#: bzrlib/builtins.py:3211

1934

#: bzrlib/builtins.py:3221

1935

msgid ""

1936

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

1937

"be ignored."

1938

msgstr ""

1939

1940

#: bzrlib/builtins.py:3214

1940

#: bzrlib/builtins.py:3224

1941

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

1942

msgstr ""

1943

1944

#: bzrlib/builtins.py:3216

1944

#: bzrlib/builtins.py:3226

1945

msgid " bzr ls --ignored"

1946

msgstr ""

1947

1948

#: bzrlib/builtins.py:3250

1948

#: bzrlib/builtins.py:3260

1949

#, python-format

1950

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

1951

msgstr ""

1952

1953

#: bzrlib/builtins.py:3257

1953

#: bzrlib/builtins.py:3267

1954

msgid ""

1955

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

1956

msgstr ""

1957

1958

#: bzrlib/builtins.py:3259

1958

#: bzrlib/builtins.py:3269

1959

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

1960

msgstr ""

1961

1962

#: bzrlib/builtins.py:3261

1962

#: bzrlib/builtins.py:3271

1963

msgid ""

1964

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

1965

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

1966

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

1967

msgstr ""

1968

1969

#: bzrlib/builtins.py:3265

1969

#: bzrlib/builtins.py:3275

1970

msgid ""

1971

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

1972

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

1973

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

1974

msgstr ""

1975

1976

#: bzrlib/builtins.py:3269

1976

#: bzrlib/builtins.py:3279

1977

msgid ""

1978

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

1979

"directory will be used."

1980

msgstr ""

1981

1982

#: bzrlib/builtins.py:3272

1982

#: bzrlib/builtins.py:3282

1983

msgid ""

1984

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

1985

msgstr ""

1986

1987

#: bzrlib/builtins.py:3274

1987

#: bzrlib/builtins.py:3284

1988

msgid ""

1989

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

1990

" Supported formats Autodetected by extension\n"

1997

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

1998

msgstr ""

1999

2000

#: bzrlib/builtins.py:3288

2000

#: bzrlib/builtins.py:3298

2001

msgid "Type of file to export to."

2002

msgstr ""

2003

2004

#: bzrlib/builtins.py:3291

2004

#: bzrlib/builtins.py:3301

2005

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

2006

msgstr ""

2007

2008

#: bzrlib/builtins.py:3295

2008

#: bzrlib/builtins.py:3305

2009

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

2010

msgstr ""

2011

2012

#: bzrlib/builtins.py:3297

2012

#: bzrlib/builtins.py:3307

2013

msgid ""

2014

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

2015

"changed."

2016

msgstr ""

2017

2018

#: bzrlib/builtins.py:3300

2018

#: bzrlib/builtins.py:3310

2019

msgid ""

2020

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

2021

msgstr ""

2022

2023

#: bzrlib/builtins.py:3319

2023

#: bzrlib/builtins.py:3329

2024

msgid "--uncommitted requires a working tree"

2025

msgstr ""

2026

2027

#: bzrlib/builtins.py:3328

2027

#: bzrlib/builtins.py:3338

2028

#, python-format

2029

msgid "Unsupported export format: %s"

2030

msgstr ""

2031

2032

#: bzrlib/builtins.py:3332

2032

#: bzrlib/builtins.py:3342

2033

msgid ""

2034

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

2035

msgstr ""

2036

2037

#: bzrlib/builtins.py:3334

2037

#: bzrlib/builtins.py:3344

2038

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

2039

msgstr ""

2040

2041

#: bzrlib/builtins.py:3336

2041

#: bzrlib/builtins.py:3346

2042

msgid ""

2043

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

2044

"binary file."

2045

msgstr ""

2046

2047

#: bzrlib/builtins.py:3342

2047

#: bzrlib/builtins.py:3352

2048

msgid "The path name in the old tree."

2049

msgstr ""

2050

2051

#: bzrlib/builtins.py:3343

2051

#: bzrlib/builtins.py:3353

2052

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

2053

msgstr ""

2054

2055

#: bzrlib/builtins.py:3354

2055

#: bzrlib/builtins.py:3364

2056

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

2057

msgstr ""

2058

2059

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

2059

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

2060

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

2061

msgstr ""

2062

2063

#: bzrlib/builtins.py:3414

2063

#: bzrlib/builtins.py:3424

2064

msgid "Commit changes into a new revision."

2065

msgstr ""

2066

2067

#: bzrlib/builtins.py:3416

2067

#: bzrlib/builtins.py:3426

2068

msgid ""

2069

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

2070

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

2074

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

2075

msgstr ""

2076

2077

#: bzrlib/builtins.py:3423

2077

#: bzrlib/builtins.py:3433

2078

msgid ""

2079

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

2080

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

2081

"as explained below."

2082

msgstr ""

2083

2084

#: bzrlib/builtins.py:3427

2084

#: bzrlib/builtins.py:3437

2085

msgid ":Selective commits:"

2086

msgstr ""

2087

2088

#: bzrlib/builtins.py:3429

2088

#: bzrlib/builtins.py:3439

2089

msgid ""

2090

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

2091

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

2092

" everything within it is committed."

2093

msgstr ""

2094

2095

#: bzrlib/builtins.py:3433

2095

#: bzrlib/builtins.py:3443

2096

msgid ""

2097

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

2098

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

2099

" within foo/bar::"

2100

msgstr ""

2101

2102

#: bzrlib/builtins.py:3437

2102

#: bzrlib/builtins.py:3447

2103

msgid " bzr commit foo -x foo/bar"

2104

msgstr ""

2105

2106

#: bzrlib/builtins.py:3439

2106

#: bzrlib/builtins.py:3449

2107

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

2108

msgstr ""

2109

2110

#: bzrlib/builtins.py:3441

2110

#: bzrlib/builtins.py:3451

2111

msgid ":Custom authors:"

2112

msgstr ""

2113

2114

#: bzrlib/builtins.py:3443

2114

#: bzrlib/builtins.py:3453

2115

msgid ""

2116

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

2117

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

2121

" author."

2122

msgstr ""

2123

2124

#: bzrlib/builtins.py:3450

2124

#: bzrlib/builtins.py:3460

2125

msgid ":Checks:"

2126

msgstr ""

2127

2128

#: bzrlib/builtins.py:3452

2128

#: bzrlib/builtins.py:3462

2129

msgid ""

2130

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

2131

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

2134

" for details."

2135

msgstr ""

2136

2137

#: bzrlib/builtins.py:3458

2137

#: bzrlib/builtins.py:3468

2138

msgid ":Things to note:"

2139

msgstr ""

2140

2141

#: bzrlib/builtins.py:3460

2141

#: bzrlib/builtins.py:3470

2142

msgid ""

2143

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

2144

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

2145

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

2146

msgstr ""

2147

2148

#: bzrlib/builtins.py:3464

2148

#: bzrlib/builtins.py:3474

2149

msgid ""

2150

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

2151

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

2153

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

2154

msgstr ""

2155

2156

#: bzrlib/builtins.py:3474

2156

#: bzrlib/builtins.py:3484

2157

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

2158

msgstr ""

2159

2160

#: bzrlib/builtins.py:3477

2160

#: bzrlib/builtins.py:3487

2161

msgid "Description of the new revision."

2162

msgstr ""

2163

2164

#: bzrlib/builtins.py:3480

2164

#: bzrlib/builtins.py:3490

2165

msgid "Commit even if nothing has changed."

2166

msgstr ""

2167

2168

#: bzrlib/builtins.py:3484

2168

#: bzrlib/builtins.py:3494

2169

msgid "Take commit message from this file."

2170

msgstr ""

2171

2172

#: bzrlib/builtins.py:3486

2172

#: bzrlib/builtins.py:3496

2173

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

2174

msgstr ""

2175

2176

#: bzrlib/builtins.py:3489

2176

#: bzrlib/builtins.py:3499

2177

msgid ""

2178

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

2179

"08:00:00 +0100'."

2180

msgstr ""

2181

2182

#: bzrlib/builtins.py:3492

2182

#: bzrlib/builtins.py:3502

2183

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

2184

msgstr ""

2185

2186

#: bzrlib/builtins.py:3495

2186

#: bzrlib/builtins.py:3505

2187

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

2188

msgstr ""

2189

2190

#: bzrlib/builtins.py:3498

2190

#: bzrlib/builtins.py:3508

2191

msgid ""

2192

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

2193

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

2194

msgstr ""

2195

2196

#: bzrlib/builtins.py:3504

2196

#: bzrlib/builtins.py:3514

2197

msgid ""

2198

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

2199

"the message editor."

2200

msgstr ""

2201

2202

#: bzrlib/builtins.py:3507

2202

#: bzrlib/builtins.py:3517

2203

msgid ""

2204

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

2205

"can not be natively represented."

2206

msgstr ""

2207

2208

#: bzrlib/builtins.py:3525

2208

#: bzrlib/builtins.py:3535

2209

#, python-format

2210

msgid ""

2211

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

2213

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

2214

msgstr ""

2215

2216

#: bzrlib/builtins.py:3534

2216

#: bzrlib/builtins.py:3544

2217

#, python-format

2218

msgid ""

2219

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

2221

"Commit refused."

2222

msgstr ""

2223

2224

#: bzrlib/builtins.py:3543

2224

#: bzrlib/builtins.py:3553

2225

#, python-format

2226

msgid "Unrecognized bug %s. Commit refused."

2227

msgstr ""

2228

2229

#: bzrlib/builtins.py:3546

2229

#: bzrlib/builtins.py:3556

2230

#, python-format

2231

msgid ""

2232

"%s\n"

2233

"Commit refused."

2234

msgstr ""

2235

2236

#: bzrlib/builtins.py:3570

2236

#: bzrlib/builtins.py:3580

2237

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

2238

msgstr ""

2239

2240

#: bzrlib/builtins.py:3610

2240

#: bzrlib/builtins.py:3620

2241

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

2242

msgstr ""

2243

2244

#: bzrlib/builtins.py:3639

2244

#: bzrlib/builtins.py:3649

2245

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

2246

msgstr ""

2247

2248

#: bzrlib/builtins.py:3642

2248

#: bzrlib/builtins.py:3652

2249

msgid ""

2250

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

2251

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

2252

msgstr ""

2253

2254

#: bzrlib/builtins.py:3662

2254

#: bzrlib/builtins.py:3672

2255

msgid ""

2256

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

2257

"-unchanged to force an empty commit."

2258

msgstr ""

2259

2260

#: bzrlib/builtins.py:3666

2260

#: bzrlib/builtins.py:3676

2261

msgid ""

2262

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

2263

"resolve FILE\" to resolve."

2264

msgstr ""

2265

2266

#: bzrlib/builtins.py:3670

2266

#: bzrlib/builtins.py:3680

2267

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

2268

msgstr ""

2269

2270

#: bzrlib/builtins.py:3673

2270

#: bzrlib/builtins.py:3683

2271

msgid ""

2272

"\n"

2273

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

2274

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

2275

msgstr ""

2276

2277

#: bzrlib/builtins.py:3681

2277

#: bzrlib/builtins.py:3691

2278

msgid ""

2279

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

2280

msgstr ""

2281

2282

#: bzrlib/builtins.py:3683

2282

#: bzrlib/builtins.py:3693

2283

msgid ""

2284

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

2285

"to detect data corruption or bzr bugs."

2286

msgstr ""

2287

2288

#: bzrlib/builtins.py:3686

2288

#: bzrlib/builtins.py:3696

2289

msgid ""

2290

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

2291

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

2292

msgstr ""

2293

2294

#: bzrlib/builtins.py:3689

2294

#: bzrlib/builtins.py:3699

2295

msgid ""

2296

"revisions\n"

2297

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

2298

" indicate a problem."

2299

msgstr ""

2300

2301

#: bzrlib/builtins.py:3693

2301

#: bzrlib/builtins.py:3703

2302

msgid ""

2303

"versionedfiles\n"

2304

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

2305

" doesn't indicate a problem."

2306

msgstr ""

2307

2308

#: bzrlib/builtins.py:3697

2308

#: bzrlib/builtins.py:3707

2309

msgid ""

2310

"unreferenced ancestors\n"

2311

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

2313

" subtle problem that Bazaar can work around."

2314

msgstr ""

2315

2316

#: bzrlib/builtins.py:3702

2316

#: bzrlib/builtins.py:3712

2317

msgid ""

2318

"unique file texts\n"

2319

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

2320

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

2321

msgstr ""

2322

2323

#: bzrlib/builtins.py:3706

2323

#: bzrlib/builtins.py:3716

2324

msgid ""

2325

"repeated file texts\n"

2326

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

2329

" indicate a problem."

2330

msgstr ""

2331

2332

#: bzrlib/builtins.py:3712

2332

#: bzrlib/builtins.py:3722

2333

msgid ""

2334

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

2335

"given\n"

2336

"location will be checked."

2337

msgstr ""

2338

2339

#: bzrlib/builtins.py:3717

2339

#: bzrlib/builtins.py:3727

2340

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

2341

msgstr ""

2342

2343

#: bzrlib/builtins.py:3719

2343

#: bzrlib/builtins.py:3729

2344

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

2345

msgstr ""

2346

2347

#: bzrlib/builtins.py:3721

2347

#: bzrlib/builtins.py:3731

2348

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

2349

msgstr ""

2350

2351

#: bzrlib/builtins.py:3723

2351

#: bzrlib/builtins.py:3733

2352

msgid " bzr check --repo bar"

2353

msgstr ""

2354

2355

#: bzrlib/builtins.py:3725

2355

#: bzrlib/builtins.py:3735

2356

msgid " Check everything at 'baz'::"

2357

msgstr ""

2358

2359

#: bzrlib/builtins.py:3727

2359

#: bzrlib/builtins.py:3737

2360

msgid " bzr check baz"

2361

msgstr ""

2362

2363

#: bzrlib/builtins.py:3733

2363

#: bzrlib/builtins.py:3743

2364

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

2365

msgstr ""

2366

2367

#: bzrlib/builtins.py:3735

2367

#: bzrlib/builtins.py:3745

2368

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

2369

msgstr ""

2370

2371

#: bzrlib/builtins.py:3737

2371

#: bzrlib/builtins.py:3747

2372

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

2373

msgstr ""

2374

2375

#: bzrlib/builtins.py:3751

2375

#: bzrlib/builtins.py:3761

2376

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

2377

msgstr ""

2378

2379

#: bzrlib/builtins.py:3753

2379

#: bzrlib/builtins.py:3763

2380

msgid ""

2381

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

2382

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

2385

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

2386

msgstr ""

2387

2388

#: bzrlib/builtins.py:3759

2388

#: bzrlib/builtins.py:3769

2389

msgid ""

2390

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

2391

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

2395

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

2396

msgstr ""

2397

2398

#: bzrlib/builtins.py:3766

2398

#: bzrlib/builtins.py:3776

2399

msgid ""

2400

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

2401

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

2406

"afterwards."

2407

msgstr ""

2408

2409

#: bzrlib/builtins.py:3774

2409

#: bzrlib/builtins.py:3784

2410

msgid ""

2411

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

2412

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

2414

"tried."

2415

msgstr ""

2416

2417

#: bzrlib/builtins.py:3779

2417

#: bzrlib/builtins.py:3789

2418

msgid ""

2419

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

2420

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

2421

msgstr ""

2422

2423

#: bzrlib/builtins.py:3787

2423

#: bzrlib/builtins.py:3797

2424

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

2425

msgstr ""

2426

2427

#: bzrlib/builtins.py:3791

2427

#: bzrlib/builtins.py:3801

2428

msgid "Branch format"

2429

msgstr ""

2430

2431

#: bzrlib/builtins.py:3793

2431

#: bzrlib/builtins.py:3803

2432

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

2433

msgstr ""

2434

2435

#: bzrlib/builtins.py:3795

2435

#: bzrlib/builtins.py:3805

2436

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

2437

msgstr ""

2438

2439

#: bzrlib/builtins.py:3810

2439

#: bzrlib/builtins.py:3820

2440

msgid "Show or set bzr user id."

2441

msgstr ""

2442

2443

#: bzrlib/builtins.py:3812

2443

#: bzrlib/builtins.py:3822

2444

msgid ""

2445

":Examples:\n"

2446

" Show the email of the current user::"

2447

msgstr ""

2448

2449

#: bzrlib/builtins.py:3815

2449

#: bzrlib/builtins.py:3825

2450

msgid " bzr whoami --email"

2451

msgstr ""

2452

2453

#: bzrlib/builtins.py:3817

2453

#: bzrlib/builtins.py:3827

2454

msgid " Set the current user::"

2455

msgstr ""

2456

2457

#: bzrlib/builtins.py:3819

2457

#: bzrlib/builtins.py:3829

2458

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

2459

msgstr ""

2460

2461

#: bzrlib/builtins.py:3823

2461

#: bzrlib/builtins.py:3833

2462

msgid "Display email address only."

2463

msgstr ""

2464

2465

#: bzrlib/builtins.py:3825

2465

#: bzrlib/builtins.py:3835

2466

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

2467

msgstr ""

2468

2469

#: bzrlib/builtins.py:3851

2469

#: bzrlib/builtins.py:3861

2470

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

2471

msgstr ""

2472

2473

#: bzrlib/builtins.py:3873

2473

#: bzrlib/builtins.py:3885

2474

msgid "Print or set the branch nickname."

2475

msgstr ""

2476

2477

#: bzrlib/builtins.py:3875

2477

#: bzrlib/builtins.py:3887

2478

msgid ""

2479

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

2480

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

2479

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

2480

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

2481

"current nickname, execute with no argument."

2481

2482

msgstr ""

2482

2483

#: bzrlib/builtins.py:3878

2484

#: bzrlib/builtins.py:3891

2484

2485

msgid ""

2485

2486

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

2486

2487

"locally."

2487

2488

msgstr ""

2488

2489

#: bzrlib/builtins.py:3898

2490

#: bzrlib/builtins.py:3911

2490

2491

msgid "Set/unset and display aliases."

2491

2492

msgstr ""

2492

2493

#: bzrlib/builtins.py:3900

2494

#: bzrlib/builtins.py:3913

2494

2495

msgid ""

2495

2496

":Examples:\n"

2496

2497

" Show the current aliases::"

2497

2498

msgstr ""

2498

2499

#: bzrlib/builtins.py:3903

2500

#: bzrlib/builtins.py:3916

2500

2501

msgid " bzr alias"

2501

2502

msgstr ""

2502

2503

#: bzrlib/builtins.py:3905

2504

#: bzrlib/builtins.py:3918

2504

2505

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

2505

2506

msgstr ""

2506

2507

#: bzrlib/builtins.py:3907

2508

#: bzrlib/builtins.py:3920

2508

2509

msgid " bzr alias ll"

2509

2510

msgstr ""

2510

2511

#: bzrlib/builtins.py:3909

2512

#: bzrlib/builtins.py:3922

2512

2513

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

2513

2514

msgstr ""

2514

2515

#: bzrlib/builtins.py:3911

2516

#: bzrlib/builtins.py:3924

2516

2517

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

2517

2518

msgstr ""

2518

2519

#: bzrlib/builtins.py:3913

2520

#: bzrlib/builtins.py:3926

2520

2521

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

2521

2522

msgstr ""

2522

2523

#: bzrlib/builtins.py:3915

2524

#: bzrlib/builtins.py:3928

2524

2525

msgid " bzr alias --remove ll"

2525

2526

msgstr ""

2526

2527

#: bzrlib/builtins.py:3920

2528

#: bzrlib/builtins.py:3933

2528

2529

msgid "Remove the alias."

2529

2530

msgstr ""

2530

2531

#: bzrlib/builtins.py:3938

2532

#: bzrlib/builtins.py:3951

2532

2533

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

2533

2534

msgstr ""

2534

2535

#: bzrlib/builtins.py:4119

2536

#: bzrlib/builtins.py:4132

2536

2537

msgid ""

2537

2538

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

2538

2539

msgstr ""

2539

2540

#: bzrlib/builtins.py:4136

2541

#: bzrlib/builtins.py:4149

2541

2542

msgid ""

2542

2543

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

2543

2544

msgstr ""

2544

2545

#: bzrlib/builtins.py:4183

2546

#: bzrlib/builtins.py:4196

2546

2547

msgid "Show version of bzr."

2547

2548

msgstr ""

2548

2549

#: bzrlib/builtins.py:4187

2550

#: bzrlib/builtins.py:4200

2550

2551

msgid "Print just the version number."

2551

2552

msgstr ""

2552

2553

#: bzrlib/builtins.py:4206

2554

#: bzrlib/builtins.py:4219

2554

2555

msgid "It sure does!\n"

2555

2556

msgstr ""

2556

2557

#: bzrlib/builtins.py:4230

2558

#: bzrlib/builtins.py:4243

2558

2559

#, python-format

2559

2560

msgid "merge base is revision %s\n"

2560

2561

msgstr ""

2561

2562

#: bzrlib/builtins.py:4234

2563

#: bzrlib/builtins.py:4247

2563

2564

msgid "Perform a three-way merge."

2564

2565

msgstr ""

2565

2566

#: bzrlib/builtins.py:4236

2567

#: bzrlib/builtins.py:4249

2567

2568

msgid ""

2568

2569

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

2569

2570

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

2574

2575

"the current working tree."

2575

2576

msgstr ""

2576

2577

#: bzrlib/builtins.py:4244

2578

#: bzrlib/builtins.py:4257

2578

2579

msgid ""

2579

2580

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

2580

2581

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

2581

2582

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

2582

2583

msgstr ""

2583

2584

#: bzrlib/builtins.py:4248

2585

#: bzrlib/builtins.py:4261

2585

2586

msgid ""

2586

2587

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

2587

2588

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

2588

2589

msgstr ""

2589

2590

#: bzrlib/builtins.py:4251

2591

#: bzrlib/builtins.py:4264

2591

2592

msgid ""

2592

2593

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

2593

2594

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

2598

2599

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

2599

2600

msgstr ""

2600

2601

#: bzrlib/builtins.py:4259

2602

#: bzrlib/builtins.py:4272

2602

2603

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

2603

2604

msgstr ""

2604

2605

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

2606

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

2606

2607

msgid ""

2607

2608

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

2608

2609

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

2610

2611

"before you can commit."

2611

2612

msgstr ""

2612

2613

#: bzrlib/builtins.py:4266

2614

#: bzrlib/builtins.py:4279

2614

2615

msgid ""

2615

2616

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

2616

2617

msgstr ""

2617

2618

#: bzrlib/builtins.py:4268

2619

#: bzrlib/builtins.py:4281

2619

2620

msgid ""

2620

2621

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

2621

2622

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

2623

2624

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

2624

2625

msgstr ""

2625

2626

#: bzrlib/builtins.py:4273

2627

#: bzrlib/builtins.py:4286

2627

2628

msgid ""

2628

2629

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

2629

2630

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

2630

2631

"committed to record the result of the merge."

2631

2632

msgstr ""

2632

2633

#: bzrlib/builtins.py:4277

2634

#: bzrlib/builtins.py:4290

2634

2635

msgid ""

2635

2636

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

2636

2637

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

2639

2640

"merge revision which has more than two parents."

2640

2641

msgstr ""

2641

2642

#: bzrlib/builtins.py:4283

2643

#: bzrlib/builtins.py:4296

2643

2644

msgid ""

2644

2645

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

2645

2646

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

2646

2647

"can be given."

2647

2648

msgstr ""

2648

2649

#: bzrlib/builtins.py:4287

2650

#: bzrlib/builtins.py:4300

2650

2651

msgid ""

2651

2652

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

2652

2653

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

2653

2654

msgstr ""

2654

2655

#: bzrlib/builtins.py:4290

2656

#: bzrlib/builtins.py:4303

2656

2657

msgid ""

2657

2658

":Examples:\n"

2658

2659

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

2659

2660

msgstr ""

2660

2661

#: bzrlib/builtins.py:4293

2662

#: bzrlib/builtins.py:4306

2662

2663

msgid " bzr merge ../bzr.dev"

2663

2664

msgstr ""

2664

2665

#: bzrlib/builtins.py:4295

2666

#: bzrlib/builtins.py:4308

2666

2667

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

2667

2668

msgstr ""

2668

2669

#: bzrlib/builtins.py:4297

2670

#: bzrlib/builtins.py:4310

2670

2671

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

2671

2672

msgstr ""

2672

2673

#: bzrlib/builtins.py:4299

2674

#: bzrlib/builtins.py:4312

2674

2675

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

2675

2676

msgstr ""

2676

2677

#: bzrlib/builtins.py:4301

2678

#: bzrlib/builtins.py:4314

2678

2679

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

2679

2680

msgstr ""

2680

2681

#: bzrlib/builtins.py:4303

2682

#: bzrlib/builtins.py:4316

2682

2683

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

2683

2684

msgstr ""

2684

2685

#: bzrlib/builtins.py:4305

2686

#: bzrlib/builtins.py:4318

2686

2687

msgid " bzr merge /tmp/merge"

2687

2688

msgstr ""

2688

2689

#: bzrlib/builtins.py:4307

2690

#: bzrlib/builtins.py:4320

2690

2691

msgid ""

2691

2692

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

2692

2693

" feature1a and feature1b:"

2693

2694

msgstr ""

2694

2695

#: bzrlib/builtins.py:4310

2696

#: bzrlib/builtins.py:4323

2696

2697

msgid ""

2697

2698

" bzr merge ../feature1a\n"

2698

2699

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

2699

2700

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

2700

2701

msgstr ""

2701

2702

#: bzrlib/builtins.py:4322

2703

#: bzrlib/builtins.py:4335

2703

2704

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

2704

2705

msgstr ""

2705

2706

#: bzrlib/builtins.py:4328

2707

#: bzrlib/builtins.py:4341

2707

2708

msgid ""

2708

2709

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

2709

2710

msgstr ""

2710

2711

#: bzrlib/builtins.py:4330

2712

#: bzrlib/builtins.py:4343

2712

2713

msgid ""

2713

2714

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

2714

2715

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

2715

2716

"commit the result."

2716

2717

msgstr ""

2717

2718

#: bzrlib/builtins.py:4335

2719

#: bzrlib/builtins.py:4348

2719

2720

msgid ""

2720

2721

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

2721

2722

msgstr ""

2722

2723

#: bzrlib/builtins.py:4337

2724

#: bzrlib/builtins.py:4350

2724

2725

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

2725

2726

msgstr ""

2726

2727

#: bzrlib/builtins.py:4339

2728

#: bzrlib/builtins.py:4352

2728

2729

msgid "Select changes interactively."

2729

2730

msgstr ""

2730

2731

#: bzrlib/builtins.py:4361

2732

#: bzrlib/builtins.py:4374

2732

2733

msgid ""

2733

2734

"Merging into empty branches not currently supported, "

2734

2735

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

2735

2736

msgstr ""

2736

2737

#: bzrlib/builtins.py:4388

2738

#: bzrlib/builtins.py:4401

2738

2739

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

2739

2740

msgstr ""

2740

2741

#: bzrlib/builtins.py:4399

2742

#: bzrlib/builtins.py:4412

2742

2743

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

2743

2744

msgstr ""

2744

2745

#: bzrlib/builtins.py:4419

2746

#: bzrlib/builtins.py:4432

2746

2747

msgid "merger: "

2747

2748

msgstr ""

2748

2749

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

2750

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

2750

2751

msgid "Nothing to do."

2751

2752

msgstr ""

2752

2753

#: bzrlib/builtins.py:4425

2754

#: bzrlib/builtins.py:4438

2754

2755

msgid "Cannot pull individual files"

2755

2756

msgstr ""

2756

2757

#: bzrlib/builtins.py:4433

2758

#: bzrlib/builtins.py:4446

2758

2759

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

2759

2760

msgstr ""

2760

2761

#: bzrlib/builtins.py:4491

2762

#: bzrlib/builtins.py:4504

2762

2763

#, python-format

2763

2764

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

2764

2765

msgstr ""

2765

2766

#: bzrlib/builtins.py:4500

2767

#: bzrlib/builtins.py:4513

2767

2768

#, python-format

2768

2769

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

2769

2770

msgstr ""

2770

2771

#: bzrlib/builtins.py:4504

2772

#: bzrlib/builtins.py:4517

2772

2773

msgid "Cannot do conflict reduction and show base."

2773

2774

msgstr ""

2774

2775

#: bzrlib/builtins.py:4615

2776

#: bzrlib/builtins.py:4628

2776

2777

msgid "No location specified or remembered"

2777

2778

msgstr ""

2778

2779

#: bzrlib/builtins.py:4617

2780

#: bzrlib/builtins.py:4630

2780

2781

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

2781

2782

msgstr ""

2782

2783

#: bzrlib/builtins.py:4623

2784

#: bzrlib/builtins.py:4636

2784

2785

msgid "Redo a merge."

2785

2786

msgstr ""

2786

2787

#: bzrlib/builtins.py:4625

2788

#: bzrlib/builtins.py:4638

2788

2789

msgid ""

2789

2790

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

2790

2791

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

2791

2792

"lets you try different ones on different files."

2792

2793

msgstr ""

2793

2794

#: bzrlib/builtins.py:4629

2795

#: bzrlib/builtins.py:4642

2795

2796

msgid ""

2796

2797

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

2797

2798

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

2798

2799

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

2799

2800

msgstr ""

2800

2801

#: bzrlib/builtins.py:4633

2802

#: bzrlib/builtins.py:4646

2802

2803

msgid ""

2803

2804

":Examples:\n"

2804

2805

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

2805

2806

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

2806

2807

msgstr ""

2807

2808

#: bzrlib/builtins.py:4637

2809

#: bzrlib/builtins.py:4650

2809

2810

msgid " bzr remerge --show-base"

2810

2811

msgstr ""

2811

2812

#: bzrlib/builtins.py:4639

2813

#: bzrlib/builtins.py:4652

2813

2814

msgid ""

2814

2815

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

2815

2816

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

2816

2817

msgstr ""

2817

2818

#: bzrlib/builtins.py:4642

2819

#: bzrlib/builtins.py:4655

2819

2820

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

2820

2821

msgstr ""

2821

2822

#: bzrlib/builtins.py:4649

2823

#: bzrlib/builtins.py:4662

2823

2824

msgid "Show base revision text in conflicts."

2824

2825

msgstr ""

2825

2826

#: bzrlib/builtins.py:4661

2827

#: bzrlib/builtins.py:4674

2827

2828

msgid ""

2828

2829

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

2829

2830

"merges."

2830

2831

msgstr ""

2831

2832

#: bzrlib/builtins.py:4717

2833

#: bzrlib/builtins.py:4731

2833

2834

msgid "Revert files to a previous revision."

2834

2835

msgstr ""

2835

2836

#: bzrlib/builtins.py:4719

2837

#: bzrlib/builtins.py:4733

2837

2838

msgid ""

2838

2839

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

2839

2840

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

2840

2841

"last committed revision is used."

2841

2842

msgstr ""

2842

2843

#: bzrlib/builtins.py:4723

2844

#: bzrlib/builtins.py:4737

2844

2845

msgid ""

2845

2846

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

2846

2847

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

2849

2850

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

2850

2851

msgstr ""

2851

2852

#: bzrlib/builtins.py:4729

2853

#: bzrlib/builtins.py:4743

2853

2854

msgid ""

2854

2855

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

2855

2856

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

2856

2857

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

2857

2858

msgstr ""

2858

2859

#: bzrlib/builtins.py:4733

2860

#: bzrlib/builtins.py:4747

2860

2861

msgid ""

2861

2862

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

2862

2863

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

2864

2865

"reverted."

2865

2866

msgstr ""

2866

2867

#: bzrlib/builtins.py:4738

2868

#: bzrlib/builtins.py:4752

2868

2869

msgid ""

2869

2870

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

2870

2871

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

2872

2873

"deleted."

2873

2874

msgstr ""

2874

2875

#: bzrlib/builtins.py:4743

2876

#: bzrlib/builtins.py:4757

2876

2877

msgid ""

2877

2878

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

2878

2879

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

2884

2885

"reverting any files."

2885

2886

msgstr ""

2886

2887

#: bzrlib/builtins.py:4752

2888

#: bzrlib/builtins.py:4766

2888

2889

msgid ""

2889

2890

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

2890

2891

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

2898

2899

"target branches."

2899

2900

msgstr ""

2900

2901

#: bzrlib/builtins.py:4766

2902

#: bzrlib/builtins.py:4780

2902

2903

msgid "Do not save backups of reverted files."

2903

2904

msgstr ""

2904

2905

#: bzrlib/builtins.py:4768

2906

#: bzrlib/builtins.py:4782

2906

2907

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

2907

2908

msgstr ""

2908

2909

#: bzrlib/builtins.py:4799

2910

#: bzrlib/builtins.py:4813

2910

2911

msgid ""

2911

2912

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

2912

2913

" "

2913

2914

msgstr ""

2914

2915

#: bzrlib/builtins.py:4804

2916

#: bzrlib/builtins.py:4818

2916

2917

msgid "Show help on all commands."

2917

2918

msgstr ""

2918

2919

#: bzrlib/builtins.py:4833

2920

#: bzrlib/builtins.py:4847

2920

2921

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

2921

2922

msgstr ""

2922

2923

#: bzrlib/builtins.py:4835

2924

#: bzrlib/builtins.py:4849

2924

2925

msgid "OTHER_BRANCH may be local or remote."

2925

2926

msgstr ""

2926

2927

#: bzrlib/builtins.py:4837

2928

#: bzrlib/builtins.py:4851

2928

2929

msgid ""

2929

2930

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

2930

2931

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

2935

2936

" 0 - no missing revisions"

2936

2937

msgstr ""

2937

2938

#: bzrlib/builtins.py:4847

2939

#: bzrlib/builtins.py:4861

2939

2940

msgid ""

2940

2941

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

2941

2942

" remembered pull location::"

2942

2943

msgstr ""

2943

2944

#: bzrlib/builtins.py:4850

2945

#: bzrlib/builtins.py:4864

2945

2946

msgid " bzr missing"

2946

2947

msgstr ""

2947

2948

#: bzrlib/builtins.py:4852

2949

#: bzrlib/builtins.py:4866

2949

2950

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

2950

2951

msgstr ""

2951

2952

#: bzrlib/builtins.py:4854

2953

#: bzrlib/builtins.py:4868

2953

2954

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

2954

2955

msgstr ""

2955

2956

#: bzrlib/builtins.py:4856

2957

#: bzrlib/builtins.py:4870

2957

2958

msgid ""

2958

2959

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

2959

2960

" branch::"

2960

2961

msgstr ""

2961

2962

#: bzrlib/builtins.py:4859

2963

#: bzrlib/builtins.py:4873

2963

2964

msgid " bzr missing -r ..-10"

2964

2965

msgstr ""

2965

2966

#: bzrlib/builtins.py:4861

2967

#: bzrlib/builtins.py:4875

2967

2968

msgid ""

2968

2969

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

2969

2970

" branch::"

2970

2971

msgstr ""

2971

2972

#: bzrlib/builtins.py:4864

2973

#: bzrlib/builtins.py:4878

2973

2974

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

2974

2975

msgstr ""

2975

2976

#: bzrlib/builtins.py:4871

2977

#: bzrlib/builtins.py:4885

2977

2978

msgid "Reverse the order of revisions."

2978

2979

msgstr ""

2979

2980

#: bzrlib/builtins.py:4873

2981

#: bzrlib/builtins.py:4887

2981

2982

msgid "Display changes in the local branch only."

2982

2983

msgstr ""

2983

2984

#: bzrlib/builtins.py:4874

2985

#: bzrlib/builtins.py:4888

2985

2986

msgid "Same as --mine-only."

2986

2987

msgstr ""

2987

2988

#: bzrlib/builtins.py:4876

2989

#: bzrlib/builtins.py:4890

2989

2990

msgid "Display changes in the remote branch only."

2990

2991

msgstr ""

2991

2992

#: bzrlib/builtins.py:4877

2993

#: bzrlib/builtins.py:4891

2993

2994

msgid "Same as --theirs-only."

2994

2995

msgstr ""

2995

2996

#: bzrlib/builtins.py:4882

2997

#: bzrlib/builtins.py:4896

2997

2998

msgid ""

2998

2999

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

2999

3000

"details."

3000

3001

msgstr ""

3001

3002

#: bzrlib/builtins.py:4886

3003

#: bzrlib/builtins.py:4900

3003

3004

msgid ""

3004

3005

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

3005

3006

"details."

3006

3007

msgstr ""

3007

3008

#: bzrlib/builtins.py:4889

3009

#: bzrlib/builtins.py:4903

3009

3010

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

3010

3011

msgstr ""

3011

3012

#: bzrlib/builtins.py:4943

3013

#: bzrlib/builtins.py:4957

3013

3014

msgid "No peer location known or specified."

3014

3015

msgstr ""

3015

3016

#: bzrlib/builtins.py:4947

3017

#: bzrlib/builtins.py:4961

3017

3018

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

3018

3019

msgstr ""

3019

3020

#: bzrlib/builtins.py:4980

3021

#: bzrlib/builtins.py:4994

3021

3022

#, python-format

3022

3023

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

3023

3024

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

3024

3025

msgstr[0] ""

3025

3026

msgstr[1] ""

3026

3027

#: bzrlib/builtins.py:4996

3028

#: bzrlib/builtins.py:5010

3028

3029

#, python-format

3029

3030

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

3030

3031

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

3031

3032

msgstr[0] ""

3032

3033

msgstr[1] ""

3033

3034

#: bzrlib/builtins.py:5008

3035

#: bzrlib/builtins.py:5022

3035

3036

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

3036

3037

msgstr ""

3037

3038

#: bzrlib/builtins.py:5011

3039

#: bzrlib/builtins.py:5025

3039

3040

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

3040

3041

msgstr ""

3041

3042

#: bzrlib/builtins.py:5016

3043

#: bzrlib/builtins.py:5030

3043

3044

msgid "Branches are up to date.\n"

3044

3045

msgstr ""

3045

3046

#: bzrlib/builtins.py:5027

3047

#: bzrlib/builtins.py:5041

3047

3048

msgid "Compress the data within a repository."

3048

3049

msgstr ""

3049

3050

#: bzrlib/builtins.py:5029

3051

#: bzrlib/builtins.py:5043

3051

3052

msgid ""

3052

3053

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

3053

3054

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

3054

3055

"normally not required to be done manually."

3055

3056

msgstr ""

3056

3057

#: bzrlib/builtins.py:5033

3058

#: bzrlib/builtins.py:5047

3058

3059

msgid ""

3059

3060

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

3060

3061

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

3063

3064

"used."

3064

3065

msgstr ""

3065

3066

#: bzrlib/builtins.py:5039

3067

#: bzrlib/builtins.py:5053

3067

3068

msgid ""

3068

3069

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

3069

3070

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

3071

3072

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

3072

3073

msgstr ""

3073

3074

#: bzrlib/builtins.py:5048

3075

#: bzrlib/builtins.py:5062

3075

3076

msgid "Delete obsolete packs to save disk space."

3076

3077

msgstr ""

3077

3078

#: bzrlib/builtins.py:5062

3079

#: bzrlib/builtins.py:5076

3079

3080

msgid "List the installed plugins."

3080

3081

msgstr ""

3081

3082

#: bzrlib/builtins.py:5064

3083

#: bzrlib/builtins.py:5078

3083

3084

msgid ""

3084

3085

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

3085

3086

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

3086

3087

msgstr ""

3087

3088

#: bzrlib/builtins.py:5067

3089

#: bzrlib/builtins.py:5081

3089

3090

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

3090

3091

msgstr ""

3091

3092

#: bzrlib/builtins.py:5069

3093

#: bzrlib/builtins.py:5083

3093

3094

msgid ""

3094

3095

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

3095

3096

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

3098

3099

"customizing log output."

3099

3100

msgstr ""

3100

3101

#: bzrlib/builtins.py:5075

3102

#: bzrlib/builtins.py:5089

3102

3103

msgid ""

3103

3104

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

3104

3105

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

3106

3107

"plugins using the Python programming language."

3107

3108

msgstr ""

3108

3109

#: bzrlib/builtins.py:5091

3110

#: bzrlib/builtins.py:5105

3110

3111

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

3111

3112

msgstr ""

3112

3113

#: bzrlib/builtins.py:5094

3114

#: bzrlib/builtins.py:5108

3114

3115

msgid "Produce long-format testament."

3115

3116

msgstr ""

3116

3117

#: bzrlib/builtins.py:5096

3118

#: bzrlib/builtins.py:5110

3118

3119

msgid "Produce a strict-format testament."

3119

3120

msgstr ""

3120

3121

#: bzrlib/builtins.py:5122

3122

#: bzrlib/builtins.py:5136

3122

3123

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

3123

3124

msgstr ""

3124

3125

#: bzrlib/builtins.py:5124

3126

#: bzrlib/builtins.py:5138

3126

3127

msgid ""

3127

3128

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

3128

3129

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

3129

3130

msgstr ""

3130

3131

#: bzrlib/builtins.py:5127

3132

#: bzrlib/builtins.py:5141

3132

3133

msgid ""

3133

3134

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

3134

3135

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

3135

3136

msgstr ""

3136

3137

#: bzrlib/builtins.py:5135

3138

#: bzrlib/builtins.py:5149

3138

3139

msgid "Show annotations on all lines."

3139

3140

msgstr ""

3140

3141

#: bzrlib/builtins.py:5136

3142

#: bzrlib/builtins.py:5150

3142

3143

msgid "Show commit date in annotations."

3143

3144

msgstr ""

3144

3145

#: bzrlib/builtins.py:5223

3146

#: bzrlib/builtins.py:5237

3146

3147

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

3147

3148

msgstr ""

3148

3149

#: bzrlib/builtins.py:5235

3150

#: bzrlib/builtins.py:5249

3150

3151

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

3151

3152

msgstr ""

3152

3153

#: bzrlib/builtins.py:5239

3154

#: bzrlib/builtins.py:5253

3154

3155

msgid ""

3155

3156

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

3156

3157

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

3157

3158

msgstr ""

3158

3159

#: bzrlib/builtins.py:5242

3160

#: bzrlib/builtins.py:5256

3160

3161

msgid ""

3161

3162

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

3162

3163

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

3163

3164

msgstr ""

3164

3165

#: bzrlib/builtins.py:5245

3166

#: bzrlib/builtins.py:5259

3166

3167

msgid ""

3167

3168

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

3168

3169

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

3169

3170

"that of the master."

3170

3171

msgstr ""

3171

3172

#: bzrlib/builtins.py:5260

3173

#: bzrlib/builtins.py:5274

3173

3174

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

3174

3175

msgstr ""

3175

3176

#: bzrlib/builtins.py:5265

3177

#: bzrlib/builtins.py:5280

3177

3178

msgid "Branch is already bound"

3178

3179

msgstr ""

3179

3180

#: bzrlib/builtins.py:5267

3181

#: bzrlib/builtins.py:5283

3181

3182

msgid "No location supplied and no previous location known"

3182

3183

msgstr ""

3183

3184

#: bzrlib/builtins.py:5273

3185

#: bzrlib/builtins.py:5289

3185

3186

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

3186

3187

msgstr ""

3187

3188

#: bzrlib/builtins.py:5280

3189

#: bzrlib/builtins.py:5296

3189

3190

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

3190

3191

msgstr ""

3191

3192

#: bzrlib/builtins.py:5282

3193

#: bzrlib/builtins.py:5298

3193

3194

msgid ""

3194

3195

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

3195

3196

"commits will be local only."

3196

3197

msgstr ""

3197

3198

#: bzrlib/builtins.py:5293

3199

#: bzrlib/builtins.py:5309

3199

3200

msgid "Local branch is not bound"

3200

3201

msgstr ""

3201

3202

#: bzrlib/builtins.py:5297

3203

#: bzrlib/builtins.py:5313

3203

3204

msgid "Remove the last committed revision."

3204

3205

msgstr ""

3205

3206

#: bzrlib/builtins.py:5299

3207

#: bzrlib/builtins.py:5315

3207

3208

msgid ""

3208

3209

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

3209

3210

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

3210

3211

"remove anything."

3211

3212

msgstr ""

3212

3213

#: bzrlib/builtins.py:5303

3214

#: bzrlib/builtins.py:5319

3214

3215

msgid ""

3215

3216

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

3216

3217

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

3217

3218

"branch at revision 15."

3218

3219

msgstr ""

3219

3220

#: bzrlib/builtins.py:5307

3221

#: bzrlib/builtins.py:5323

3221

3222

msgid ""

3222

3223

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

3223

3224

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

3224

3225

"the commit."

3225

3226

msgstr ""

3226

3227

#: bzrlib/builtins.py:5318

3228

#: bzrlib/builtins.py:5334

3228

3229

msgid "Don't actually make changes."

3229

3230

msgstr ""

3230

3231

#: bzrlib/builtins.py:5319

3232

#: bzrlib/builtins.py:5335

3232

3233

msgid "Say yes to all questions."

3233

3234

msgstr ""

3234

3235

#: bzrlib/builtins.py:5321

3236

#: bzrlib/builtins.py:5337

3236

3237

msgid "Keep tags that point to removed revisions."

3237

3238

msgstr ""

3238

3239

#: bzrlib/builtins.py:5323

3240

#: bzrlib/builtins.py:5339

3240

3241

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

3241

3242

msgstr ""

3242

3243

#: bzrlib/builtins.py:5372

3244

#: bzrlib/builtins.py:5388

3244

3245

msgid "No revisions to uncommit.\n"

3245

3246

msgstr ""

3246

3247

#: bzrlib/builtins.py:5387

3248

#: bzrlib/builtins.py:5403

3248

3249

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

3249

3250

msgstr ""

3250

3251

#: bzrlib/builtins.py:5390

3252

#: bzrlib/builtins.py:5406

3252

3253

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

3253

3254

msgstr ""

3254

3255

#: bzrlib/builtins.py:5394

3256

#: bzrlib/builtins.py:5410

3256

3257

msgid "Uncommit these revisions"

3257

3258

msgstr ""

3258

3259

#: bzrlib/builtins.py:5397

3260

#: bzrlib/builtins.py:5413

3260

3261

msgid "Canceled\n"

3261

3262

msgstr ""

3262

3263

#: bzrlib/builtins.py:5404

3264

#: bzrlib/builtins.py:5420

3264

3265

#, python-format

3265

3266

msgid ""

3266

3267

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

3267

3268

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

3268

3269

msgstr ""

3269

3270

#: bzrlib/builtins.py:5409

3271

#: bzrlib/builtins.py:5425

3271

3272

msgid "Break a dead lock."

3272

3273

msgstr ""

3273

3274

#: bzrlib/builtins.py:5411

3275

#: bzrlib/builtins.py:5427

3275

3276

msgid ""

3276

3277

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

3277

3278

"config file."

3278

3279

msgstr ""

3279

3280

#: bzrlib/builtins.py:5414

3281

#: bzrlib/builtins.py:5430

3281

3282

msgid ""

3282

3283

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

3283

3284

"holding the lock has been stopped."

3284

3285

msgstr ""

3285

3286

#: bzrlib/builtins.py:5417

3287

#: bzrlib/builtins.py:5433

3287

3288

msgid ""

3288

3289

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

3289

3290

"[location]' command."

3290

3291

msgstr ""

3291

3292

#: bzrlib/builtins.py:5420

3293

#: bzrlib/builtins.py:5436

3293

3294

msgid ""

3294

3295

":Examples:\n"

3295

3296

" bzr break-lock\n"

3297

3298

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

3298

3299

msgstr ""

3299

3300

#: bzrlib/builtins.py:5429

3301

#: bzrlib/builtins.py:5445

3301

3302

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

3302

3303

msgstr ""

3303

3304

#: bzrlib/builtins.py:5431

3305

#: bzrlib/builtins.py:5447

3305

3306

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

3306

3307

msgstr ""

3307

3308

#: bzrlib/builtins.py:5466

3309

#: bzrlib/builtins.py:5482

3309

3310

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

3310

3311

msgstr ""

3311

3312

#: bzrlib/builtins.py:5467

3313

#: bzrlib/builtins.py:5483

3313

3314

msgid "Run the bzr server."

3314

3315

msgstr ""

3315

3316

#: bzrlib/builtins.py:5473

3317

#: bzrlib/builtins.py:5489

3317

3318

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

3318

3319

msgstr ""

3319

3320

#: bzrlib/builtins.py:5474

3321

#: bzrlib/builtins.py:5490

3321

3322

msgid "protocol"

3322

3323

msgstr ""

3323

3324

#: bzrlib/builtins.py:5475

3325

#: bzrlib/builtins.py:5491

3325

3326

msgid "Protocol to serve."

3326

3327

msgstr ""

3327

3328

#: bzrlib/builtins.py:5479

3329

#: bzrlib/builtins.py:5495

3330

msgid "Listen for connections on nominated address."

3331

msgstr ""

3332

3333

#: bzrlib/builtins.py:5497

3329

3334

msgid ""

3330

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

3331

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

3332

"The default port depends on the protocol."

3335

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

3336

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

3337

"protocol."

3333

3338

msgstr ""

3334

3339

3335

#: bzrlib/builtins.py:5485

3340

#: bzrlib/builtins.py:5502

3336

3341

msgid "Serve contents of this directory."

3337

3342

msgstr ""

3338

3343

3339

#: bzrlib/builtins.py:5487

3344

#: bzrlib/builtins.py:5504

3340

3345

msgid ""

3341

3346

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

3342

3347

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

3345

3350

"uncontrolled write access to your file system."

3346

3351

msgstr ""

3347

3352

3348

#: bzrlib/builtins.py:5496

3353

#: bzrlib/builtins.py:5513

3349

3354

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

3350

3355

msgstr ""

3351

3356

3352

#: bzrlib/builtins.py:5546

3357

#: bzrlib/builtins.py:5531

3353

3358

msgid "Combine a tree into its containing tree."

3354

3359

msgstr ""

3355

3360

3356

#: bzrlib/builtins.py:5548

3361

#: bzrlib/builtins.py:5533

3357

3362

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

3358

3363

msgstr ""

3359

3364

3360

#: bzrlib/builtins.py:5550

3365

#: bzrlib/builtins.py:5535

3361

3366

msgid ""

3362

3367

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

3363

3368

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

3364

3369

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

3365

3370

msgstr ""

3366

3371

3367

#: bzrlib/builtins.py:5554

3372

#: bzrlib/builtins.py:5539

3368

3373

msgid ""

3369

3374

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

3370

3375

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

3371

3376

"and all history is preserved."

3372

3377

msgstr ""

3373

3378

3374

#: bzrlib/builtins.py:5572

3379

#: bzrlib/builtins.py:5557

3375

3380

#, python-format

3376

3381

msgid ""

3377

3382

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

3378

3383

"You can use bzr upgrade on the repository."

3379

3384

msgstr ""

3380

3385

3381

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

3386

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

3382

3387

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

3383

3388

msgstr ""

3384

3389

3385

#: bzrlib/builtins.py:5592

3390

#: bzrlib/builtins.py:5577

3386

3391

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

3387

3392

msgstr ""

3388

3393

3389

#: bzrlib/builtins.py:5594

3394

#: bzrlib/builtins.py:5579

3390

3395

msgid ""

3391

3396

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

3392

3397

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

3393

3398

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

3394

3399

msgstr ""

3395

3400

3396

#: bzrlib/builtins.py:5598

3401

#: bzrlib/builtins.py:5583

3397

3402

msgid ""

3398

3403

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

3399

3404

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

3400

3405

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

3401

3406

msgstr ""

3402

3407

3403

#: bzrlib/builtins.py:5678

3408

#: bzrlib/builtins.py:5663

3404

3409

msgid "No submit branch specified or known"

3405

3410

msgstr ""

3406

3411

3407

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

3412

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

3408

3413

msgid "No public branch specified or known"

3409

3414

msgstr ""

3410

3415

3411

#: bzrlib/builtins.py:5691

3416

#: bzrlib/builtins.py:5677

3412

3417

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

3413

3418

msgstr ""

3414

3419

3415

#: bzrlib/builtins.py:5700

3420

#: bzrlib/builtins.py:5686

3416

3421

msgid "No revisions to bundle."

3417

3422

msgstr ""

3418

3423

3419

#: bzrlib/builtins.py:5719

3424

#: bzrlib/builtins.py:5705

3420

3425

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

3421

3426

msgstr ""

3422

3427

3423

#: bzrlib/builtins.py:5721

3428

#: bzrlib/builtins.py:5707

3424

3429

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

3425

3430

msgstr ""

3426

3431

3427

#: bzrlib/builtins.py:5723

3432

#: bzrlib/builtins.py:5709

3428

3433

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

3429

3434

msgstr ""

3430

3435

3431

#: bzrlib/builtins.py:5725

3436

#: bzrlib/builtins.py:5711

3432

3437

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

3433

3438

msgstr ""

3434

3439

3435

#: bzrlib/builtins.py:5727

3440

#: bzrlib/builtins.py:5713

3436

3441

msgid ""

3437

3442

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

3438

3443

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

3439

3444

" branch."

3440

3445

msgstr ""

3441

3446

3442

#: bzrlib/builtins.py:5731

3447

#: bzrlib/builtins.py:5717

3443

3448

msgid ""

3444

3449

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

3445

3450

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

3446

3451

msgstr ""

3447

3452

3448

#: bzrlib/builtins.py:5734

3453

#: bzrlib/builtins.py:5720

3449

3454

msgid ""

3450

3455

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

3451

3456

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

3452

3457

"the source branch."

3453

3458

msgstr ""

3454

3459

3455

#: bzrlib/builtins.py:5738

3460

#: bzrlib/builtins.py:5724

3456

3461

msgid ""

3457

3462

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

3458

3463

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

3461

3466

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

3462

3467

msgstr ""

3463

3468

3464

#: bzrlib/builtins.py:5744

3469

#: bzrlib/builtins.py:5730

3465

3470

msgid ""

3466

3471

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

3467

3472

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

3470

3475

"be changed using --from."

3471

3476

msgstr ""

3472

3477

3473

#: bzrlib/builtins.py:5750

3478

#: bzrlib/builtins.py:5736

3474

3479

msgid ""

3475

3480

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

3476

3481

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

3479

3484

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

3480

3485

msgstr ""

3481

3486

3482

#: bzrlib/builtins.py:5756

3487

#: bzrlib/builtins.py:5742

3483

3488

msgid ""

3484

3489

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

3485

3490

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

3487

3492

"in the merge directive."

3488

3493

msgstr ""

3489

3494

3490

#: bzrlib/builtins.py:5761

3495

#: bzrlib/builtins.py:5747

3491

3496

msgid ""

3492

3497

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

3493

3498

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

3494

3499

msgstr ""

3495

3500

3496

#: bzrlib/builtins.py:5764

3501

#: bzrlib/builtins.py:5750

3497

3502

msgid ""

3498

3503

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

3499

3504

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

3500

3505

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

3501

3506

msgstr ""

3502

3507

3503

#: bzrlib/builtins.py:5768

3508

#: bzrlib/builtins.py:5754

3504

3509

msgid ""

3505

3510

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

3506

3511

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

3512

3517

"supported clients."

3513

3518

msgstr ""

3514

3519

3515

#: bzrlib/builtins.py:5775

3520

#: bzrlib/builtins.py:5761

3516

3521

msgid ""

3517

3522

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

3518

3523

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

3520

3525

"in the submit branch."

3521

3526

msgstr ""

3522

3527

3523

#: bzrlib/builtins.py:5780

3528

#: bzrlib/builtins.py:5766

3524

3529

msgid ""

3525

3530

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

3526

3531

"and\n"

3530

3535

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

3531

3536

msgstr ""

3532

3537

3533

#: bzrlib/builtins.py:5786

3538

#: bzrlib/builtins.py:5772

3534

3539

msgid ""

3535

3540

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

3536

3541

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

3537

3542

msgstr ""

3538

3543

3539

#: bzrlib/builtins.py:5789

3544

#: bzrlib/builtins.py:5775

3540

3545

msgid ""

3541

3546

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

3542

3547

"into\n"

3544

3549

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

3545

3550

msgstr ""

3546

3551

3547

#: bzrlib/builtins.py:5813

3552

#: bzrlib/builtins.py:5799

3548

3553

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

3549

3554

msgstr ""

3550

3555

3551

#: bzrlib/builtins.py:5817

3556

#: bzrlib/builtins.py:5803

3552

3557

msgid ""

3553

3558

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

3554

3559

"strict disables the check."

3555

3560

msgstr ""

3556

3561

3557

#: bzrlib/builtins.py:5819

3562

#: bzrlib/builtins.py:5805

3558

3563

msgid "Mail the request to this address."

3559

3564

msgstr ""

3560

3565

3561

#: bzrlib/builtins.py:5823

3566

#: bzrlib/builtins.py:5809

3562

3567

msgid "Body for the email."

3563

3568

msgstr ""

3564

3569

3565

#: bzrlib/builtins.py:5876

3570

#: bzrlib/builtins.py:5862

3566

3571

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

3567

3572

msgstr ""

3568

3573

3569

#: bzrlib/builtins.py:5877

3574

#: bzrlib/builtins.py:5863

3570

3575

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

3571

3576

msgstr ""

3572

3577

3573

#: bzrlib/builtins.py:5880

3578

#: bzrlib/builtins.py:5866

3574

3579

msgid "Remember submit and public branch."

3575

3580

msgstr ""

3576

3581

3577

#: bzrlib/builtins.py:5882

3582

#: bzrlib/builtins.py:5868

3578

3583

msgid ""

3579

3584

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

3580

3585

"working directory."

3581

3586

msgstr ""

3582

3587

3583

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

3588

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

3584

3589

msgid "format"

3585

3590

msgstr ""

3586

3591

3587

#: bzrlib/builtins.py:5893

3592

#: bzrlib/builtins.py:5879

3588

3593

msgid "Use the specified output format."

3589

3594

msgstr ""

3590

3595

3591

#: bzrlib/builtins.py:5915

3596

#: bzrlib/builtins.py:5901

3592

3597

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

3593

3598

msgstr ""

3594

3599

3595

#: bzrlib/builtins.py:5917

3600

#: bzrlib/builtins.py:5903

3596

3601

msgid ""

3597

3602

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

3598

3603

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

3599

3604

"created tag."

3600

3605

msgstr ""

3601

3606

3602

#: bzrlib/builtins.py:5921

3607

#: bzrlib/builtins.py:5907

3603

3608

msgid ""

3604

3609

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

3605

3610

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

3606

3611

msgstr ""

3607

3612

3608

#: bzrlib/builtins.py:5924

3613

#: bzrlib/builtins.py:5910

3609

3614

msgid ""

3610

3615

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

3611

3616

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

3612

3617

msgstr ""

3613

3618

3614

#: bzrlib/builtins.py:5927

3619

#: bzrlib/builtins.py:5913

3615

3620

msgid ""

3616

3621

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

3617

3622

"``bzr\n"

3618

3623

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

3619

3624

msgstr ""

3620

3625

3621

#: bzrlib/builtins.py:5930

3626

#: bzrlib/builtins.py:5916

3622

3627

msgid ""

3623

3628

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

3624

3629

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

3626

3631

"details."

3627

3632

msgstr ""

3628

3633

3629

#: bzrlib/builtins.py:5940

3634

#: bzrlib/builtins.py:5926

3630

3635

msgid "Delete this tag rather than placing it."

3631

3636

msgstr ""

3632

3637

3633

#: bzrlib/builtins.py:5943

3638

#: bzrlib/builtins.py:5929

3634

3639

msgid "Branch in which to place the tag."

3635

3640

msgstr ""

3636

3641

3637

#: bzrlib/builtins.py:5945

3642

#: bzrlib/builtins.py:5931

3638

3643

msgid "Replace existing tags."

3639

3644

msgstr ""

3640

3645

3641

#: bzrlib/builtins.py:5960

3646

#: bzrlib/builtins.py:5946

3642

3647

msgid "No tag specified to delete."

3643

3648

msgstr ""

3644

3649

3650

#: bzrlib/builtins.py:5948

3651

#, python-format

3652

msgid "Deleted tag %s."

3653

msgstr ""

3654

3645

3655

#: bzrlib/builtins.py:5962

3646

#, python-format

3647

msgid "Deleted tag %s."

3648

msgstr ""

3649

3650

#: bzrlib/builtins.py:5976

3651

3656

msgid "Please specify a tag name."

3652

3657

msgstr ""

3653

3658

3654

#: bzrlib/builtins.py:5984

3659

#: bzrlib/builtins.py:5970

3655

3660

#, python-format

3656

3661

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

3657

3662

msgstr ""

3658

3663

3659

#: bzrlib/builtins.py:5988

3664

#: bzrlib/builtins.py:5974

3660

3665

#, python-format

3661

3666

msgid "Created tag %s."

3662

3667

msgstr ""

3663

3668

3664

#: bzrlib/builtins.py:5990

3669

#: bzrlib/builtins.py:5976

3665

3670

#, python-format

3666

3671

msgid "Updated tag %s."

3667

3672

msgstr ""

3668

3673

3669

#: bzrlib/builtins.py:5994

3674

#: bzrlib/builtins.py:5980

3670

3675

msgid "List tags."

3671

3676

msgstr ""

3672

3677

3673

#: bzrlib/builtins.py:5996

3678

#: bzrlib/builtins.py:5982

3674

3679

msgid ""

3675

3680

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

3676

3681

msgstr ""

3677

3682

3678

#: bzrlib/builtins.py:6002

3683

#: bzrlib/builtins.py:5988

3679

3684

msgid "Branch whose tags should be displayed."

3680

3685

msgstr ""

3681

3686

3682

#: bzrlib/builtins.py:6004

3687

#: bzrlib/builtins.py:5990

3683

3688

msgid "Sort tags by different criteria."

3684

3689

msgstr ""

3685

3690

3686

#: bzrlib/builtins.py:6004

3691

#: bzrlib/builtins.py:5990

3687

3692

msgid "Sorting"

3688

3693

msgstr ""

3689

3694

3690

#: bzrlib/builtins.py:6073

3695

#: bzrlib/builtins.py:6059

3691

3696

msgid "Reconfigure the type of a bzr directory."

3692

3697

msgstr ""

3693

3698

3694

#: bzrlib/builtins.py:6075

3699

#: bzrlib/builtins.py:6061

3695

3700

msgid "A target configuration must be specified."

3696

3701

msgstr ""

3697

3702

3698

#: bzrlib/builtins.py:6077

3703

#: bzrlib/builtins.py:6063

3699

3704

msgid ""

3700

3705

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

3701

3706

"The order of preference is\n"

3706

3711

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

3707

3712

msgstr ""

3708

3713

3709

#: bzrlib/builtins.py:6091

3714

#: bzrlib/builtins.py:6077

3710

3715

msgid "Tree type"

3711

3716

msgstr ""

3712

3717

3713

#: bzrlib/builtins.py:6092

3718

#: bzrlib/builtins.py:6078

3714

3719

msgid "The relation between branch and tree."

3715

3720

msgstr ""

3716

3721

3717

#: bzrlib/builtins.py:6094

3722

#: bzrlib/builtins.py:6080

3718

3723

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

3719

3724

msgstr ""

3720

3725

3721

#: bzrlib/builtins.py:6095

3726

#: bzrlib/builtins.py:6081

3722

3727

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

3723

3728

msgstr ""

3724

3729

3725

#: bzrlib/builtins.py:6096

3730

#: bzrlib/builtins.py:6082

3726

3731

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

3727

3732

msgstr ""

3728

3733

3729

#: bzrlib/builtins.py:6097

3734

#: bzrlib/builtins.py:6083

3730

3735

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

3731

3736

msgstr ""

3732

3737

3733

#: bzrlib/builtins.py:6102

3738

#: bzrlib/builtins.py:6088

3734

3739

msgid "Repository type"

3735

3740

msgstr ""

3736

3741

3737

#: bzrlib/builtins.py:6103

3742

#: bzrlib/builtins.py:6089

3738

3743

msgid "Location fo the repository."

3739

3744

msgstr ""

3740

3745

3741

#: bzrlib/builtins.py:6105

3746

#: bzrlib/builtins.py:6091

3742

3747

msgid ""

3743

3748

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

3744

3749

msgstr ""

3745

3750

3746

#: bzrlib/builtins.py:6107

3751

#: bzrlib/builtins.py:6093

3747

3752

msgid "Reconfigure to use a shared repository."

3748

3753

msgstr ""

3749

3754

3750

#: bzrlib/builtins.py:6111

3755

#: bzrlib/builtins.py:6097

3751

3756

msgid "Trees in Repository"

3752

3757

msgstr ""

3753

3758

3754

#: bzrlib/builtins.py:6112

3759

#: bzrlib/builtins.py:6098

3755

3760

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

3756

3761

msgstr ""

3757

3762

3758

#: bzrlib/builtins.py:6114

3763

#: bzrlib/builtins.py:6100

3759

3764

msgid ""

3760

3765

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

3761

3766

msgstr ""

3762

3767

3763

#: bzrlib/builtins.py:6116

3768

#: bzrlib/builtins.py:6102

3764

3769

msgid ""

3765

3770

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

3766

3771

msgstr ""

3767

3772

3768

#: bzrlib/builtins.py:6119

3773

#: bzrlib/builtins.py:6105

3769

3774

msgid "Branch to bind checkout to."

3770

3775

msgstr ""

3771

3776

3772

#: bzrlib/builtins.py:6121

3777

#: bzrlib/builtins.py:6107

3773

3778

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

3774

3779

msgstr ""

3775

3780

3776

#: bzrlib/builtins.py:6124

3781

#: bzrlib/builtins.py:6110

3777

3782

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

3778

3783

msgstr ""

3779

3784

3780

#: bzrlib/builtins.py:6128

3785

#: bzrlib/builtins.py:6114

3781

3786

msgid ""

3782

3787

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

3783

3788

"data into it."

3784

3789

msgstr ""

3785

3790

3791

#: bzrlib/builtins.py:6124

3792

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

3793

msgstr ""

3794

3786

3795

#: bzrlib/builtins.py:6138

3787

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

3788

msgstr ""

3789

3790

#: bzrlib/builtins.py:6152

3791

3796

msgid "No target configuration specified"

3792

3797

msgstr ""

3793

3798

3794

#: bzrlib/builtins.py:6187

3799

#: bzrlib/builtins.py:6173

3795

3800

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

3796

3801

msgstr ""

3797

3802

3798

#: bzrlib/builtins.py:6189

3803

#: bzrlib/builtins.py:6175

3799

3804

msgid ""

3800

3805

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

3801

3806

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

3803

3808

"of the new location and binds to it."

3804

3809

msgstr ""

3805

3810

3806

#: bzrlib/builtins.py:6194

3811

#: bzrlib/builtins.py:6180

3807

3812

msgid ""

3808

3813

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

3809

3814

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

3810

3815

msgstr ""

3811

3816

3812

#: bzrlib/builtins.py:6197

3817

#: bzrlib/builtins.py:6183

3813

3818

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

3814

3819

msgstr ""

3815

3820

3816

#: bzrlib/builtins.py:6199

3821

#: bzrlib/builtins.py:6185

3817

3822

msgid ""

3818

3823

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

3819

3824

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

3821

3826

"/path/to/newbranch."

3822

3827

msgstr ""

3823

3828

3824

#: bzrlib/builtins.py:6204

3829

#: bzrlib/builtins.py:6190

3825

3830

msgid ""

3826

3831

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

3827

3832

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

3828

3833

"that of the master."

3829

3834

msgstr ""

3830

3835

3831

#: bzrlib/builtins.py:6212

3836

#: bzrlib/builtins.py:6198

3832

3837

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

3833

3838

msgstr ""

3834

3839

3840

#: bzrlib/builtins.py:6201

3841

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

3842

msgstr ""

3843

3835

3844

#: bzrlib/builtins.py:6215

3836

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

3837

msgstr ""

3838

3839

#: bzrlib/builtins.py:6229

3840

3845

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

3841

3846

msgstr ""

3842

3847

3843

#: bzrlib/builtins.py:6242

3848

#: bzrlib/builtins.py:6228

3844

3849

msgid "cannot create branch without source branch"

3845

3850

msgstr ""

3846

3851

3847

#: bzrlib/builtins.py:6262

3852

#: bzrlib/builtins.py:6253

3848

3853

msgid "Manage filtered views."

3849

3854

msgstr ""

3850

3855

3851

#: bzrlib/builtins.py:6264

3856

#: bzrlib/builtins.py:6255

3852

3857

msgid ""

3853

3858

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

3854

3859

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

3858

3863

"must be within the current view."

3859

3864

msgstr ""

3860

3865

3861

#: bzrlib/builtins.py:6271

3866

#: bzrlib/builtins.py:6262

3862

3867

msgid ""

3863

3868

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

3864

3869

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

3866

3871

"and switch between them."

3867

3872

msgstr ""

3868

3873

3869

#: bzrlib/builtins.py:6276

3874

#: bzrlib/builtins.py:6267

3870

3875

msgid ""

3871

3876

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

3872

3877

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

3874

3879

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

3875

3880

msgstr ""

3876

3881

3877

#: bzrlib/builtins.py:6281

3882

#: bzrlib/builtins.py:6272

3878

3883

msgid ""

3879

3884

":Examples:\n"

3880

3885

" To define the current view::"

3881

3886

msgstr ""

3882

3887

3883

#: bzrlib/builtins.py:6284

3888

#: bzrlib/builtins.py:6275

3884

3889

msgid " bzr view file1 dir1 ..."

3885

3890

msgstr ""

3886

3891

3887

#: bzrlib/builtins.py:6286

3892

#: bzrlib/builtins.py:6277

3888

3893

msgid " To list the current view::"

3889

3894

msgstr ""

3890

3895

3891

#: bzrlib/builtins.py:6288

3896

#: bzrlib/builtins.py:6279

3892

3897

msgid " bzr view"

3893

3898

msgstr ""

3894

3899

3895

#: bzrlib/builtins.py:6290

3900

#: bzrlib/builtins.py:6281

3896

3901

msgid " To delete the current view::"

3897

3902

msgstr ""

3898

3903

3899

#: bzrlib/builtins.py:6292

3904

#: bzrlib/builtins.py:6283

3900

3905

msgid " bzr view --delete"

3901

3906

msgstr ""

3902

3907

3903

#: bzrlib/builtins.py:6294

3908

#: bzrlib/builtins.py:6285

3904

3909

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

3905

3910

msgstr ""

3906

3911

3907

#: bzrlib/builtins.py:6296

3912

#: bzrlib/builtins.py:6287

3908

3913

msgid " bzr view --switch off"

3909

3914

msgstr ""

3910

3915

3911

#: bzrlib/builtins.py:6298

3916

#: bzrlib/builtins.py:6289

3912

3917

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

3913

3918

msgstr ""

3914

3919

3915

#: bzrlib/builtins.py:6300

3920

#: bzrlib/builtins.py:6291

3916

3921

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

3917

3922

msgstr ""

3918

3923

3919

#: bzrlib/builtins.py:6302

3924

#: bzrlib/builtins.py:6293

3920

3925

msgid " To list a named view::"

3921

3926

msgstr ""

3922

3927

3923

#: bzrlib/builtins.py:6304

3928

#: bzrlib/builtins.py:6295

3924

3929

msgid " bzr view --name view-name"

3925

3930

msgstr ""

3926

3931

3927

#: bzrlib/builtins.py:6306

3932

#: bzrlib/builtins.py:6297

3928

3933

msgid " To delete a named view::"

3929

3934

msgstr ""

3930

3935

3931

#: bzrlib/builtins.py:6308

3936

#: bzrlib/builtins.py:6299

3932

3937

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

3933

3938

msgstr ""

3934

3939

3935

#: bzrlib/builtins.py:6310

3940

#: bzrlib/builtins.py:6301

3936

3941

msgid " To switch to a named view::"

3937

3942

msgstr ""

3938

3943

3939

#: bzrlib/builtins.py:6312

3944

#: bzrlib/builtins.py:6303

3940

3945

msgid " bzr view --switch view-name"

3941

3946

msgstr ""

3942

3947

3943

#: bzrlib/builtins.py:6314

3948

#: bzrlib/builtins.py:6305

3944

3949

msgid " To list all views defined::"

3945

3950

msgstr ""

3946

3951

3947

#: bzrlib/builtins.py:6316

3952

#: bzrlib/builtins.py:6307

3948

3953

msgid " bzr view --all"

3949

3954

msgstr ""

3950

3955

3951

#: bzrlib/builtins.py:6318

3956

#: bzrlib/builtins.py:6309

3952

3957

msgid " To delete all views::"

3953

3958

msgstr ""

3954

3959

3955

#: bzrlib/builtins.py:6320

3960

#: bzrlib/builtins.py:6311

3956

3961

msgid " bzr view --delete --all"

3957

3962

msgstr ""

3958

3963

3959

#: bzrlib/builtins.py:6327

3964

#: bzrlib/builtins.py:6318

3960

3965

msgid "Apply list or delete action to all views."

3961

3966

msgstr ""

3962

3967

3963

#: bzrlib/builtins.py:6330

3968

#: bzrlib/builtins.py:6321

3964

3969

msgid "Delete the view."

3965

3970

msgstr ""

3966

3971

3967

#: bzrlib/builtins.py:6333

3972

#: bzrlib/builtins.py:6324

3968

3973

msgid "Name of the view to define, list or delete."

3969

3974

msgstr ""

3970

3975

3971

#: bzrlib/builtins.py:6337

3976

#: bzrlib/builtins.py:6328

3972

3977

msgid "Name of the view to switch to."

3973

3978

msgstr ""

3974

3979

3975

#: bzrlib/builtins.py:6356

3980

#: bzrlib/builtins.py:6347

3976

3981

msgid "Both --delete and a file list specified"

3977

3982

msgstr ""

3978

3983

3979

#: bzrlib/builtins.py:6359

3984

#: bzrlib/builtins.py:6350

3980

3985

msgid "Both --delete and --switch specified"

3981

3986

msgstr ""

3982

3987

3983

#: bzrlib/builtins.py:6362

3988

#: bzrlib/builtins.py:6353

3984

3989

msgid "Deleted all views.\n"

3985

3990

msgstr ""

3986

3991

3987

#: bzrlib/builtins.py:6364

3992

#: bzrlib/builtins.py:6355

3988

3993

msgid "No current view to delete"

3989

3994

msgstr ""

3990

3995

3991

#: bzrlib/builtins.py:6367

3996

#: bzrlib/builtins.py:6358

3992

3997

#, python-format

3993

3998

msgid "Deleted '%s' view.\n"

3994

3999

msgstr ""

3995

4000

3996

#: bzrlib/builtins.py:6371

4001

#: bzrlib/builtins.py:6362

3997

4002

msgid "Both --switch and a file list specified"

3998

4003

msgstr ""

3999

4004

4000

#: bzrlib/builtins.py:6374

4005

#: bzrlib/builtins.py:6365

4001

4006

msgid "Both --switch and --all specified"

4002

4007

msgstr ""

4003

4008

4004

#: bzrlib/builtins.py:6377

4009

#: bzrlib/builtins.py:6368

4005

4010

msgid "No current view to disable"

4006

4011

msgstr ""

4007

4012

4008

#: bzrlib/builtins.py:6379

4013

#: bzrlib/builtins.py:6370

4009

4014

#, python-format

4010

4015

msgid "Disabled '%s' view.\n"

4011

4016

msgstr ""

4012

4017

4013

#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405

4018

#: bzrlib/builtins.py:6374 bzrlib/builtins.py:6396

4014

4019

msgid "Using '{0}' view: {1}\n"

4015

4020

msgstr ""

4016

4021

4022

#: bzrlib/builtins.py:6377

4023

msgid "Views defined:\n"

4024

msgstr ""

4025

4017

4026

#: bzrlib/builtins.py:6386

4018

msgid "Views defined:\n"

4019

msgstr ""

4020

4021

#: bzrlib/builtins.py:6395

4022

4027

msgid "No views defined.\n"

4023

4028

msgstr ""

4024

4029

4025

#: bzrlib/builtins.py:6402

4030

#: bzrlib/builtins.py:6393

4026

4031

msgid "Cannot change the 'off' pseudo view"

4027

4032

msgstr ""

4028

4033

4029

#: bzrlib/builtins.py:6410

4034

#: bzrlib/builtins.py:6401

4030

4035

msgid "No current view.\n"

4031

4036

msgstr ""

4032

4037

4033

#: bzrlib/builtins.py:6413

4038

#: bzrlib/builtins.py:6404

4034

4039

msgid "'{0}' view is: {1}\n"

4035

4040

msgstr ""

4036

4041

4037

#: bzrlib/builtins.py:6433

4042

#: bzrlib/builtins.py:6424

4038

4043

msgid " <no hooks installed>\n"

4039

4044

msgstr ""

4040

4045

4041

#: bzrlib/builtins.py:6437

4046

#: bzrlib/builtins.py:6428

4042

4047

msgid "Remove a branch."

4043

4048

msgstr ""

4044

4049

4045

#: bzrlib/builtins.py:6439

4050

#: bzrlib/builtins.py:6430

4046

4051

msgid ""

4047

4052

"This will remove the branch from the specified location but \n"

4048

4053

"will keep any working tree or repository in place."

4049

4054

msgstr ""

4050

4055

4051

#: bzrlib/builtins.py:6444

4056

#: bzrlib/builtins.py:6435

4052

4057

msgid " Remove the branch at repo/trunk::"

4053

4058

msgstr ""

4054

4059

4055

#: bzrlib/builtins.py:6446

4060

#: bzrlib/builtins.py:6437

4056

4061

msgid " bzr remove-branch repo/trunk"

4057

4062

msgstr ""

4058

4063

4059

#: bzrlib/builtins.py:6461

4064

#: bzrlib/builtins.py:6444

4065

msgid "Remove branch even if it is the active branch."

4066

msgstr ""

4067

4068

#: bzrlib/builtins.py:6458

4069

msgid "Branch is active. Use --force to remove it."

4070

msgstr ""

4071

4072

#: bzrlib/builtins.py:6462

4060

4073

msgid "Plaintext diff output."

4061

4074

msgstr ""

4062

4075

4063

#: bzrlib/builtins.py:6462

4076

#: bzrlib/builtins.py:6463

4064

4077

msgid "Temporarily set aside some changes from the current tree."

4065

4078

msgstr ""

4066

4079

4067

#: bzrlib/builtins.py:6464

4080

#: bzrlib/builtins.py:6465

4068

4081

msgid ""

4069

4082

"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"

4070

4083

"ie. out of the way, until a later time when you can bring them back from\n"

4073

4086

"will they survive its deletion."

4074

4087

msgstr ""

4075

4088

4076

#: bzrlib/builtins.py:6470

4089

#: bzrlib/builtins.py:6471

4077

4090

msgid "If shelve --list is specified, previously-shelved changes are listed."

4078

4091

msgstr ""

4079

4092

4080

#: bzrlib/builtins.py:6472

4093

#: bzrlib/builtins.py:6473

4081

4094

msgid ""

4082

4095

"Shelve is intended to help separate several sets of changes that have\n"

4083

4096

"been inappropriately mingled. If you just want to get rid of all changes\n"

4085

4098

"shelve all text changes at once, use shelve --all."

4086

4099

msgstr ""

4087

4100

4088

#: bzrlib/builtins.py:6477

4101

#: bzrlib/builtins.py:6478

4089

4102

msgid ""

4090

4103

"If filenames are specified, only the changes to those files will be\n"

4091

4104

"shelved. Other files will be left untouched."

4092

4105

msgstr ""

4093

4106

4094

#: bzrlib/builtins.py:6480

4107

#: bzrlib/builtins.py:6481

4095

4108

msgid ""

4096

4109

"If a revision is specified, changes since that revision will be shelved."

4097

4110

msgstr ""

4098

4111

4099

#: bzrlib/builtins.py:6482

4112

#: bzrlib/builtins.py:6483

4100

4113

msgid ""

4101

4114

"You can put multiple items on the shelf, and by default, 'unshelve' will\n"

4102

4115

"restore the most recently shelved changes."

4103

4116

msgstr ""

4104

4117

4105

#: bzrlib/builtins.py:6485

4118

#: bzrlib/builtins.py:6486

4106

4119

msgid ""

4107

4120

"For complicated changes, it is possible to edit the changes in a separate\n"

4108

4121

"editor program to decide what the file remaining in the working copy\n"

4109

4122

"should look like. To do this, add the configuration option"

4110

4123

msgstr ""

4111

4124

4112

#: bzrlib/builtins.py:6489

4125

#: bzrlib/builtins.py:6490

4113

4126

msgid " change_editor = PROGRAM @new_path @old_path"

4114

4127

msgstr ""

4115

4128

4116

#: bzrlib/builtins.py:6491

4129

#: bzrlib/builtins.py:6492

4117

4130

msgid ""

4118

4131

"where @new_path is replaced with the path of the new version of the \n"

4119

4132

"file and @old_path is replaced with the path of the old version of \n"

4122

4135

" "

4123

4136

msgstr ""

4124

4137

4125

#: bzrlib/builtins.py:6503

4138

#: bzrlib/builtins.py:6504

4126

4139

msgid "Shelve all changes."

4127

4140

msgstr ""

4128

4141

4129

#: bzrlib/builtins.py:6505

4142

#: bzrlib/builtins.py:6506

4130

4143

msgid "Method to use for writing diffs."

4131

4144

msgstr ""

4132

4145

4133

#: bzrlib/builtins.py:6505

4146

#: bzrlib/builtins.py:6506

4134

4147

msgid "writer"

4135

4148

msgstr ""

4136

4149

4137

#: bzrlib/builtins.py:6509

4150

#: bzrlib/builtins.py:6510

4138

4151

msgid "List shelved changes."

4139

4152

msgstr ""

4140

4153

4141

#: bzrlib/builtins.py:6511

4154

#: bzrlib/builtins.py:6512

4142

4155

msgid "Destroy removed changes instead of shelving them."

4143

4156

msgstr ""

4144

4157

4145

#: bzrlib/builtins.py:6540

4158

#: bzrlib/builtins.py:6541

4146

4159

msgid "No shelved changes."

4147

4160

msgstr ""

4148

4161

4149

#: bzrlib/builtins.py:6551

4162

#: bzrlib/builtins.py:6552

4150

4163

msgid "Restore shelved changes."

4151

4164

msgstr ""

4152

4165

4153

#: bzrlib/builtins.py:6553

4166

#: bzrlib/builtins.py:6554

4154

4167

msgid ""

4155

4168

"By default, the most recently shelved changes are restored. However if you\n"

4156

4169

"specify a shelf by id those changes will be restored instead. This works\n"

4157

4170

"best when the changes don't depend on each other."

4158

4171

msgstr ""

4159

4172

4160

#: bzrlib/builtins.py:6562

4173

#: bzrlib/builtins.py:6563

4161

4174

msgid "The action to perform."

4162

4175

msgstr ""

4163

4176

4164

#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694

4177

#: bzrlib/builtins.py:6563 bzrlib/conflicts.py:694

4165

4178

msgid "action"

4166

4179

msgstr ""

4167

4180

4168

#: bzrlib/builtins.py:6564

4181

#: bzrlib/builtins.py:6565

4169

4182

msgid "Apply changes and remove from the shelf."

4170

4183

msgstr ""

4171

4184

4172

#: bzrlib/builtins.py:6565

4185

#: bzrlib/builtins.py:6566

4173

4186

msgid "Show changes, but do not apply or remove them."

4174

4187

msgstr ""

4175

4188

4176

#: bzrlib/builtins.py:6566

4189

#: bzrlib/builtins.py:6567

4177

4190

msgid ""

4178

4191

"Instead of unshelving the changes, show the diff that would result from "

4179

4192

"unshelving."

4180

4193

msgstr ""

4181

4194

4182

#: bzrlib/builtins.py:6568

4195

#: bzrlib/builtins.py:6569

4183

4196

msgid "Delete changes without applying them."

4184

4197

msgstr ""

4185

4198

4186

#: bzrlib/builtins.py:6569

4199

#: bzrlib/builtins.py:6570

4187

4200

msgid "Apply changes but don't delete them."

4188

4201

msgstr ""

4189

4202

4190

#: bzrlib/builtins.py:6584

4203

#: bzrlib/builtins.py:6585

4191

4204

msgid "Remove unwanted files from working tree."

4192

4205

msgstr ""

4193

4206

4194

#: bzrlib/builtins.py:6586

4207

#: bzrlib/builtins.py:6587

4195

4208

msgid ""

4196

4209

"By default, only unknown files, not ignored files, are deleted. Versioned\n"

4197

4210

"files are never deleted."

4198

4211

msgstr ""

4199

4212

4200

#: bzrlib/builtins.py:6589

4213

#: bzrlib/builtins.py:6590

4201

4214

msgid ""

4202

4215

"Another class is 'detritus', which includes files emitted by bzr during\n"

4203

4216

"normal operations and selftests. (The value of these files decreases with\n"

4204

4217

"time.)"

4205

4218

msgstr ""

4206

4219

4207

#: bzrlib/builtins.py:6593

4220

#: bzrlib/builtins.py:6594

4208

4221

msgid ""

4209

4222

"If no options are specified, unknown files are deleted. Otherwise, option\n"

4210

4223

"flags are respected, and may be combined."

4211

4224

msgstr ""

4212

4225

4213

#: bzrlib/builtins.py:6596

4226

#: bzrlib/builtins.py:6597

4214

4227

msgid "To check what clean-tree will do, use --dry-run."

4215

4228

msgstr ""

4216

4229

4217

#: bzrlib/builtins.py:6599

4230

#: bzrlib/builtins.py:6600

4218

4231

msgid "Delete all ignored files."

4219

4232

msgstr ""

4220

4233

4221

#: bzrlib/builtins.py:6600

4234

#: bzrlib/builtins.py:6601

4222

4235

msgid ""

4223

4236

"Delete conflict files, merge and revert backups, and failed selftest dirs."

4224

4237

msgstr ""

4225

4238

4226

#: bzrlib/builtins.py:6603

4239

#: bzrlib/builtins.py:6604

4227

4240

msgid "Delete files unknown to bzr (default)."

4228

4241

msgstr ""

4229

4242

4230

#: bzrlib/builtins.py:6604

4243

#: bzrlib/builtins.py:6605

4231

4244

msgid "Show files to delete instead of deleting them."

4232

4245

msgstr ""

4233

4246

4234

#: bzrlib/builtins.py:6606

4247

#: bzrlib/builtins.py:6607

4235

4248

msgid "Do not prompt before deleting."

4236

4249

msgstr ""

4237

4250

4291

4304

msgstr[0] ""

4292

4305

msgstr[1] ""

4293

4306

4294

#: bzrlib/bzrdir.py:490

4307

#: bzrlib/bzrdir.py:486

4295

4308

msgid ""

4296

4309

"making backup of {0}\n"

4297

4310

" to {1}"

4298

4311

msgstr ""

4299

4312

4300

#: bzrlib/bzrdir.py:513

4313

#: bzrlib/bzrdir.py:509

4301

4314

msgid "renamed {0} to {1}"

4302

4315

msgstr ""

4303

4316

4304

#: bzrlib/bzrdir.py:1652

4317

#: bzrlib/bzrdir.py:1638

4305

4318

#, python-format

4306

4319

msgid ""

4307

4320

"Source repository format does not support stacking, using format:\n"

4308

4321

" %s"

4309

4322

msgstr ""

4310

4323

4311

#: bzrlib/bzrdir.py:1672

4324

#: bzrlib/bzrdir.py:1658

4312

4325

#, python-format

4313

4326

msgid ""

4314

4327

"Source branch format does not support stacking, using format:\n"

4315

4328

" %s"

4316

4329

msgstr ""

4317

4330

4318

#: bzrlib/bzrdir.py:1818

4331

#: bzrlib/bzrdir.py:1804

4319

4332

msgid "starting repository conversion"

4320

4333

msgstr ""

4321

4334

4322

#: bzrlib/bzrdir.py:2039

4335

#: bzrlib/bzrdir.py:2025

4323

4336

msgid "Using default stacking branch {0} at {1}"

4324

4337

msgstr ""

4325

4338

4622

4635

msgid ":See also: %s"

4623

4636

msgstr ""

4624

4637

4625

#: bzrlib/commands.py:816 bzrlib/gpg.py:324

4638

#: bzrlib/commands.py:826 bzrlib/gpg.py:347

4626

4639

msgid "Only ASCII permitted in option names"

4627

4640

msgstr ""

4628

4641

4629

#: bzrlib/commands.py:841 bzrlib/commands.py:849

4642

#: bzrlib/commands.py:851 bzrlib/commands.py:859

4630

4643

msgid "command {0!r} needs one or more {1}"

4631

4644

msgstr ""

4632

4645

4633

#: bzrlib/commands.py:858

4646

#: bzrlib/commands.py:868

4634

4647

msgid "command {0!r} requires argument {1}"

4635

4648

msgstr ""

4636

4649

4637

#: bzrlib/commands.py:865

4650

#: bzrlib/commands.py:875

4638

4651

msgid "extra argument to command {0}: {1}"

4639

4652

msgstr ""

4640

4653

4641

#: bzrlib/commands.py:962

4654

#: bzrlib/commands.py:972

4642

4655

#, python-format

4643

4656

msgid "Profile data written to \"%s\"."

4644

4657

msgstr ""

4681

4694

msgid "renamed"

4682

4695

msgstr ""

4683

4696

4684

#: bzrlib/commit.py:977

4697

#: bzrlib/commit.py:976

4685

4698

msgid "unchanged"

4686

4699

msgstr ""

4687

4700

4688

#: bzrlib/commit.py:999

4701

#: bzrlib/commit.py:998

4689

4702

msgid "{0} [{1}] - Stage"

4690

4703

msgstr ""

4691

4704

4692

#: bzrlib/commit.py:1002

4705

#: bzrlib/commit.py:1001

4693

4706

#, python-format

4694

4707

msgid "%s - Stage"

4695

4708

msgstr ""

4696

4709

4710

#: bzrlib/commit_signature_commands.py:34

4711

msgid "Sign all commits by a given committer."

4712

msgstr ""

4713

4697

4714

#: bzrlib/commit_signature_commands.py:36

4698

msgid "Sign all commits by a given committer."

4699

msgstr ""

4700

4701

#: bzrlib/commit_signature_commands.py:38

4702

4715

msgid ""

4703

4716

"If location is not specified the local tree is used.\n"

4704

4717

"If committer is not specified the default committer is used."

4705

4718

msgstr ""

4706

4719

4707

#: bzrlib/commit_signature_commands.py:41

4720

#: bzrlib/commit_signature_commands.py:39

4708

4721

msgid "This does not sign commits that already have signatures."

4709

4722

msgstr ""

4710

4723

4711

#: bzrlib/commit_signature_commands.py:49

4724

#: bzrlib/commit_signature_commands.py:47

4712

4725

msgid ""

4713

4726

"Don't actually sign anything, just print the revisions that would be signed."

4714

4727

msgstr ""

4715

4728

4729

#: bzrlib/commit_signature_commands.py:98

4730

#, python-format

4731

msgid "Signed %d revision.\n"

4732

msgid_plural "Signed %d revisions.\n"

4733

msgstr[0] ""

4734

msgstr[1] ""

4735

4716

4736

#: bzrlib/commit_signature_commands.py:103

4717

4737

msgid "Verify all commit signatures."

4718

4738

msgstr ""

4728

4748

"verification."

4729

4749

msgstr ""

4730

4750

4731

#: bzrlib/commit_signature_commands.py:147

4751

#: bzrlib/commit_signature_commands.py:148

4732

4752

msgid "Cannot verify a range of non-revision-history revisions"

4733

4753

msgstr ""

4734

4754

4735

#: bzrlib/commit_signature_commands.py:168

4755

#: bzrlib/commit_signature_commands.py:166

4736

4756

msgid "All commits signed with verifiable keys"

4737

4757

msgstr ""

4738

4758

4739

#: bzrlib/config.py:475

4759

#: bzrlib/config.py:436

4740

4760

msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."

4741

4761

msgstr ""

4742

4762

4743

#: bzrlib/config.py:2485

4763

#: bzrlib/config.py:2451

4744

4764

msgid "{0} is not an SI unit."

4745

4765

msgstr ""

4746

4766

4747

#: bzrlib/config.py:2949

4767

#: bzrlib/config.py:2970

4748

4768

msgid ""

4749

4769

"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "

4750

4770

"will be saved."

4751

4771

msgstr ""

4752

4772

4753

#: bzrlib/config.py:3093

4773

#: bzrlib/config.py:3114

4754

4774

#, python-format

4755

4775

msgid "Invalid '%s', should be of the form 'name=value'"

4756

4776

msgstr ""

4757

4777

4758

#: bzrlib/config.py:3962

4778

#: bzrlib/config.py:4004

4759

4779

msgid "Display, set or remove a configuration option."

4760

4780

msgstr ""

4761

4781

4762

#: bzrlib/config.py:3964

4782

#: bzrlib/config.py:4006

4763

4783

msgid "Display the active value for a given option."

4764

4784

msgstr ""

4765

4785

4766

#: bzrlib/config.py:3966

4786

#: bzrlib/config.py:4008

4767

4787

msgid ""

4768

4788

"If --all is specified, NAME is interpreted as a regular expression and all\n"

4769

4789

"matching options are displayed mentioning their scope. The active value\n"

4770

4790

"that bzr will take into account is the first one displayed for each option."

4771

4791

msgstr ""

4772

4792

4773

#: bzrlib/config.py:3970

4793

#: bzrlib/config.py:4012

4774

4794

msgid "If no NAME is given, --all .* is implied."

4775

4795

msgstr ""

4776

4796

4777

#: bzrlib/config.py:3972

4797

#: bzrlib/config.py:4014

4778

4798

msgid ""

4779

4799

"Setting a value is achieved by using name=value without spaces. The value\n"

4780

4800

"is set in the most relevant scope and can be checked by displaying the\n"

4781

4801

"option again."

4782

4802

msgstr ""

4783

4803

4784

#: bzrlib/config.py:3984

4804

#: bzrlib/config.py:4026

4785

4805

msgid "Reduce the scope to the specified configuration file."

4786

4806

msgstr ""

4787

4807

4788

#: bzrlib/config.py:3988

4808

#: bzrlib/config.py:4030

4789

4809

msgid "Display all the defined values for the matching options."

4790

4810

msgstr ""

4791

4811

4792

#: bzrlib/config.py:3990

4812

#: bzrlib/config.py:4032

4793

4813

msgid "Remove the option from the configuration file."

4794

4814

msgstr ""

4795

4815

4869

4889

msgstr[0] ""

4870

4890

msgstr[1] ""

4871

4891

4872

#: bzrlib/controldir.py:710

4892

#: bzrlib/controldir.py:712

4873

4893

msgid "{0} is{1} redirected to {2}"

4874

4894

msgstr ""

4875

4895

5086

5106

msgstr ""

5087

5107

5088

5108

#: bzrlib/errors.py:715

5109

msgid "Invalid branch name: %(name)s"

5110

msgstr ""

5111

5112

#: bzrlib/errors.py:724

5089

5113

msgid "Parent branch already exists: \"%(path)s\"."

5090

5114

msgstr ""

5091

5115

5092

#: bzrlib/errors.py:721

5116

#: bzrlib/errors.py:730

5093

5117

msgid ""

5094

5118

"Directory contains a branch, but no working tree (use bzr checkout if you "

5095

5119

"wish to build a working tree): \"%(path)s\""

5096

5120

msgstr ""

5097

5121

5098

#: bzrlib/errors.py:726

5122

#: bzrlib/errors.py:735

5099

5123

msgid ""

5100

5124

"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""

5101

5125

msgstr ""

5102

5126

5103

#: bzrlib/errors.py:736

5127

#: bzrlib/errors.py:745

5104

5128

msgid ""

5105

5129

"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""

5106

5130

msgstr ""

5107

5131

5108

#: bzrlib/errors.py:746

5132

#: bzrlib/errors.py:755

5109

5133

msgid "No repository present: \"%(path)s\""

5110

5134

msgstr ""

5111

5135

5112

#: bzrlib/errors.py:753

5136

#: bzrlib/errors.py:762

5113

5137

msgid ""

5114

5138

"Unsupported branch format: %(format)s\n"

5115

5139

"Please run 'bzr upgrade'"

5116

5140

msgstr ""

5117

5141

5118

#: bzrlib/errors.py:759

5142

#: bzrlib/errors.py:768

5119

5143

msgid "Unknown %(kind)s format: %(format)r"

5120

5144

msgstr ""

5121

5145

5122

#: bzrlib/errors.py:768

5146

#: bzrlib/errors.py:777

5123

5147

msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."

5124

5148

msgstr ""

5125

5149

5126

#: bzrlib/errors.py:778

5150

#: bzrlib/errors.py:787

5127

5151

msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"

5128

5152

msgstr ""

5129

5153

5130

#: bzrlib/errors.py:793

5154

#: bzrlib/errors.py:802

5131

5155

msgid ""

5132

5156

"%(target)s\n"

5133

5157

"is not compatible with\n"

5135

5159

"%(details)s"

5136

5160

msgstr ""

5137

5161

5138

#: bzrlib/errors.py:809

5162

#: bzrlib/errors.py:818

5139

5163

msgid "Revision is not compatible with %(repo_format)s"

5140

5164

msgstr ""

5141

5165

5142

#: bzrlib/errors.py:819

5166

#: bzrlib/errors.py:828

5143

5167

msgid "%(context_info)s%(path)s is already versioned."

5144

5168

msgstr ""

5145

5169

5146

#: bzrlib/errors.py:840

5170

#: bzrlib/errors.py:849

5147

5171

msgid "%(context_info)s%(path)s is not versioned."

5148

5172

msgstr ""

5149

5173

5150

#: bzrlib/errors.py:861

5174

#: bzrlib/errors.py:870

5151

5175

msgid "Path(s) are not versioned: %(paths_as_string)s"

5152

5176

msgstr ""

5153

5177

5154

#: bzrlib/errors.py:872

5178

#: bzrlib/errors.py:881

5155

5179

msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"

5156

5180

msgstr ""

5157

5181

5158

#: bzrlib/errors.py:891

5182

#: bzrlib/errors.py:900

5159

5183

msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""

5160

5184

msgstr ""

5161

5185

5162

#: bzrlib/errors.py:899

5186

#: bzrlib/errors.py:908

5163

5187

msgid ""

5164

5188

"Filename %(filename)r is not valid in your current filesystem encoding "

5165

5189

"%(fs_encoding)s"

5166

5190

msgstr ""

5167

5191

5168

#: bzrlib/errors.py:910

5192

#: bzrlib/errors.py:919

5169

5193

msgid "Cannot operate on \"%(filename)s\" because it is a control file"

5170

5194

msgstr ""

5171

5195

5172

#: bzrlib/errors.py:928

5196

#: bzrlib/errors.py:937

5173

5197

msgid "The lock for '%(lock_description)s' is in use and cannot be broken."

5174

5198

msgstr ""

5175

5199

5176

#: bzrlib/errors.py:967

5200

#: bzrlib/errors.py:976

5177

5201

msgid "Cannot lock %(lock)s: %(why)s"

5178

5202

msgstr ""

5179

5203

5180

#: bzrlib/errors.py:977

5204

#: bzrlib/errors.py:986

5181

5205

msgid ""

5182

5206

"A transaction related operation was attempted after the transaction finished."

5183

5207

msgstr ""

5184

5208

5185

#: bzrlib/errors.py:1004

5209

#: bzrlib/errors.py:1013

5186

5210

msgid "Cannot lock: transport is read only: %(transport)s"

5187

5211

msgstr ""

5188

5212

5189

#: bzrlib/errors.py:1012

5213

#: bzrlib/errors.py:1021

5190

5214

msgid "Could not acquire lock \"%(lock)s\": %(msg)s"

5191

5215

msgstr ""

5192

5216

5193

#: bzrlib/errors.py:1023

5217

#: bzrlib/errors.py:1032

5194

5218

msgid ""

5195

5219

"Lock was broken while still open: %(lock)s - check storage consistency!"

5196

5220

msgstr ""

5197

5221

5198

#: bzrlib/errors.py:1034

5222

#: bzrlib/errors.py:1043

5199

5223

msgid ""

5200

5224

"Lock was released and re-acquired before being broken: %(lock)s: held by "

5201

5225

"%(holder)r, wanted to break %(target)r"

5202

5226

msgstr ""

5203

5227

5204

#: bzrlib/errors.py:1046

5228

#: bzrlib/errors.py:1055

5205

5229

msgid ""

5206

5230

"Lock is apparently held, but corrupted: %(corruption_info)s\n"

5207

5231

"Use 'bzr break-lock' to clear it"

5208

5232

msgstr ""

5209

5233

5210

#: bzrlib/errors.py:1059

5234

#: bzrlib/errors.py:1068

5211

5235

msgid "Lock not held: %(lock)s"

5212

5236

msgstr ""

5213

5237

5214

#: bzrlib/errors.py:1088

5238

#: bzrlib/errors.py:1097

5215

5239

msgid "No changes to commit"

5216

5240

msgstr ""

5217

5241

5218

#: bzrlib/errors.py:1093

5242

#: bzrlib/errors.py:1102

5219

5243

msgid ""

5220

5244

"Selected-file commit of merges is not supported yet: files %(files_str)s"

5221

5245

msgstr ""

5222

5246

5223

#: bzrlib/errors.py:1103

5247

#: bzrlib/errors.py:1112

5224

5248

msgid ""

5225

5249

"Excluding paths during commit is not supported by repository at "

5226

5250

"%(repository)r."

5227

5251

msgstr ""

5228

5252

5229

#: bzrlib/errors.py:1112

5253

#: bzrlib/errors.py:1121

5230

5254

msgid ""

5231

5255

"The specified commit message contains characters unsupported by the current "

5232

5256

"encoding."

5233

5257

msgstr ""

5234

5258

5235

#: bzrlib/errors.py:1118

5259

#: bzrlib/errors.py:1127

5236

5260

msgid "Upgrade URL cannot work with readonly URLs."

5237

5261

msgstr ""

5238

5262

5239

#: bzrlib/errors.py:1123

5263

#: bzrlib/errors.py:1132

5240

5264

msgid "The branch format %(format)s is already at the most recent format."

5241

5265

msgstr ""

5242

5266

5243

#: bzrlib/errors.py:1146

5267

#: bzrlib/errors.py:1155

5244

5268

msgid "Option --change does not accept revision ranges"

5245

5269

msgstr ""

5246

5270

5247

#: bzrlib/errors.py:1151

5271

#: bzrlib/errors.py:1160

5248

5272

msgid "No namespace registered for string: %(spec)r"

5249

5273

msgstr ""

5250

5274

5251

#: bzrlib/errors.py:1170

5275

#: bzrlib/errors.py:1179

5252

5276

msgid ""

5253

5277

"Requested revision: '%(spec)s' does not exist in branch: "

5254

5278

"%(branch_url)s%(extra)s"

5255

5279

msgstr ""

5256

5280

5257

#: bzrlib/errors.py:1184

5281

#: bzrlib/errors.py:1193

5258

5282

msgid ""

5259

5283

"Operation denied because it would change the main history, which is not "

5260

5284

"permitted by the append_revisions_only setting on branch \"%(location)s\"."

5261

5285

msgstr ""

5262

5286

5263

#: bzrlib/errors.py:1195

5287

#: bzrlib/errors.py:1204

5264

5288

msgid ""

5265

5289

"These branches have diverged. Use the missing command to see how.\n"

5266

5290

"Use the merge command to reconcile them."

5267

5291

msgstr ""

5268

5292

5269

#: bzrlib/errors.py:1215

5293

#: bzrlib/errors.py:1224

5270

5294

msgid ""

5271

5295

"Branches have no common ancestor, and no merge base revision was specified."

5272

5296

msgstr ""

5273

5297

5274

#: bzrlib/errors.py:1221

5298

#: bzrlib/errors.py:1230

5275

5299

msgid ""

5276

5300

"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."

5277

5301

msgstr ""

5278

5302

5279

#: bzrlib/errors.py:1227

5303

#: bzrlib/errors.py:1236

5280

5304

msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"

5281

5305

msgstr ""

5282

5306

5283

#: bzrlib/errors.py:1236

5307

#: bzrlib/errors.py:1245

5284

5308

msgid ""

5285

5309

"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."

5286

5310

msgstr ""

5287

5311

5288

#: bzrlib/errors.py:1245

5312

#: bzrlib/errors.py:1254

5289

5313

msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"

5290

5314

msgstr ""

5291

5315

5292

#: bzrlib/errors.py:1254

5316

#: bzrlib/errors.py:1263

5293

5317

msgid "Branch %(branch)s has no commits."

5294

5318

msgstr ""

5295

5319

5296

#: bzrlib/errors.py:1272

5320

#: bzrlib/errors.py:1281

5297

5321

msgid ""

5298

5322

"Bound branch %(branch)s is out of date with master branch "

5299

5323

"%(master)s.%(extra_help)s"

5300

5324

msgstr ""

5301

5325

5302

#: bzrlib/errors.py:1284

5326

#: bzrlib/errors.py:1293

5303

5327

msgid ""

5304

5328

"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "

5305

5329

"bound to %(remote)s."

5306

5330

msgstr ""

5307

5331

5308

#: bzrlib/errors.py:1296

5332

#: bzrlib/errors.py:1305

5309

5333

msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"

5310

5334

msgstr ""

5311

5335

5312

#: bzrlib/errors.py:1305

5336

#: bzrlib/errors.py:1314

5313

5337

msgid ""

5314

5338

"Unable to connect to target of bound branch %(branch)s => %(target)s: "

5315

5339

"%(error)s"

5316

5340

msgstr ""

5317

5341

5318

#: bzrlib/errors.py:1317

5342

#: bzrlib/errors.py:1326

5319

5343

msgid "Error in processing weave: %(msg)s"

5320

5344

msgstr ""

5321

5345

5322

#: bzrlib/errors.py:1326

5346

#: bzrlib/errors.py:1335

5323

5347

msgid "Revision {%(revision_id)s} already present in %(weave)s"

5324

5348

msgstr ""

5325

5349

5326

#: bzrlib/errors.py:1337

5350

#: bzrlib/errors.py:1346

5327

5351

msgid "Revision {%(revision_id)s} not present in %(weave)s"

5328

5352

msgstr ""

5329

5353

5330

#: bzrlib/errors.py:1347

5354

#: bzrlib/errors.py:1356

5331

5355

msgid "Weave invariant violated: %(what)s"

5332

5356

msgstr ""

5333

5357

5334

#: bzrlib/errors.py:1356

5358

#: bzrlib/errors.py:1365

5335

5359

msgid "Parents are mismatched between two revisions. %(msg)s"

5336

5360

msgstr ""

5337

5361

5338

#: bzrlib/errors.py:1378

5362

#: bzrlib/errors.py:1387

5339

5363

msgid ""

5340

5364

"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "

5341

5365

"%(weave_b)s"

5342

5366

msgstr ""

5343

5367

5344

#: bzrlib/errors.py:1390

5368

#: bzrlib/errors.py:1399

5345

5369

msgid "Versioned file error"

5346

5370

msgstr ""

5347

5371

5348

#: bzrlib/errors.py:1395

5372

#: bzrlib/errors.py:1404

5349

5373

msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."

5350

5374

msgstr ""

5351

5375

5352

#: bzrlib/errors.py:1405

5376

#: bzrlib/errors.py:1414

5353

5377

msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."

5354

5378

msgstr ""

5355

5379

5356

#: bzrlib/errors.py:1415

5380

#: bzrlib/errors.py:1424

5357

5381

msgid "Text did not match its checksum: %(msg)s"

5358

5382

msgstr ""

5359

5383

5360

#: bzrlib/errors.py:1541

5384

#: bzrlib/errors.py:1550

5361

5385

msgid "Export format %(format)r not supported"

5362

5386

msgstr ""

5363

5387

5364

#: bzrlib/errors.py:1550

5388

#: bzrlib/errors.py:1559

5365

5389

msgid "Transport error: %(msg)s %(orig_error)s"

5366

5390

msgstr ""

5367

5391

5368

#: bzrlib/errors.py:1576

5392

#: bzrlib/errors.py:1585

5369

5393

msgid "Generic bzr smart protocol error: %(details)s"

5370

5394

msgstr ""

5371

5395

5372

#: bzrlib/errors.py:1584

5396

#: bzrlib/errors.py:1593

5373

5397

msgid "Received bad protocol version marker: %(marker)r"

5374

5398

msgstr ""

5375

5399

5376

#: bzrlib/errors.py:1616

5400

#: bzrlib/errors.py:1625

5377

5401

msgid "Transport operation not possible: %(msg)s %(orig_error)s"

5378

5402

msgstr ""

5379

5403

5380

#: bzrlib/errors.py:1621

5404

#: bzrlib/errors.py:1630

5381

5405

msgid "Connection error: %(msg)s %(orig_error)s"

5382

5406

msgstr ""

5383

5407

5384

#: bzrlib/errors.py:1626

5408

#: bzrlib/errors.py:1635

5385

5409

msgid "%(msg)s %(host)s%(port)s%(orig_error)s"

5386

5410

msgstr ""

5387

5411

5388

#: bzrlib/errors.py:1647

5412

#: bzrlib/errors.py:1656

5389

5413

msgid "Connection closed: %(msg)s %(orig_error)s"

5390

5414

msgstr ""

5391

5415

5392

#: bzrlib/errors.py:1652

5416

#: bzrlib/errors.py:1661

5393

5417

msgid "Connection Timeout: %(msg)s%(orig_error)s"

5394

5418

msgstr ""

5395

5419

5396

#: bzrlib/errors.py:1657

5420

#: bzrlib/errors.py:1666

5397

5421

msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"

5398

5422

msgstr ""

5399

5423

5400

#: bzrlib/errors.py:1667

5424

#: bzrlib/errors.py:1676

5401

5425

msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"

5402

5426

msgstr ""

5403

5427

5404

#: bzrlib/errors.py:1682

5428

#: bzrlib/errors.py:1691

5405

5429

msgid "Certificate error: %(error)s"

5406

5430

msgstr ""

5407

5431

5408

#: bzrlib/errors.py:1690

5432

#: bzrlib/errors.py:1699

5409

5433

msgid "Invalid http range %(range)r for %(path)s: %(msg)s"

5410

5434

msgstr ""

5411

5435

5412

#: bzrlib/errors.py:1704

5436

#: bzrlib/errors.py:1713

5413

5437

msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"

5414

5438

msgstr ""

5415

5439

5416

#: bzrlib/errors.py:1712

5440

#: bzrlib/errors.py:1721

5417

5441

msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"

5418

5442

msgstr ""

5419

5443

5420

#: bzrlib/errors.py:1721

5444

#: bzrlib/errors.py:1730

5421

5445

msgid "%(source)s is%(permanently)s redirected to %(target)s"

5422

5446

msgstr ""

5423

5447

5424

#: bzrlib/errors.py:1735

5448

#: bzrlib/errors.py:1744

5425

5449

msgid "Too many redirections"

5426

5450

msgstr ""

5427

5451

5428

#: bzrlib/errors.py:1740

5452

#: bzrlib/errors.py:1749

5429

5453

msgid "Working tree has conflicts."

5430

5454

msgstr ""

5431

5455

5432

#: bzrlib/errors.py:1744

5456

#: bzrlib/errors.py:1753

5433

5457

msgid "Config file %(filename)s is not UTF-8 encoded\n"

5434

5458

msgstr ""

5435

5459

5436

#: bzrlib/errors.py:1753

5460

#: bzrlib/errors.py:1762

5437

5461

msgid ""

5438

5462

"Error(s) parsing config file %(filename)s:\n"

5439

5463

"%(errors)s"

5440

5464

msgstr ""

5441

5465

5442

#: bzrlib/errors.py:1763

5466

#: bzrlib/errors.py:1772

5443

5467

msgid ""

5444

5468

"Bad value \"%(value)s\" for option \"%(name)s\".\n"

5445

5469

"See ``bzr help %(name)s``"

5446

5470

msgstr ""

5447

5471

5448

#: bzrlib/errors.py:1773

5472

#: bzrlib/errors.py:1782

5449

5473

msgid "%(username)r does not seem to contain a reasonable email address"

5450

5474

msgstr ""

5451

5475

5452

#: bzrlib/errors.py:1782

5476

#: bzrlib/errors.py:1791

5453

5477

msgid "Failed to GPG sign data with command \"%(command_line)s\""

5454

5478

msgstr ""

5455

5479

5456

#: bzrlib/errors.py:1790

5480

#: bzrlib/errors.py:1799

5457

5481

msgid "Failed to verify GPG signature data with error \"%(error)s\""

5458

5482

msgstr ""

5459

5483

5460

#: bzrlib/errors.py:1798

5484

#: bzrlib/errors.py:1807

5461

5485

msgid "Unable to import library \"%(library)s\": %(error)s"

5462

5486

msgstr ""

5463

5487

5464

#: bzrlib/errors.py:1806

5488

#: bzrlib/errors.py:1815

5465

5489

msgid "python-gpgme is not installed, it is needed to verify signatures"

5466

5490

msgstr ""

5467

5491

5468

#: bzrlib/errors.py:1814

5492

#: bzrlib/errors.py:1823

5469

5493

msgid ""

5470

5494

"The working tree for %(basedir)s has changed since the last commit, but "

5471

5495

"weave merge requires that it be unchanged"

5472

5496

msgstr ""

5473

5497

5474

#: bzrlib/errors.py:1824

5498

#: bzrlib/errors.py:1833

5475

5499

msgid ""

5476

5500

"Can't reprocess and show base, because reprocessing obscures the "

5477

5501

"relationship of conflicting lines to the base"

5478

5502

msgstr ""

5479

5503

5480

#: bzrlib/errors.py:1830

5504

#: bzrlib/errors.py:1839

5481

5505

msgid "Cycle in graph %(graph)r"

5482

5506

msgstr ""

5483

5507

5484

#: bzrlib/errors.py:1858

5508

#: bzrlib/errors.py:1867

5485

5509

msgid "File %(filename)s is not conflicted."

5486

5510

msgstr ""

5487

5511

5488

#: bzrlib/errors.py:1880

5512

#: bzrlib/errors.py:1889

5489

5513

msgid "No bundle was found in \"%(filename)s\"."

5490

5514

msgstr ""

5491

5515

5492

#: bzrlib/errors.py:1889

5516

#: bzrlib/errors.py:1898

5493

5517

msgid "Unable to handle bundle version %(version)s: %(msg)s"

5494

5518

msgstr ""

5495

5519

5496

#: bzrlib/errors.py:1899

5520

#: bzrlib/errors.py:1908

5497

5521

msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"

5498

5522

msgstr ""

5499

5523

5500

#: bzrlib/errors.py:1912

5524

#: bzrlib/errors.py:1921

5501

5525

msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"

5502

5526

msgstr ""

5503

5527

5504

#: bzrlib/errors.py:1922

5528

#: bzrlib/errors.py:1931

5505

5529

msgid "Key %(key)s is already present in map"

5506

5530

msgstr ""

5507

5531

5508

#: bzrlib/errors.py:1927

5532

#: bzrlib/errors.py:1936

5509

5533

msgid "The prefix %(prefix)s is in the help search path twice."

5510

5534

msgstr ""

5511

5535

5512

#: bzrlib/errors.py:1937

5536

#: bzrlib/errors.py:1946

5513

5537

msgid ""

5514

5538

"No final name for trans_id %(trans_id)r\n"

5515

5539

"file-id: %(file_id)r\n"

5516

5540

"root trans-id: %(root_trans_id)r\n"

5517

5541

msgstr ""

5518

5542

5519

#: bzrlib/errors.py:1969

5543

#: bzrlib/errors.py:1978

5520

5544

msgid "Attempt to reuse a transform that has already been applied."

5521

5545

msgstr ""

5522

5546

5523

#: bzrlib/errors.py:1974

5547

#: bzrlib/errors.py:1983

5524

5548

msgid "Moving the root directory is not supported at this time"

5525

5549

msgstr ""

5526

5550

5527

#: bzrlib/errors.py:1979

5551

#: bzrlib/errors.py:1988

5528

5552

msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"

5529

5553

msgstr ""

5530

5554

5531

#: bzrlib/errors.py:1990

5555

#: bzrlib/errors.py:1999

5532

5556

msgid ""

5533

5557

"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5534

5558

msgstr ""

5535

5559

5536

#: bzrlib/errors.py:2026

5560

#: bzrlib/errors.py:2035

5537

5561

msgid ""

5538

5562

"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5539

5563

msgstr ""

5540

5564

5541

#: bzrlib/errors.py:2056

5565

#: bzrlib/errors.py:2065

5542

5566

msgid "Unable to import paramiko (required for sftp support): %(error)s"

5543

5567

msgstr ""

5544

5568

5545

#: bzrlib/errors.py:2064

5569

#: bzrlib/errors.py:2073

5546

5570

msgid "Nothing to merge."

5547

5571

msgstr ""

5548

5572

5549

#: bzrlib/errors.py:2069

5573

#: bzrlib/errors.py:2078

5550

5574

msgid "Format %(format)s cannot be initialised by this version of bzr."

5551

5575

msgstr ""

5552

5576

5553

#: bzrlib/errors.py:2078

5577

#: bzrlib/errors.py:2087

5554

5578

msgid ""

5555

5579

"Cannot convert from format %(from_format)s to format %(format)s. "

5556

5580

"%(problem)s"

5557

5581

msgstr ""

5558

5582

5559

#: bzrlib/errors.py:2090

5583

#: bzrlib/errors.py:2099

5560

5584

msgid "Could not find an appropriate Differ for file \"%(path)s\""

5561

5585

msgstr ""

5562

5586

5563

#: bzrlib/errors.py:2098

5587

#: bzrlib/errors.py:2107

5564

5588

msgid "%(exe_name)s could not be found on this machine"

5565

5589

msgstr ""

5566

5590

5567

#: bzrlib/errors.py:2106

5591

#: bzrlib/errors.py:2115

5568

5592

msgid "Diff is not installed on this machine: %(msg)s"

5569

5593

msgstr ""

5570

5594

5571

#: bzrlib/errors.py:2114

5595

#: bzrlib/errors.py:2123

5572

5596

msgid "Diff3 is not installed on this machine."

5573

5597

msgstr ""

5574

5598

5575

#: bzrlib/errors.py:2120

5599

#: bzrlib/errors.py:2129

5576

5600

msgid "The content being inserted is already present."

5577

5601

msgstr ""

5578

5602

5579

#: bzrlib/errors.py:2125

5603

#: bzrlib/errors.py:2134

5580

5604

msgid ""

5581

5605

"This tree contains left-over files from a failed operation.\n"

5582

5606

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5584

5608

" keep, and delete it when you are done."

5585

5609

msgstr ""

5586

5610

5587

#: bzrlib/errors.py:2136

5611

#: bzrlib/errors.py:2145

5588

5612

msgid ""

5589

5613

"This tree contains left-over files from a failed operation.\n"

5590

5614

" Please examine %(pending_deletion)s to see if it contains any files you\n"

5591

5615

" wish to keep, and delete it when you are done."

5592

5616

msgstr ""

5593

5617

5594

#: bzrlib/errors.py:2146

5618

#: bzrlib/errors.py:2155

5595

5619

msgid ""

5596

5620

"Unable to delete transform temporary directory %(limbo_dir)s.\n"

5597

5621

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5599

5623

" keep, and delete it when you are done."

5600

5624

msgstr ""

5601

5625

5602

#: bzrlib/errors.py:2157

5626

#: bzrlib/errors.py:2166

5603

5627

msgid ""

5604

5628

"Unable to delete transform temporary directory %(pending_deletion)s. Please "

5605

5629

"examine %(pending_deletion)s to see if it contains any files you wish to "

5606

5630

"keep, and delete it when you are done."

5607

5631

msgstr ""

5608

5632

5609

#: bzrlib/errors.py:2167

5633

#: bzrlib/errors.py:2176

5610

5634

msgid "Working tree is out of date, please run 'bzr update'.%(more)s"

5611

5635

msgstr ""

5612

5636

5613

#: bzrlib/errors.py:2181

5637

#: bzrlib/errors.py:2190

5614

5638

msgid ""

5615

5639

"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."

5616

5640

msgstr ""

5617

5641

5618

#: bzrlib/errors.py:2194

5642

#: bzrlib/errors.py:2203

5619

5643

msgid "Error in merge modified format"

5620

5644

msgstr ""

5621

5645

5622

#: bzrlib/errors.py:2199

5646

#: bzrlib/errors.py:2208

5623

5647

msgid "Format error in conflict listings"

5624

5648

msgstr ""

5625

5649

5626

#: bzrlib/errors.py:2203

5650

#: bzrlib/errors.py:2212

5627

5651

msgid ""

5628

5652

"Inconsistency in dirstate file %(dirstate_path)s.\n"

5629

5653

"Error: %(description)s"

5630

5654

msgstr ""

5631

5655

5632

#: bzrlib/errors.py:2214

5656

#: bzrlib/errors.py:2223

5633

5657

msgid ""

5634

5658

"An error has been detected in the repository %(repo_path)s.\n"

5635

5659

"Please run bzr reconcile on this repository."

5636

5660

msgstr ""

5637

5661

5638

#: bzrlib/errors.py:2225

5662

#: bzrlib/errors.py:2234

5639

5663

msgid ""

5640

5664

"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"

5641

5665

"reason: %(reason)s"

5642

5666

msgstr ""

5643

5667

5644

#: bzrlib/errors.py:2238

5668

#: bzrlib/errors.py:2247

5645

5669

msgid ""

5646

5670

"An inconsistent delta was supplied: %(delta)r\n"

5647

5671

"reason: %(reason)s"

5648

5672

msgstr ""

5649

5673

5650

#: bzrlib/errors.py:2250

5674

#: bzrlib/errors.py:2259

5651

5675

msgid "To use this feature you must upgrade your branch at %(path)s."

5652

5676

msgstr ""

5653

5677

5654

#: bzrlib/errors.py:2259

5678

#: bzrlib/errors.py:2268

5655

5679

msgid "To use this feature you must upgrade your repository at %(path)s."

5656

5680

msgstr ""

5657

5681

5658

#: bzrlib/errors.py:2264

5682

#: bzrlib/errors.py:2273

5659

5683

msgid ""

5660

5684

"To use this feature you must upgrade your branch at %(path)s to a format "

5661

5685

"which supports rich roots."

5662

5686

msgstr ""

5663

5687

5664

#: bzrlib/errors.py:2270

5688

#: bzrlib/errors.py:2279

5665

5689

msgid "Cannot perform local-only commits on unbound branches."

5666

5690

msgstr ""

5667

5691

5668

#: bzrlib/errors.py:2275

5692

#: bzrlib/errors.py:2284

5669

5693

msgid "The method %(mname)s is not supported on objects of type %(tname)s."

5670

5694

msgstr ""

5671

5695

5672

#: bzrlib/errors.py:2296

5696

#: bzrlib/errors.py:2305

5673

5697

msgid "Ghost tags not supported by format %(format)r."

5674

5698

msgstr ""

5675

5699

5676

#: bzrlib/errors.py:2304

5700

#: bzrlib/errors.py:2313

5677

5701

msgid "File is binary but should be text."

5678

5702

msgstr ""

5679

5703

5680

#: bzrlib/errors.py:2309

5704

#: bzrlib/errors.py:2318

5681

5705

msgid "The path %(path)s is not permitted on this platform"

5682

5706

msgstr ""

5683

5707

5684

#: bzrlib/errors.py:2318

5708

#: bzrlib/errors.py:2327

5685

5709

msgid ""

5686

5710

"Testament did not match expected value.\n"

5687

5711

" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"

5688

5712

" {%(measured)s}"

5689

5713

msgstr ""

5690

5714

5691

#: bzrlib/errors.py:2330

5715

#: bzrlib/errors.py:2339

5692

5716

msgid "Not a bzr revision-bundle: %(text)r"

5693

5717

msgstr ""

5694

5718

5695

#: bzrlib/errors.py:2339

5719

#: bzrlib/errors.py:2348

5696

5720

msgid "Bad bzr revision-bundle: %(text)r"

5697

5721

msgstr ""

5698

5722

5699

#: bzrlib/errors.py:2348

5723

#: bzrlib/errors.py:2357

5700

5724

msgid "Malformed bzr revision-bundle header: %(text)r"

5701

5725

msgstr ""

5702

5726

5703

#: bzrlib/errors.py:2353

5727

#: bzrlib/errors.py:2362

5704

5728

msgid "Malformed patches in bzr revision-bundle: %(text)r"

5705

5729

msgstr ""

5706

5730

5707

#: bzrlib/errors.py:2358

5731

#: bzrlib/errors.py:2367

5708

5732

msgid "Malformed footer in bzr revision-bundle: %(text)r"

5709

5733

msgstr ""

5710

5734

5711

#: bzrlib/errors.py:2363

5735

#: bzrlib/errors.py:2372

5712

5736

msgid "End of line marker was not \\n in bzr revision-bundle"

5713

5737

msgstr ""

5714

5738

5715

#: bzrlib/errors.py:2373

5739

#: bzrlib/errors.py:2382

5716

5740

msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"

5717

5741

msgstr ""

5718

5742

5719

#: bzrlib/errors.py:2383

5743

#: bzrlib/errors.py:2392

5720

5744

msgid "Root class for inventory serialization errors"

5721

5745

msgstr ""

5722

5746

5723

#: bzrlib/errors.py:2387

5747

#: bzrlib/errors.py:2396

5724

5748

msgid ""

5725

5749

"The inventory was not in the expected format:\n"

5726

5750

" %(msg)s"

5727

5751

msgstr ""

5728

5752

5729

#: bzrlib/errors.py:2396

5753

#: bzrlib/errors.py:2405

5730

5754

msgid "This operation requires rich root data storage"

5731

5755

msgstr ""

5732

5756

5733

#: bzrlib/errors.py:2409

5757

#: bzrlib/errors.py:2418

5734

5758

msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"

5735

5759

msgstr ""

5736

5760

5737

#: bzrlib/errors.py:2418

5761

#: bzrlib/errors.py:2427

5738

5762

msgid ""

5739

5763

"Don't know how to handle SSH connections. Please set BZR_SSH environment "

5740

5764

"variable."

5741

5765

msgstr ""

5742

5766

5743

#: bzrlib/errors.py:2425

5767

#: bzrlib/errors.py:2434

5744

5768

msgid ""

5745

5769

"Could not determine revno for {%(revision_id)s} because its ancestry shows a "

5746

5770

"ghost at {%(ghost_revision_id)s}"

5747

5771

msgstr ""

5748

5772

5749

#: bzrlib/errors.py:2435

5773

#: bzrlib/errors.py:2444

5750

5774

msgid "Ghost revision {%(revision_id)s} cannot be used here."

5751

5775

msgstr ""

5752

5776

5753

#: bzrlib/errors.py:2486

5777

#: bzrlib/errors.py:2495

5754

5778

msgid ""

5755

5779

"A merge directive must provide either a bundle or a public branch location."

5756

5780

msgstr ""

5757

5781

5758

#: bzrlib/errors.py:2493

5782

#: bzrlib/errors.py:2502

5759

5783

msgid "Bad merge directive payload %(start)r"

5760

5784

msgstr ""

5761

5785

5762

#: bzrlib/errors.py:2503

5786

#: bzrlib/errors.py:2512

5763

5787

msgid "Preview patch does not match requested changes."

5764

5788

msgstr ""

5765

5789

5766

#: bzrlib/errors.py:2509

5790

#: bzrlib/errors.py:2518

5767

5791

msgid "Patch_type was %(patch_type)s, but no patch was supplied."

5768

5792

msgstr ""

5769

5793

5770

#: bzrlib/errors.py:2519

5794

#: bzrlib/errors.py:2528

5771

5795

msgid ""

5772

5796

"Your branch does not have all of the revisions required in order to merge "

5773

5797

"this merge directive and the target location specified in the merge "

5774

5798

"directive is not a branch: %(location)s."

5775

5799

msgstr ""

5776

5800

5777

#: bzrlib/errors.py:2531

5801

#: bzrlib/errors.py:2540

5778

5802

msgid "Unsupported entry kind %(kind)s"

5779

5803

msgstr ""

5780

5804

5781

#: bzrlib/errors.py:2539

5805

#: bzrlib/errors.py:2548

5782

5806

msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"

5783

5807

msgstr ""

5784

5808

5785

#: bzrlib/errors.py:2549

5809

#: bzrlib/errors.py:2558

5786

5810

msgid "Subsume target %(other_tree)s needs to be upgraded."

5787

5811

msgstr ""

5788

5812

5789

#: bzrlib/errors.py:2568

5813

#: bzrlib/errors.py:2577

5790

5814

msgid "No such tag: %(tag_name)s"

5791

5815

msgstr ""

5792

5816

5793

#: bzrlib/errors.py:2576

5817

#: bzrlib/errors.py:2585

5794

5818

msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."

5795

5819

msgstr ""

5796

5820

5797

#: bzrlib/errors.py:2585

5821

#: bzrlib/errors.py:2594

5798

5822

msgid "Tag %(tag_name)s already exists."

5799

5823

msgstr ""

5800

5824

5801

#: bzrlib/errors.py:2593

5825

#: bzrlib/errors.py:2602

5802

5826

msgid ""

5803

5827

"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "

5804

5828

"bugs\" for more information on this feature."

5805

5829

msgstr ""

5806

5830

5807

#: bzrlib/errors.py:2603

5831

#: bzrlib/errors.py:2612

5808

5832

msgid ""

5809

5833

"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"

5810

5834

msgstr ""

5811

5835

5812

#: bzrlib/errors.py:2613

5836

#: bzrlib/errors.py:2622

5813

5837

msgid ""

5814

5838

"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"

5815

5839

msgstr ""

5816

5840

5817

#: bzrlib/errors.py:2623

5841

#: bzrlib/errors.py:2632

5818

5842

msgid "Invalid line in bugs property: '%(line)s'"

5819

5843

msgstr ""

5820

5844

5821

#: bzrlib/errors.py:2631

5845

#: bzrlib/errors.py:2640

5822

5846

msgid "Invalid bug status: '%(status)s'"

5823

5847

msgstr ""

5824

5848

5825

#: bzrlib/errors.py:2639

5849

#: bzrlib/errors.py:2648

5826

5850

msgid "Could not understand response from smart server: %(response_tuple)r"

5827

5851

msgstr ""

5828

5852

5829

#: bzrlib/errors.py:2678

5853

#: bzrlib/errors.py:2687

5830

5854

msgid "Server sent an unexpected error: %(error_tuple)r"

5831

5855

msgstr ""

5832

5856

5833

#: bzrlib/errors.py:2697

5857

#: bzrlib/errors.py:2706

5834

5858

msgid "Unrecognised container format: %(container_format)r"

5835

5859

msgstr ""

5836

5860

5837

#: bzrlib/errors.py:2705

5861

#: bzrlib/errors.py:2714

5838

5862

msgid "Unexpected end of container stream"

5839

5863

msgstr ""

5840

5864

5841

#: bzrlib/errors.py:2710

5865

#: bzrlib/errors.py:2719

5842

5866

msgid "Unknown record type: %(record_type)r"

5843

5867

msgstr ""

5844

5868

5845

#: bzrlib/errors.py:2718

5869

#: bzrlib/errors.py:2727

5846

5870

msgid "Invalid record: %(reason)s"

5847

5871

msgstr ""

5848

5872

5849

#: bzrlib/errors.py:2726

5873

#: bzrlib/errors.py:2735

5850

5874

msgid "Container has data after end marker: %(excess)r"

5851

5875

msgstr ""

5852

5876

5853

#: bzrlib/errors.py:2734

5877

#: bzrlib/errors.py:2743

5854

5878

msgid "Container has multiple records with the same name: %(name)s"

5855

5879

msgstr ""

5856

5880

5857

#: bzrlib/errors.py:2747

5881

#: bzrlib/errors.py:2756

5858

5882

msgid "Corrupt or incompatible data stream: %(reason)s"

5859

5883

msgstr ""

5860

5884

5861

#: bzrlib/errors.py:2755

5885

#: bzrlib/errors.py:2764

5862

5886

msgid "SMTP error: %(error)s"

5863

5887

msgstr ""

5864

5888

5865

#: bzrlib/errors.py:2763

5889

#: bzrlib/errors.py:2772

5866

5890

msgid "No message supplied."

5867

5891

msgstr ""

5868

5892

5869

#: bzrlib/errors.py:2768

5893

#: bzrlib/errors.py:2777

5870

5894

msgid "No mail-to address (--mail-to) or output (-o) specified."

5871

5895

msgstr ""

5872

5896

5873

#: bzrlib/errors.py:2773

5874

msgid "Unknown mail client: %(mail_client)s"

5875

msgstr ""

5876

5877

#: bzrlib/errors.py:2781

5897

#: bzrlib/errors.py:2782

5878

5898

msgid ""

5879

5899

"Unable to find mail client with the following names: "

5880

5900

"%(mail_command_list_string)s"

5881

5901

msgstr ""

5882

5902

5883

#: bzrlib/errors.py:2791

5903

#: bzrlib/errors.py:2792

5884

5904

msgid "SMTP connection to %(host)s refused"

5885

5905

msgstr ""

5886

5906

5887

#: bzrlib/errors.py:2800

5907

#: bzrlib/errors.py:2801

5888

5908

msgid "Please specify smtp_server. No server at default %(host)s."

5889

5909

msgstr ""

5890

5910

5891

#: bzrlib/errors.py:2814

5911

#: bzrlib/errors.py:2815

5892

5912

msgid ""

5893

5913

"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"

5894

5914

"reconfigure."

5895

5915

msgstr ""

5896

5916

5897

#: bzrlib/errors.py:2826

5917

#: bzrlib/errors.py:2827

5898

5918

msgid "'%(display_url)s' is already a branch."

5899

5919

msgstr ""

5900

5920

5901

#: bzrlib/errors.py:2831

5921

#: bzrlib/errors.py:2832

5902

5922

msgid "'%(display_url)s' is already a tree."

5903

5923

msgstr ""

5904

5924

5905

#: bzrlib/errors.py:2836

5925

#: bzrlib/errors.py:2837

5906

5926

msgid "'%(display_url)s' is already a checkout."

5907

5927

msgstr ""

5908

5928

5909

#: bzrlib/errors.py:2841

5929

#: bzrlib/errors.py:2842

5910

5930

msgid "'%(display_url)s' is already a lightweight checkout."

5911

5931

msgstr ""

5912

5932

5913

#: bzrlib/errors.py:2846

5933

#: bzrlib/errors.py:2847

5914

5934

msgid "'%(display_url)s' is already using a shared repository."

5915

5935

msgstr ""

5916

5936

5917

#: bzrlib/errors.py:2851

5937

#: bzrlib/errors.py:2852

5918

5938

msgid "'%(display_url)s' is already standalone."

5919

5939

msgstr ""

5920

5940

5921

#: bzrlib/errors.py:2856

5941

#: bzrlib/errors.py:2857

5922

5942

msgid "Shared repository '%(display_url)s' already creates working trees."

5923

5943

msgstr ""

5924

5944

5925

#: bzrlib/errors.py:2862

5945

#: bzrlib/errors.py:2863

5926

5946

msgid ""

5927

5947

"Shared repository '%(display_url)s' already doesn't create working trees."

5928

5948

msgstr ""

5929

5949

5930

#: bzrlib/errors.py:2868

5950

#: bzrlib/errors.py:2869

5931

5951

msgid "Requested reconfiguration of '%(display_url)s' is not supported."

5932

5952

msgstr ""

5933

5953

5934

#: bzrlib/errors.py:2873

5954

#: bzrlib/errors.py:2874

5935

5955

msgid "No location could be found to bind to at %(display_url)s."

5936

5956

msgstr ""

5937

5957

5938

#: bzrlib/errors.py:2878

5958

#: bzrlib/errors.py:2879

5939

5959

msgid ""

5940

5960

"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "

5941

5961

"status).%(more)s"

5942

5962

msgstr ""

5943

5963

5944

#: bzrlib/errors.py:2897

5964

#: bzrlib/errors.py:2898

5945

5965

msgid ""

5946

5966

"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"

5947

5967

"list).%(more)s"

5948

5968

msgstr ""

5949

5969

5950

#: bzrlib/errors.py:2903

5970

#: bzrlib/errors.py:2904

5951

5971

msgid "Variable {%(name)s} is not available."

5952

5972

msgstr ""

5953

5973

5954

#: bzrlib/errors.py:2911

5974

#: bzrlib/errors.py:2912

5955

5975

msgid "No template specified."

5956

5976

msgstr ""

5957

5977

5958

#: bzrlib/errors.py:2916

5978

#: bzrlib/errors.py:2917

5959

5979

msgid "Unable to create symlink %(path_str)son this platform"

5960

5980

msgstr ""

5961

5981

5962

#: bzrlib/errors.py:2931

5982

#: bzrlib/errors.py:2932

5963

5983

msgid ""

5964

5984

"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "

5965

5985

"\"original\", \"local\"."

5966

5986

msgstr ""

5967

5987

5968

#: bzrlib/errors.py:2965

5988

#: bzrlib/errors.py:2966

5969

5989

msgid ""

5970

5990

"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"

5971

5991

msgstr ""

5972

5992

5973

#: bzrlib/errors.py:2977

5993

#: bzrlib/errors.py:2978

5974

5994

msgid "The \"%(config_id)s\" configuration does not exist."

5975

5995

msgstr ""

5976

5996

5977

#: bzrlib/errors.py:2985

5997

#: bzrlib/errors.py:2986

5978

5998

msgid "The \"%(option_name)s\" configuration option does not exist."

5979

5999

msgstr ""

5980

6000

5981

#: bzrlib/errors.py:2993

6001

#: bzrlib/errors.py:2994

5982

6002

msgid "The alias \"%(alias_name)s\" does not exist."

5983

6003

msgstr ""

5984

6004

5985

#: bzrlib/errors.py:3007

6005

#: bzrlib/errors.py:3008

5986

6006

msgid "\"%(alias_name)s\" is not a valid location alias."

5987

6007

msgstr ""

5988

6008

5989

#: bzrlib/errors.py:3015

6009

#: bzrlib/errors.py:3016

5990

6010

msgid "No %(alias_name)s location assigned."

5991

6011

msgstr ""

5992

6012

5993

#: bzrlib/errors.py:3023

6013

#: bzrlib/errors.py:3024

5994

6014

msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."

5995

6015

msgstr ""

5996

6016

5997

#: bzrlib/errors.py:3033

6017

#: bzrlib/errors.py:3034

5998

6018

msgid "Unknown rules detected: %(unknowns_str)s."

5999

6019

msgstr ""

6000

6020

6001

#: bzrlib/errors.py:3044

6021

#: bzrlib/errors.py:3045

6002

6022

msgid "Tip change rejected: %(msg)s"

6003

6023

msgstr ""

6004

6024

6005

#: bzrlib/errors.py:3052

6025

#: bzrlib/errors.py:3053

6006

6026

msgid "Shelf corrupt."

6007

6027

msgstr ""

6008

6028

6009

#: bzrlib/errors.py:3057

6029

#: bzrlib/errors.py:3058

6010

6030

msgid "Corruption while decompressing repository file%(orig_error)s"

6011

6031

msgstr ""

6012

6032

6013

#: bzrlib/errors.py:3069

6033

#: bzrlib/errors.py:3070

6014

6034

msgid "No changes are shelved with id \"%(shelf_id)d\"."

6015

6035

msgstr ""

6016

6036

6017

#: bzrlib/errors.py:3077

6037

#: bzrlib/errors.py:3078

6018

6038

msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."

6019

6039

msgstr ""

6020

6040

6021

#: bzrlib/errors.py:3085

6041

#: bzrlib/errors.py:3086

6022

6042

msgid ""

6023

6043

"An attempt to access a url outside the server jail was made: '%(url)s'."

6024

6044

msgstr ""

6025

6045

6026

#: bzrlib/errors.py:3093

6046

#: bzrlib/errors.py:3094

6027

6047

msgid "The user aborted the operation."

6028

6048

msgstr ""

6029

6049

6030

#: bzrlib/errors.py:3098

6050

#: bzrlib/errors.py:3099

6031

6051

msgid "Branching '%(url)s'(%(format)s) must create a working tree."

6032

6052

msgstr ""

6033

6053

6034

#: bzrlib/errors.py:3108

6054

#: bzrlib/errors.py:3109

6035

6055

msgid "No such view: %(view_name)s."

6036

6056

msgstr ""

6037

6057

6038

#: bzrlib/errors.py:3118

6058

#: bzrlib/errors.py:3119

6039

6059

msgid ""

6040

6060

"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "

6041

6061

"to a later format."

6042

6062

msgstr ""

6043

6063

6044

#: bzrlib/errors.py:3127

6064

#: bzrlib/errors.py:3128

6045

6065

msgid ""

6046

6066

"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"

6047

6067

msgstr ""

6048

6068

6049

#: bzrlib/errors.py:3194

6069

#: bzrlib/errors.py:3195

6050

6070

msgid "%(bzrdir)r does not support co-located branches."

6051

6071

msgstr ""

6052

6072

6053

#: bzrlib/errors.py:3200

6073

#: bzrlib/errors.py:3201

6054

6074

msgid ""

6055

6075

"Unable to determine your name.\n"

6056

6076

"Please, set your name with the 'whoami' command.\n"

6057

6077

"E.g. bzr whoami \"Your Name <name@example.com>\""

6058

6078

msgstr ""

6059

6079

6060

#: bzrlib/errors.py:3209

6080

#: bzrlib/errors.py:3210

6061

6081

msgid "Invalid pattern(s) found. %(msg)s"

6062

6082

msgstr ""

6063

6083

6064

#: bzrlib/errors.py:3217

6084

#: bzrlib/errors.py:3218

6065

6085

msgid ""

6066

6086

"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "

6067

6087

"unbind` to fix."

6068

6088

msgstr ""

6069

6089

6070

#: bzrlib/errors.py:3228

6090

#: bzrlib/errors.py:3229

6071

6091

msgid "Loop involving %(refs)r while expanding \"%(string)s\"."

6072

6092

msgstr ""

6073

6093

6074

#: bzrlib/errors.py:3237

6094

#: bzrlib/errors.py:3238

6075

6095

msgid "Option %(name)s is not defined while expanding \"%(string)s\"."

6076

6096

msgstr ""

6077

6097

6078

#: bzrlib/errors.py:3246

6098

#: bzrlib/errors.py:3247

6079

6099

msgid ""

6080

6100

"No compatible object available for operations from %(source)r to %(target)r."

6081

6101

msgstr ""

6082

6102

6083

#: bzrlib/errors.py:3256

6103

#: bzrlib/errors.py:3257

6084

6104

msgid ""

6085

6105

"VFS requests over the smart server are not allowed. Encountered: %(method)s, "

6086

6106

"%(arguments)s."

6087

6107

msgstr ""

6088

6108

6089

#: bzrlib/errors.py:3266

6109

#: bzrlib/errors.py:3267

6090

6110

msgid ""

6091

6111

"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "

6092

6112

"format %(format)r"

6093

6113

msgstr ""

6094

6114

6095

#: bzrlib/errors.py:3278

6115

#: bzrlib/errors.py:3279

6096

6116

msgid ""

6097

6117

"Missing feature %(feature)s not provided by this version of Bazaar or any "

6098

6118

"plugin."

6099

6119

msgstr ""

6100

6120

6101

#: bzrlib/errors.py:3291

6121

#: bzrlib/errors.py:3292

6102

6122

msgid "Binary files section encountered."

6103

6123

msgstr ""

6104

6124

6105

#: bzrlib/errors.py:3299

6125

#: bzrlib/errors.py:3300

6106

6126

msgid ""

6107

6127

"Malformed patch header. %(desc)s\n"

6108

6128

"%(line)r"

6109

6129

msgstr ""

6110

6130

6111

#: bzrlib/errors.py:3308

6131

#: bzrlib/errors.py:3309

6112

6132

msgid ""

6113

6133

"Malformed hunk header. %(desc)s\n"

6114

6134

"%(line)r"

6115

6135

msgstr ""

6116

6136

6117

#: bzrlib/errors.py:3317

6137

#: bzrlib/errors.py:3318

6118

6138

msgid ""

6119

6139

"Malformed line. %(desc)s\n"

6120

6140

"%(line)r"

6121

6141

msgstr ""

6122

6142

6123

#: bzrlib/errors.py:3327

6143

#: bzrlib/errors.py:3328

6124

6144

msgid ""

6125

6145

"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "

6126

6146

"but patch says it should be \"%(patch_line)s\""

6127

6147

msgstr ""

6128

6148

6129

#: bzrlib/errors.py:3338

6149

#: bzrlib/errors.py:3339

6130

6150

msgid "The feature %(feature)s has already been registered."

6131

6151

msgstr ""

6132

6152

6178

6198

"regular push."

6179

6199

msgstr ""

6180

6200

6181

#: bzrlib/gpg.py:119 bzrlib/gpg.py:460

6201

#: bzrlib/gpg.py:366

6202

msgid "No GnuPG key results for pattern: {0}"

6203

msgstr ""

6204

6205

#: bzrlib/gpg.py:439

6182

6206

msgid "{0} commits with valid signatures"

6183

6207

msgstr ""

6184

6208

6185

#: bzrlib/gpg.py:123 bzrlib/gpg.py:465

6209

#: bzrlib/gpg.py:445

6186

6210

msgid "{0} commit with unknown key"

6187

6211

msgid_plural "{0} commits with unknown keys"

6188

6212

msgstr[0] ""

6189

6213

msgstr[1] ""

6190

6214

6191

#: bzrlib/gpg.py:129 bzrlib/gpg.py:472

6215

#: bzrlib/gpg.py:453

6192

6216

msgid "{0} commit not valid"

6193

6217

msgid_plural "{0} commits not valid"

6194

6218

msgstr[0] ""

6195

6219

msgstr[1] ""

6196

6220

6197

#: bzrlib/gpg.py:135 bzrlib/gpg.py:479

6221

#: bzrlib/gpg.py:461

6198

6222

msgid "{0} commit not signed"

6199

6223

msgid_plural "{0} commits not signed"

6200

6224

msgstr[0] ""

6201

6225

msgstr[1] ""

6202

6226

6203

#: bzrlib/gpg.py:141 bzrlib/gpg.py:486

6227

#: bzrlib/gpg.py:469

6204

6228

msgid "{0} commit with key now expired"

6205

6229

msgid_plural "{0} commits with key now expired"

6206

6230

msgstr[0] ""

6207

6231

msgstr[1] ""

6208

6232

6209

#: bzrlib/gpg.py:343

6210

msgid "No GnuPG key results for pattern: {0}"

6211

msgstr ""

6233

#: bzrlib/gpg.py:489

6234

msgid "{0} commit by author {1} with key {2} now expired"

6235

msgid_plural "{0} commits by author {1} with key {2} now expired"

6236

msgstr[0] ""

6237

msgstr[1] ""

6212

6238

6213

#: bzrlib/gpg.py:386

6239

#: bzrlib/gpg.py:505

6214

6240

msgid "{0} signed {1} commit"

6215

6241

msgid_plural "{0} signed {1} commits"

6216

6242

msgstr[0] ""

6217

6243

msgstr[1] ""

6218

6244

6219

#: bzrlib/gpg.py:403 bzrlib/gpg.py:419

6245

#: bzrlib/gpg.py:522 bzrlib/gpg.py:539

6220

6246

msgid "{0} commit by author {1}"

6221

6247

msgid_plural "{0} commits by author {1}"

6222

6248

msgstr[0] ""

6223

6249

msgstr[1] ""

6224

6250

6225

#: bzrlib/gpg.py:433

6251

#: bzrlib/gpg.py:554

6226

6252

msgid "Unknown key {0} signed {1} commit"

6227

6253

msgid_plural "Unknown key {0} signed {1} commits"

6228

6254

msgstr[0] ""

6229

6255

msgstr[1] ""

6230

6256

6231

#: bzrlib/gpg.py:452

6232

msgid "{0} commit by author {1} with key {2} now expired"

6233

msgid_plural "{0} commits by author {1} with key {2} now expired"

6234

msgstr[0] ""

6235

msgstr[1] ""

6236

6237

6257

#: bzrlib/groupcompress.py:1739

6238

6258

#, python-format

6239

6259

msgid "Insert claimed random_id=True, but then inserted %r two times"

6240

6260

msgstr ""

6241

6261

6242

#: bzrlib/hooks.py:331

6262

#: bzrlib/hooks.py:313

6243

6263

#, python-format

6244

6264

msgid "Introduced in: %s"

6245

6265

msgstr ""

6246

6266

6247

#: bzrlib/hooks.py:334

6267

#: bzrlib/hooks.py:316

6248

6268

#, python-format

6249

6269

msgid "Deprecated in: %s"

6250

6270

msgstr ""

6293

6313

"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"

6294

6314

msgstr ""

6295

6315

6296

#: bzrlib/log.py:572

6316

#: bzrlib/log.py:563

6297

6317

msgid "--exclude-common-ancestry requires two different revisions"

6298

6318

msgstr ""

6299

6319

6300

#: bzrlib/log.py:574

6320

#: bzrlib/log.py:565

6301

6321

#, python-format

6302

6322

msgid "invalid direction %r"

6303

6323

msgstr ""

6304

6324

6305

#: bzrlib/log.py:662

6325

#: bzrlib/log.py:653

6306

6326

msgid "Start revision not found in history of end revision."

6307

6327

msgstr ""

6308

6328

6309

#: bzrlib/log.py:1080 bzrlib/log.py:1138

6329

#: bzrlib/log.py:1071 bzrlib/log.py:1129

6310

6330

msgid "Logging revision 0 is invalid."

6311

6331

msgstr ""

6312

6332

6313

#: bzrlib/log.py:1082 bzrlib/log.py:1140

6333

#: bzrlib/log.py:1073 bzrlib/log.py:1131

6314

6334

msgid "Start revision must be older than the end revision."

6315

6335

msgstr ""

6316

6336

6317

#: bzrlib/log.py:1827

6337

#: bzrlib/log.py:1818

6318

6338

#, python-format

6319

6339

msgid "unknown log formatter: %r"

6320

6340

msgstr ""

6321

6341

6322

#: bzrlib/log.py:2123

6342

#: bzrlib/log.py:2114

6323

6343

msgid "fixes bug"

6324

6344

msgid_plural "fixes bugs"

6325

6345

msgstr[0] ""

6334

6354

msgid "%d conflicts encountered."

6335

6355

msgstr ""

6336

6356

6337

#: bzrlib/merge.py:845 bzrlib/merge.py:1933

6357

#: bzrlib/merge.py:845 bzrlib/merge.py:1868

6338

6358

msgid "Preparing file merge"

6339

6359

msgstr ""

6340

6360

6456

6476

msgid "lstat/stat of ({0!r}): {1!r}"

6457

6477

msgstr ""

6458

6478

6459

#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019

6479

#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041

6460

6480

#, python-format

6461

6481

msgid "sorry, %r not allowed in path"

6462

6482

msgstr ""

6463

6483

6464

#: bzrlib/osutils.py:1237

6484

#: bzrlib/osutils.py:1259

6465

6485

#, python-format

6466

6486

msgid "%r is too short to calculate a relative path"

6467

6487

msgstr ""

6500

6520

msgid "Generate only the shell function, don't enable it"

6501

6521

msgstr ""

6502

6522

6503

#: bzrlib/plugins/launchpad/__init__.py:81

6523

#: bzrlib/plugins/launchpad/account.py:66

6524

msgid "Setting ssh/sftp usernames for launchpad.net."

6525

msgstr ""

6526

6527

#: bzrlib/plugins/launchpad/cmds.py:44

6504

6528

msgid "Register a branch with launchpad.net."

6505

6529

msgstr ""

6506

6530

6507

#: bzrlib/plugins/launchpad/__init__.py:83

6531

#: bzrlib/plugins/launchpad/cmds.py:46

6508

6532

msgid ""

6509

6533

"This command lists a bzr branch in the directory of branches on\n"

6510

6534

"launchpad.net. Registration allows the branch to be associated with\n"

6511

6535

"bugs or specifications."

6512

6536

msgstr ""

6513

6537

6514

#: bzrlib/plugins/launchpad/__init__.py:87

6538

#: bzrlib/plugins/launchpad/cmds.py:50

6515

6539

msgid ""

6516

6540

"Before using this command you must register the project to which the\n"

6517

6541

"branch belongs, and create an account for yourself on launchpad.net."

6518

6542

msgstr ""

6519

6543

6520

#: bzrlib/plugins/launchpad/__init__.py:90

6544

#: bzrlib/plugins/launchpad/cmds.py:53

6521

6545

msgid ""

6522

6546

"arguments:\n"

6523

6547

" public_url: The publicly visible url for the branch to register.\n"

6529

6553

" otherwise error."

6530

6554

msgstr ""

6531

6555

6532

#: bzrlib/plugins/launchpad/__init__.py:99

6556

#: bzrlib/plugins/launchpad/cmds.py:62

6533

6557

msgid ""

6534

6558

"example:\n"

6535

6559

" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"

6536

6560

" --project fooproject"

6537

6561

msgstr ""

6538

6562

6539

#: bzrlib/plugins/launchpad/__init__.py:106

6563

#: bzrlib/plugins/launchpad/cmds.py:69

6540

6564

msgid "Launchpad project short name to associate with the branch."

6541

6565

msgstr ""

6542

6566

6543

#: bzrlib/plugins/launchpad/__init__.py:113

6567

#: bzrlib/plugins/launchpad/cmds.py:76

6544

6568

msgid ""

6545

6569

"Short name for the branch; by default taken from the last component of the "

6546

6570

"url."

6547

6571

msgstr ""

6548

6572

6549

#: bzrlib/plugins/launchpad/__init__.py:117

6573

#: bzrlib/plugins/launchpad/cmds.py:80

6550

6574

msgid "One-sentence description of the branch."

6551

6575

msgstr ""

6552

6576

6553

#: bzrlib/plugins/launchpad/__init__.py:120

6577

#: bzrlib/plugins/launchpad/cmds.py:83

6554

6578

msgid "Longer description of the purpose or contents of the branch."

6555

6579

msgstr ""

6556

6580

6557

#: bzrlib/plugins/launchpad/__init__.py:123

6581

#: bzrlib/plugins/launchpad/cmds.py:86

6558

6582

msgid "Branch author's email address, if not yourself."

6559

6583

msgstr ""

6560

6584

6561

#: bzrlib/plugins/launchpad/__init__.py:126

6585

#: bzrlib/plugins/launchpad/cmds.py:89

6562

6586

msgid "The bug this branch fixes."

6563

6587

msgstr ""

6564

6588

6565

#: bzrlib/plugins/launchpad/__init__.py:129

6589

#: bzrlib/plugins/launchpad/cmds.py:92

6566

6590

msgid "Prepare the request but don't actually send it."

6567

6591

msgstr ""

6568

6592

6569

#: bzrlib/plugins/launchpad/__init__.py:151

6593

#: bzrlib/plugins/launchpad/cmds.py:114

6570

6594

msgid ""

6571

6595

"register-branch requires a public branch url - see bzr help register-branch."

6572

6596

msgstr ""

6573

6597

6574

#: bzrlib/plugins/launchpad/__init__.py:159

6598

#: bzrlib/plugins/launchpad/cmds.py:122

6575

6599

msgid "--product is deprecated; please use --project."

6576

6600

msgstr ""

6577

6601

6578

#: bzrlib/plugins/launchpad/__init__.py:191

6602

#: bzrlib/plugins/launchpad/cmds.py:152

6579

6603

msgid "Open a Launchpad branch page in your web browser."

6580

6604

msgstr ""

6581

6605

6582

#: bzrlib/plugins/launchpad/__init__.py:196

6606

#: bzrlib/plugins/launchpad/cmds.py:157

6583

6607

msgid "Do not actually open the browser. Just say the URL we would use."

6584

6608

msgstr ""

6585

6609

6586

#: bzrlib/plugins/launchpad/__init__.py:231

6610

#: bzrlib/plugins/launchpad/cmds.py:192

6587

6611

#, python-format

6588

6612

msgid "Opening %s in web browser"

6589

6613

msgstr ""

6590

6614

6591

#: bzrlib/plugins/launchpad/__init__.py:241

6615

#: bzrlib/plugins/launchpad/cmds.py:200

6592

6616

msgid "Show or set the Launchpad user ID."

6593

6617

msgstr ""

6594

6618

6595

#: bzrlib/plugins/launchpad/__init__.py:243

6619

#: bzrlib/plugins/launchpad/cmds.py:202

6596

6620

msgid ""

6597

6621

"When communicating with Launchpad, some commands need to know your\n"

6598

6622

"Launchpad user ID. This command can be used to set or show the\n"

6599

6623

"user ID that Bazaar will use for such communication."

6600

6624

msgstr ""

6601

6625

6602

#: bzrlib/plugins/launchpad/__init__.py:247

6626

#: bzrlib/plugins/launchpad/cmds.py:206

6603

6627

msgid ""

6604

6628

":Examples:\n"

6605

6629

" Show the Launchpad ID of the current user::"

6606

6630

msgstr ""

6607

6631

6608

#: bzrlib/plugins/launchpad/__init__.py:250

6632

#: bzrlib/plugins/launchpad/cmds.py:209

6609

6633

msgid " bzr launchpad-login"

6610

6634

msgstr ""

6611

6635

6612

#: bzrlib/plugins/launchpad/__init__.py:252

6636

#: bzrlib/plugins/launchpad/cmds.py:211

6613

6637

msgid " Set the Launchpad ID of the current user to 'bob'::"

6614

6638

msgstr ""

6615

6639

6616

#: bzrlib/plugins/launchpad/__init__.py:254

6640

#: bzrlib/plugins/launchpad/cmds.py:213

6617

6641

msgid " bzr launchpad-login bob"

6618

6642

msgstr ""

6619

6643

6620

#: bzrlib/plugins/launchpad/__init__.py:261

6644

#: bzrlib/plugins/launchpad/cmds.py:220

6621

6645

msgid "Don't check that the user name is valid."

6622

6646

msgstr ""

6623

6647

6624

#: bzrlib/plugins/launchpad/__init__.py:276

6625

#: bzrlib/plugins/launchpad/__init__.py:287

6648

#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246

6626

6649

msgid "Launchpad user ID exists and has SSH keys.\n"

6627

6650

msgstr ""

6628

6651

6629

#: bzrlib/plugins/launchpad/__init__.py:279

6652

#: bzrlib/plugins/launchpad/cmds.py:238

6630

6653

msgid "No Launchpad user ID configured.\n"

6631

6654

msgstr ""

6632

6655

6633

#: bzrlib/plugins/launchpad/__init__.py:290

6656

#: bzrlib/plugins/launchpad/cmds.py:249

6634

6657

#, python-format

6635

6658

msgid "Launchpad user ID set to '%s'.\n"

6636

6659

msgstr ""

6637

6660

6638

#: bzrlib/plugins/launchpad/__init__.py:298

6661

#: bzrlib/plugins/launchpad/cmds.py:255

6639

6662

msgid "Ask Launchpad to mirror a branch now."

6640

6663

msgstr ""

6641

6664

6642

#: bzrlib/plugins/launchpad/__init__.py:318

6665

#: bzrlib/plugins/launchpad/cmds.py:272

6643

6666

msgid "Propose merging a branch on Launchpad."

6644

6667

msgstr ""

6645

6668

6646

#: bzrlib/plugins/launchpad/__init__.py:320

6669

#: bzrlib/plugins/launchpad/cmds.py:274

6647

6670

msgid ""

6648

6671

"This will open your usual editor to provide the initial comment. When it\n"

6649

6672

"has created the proposal, it will open it in your default web browser."

6650

6673

msgstr ""

6651

6674

6652

#: bzrlib/plugins/launchpad/__init__.py:323

6675

#: bzrlib/plugins/launchpad/cmds.py:277

6653

6676

msgid ""

6654

6677

"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"

6655

6678

"is not supplied, the remembered submit branch will be used. If no submit\n"

6656

6679

"branch is remembered, the development focus will be used."

6657

6680

msgstr ""

6658

6681

6659

#: bzrlib/plugins/launchpad/__init__.py:327

6682

#: bzrlib/plugins/launchpad/cmds.py:281

6660

6683

msgid ""

6661

6684

"By default, the SUBMIT_BRANCH's review team will be requested to review\n"

6662

6685

"the merge proposal. This can be overriden by specifying --review (-R).\n"

6664

6687

"may optionally be followed by '=' and the review type. For example:"

6665

6688

msgstr ""

6666

6689

6667

#: bzrlib/plugins/launchpad/__init__.py:332

6690

#: bzrlib/plugins/launchpad/cmds.py:286

6668

6691

msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"

6669

6692

msgstr ""

6670

6693

6671

#: bzrlib/plugins/launchpad/__init__.py:334

6694

#: bzrlib/plugins/launchpad/cmds.py:288

6672

6695

msgid ""

6673

6696

"This will propose a merge, request \"jrandom\" to perform a review of\n"

6674

6697

"unspecified type, and request \"review-team\" to perform a \"qa\" review."

6675

6698

msgstr ""

6676

6699

6677

#: bzrlib/plugins/launchpad/__init__.py:339

6700

#: bzrlib/plugins/launchpad/cmds.py:293

6678

6701

msgid "Propose the merge on staging."

6679

6702

msgstr ""

6680

6703

6681

#: bzrlib/plugins/launchpad/__init__.py:341

6704

#: bzrlib/plugins/launchpad/cmds.py:295

6682

6705

msgid "Commit message."

6683

6706

msgstr ""

6684

6707

6685

#: bzrlib/plugins/launchpad/__init__.py:343

6708

#: bzrlib/plugins/launchpad/cmds.py:297

6686

6709

msgid "Mark the proposal as approved immediately."

6687

6710

msgstr ""

6688

6711

6689

#: bzrlib/plugins/launchpad/__init__.py:345

6712

#: bzrlib/plugins/launchpad/cmds.py:298

6713

msgid "The bug this proposal fixes."

6714

msgstr ""

6715

6716

#: bzrlib/plugins/launchpad/cmds.py:300

6690

6717

msgid "Requested reviewer and optional type."

6691

6718

msgstr ""

6692

6719

6693

#: bzrlib/plugins/launchpad/__init__.py:382

6720

#: bzrlib/plugins/launchpad/cmds.py:335

6694

6721

msgid "Find the proposal to merge this revision."

6695

6722

msgstr ""

6696

6723

6697

#: bzrlib/plugins/launchpad/__init__.py:384

6724

#: bzrlib/plugins/launchpad/cmds.py:337

6698

6725

msgid ""

6699

6726

"Finds the merge proposal(s) that discussed landing the specified revision.\n"

6700

6727

"This works only if the selected branch was the merge proposal target, and\n"

6702

6729

"are opened in a web browser."

6703

6730

msgstr ""

6704

6731

6705

#: bzrlib/plugins/launchpad/__init__.py:389

6732

#: bzrlib/plugins/launchpad/cmds.py:342

6706

6733

msgid ""

6707

6734

"Any revision involved in the merge may be specified-- the revision in\n"

6708

6735

"which the merge was performed, or one of the revisions that was merged."

6709

6736

msgstr ""

6710

6737

6711

#: bzrlib/plugins/launchpad/__init__.py:392

6738

#: bzrlib/plugins/launchpad/cmds.py:345

6712

6739

msgid "So, to find the merge proposal that reviewed line 1 of README::"

6713

6740

msgstr ""

6714

6741

6715

#: bzrlib/plugins/launchpad/__init__.py:394

6742

#: bzrlib/plugins/launchpad/cmds.py:347

6716

6743

msgid " bzr lp-find-proposal -r annotate:README:1"

6717

6744

msgstr ""

6718

6745

6719

#: bzrlib/plugins/launchpad/__init__.py:409

6746

#: bzrlib/plugins/launchpad/cmds.py:363

6720

6747

msgid "No review found."

6721

6748

msgstr ""

6722

6749

6723

#: bzrlib/plugins/launchpad/__init__.py:410

6750

#: bzrlib/plugins/launchpad/cmds.py:364

6724

6751

#, python-format

6725

6752

msgid "%d proposals(s) found."

6726

6753

msgstr ""

6727

6754

6728

#: bzrlib/plugins/launchpad/__init__.py:420

6755

#: bzrlib/plugins/launchpad/cmds.py:374

6729

6756

msgid "Finding revision-id"

6730

6757

msgstr ""

6731

6758

6732

#: bzrlib/plugins/launchpad/__init__.py:427

6759

#: bzrlib/plugins/launchpad/cmds.py:381

6733

6760

msgid "Finding merge"

6734

6761

msgstr ""

6735

6762

6736

#: bzrlib/plugins/launchpad/__init__.py:432

6763

#: bzrlib/plugins/launchpad/cmds.py:386

6737

6764

msgid "Finding revno"

6738

6765

msgstr ""

6739

6766

6740

#: bzrlib/plugins/launchpad/__init__.py:437

6767

#: bzrlib/plugins/launchpad/cmds.py:392

6741

6768

msgid "Finding Launchpad branch"

6742

6769

msgstr ""

6743

6770

6744

#: bzrlib/plugins/launchpad/__init__.py:440

6771

#: bzrlib/plugins/launchpad/cmds.py:395

6745

6772

msgid "Finding proposals"

6746

6773

msgstr ""

6747

6774

6748

#: bzrlib/plugins/launchpad/account.py:66

6749

msgid "Setting ssh/sftp usernames for launchpad.net."

6750

msgstr ""

6751

6752

6775

#: bzrlib/plugins/launchpad/lp_api.py:241

6753

6776

#: bzrlib/plugins/launchpad/lp_api.py:246

6754

6777

#, python-format

6792

6815

" remote: {2}"

6793

6816

msgstr ""

6794

6817

6795

#: bzrlib/plugins/launchpad/lp_propose.py:149

6818

#: bzrlib/plugins/launchpad/lp_propose.py:150

6796

6819

#, python-format

6797

6820

msgid "There is already a branch merge proposal: %s"

6798

6821

msgstr ""

6799

6822

6800

#: bzrlib/plugins/weave_fmt/bzrdir.py:236

6823

#: bzrlib/plugins/weave_fmt/bzrdir.py:237

6801

6824

msgid "pb parameter to convert() is deprecated"

6802

6825

msgstr ""

6803

6826

6804

#: bzrlib/plugins/weave_fmt/bzrdir.py:239

6827

#: bzrlib/plugins/weave_fmt/bzrdir.py:240

6805

6828

msgid "starting upgrade from format 4 to 5"

6806

6829

msgstr ""

6807

6830

6808

#: bzrlib/plugins/weave_fmt/bzrdir.py:249

6831

#: bzrlib/plugins/weave_fmt/bzrdir.py:250

6809

6832

msgid "note: upgrade may be faster if all store files are ungzipped first"

6810

6833

msgstr ""

6811

6834

6812

#: bzrlib/plugins/weave_fmt/bzrdir.py:278

6835

#: bzrlib/plugins/weave_fmt/bzrdir.py:279

6813

6836

msgid "converting revision"

6814

6837

msgstr ""

6815

6838

6816

#: bzrlib/plugins/weave_fmt/bzrdir.py:283

6839

#: bzrlib/plugins/weave_fmt/bzrdir.py:284

6817

6840

msgid "upgraded to weaves:"

6818

6841

msgstr ""

6819

6842

6820

#: bzrlib/plugins/weave_fmt/bzrdir.py:284

6843

#: bzrlib/plugins/weave_fmt/bzrdir.py:285

6821

6844

#, python-format

6822

6845

msgid "%6d revisions and inventories"

6823

6846

msgstr ""

6824

6847

6825

#: bzrlib/plugins/weave_fmt/bzrdir.py:286

6848

#: bzrlib/plugins/weave_fmt/bzrdir.py:287

6826

6849

#, python-format

6827

6850

msgid "%6d revisions not present"

6828

6851

msgstr ""

6829

6852

6830

#: bzrlib/plugins/weave_fmt/bzrdir.py:288

6853

#: bzrlib/plugins/weave_fmt/bzrdir.py:289

6831

6854

#, python-format

6832

6855

msgid "%6d texts"

6833

6856

msgstr ""

6834

6857

6835

#: bzrlib/plugins/weave_fmt/bzrdir.py:324

6858

#: bzrlib/plugins/weave_fmt/bzrdir.py:325

6836

6859

msgid "writing weave"

6837

6860

msgstr ""

6838

6861

6839

#: bzrlib/plugins/weave_fmt/bzrdir.py:328

6840

#: bzrlib/plugins/weave_fmt/bzrdir.py:330

6862

#: bzrlib/plugins/weave_fmt/bzrdir.py:329

6863

#: bzrlib/plugins/weave_fmt/bzrdir.py:331

6841

6864

msgid "inventory"

6842

6865

msgstr ""

6843

6866

6844

#: bzrlib/plugins/weave_fmt/bzrdir.py:347

6867

#: bzrlib/plugins/weave_fmt/bzrdir.py:348

6845

6868

msgid "write revision"

6846

6869

msgstr ""

6847

6870

6848

#: bzrlib/plugins/weave_fmt/bzrdir.py:361

6871

#: bzrlib/plugins/weave_fmt/bzrdir.py:362

6849

6872

msgid "loading revision"

6850

6873

msgstr ""

6851

6874

6852

#: bzrlib/plugins/weave_fmt/bzrdir.py:366

6875

#: bzrlib/plugins/weave_fmt/bzrdir.py:367

6853

6876

#, python-format

6854

6877

msgid "revision {%s} not present in branch; will be converted as a ghost"

6855

6878

msgstr ""

6856

6879

6857

#: bzrlib/plugins/weave_fmt/bzrdir.py:506

6880

#: bzrlib/plugins/weave_fmt/bzrdir.py:507

6858

6881

msgid "starting upgrade from format 5 to 6"

6859

6882

msgstr ""

6860

6883

6861

#: bzrlib/plugins/weave_fmt/bzrdir.py:516

6884

#: bzrlib/plugins/weave_fmt/bzrdir.py:517

6862

6885

#, python-format

6863

6886

msgid "adding prefixes to %s"

6864

6887

msgstr ""

6865

6888

6866

#: bzrlib/plugins/weave_fmt/bzrdir.py:556

6889

#: bzrlib/plugins/weave_fmt/bzrdir.py:557

6867

6890

msgid "starting upgrade from format 6 to metadir"

6868

6891

msgstr ""

6869

6892

6870

#: bzrlib/plugins/weave_fmt/bzrdir.py:564

6893

#: bzrlib/plugins/weave_fmt/bzrdir.py:565

6871

6894

msgid "Removing ancestry.weave"

6872

6895

msgstr ""

6873

6896

6874

#: bzrlib/plugins/weave_fmt/bzrdir.py:569

6897

#: bzrlib/plugins/weave_fmt/bzrdir.py:570

6875

6898

msgid "Finding branch files"

6876

6899

msgstr ""

6877

6900

6878

#: bzrlib/plugins/weave_fmt/bzrdir.py:579

6901

#: bzrlib/plugins/weave_fmt/bzrdir.py:580

6879

6902

msgid "Upgrading repository"

6880

6903

msgstr ""

6881

6904

6882

#: bzrlib/plugins/weave_fmt/bzrdir.py:589

6905

#: bzrlib/plugins/weave_fmt/bzrdir.py:590

6883

6906

msgid "Upgrading branch"

6884

6907

msgstr ""

6885

6908

6886

#: bzrlib/plugins/weave_fmt/bzrdir.py:612

6909

#: bzrlib/plugins/weave_fmt/bzrdir.py:613

6887

6910

msgid "No working tree."

6888

6911

msgstr ""

6889

6912

6890

#: bzrlib/plugins/weave_fmt/bzrdir.py:619

6913

#: bzrlib/plugins/weave_fmt/bzrdir.py:620

6891

6914

msgid "Upgrading working tree"

6892

6915

msgstr ""

6893

6916

6894

#: bzrlib/plugins/weave_fmt/bzrdir.py:640

6917

#: bzrlib/plugins/weave_fmt/bzrdir.py:641

6895

6918

#, python-format

6896

6919

msgid "Make %s lock"

6897

6920

msgstr ""

6898

6921

6899

#: bzrlib/plugins/weave_fmt/bzrdir.py:651

6922

#: bzrlib/plugins/weave_fmt/bzrdir.py:652

6900

6923

#, python-format

6901

6924

msgid "Moving %s"

6902

6925

msgstr ""

6923

6946

msgid "Too many redirections trying to make %s."

6924

6947

msgstr ""

6925

6948

6926

#: bzrlib/push.py:147

6949

#: bzrlib/push.py:148

6927

6950

msgid ""

6928

6951

"These branches have diverged. See \"bzr help diverged-branches\" for more "

6929

6952

"information."

6930

6953

msgstr ""

6931

6954

6932

#: bzrlib/push.py:151

6955

#: bzrlib/push.py:152

6933

6956

#, python-format

6934

6957

msgid ""

6935

6958

"It is not possible to losslessly push to %s. You may want to use dpush "

6936

6959

"instead."

6937

6960

msgstr ""

6938

6961

6939

#: bzrlib/push.py:157

6962

#: bzrlib/push.py:158

6940

6963

#, python-format

6941

6964

msgid ""

6942

6965

"At %s you have a valid .bzr control directory, but not a branch or "

7053

7076

msgid "{0} => {1}"

7054

7077

msgstr ""

7055

7078

7056

#: bzrlib/repository.py:1787

7079

#: bzrlib/repository.py:1799

7057

7080

msgid "Moving repository to repository.backup"

7058

7081

msgstr ""

7059

7082

7060

#: bzrlib/repository.py:1794

7083

#: bzrlib/repository.py:1806

7061

7084

msgid "Creating new repository"

7062

7085

msgstr ""

7063

7086

7064

#: bzrlib/repository.py:1799

7087

#: bzrlib/repository.py:1811

7065

7088

msgid "Copying content"

7066

7089

msgstr ""

7067

7090

7068

#: bzrlib/repository.py:1803

7091

#: bzrlib/repository.py:1815

7069

7092

msgid "Deleting old repository content"

7070

7093

msgstr ""

7071

7094

7072

#: bzrlib/repository.py:1805

7095

#: bzrlib/repository.py:1817

7073

7096

msgid "repository converted"

7074

7097

msgstr ""

7075

7098

7077

7100

msgid "Using {0} {1}"

7078

7101

msgstr ""

7079

7102

7080

#: bzrlib/send.py:58

7103

#: bzrlib/send.py:59

7081

7104

#, python-format

7082

7105

msgid "Mail client \"%s\" does not support specifying body"

7083

7106

msgstr ""

7084

7107

7085

#: bzrlib/send.py:62

7108

#: bzrlib/send.py:63

7086

7109

msgid "--remember requires a branch to be specified."

7087

7110

msgstr ""

7088

7111

7089

#: bzrlib/send.py:77

7112

#: bzrlib/send.py:78

7090

7113

msgid "No submit branch known or specified"

7091

7114

msgstr ""

7092

7115

7093

#: bzrlib/send.py:80

7116

#: bzrlib/send.py:81

7094

7117

msgid "Using saved {0} location \"{1}\" to determine what changes to submit."

7095

7118

msgstr ""

7096

7119

7097

#: bzrlib/send.py:98

7120

#: bzrlib/send.py:99

7098

7121

#, python-format

7099

7122

msgid "No such send format '%s'."

7100

7123

msgstr ""

7101

7124

7102

#: bzrlib/send.py:114

7125

#: bzrlib/send.py:115

7103

7126

msgid "bzr send takes at most two one revision identifiers"

7104

7127

msgstr ""

7105

7128

7106

#: bzrlib/send.py:127

7129

#: bzrlib/send.py:128

7107

7130

msgid "No revisions to submit."

7108

7131

msgstr ""

7109

7132

7110

#: bzrlib/send.py:139

7133

#: bzrlib/send.py:140

7111

7134

msgid ""

7112

7135

"- not supported for merge directives that use more than one output file."

7113

7136

msgstr ""

7114

7137

7115

#: bzrlib/send.py:185

7138

#: bzrlib/send.py:186

7116

7139

msgid "Format 0.9 does not permit bundle with no patch"

7117

7140

msgstr ""

7118

7141

7269

7292

"anyway, use --force."

7270

7293

msgstr ""

7271

7294

7272

#: bzrlib/switch.py:125

7295

#: bzrlib/switch.py:129

7273

7296

msgid "Cannot switch a branch, only a checkout."

7274

7297

msgstr ""

7275

7298

7276

#: bzrlib/switch.py:163

7299

#: bzrlib/switch.py:167

7277

7300

#, python-format

7278

7301

msgid "Tree is up to date at revision %d."

7279

7302

msgstr ""

7280

7303

7281

#: bzrlib/switch.py:169

7304

#: bzrlib/switch.py:173

7282

7305

#, python-format

7283

7306

msgid "Updated to revision %d."

7284

7307

msgstr ""

7285

7308

7286

#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747

7309

#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736

7287

7310

msgid "Apply phase"

7288

7311

msgstr ""

7289

7312

7290

#: bzrlib/transform.py:1773 bzrlib/transform.py:1841

7313

#: bzrlib/transform.py:1762 bzrlib/transform.py:1830

7291

7314

msgid "removing file"

7292

7315

msgstr ""

7293

7316

7294

#: bzrlib/transform.py:1791 bzrlib/transform.py:1876

7317

#: bzrlib/transform.py:1780 bzrlib/transform.py:1865

7295

7318

msgid "adding file"

7296

7319

msgstr ""

7297

7320

7298

#: bzrlib/transform.py:2591

7321

#: bzrlib/transform.py:2590

7299

7322

msgid "Building tree"

7300

7323

msgstr ""

7301

7324

7302

#: bzrlib/transform.py:2681 bzrlib/transform.py:2708

7325

#: bzrlib/transform.py:2680 bzrlib/transform.py:2707

7303

7326

msgid "Adding file contents"

7304

7327

msgstr ""

7305

7328

7306

#: bzrlib/transform.py:3028

7329

#: bzrlib/transform.py:3009

7307

7330

msgid "Resolution pass"

7308

7331

msgstr ""

7309

7332

7312

7335

msgid "Authenticated as %s"

7313

7336

msgstr ""

7314

7337

7315

#: bzrlib/tree.py:634

7338

#: bzrlib/tree.py:637

7316

7339

msgid "*** {0} content-filter: {1} => {2!r}"

7317

7340

msgstr ""

7318

7341

7371

7394

msgid "failed to clean-up {0}: {1}"

7372

7395

msgstr ""

7373

7396

7374

#: bzrlib/vf_repository.py:1090

7397

#: bzrlib/vf_repository.py:1091

7375

7398

msgid "inventories"

7376

7399

msgstr ""

7377

7400

7378

#: bzrlib/vf_repository.py:1116

7401

#: bzrlib/vf_repository.py:1117

7379

7402

msgid "texts"

7380

7403

msgstr ""

7381

7404

7382

#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630

7405

#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631

7383

7406

msgid "Calculating text parents"

7384

7407

msgstr ""

7385

7408

7386

#: bzrlib/vf_repository.py:1706

7409

#: bzrlib/vf_repository.py:1707

7387

7410

msgid "Fetch texts"

7388

7411

msgstr ""

7389

7412

7390

#: bzrlib/vf_repository.py:2535

7413

#: bzrlib/vf_repository.py:2536

7391

7414

msgid "loading text store"

7392

7415

msgstr ""

7393

7416

7394

#: bzrlib/vf_repository.py:2541

7417

#: bzrlib/vf_repository.py:2542

7395

7418

msgid "checking text graph"

7396

7419

msgstr ""

7397

7420

7398

#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009

7399

#: bzrlib/vf_repository.py:3124

7421

#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012

7422

#: bzrlib/vf_repository.py:3127

7400

7423

msgid "Transferring revisions"

7401

7424

msgstr ""

7402

7425

7442

7465

msgid "PageFaultCount %8d"

7443

7466

msgstr ""

7444

7467

7445

#: bzrlib/workingtree.py:1478

7468

#: bzrlib/workingtree.py:1482

7446

7469

msgid "Rerun update after fixing the conflicts."

7447

7470

msgstr ""

7448

7471

7452

7475

7453

7476

#: dummy/help_topics/basic/detail.txt:1

7454

7477

msgid ""

7455

"Bazaar 2.5b6 -- a free distributed version-control tool\n"

7478

"Bazaar 2.6.0dev1 -- a free distributed version-control tool\n"

7456

7479

"http://bazaar.canonical.com/"

7457

7480

msgstr ""

7458

7481

11669

11692

msgstr ""

11670

11693

11671

11694

#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56

11672

#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259

11695

#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262

11673

11696

msgid "Introduced in: 2.2"

11674

11697

msgstr ""

11675

11698

11687

11710

"~~~~"

11688

11711

msgstr ""

11689

11712

11690

#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290

11691

#: en/help_topics/hooks.txt:304

11713

#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293

11714

#: en/help_topics/hooks.txt:307

11692

11715

msgid "Introduced in: 1.8"

11693

11716

msgstr ""

11694

11717

11718

11741

"~~~~~~~~~~~~~~~~~~~~~~"

11719

11742

msgstr ""

11720

11743

11721

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418

11744

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421

11722

11745

msgid "Introduced in: 1.4"

11723

11746

msgstr ""

11724

11747

11730

11753

"uncommit will all trigger this hook."

11731

11754

msgstr ""

11732

11755

11733

#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389

11756

#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392

11734

11757

msgid ""

11735

11758

"post_commit\n"

11736

11759

"~~~~~~~~~~~"

11738

11761

11739

11762

#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86

11740

11763

#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110

11741

#: en/help_topics/hooks.txt:145

11742

11764

msgid "Introduced in: 0.15"

11743

11765

msgstr ""

11744

11766

11843

11865

11844

11866

#: en/help_topics/hooks.txt:142

11845

11867

msgid ""

11846

"set_rh\n"

11847

"~~~~~~"

11848

msgstr ""

11849

11850

#: en/help_topics/hooks.txt:147

11851

msgid ""

11852

"Invoked whenever the revision history has been set via\n"

11853

"set_revision_history. The api signature is (branch, revision_history),\n"

11854

"and the branch will be write-locked. The set_rh hook can be expensive\n"

11855

"for bzr to trigger, a better hook to use is\n"

11856

"Branch.post_change_branch_tip."

11857

msgstr ""

11858

11859

#: en/help_topics/hooks.txt:153

11860

msgid ""

11861

11868

"transform_fallback_location\n"

11862

11869

"~~~~~~~~~~~~~~~~~~~~~~~~~~~"

11863

11870

msgstr ""

11864

11871

11865

#: en/help_topics/hooks.txt:156

11872

#: en/help_topics/hooks.txt:145

11866

11873

msgid "Introduced in: 1.9"

11867

11874

msgstr ""

11868

11875

11869

#: en/help_topics/hooks.txt:158

11876

#: en/help_topics/hooks.txt:147

11870

11877

msgid ""

11871

11878

"Called when a stacked branch is activating its fallback locations.\n"

11872

11879

"transform_fallback_location is called with (branch, url), and should\n"

11880

11887

"however undefined."

11881

11888

msgstr ""

11882

11889

11883

#: en/help_topics/hooks.txt:169

11890

#: en/help_topics/hooks.txt:158

11884

11891

msgid ""

11885

11892

"CommandHooks\n"

11886

11893

"------------"

11887

11894

msgstr ""

11888

11895

11889

#: en/help_topics/hooks.txt:172

11896

#: en/help_topics/hooks.txt:161

11890

11897

msgid ""

11891

11898

"extend_command\n"

11892

11899

"~~~~~~~~~~~~~~"

11893

11900

msgstr ""

11894

11901

11895

#: en/help_topics/hooks.txt:175

11902

#: en/help_topics/hooks.txt:164

11896

11903

msgid "Introduced in: 1.13"

11897

11904

msgstr ""

11898

11905

11899

#: en/help_topics/hooks.txt:177

11906

#: en/help_topics/hooks.txt:166

11900

11907

msgid ""

11901

11908

"Called after creating a command object to allow modifications such as\n"

11902

11909

"adding or removing options, docs etc. Called with the new\n"

11903

11910

"bzrlib.commands.Command object."

11904

11911

msgstr ""

11905

11912

11906

#: en/help_topics/hooks.txt:181

11913

#: en/help_topics/hooks.txt:170

11907

11914

msgid ""

11908

11915

"get_command\n"

11909

11916

"~~~~~~~~~~~"

11910

11917

msgstr ""

11911

11918

11912

#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196

11913

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464

11919

#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185

11920

#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467

11914

11921

msgid "Introduced in: 1.17"

11915

11922

msgstr ""

11916

11923

11917

#: en/help_topics/hooks.txt:186

11924

#: en/help_topics/hooks.txt:175

11918

11925

msgid ""

11919

11926

"Called when creating a single command. Called with (cmd_or_None,\n"

11920

11927

"command_name). get_command should either return the cmd_or_None\n"

11924

11931

"plugin_cmds.register_lazy."

11925

11932

msgstr ""

11926

11933

11927

#: en/help_topics/hooks.txt:193

11934

#: en/help_topics/hooks.txt:182

11928

11935

msgid ""

11929

11936

"get_missing_command\n"

11930

11937

"~~~~~~~~~~~~~~~~~~~"

11931

11938

msgstr ""

11932

11939

11933

#: en/help_topics/hooks.txt:198

11940

#: en/help_topics/hooks.txt:187

11934

11941

msgid ""

11935

11942

"Called when creating a single command if no command could be found.\n"

11936

11943

"Called with (command_name). get_missing_command should either return\n"

11937

11944

"None, or a Command object to be used for the command."

11938

11945

msgstr ""

11939

11946

11940

#: en/help_topics/hooks.txt:202

11947

#: en/help_topics/hooks.txt:191

11941

11948

msgid ""

11942

11949

"list_commands\n"

11943

11950

"~~~~~~~~~~~~~"

11944

11951

msgstr ""

11945

11952

11946

#: en/help_topics/hooks.txt:207

11953

#: en/help_topics/hooks.txt:196

11947

11954

msgid ""

11948

11955

"Called when enumerating commands. Called with a set of cmd_name\n"

11949

11956

"strings for all the commands found so far. This set is safe to mutate\n"

11951

11958

"set of command names."

11952

11959

msgstr ""

11953

11960

11954

#: en/help_topics/hooks.txt:212

11961

#: en/help_topics/hooks.txt:201

11962

msgid ""

11963

"post_command\n"

11964

"~~~~~~~~~~~~"

11965

msgstr ""

11966

11967

#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211

11968

msgid "Introduced in: 2.6"

11969

msgstr ""

11970

11971

#: en/help_topics/hooks.txt:206

11972

msgid "Called after executing a command. Called with the command object."

11973

msgstr ""

11974

11975

#: en/help_topics/hooks.txt:208

11976

msgid ""

11977

"pre_command\n"

11978

"~~~~~~~~~~~"

11979

msgstr ""

11980

11981

#: en/help_topics/hooks.txt:213

11982

msgid "Called prior to executing a command. Called with the command object."

11983

msgstr ""

11984

11985

#: en/help_topics/hooks.txt:215

11955

11986

msgid ""

11956

11987

"_ConfigHooks\n"

11957

11988

"------------"

11958

11989

msgstr ""

11959

11990

11960

#: en/help_topics/hooks.txt:215

11991

#: en/help_topics/hooks.txt:218

11961

11992

msgid ""

11962

11993

"get\n"

11963

11994

"~~~"

11964

11995

msgstr ""

11965

11996

11966

#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226

11967

#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241

11968

#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370

11969

#: en/help_topics/hooks.txt:443

11997

#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229

11998

#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244

11999

#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373

12000

#: en/help_topics/hooks.txt:446

11970

12001

msgid "Introduced in: 2.4"

11971

12002

msgstr ""

11972

12003

11973

#: en/help_topics/hooks.txt:220

12004

#: en/help_topics/hooks.txt:223

11974

12005

msgid ""

11975

12006

"Invoked when a config option is read. The signature is (stack, name,\n"

11976

12007

"value)."

11977

12008

msgstr ""

11978

12009

11979

#: en/help_topics/hooks.txt:223

12010

#: en/help_topics/hooks.txt:226

11980

12011

msgid ""

11981

12012

"load\n"

11982

12013

"~~~~"

11983

12014

msgstr ""

11984

12015

11985

#: en/help_topics/hooks.txt:228

12016

#: en/help_topics/hooks.txt:231

11986

12017

msgid "Invoked when a config store is loaded. The signature is (store)."

11987

12018

msgstr ""

11988

12019

11989

#: en/help_topics/hooks.txt:230

12020

#: en/help_topics/hooks.txt:233

11990

12021

msgid ""

11991

12022

"remove\n"

11992

12023

"~~~~~~"

11993

12024

msgstr ""

11994

12025

11995

#: en/help_topics/hooks.txt:235

12026

#: en/help_topics/hooks.txt:238

11996

12027

msgid ""

11997

12028

"Invoked when a config option is removed. The signature is (stack,\n"

11998

12029

"name)."

11999

12030

msgstr ""

12000

12031

12001

#: en/help_topics/hooks.txt:238

12032

#: en/help_topics/hooks.txt:241

12002

12033

msgid ""

12003

12034

"save\n"

12004

12035

"~~~~"

12005

12036

msgstr ""

12006

12037

12007

#: en/help_topics/hooks.txt:243

12038

#: en/help_topics/hooks.txt:246

12008

12039

msgid "Invoked when a config store is saved. The signature is (store)."

12009

12040

msgstr ""

12010

12041

12011

#: en/help_topics/hooks.txt:245

12042

#: en/help_topics/hooks.txt:248

12012

12043

msgid ""

12013

12044

"set\n"

12014

12045

"~~~"

12015

12046

msgstr ""

12016

12047

12017

#: en/help_topics/hooks.txt:250

12048

#: en/help_topics/hooks.txt:253

12018

12049

msgid ""

12019

12050

"Invoked when a config option is set. The signature is (stack, name,\n"

12020

12051

"value)."

12021

12052

msgstr ""

12022

12053

12023

#: en/help_topics/hooks.txt:253

12054

#: en/help_topics/hooks.txt:256

12024

12055

msgid ""

12025

12056

"ControlDirHooks\n"

12026

12057

"---------------"

12027

12058

msgstr ""

12028

12059

12029

#: en/help_topics/hooks.txt:256

12060

#: en/help_topics/hooks.txt:259

12030

12061

msgid ""

12031

12062

"post_repo_init\n"

12032

12063

"~~~~~~~~~~~~~~"

12033

12064

msgstr ""

12034

12065

12035

#: en/help_topics/hooks.txt:261

12066

#: en/help_topics/hooks.txt:264

12036

12067

msgid ""

12037

12068

"Invoked after a repository has been initialized. post_repo_init is\n"

12038

12069

"called with a bzrlib.controldir.RepoInitHookParams."

12039

12070

msgstr ""

12040

12071

12041

#: en/help_topics/hooks.txt:264

12072

#: en/help_topics/hooks.txt:267

12042

12073

msgid ""

12043

12074

"pre_open\n"

12044

12075

"~~~~~~~~"

12045

12076

msgstr ""

12046

12077

12047

#: en/help_topics/hooks.txt:267

12078

#: en/help_topics/hooks.txt:270

12048

12079

msgid "Introduced in: 1.14"

12049

12080

msgstr ""

12050

12081

12051

#: en/help_topics/hooks.txt:269

12082

#: en/help_topics/hooks.txt:272

12052

12083

msgid ""

12053

12084

"Invoked before attempting to open a ControlDir with the transport that\n"

12054

12085

"the open will use."

12055

12086

msgstr ""

12056

12087

12057

#: en/help_topics/hooks.txt:272

12088

#: en/help_topics/hooks.txt:275

12058

12089

msgid ""

12059

12090

"InfoHooks\n"

12060

12091

"---------"

12061

12092

msgstr ""

12062

12093

12063

#: en/help_topics/hooks.txt:275

12094

#: en/help_topics/hooks.txt:278

12064

12095

msgid ""

12065

12096

"repository\n"

12066

12097

"~~~~~~~~~~"

12067

12098

msgstr ""

12068

12099

12069

#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297

12070

#: en/help_topics/hooks.txt:521

12100

#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300

12101

#: en/help_topics/hooks.txt:524

12071

12102

msgid "Introduced in: 1.15"

12072

12103

msgstr ""

12073

12104

12074

#: en/help_topics/hooks.txt:280

12105

#: en/help_topics/hooks.txt:283

12075

12106

msgid ""

12076

12107

"Invoked when displaying the statistics for a repository. repository is\n"

12077

12108

"called with a statistics dictionary as returned by the repository and\n"

12078

12109

"a file-like object to write to."

12079

12110

msgstr ""

12080

12111

12081

#: en/help_topics/hooks.txt:284

12112

#: en/help_topics/hooks.txt:287

12082

12113

msgid ""

12083

12114

"LockHooks\n"

12084

12115

"---------"

12085

12116

msgstr ""

12086

12117

12087

#: en/help_topics/hooks.txt:287

12118

#: en/help_topics/hooks.txt:290

12088

12119

msgid ""

12089

12120

"lock_acquired\n"

12090

12121

"~~~~~~~~~~~~~"

12091

12122

msgstr ""

12092

12123

12093

#: en/help_topics/hooks.txt:292

12124

#: en/help_topics/hooks.txt:295

12094

12125

msgid ""

12095

12126

"Called with a bzrlib.lock.LockResult when a physical lock is acquired."

12096

12127

msgstr ""

12097

12128

12098

#: en/help_topics/hooks.txt:294

12129

#: en/help_topics/hooks.txt:297

12099

12130

msgid ""

12100

12131

"lock_broken\n"

12101

12132

"~~~~~~~~~~~"

12102

12133

msgstr ""

12103

12134

12104

#: en/help_topics/hooks.txt:299

12135

#: en/help_topics/hooks.txt:302

12105

12136

msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."

12106

12137

msgstr ""

12107

12138

12108

#: en/help_topics/hooks.txt:301

12139

#: en/help_topics/hooks.txt:304

12109

12140

msgid ""

12110

12141

"lock_released\n"

12111

12142

"~~~~~~~~~~~~~"

12112

12143

msgstr ""

12113

12144

12114

#: en/help_topics/hooks.txt:306

12145

#: en/help_topics/hooks.txt:309

12115

12146

msgid ""

12116

12147

"Called with a bzrlib.lock.LockResult when a physical lock is released."

12117

12148

msgstr ""

12118

12149

12119

#: en/help_topics/hooks.txt:308

12150

#: en/help_topics/hooks.txt:311

12120

12151

msgid ""

12121

12152

"MergeHooks\n"

12122

12153

"----------"

12123

12154

msgstr ""

12124

12155

12125

#: en/help_topics/hooks.txt:311

12156

#: en/help_topics/hooks.txt:314

12126

12157

msgid ""

12127

12158

"merge_file_content\n"

12128

12159

"~~~~~~~~~~~~~~~~~~"

12129

12160

msgstr ""

12130

12161

12131

#: en/help_topics/hooks.txt:314

12162

#: en/help_topics/hooks.txt:317

12132

12163

msgid "Introduced in: 2.1"

12133

12164

msgstr ""

12134

12165

12135

#: en/help_topics/hooks.txt:316

12166

#: en/help_topics/hooks.txt:319

12136

12167

msgid ""

12137

12168

"Called with a bzrlib.merge.Merger object to create a per file merge\n"

12138

12169

"object when starting a merge. Should return either None or a subclass\n"

12142

12173

"AbstractPerFileMerger API docs for details on how it is used by merge."

12143

12174

msgstr ""

12144

12175

12145

#: en/help_topics/hooks.txt:323

12176

#: en/help_topics/hooks.txt:326

12146

12177

msgid ""

12147

12178

"post_merge\n"

12148

12179

"~~~~~~~~~~"

12149

12180

msgstr ""

12150

12181

12151

#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334

12152

#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402

12153

#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509

12182

#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337

12183

#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405

12184

#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512

12154

12185

msgid "Introduced in: 2.5"

12155

12186

msgstr ""

12156

12187

12157

#: en/help_topics/hooks.txt:328

12188

#: en/help_topics/hooks.txt:331

12158

12189

msgid ""

12159

12190

"Called after a merge. Receives a Merger object as the single argument.\n"

12160

12191

"The return value is ignored."

12161

12192

msgstr ""

12162

12193

12163

#: en/help_topics/hooks.txt:331

12194

#: en/help_topics/hooks.txt:334

12164

12195

msgid ""

12165

12196

"pre_merge\n"

12166

12197

"~~~~~~~~~"

12167

12198

msgstr ""

12168

12199

12169

#: en/help_topics/hooks.txt:336

12200

#: en/help_topics/hooks.txt:339

12170

12201

msgid ""

12171

12202

"Called before a merge. Receives a Merger object as the single\n"

12172

12203

"argument."

12173

12204

msgstr ""

12174

12205

12175

#: en/help_topics/hooks.txt:339

12206

#: en/help_topics/hooks.txt:342

12176

12207

msgid ""

12177

12208

"MergeDirectiveHooks\n"

12178

12209

"-------------------"

12179

12210

msgstr ""

12180

12211

12181

#: en/help_topics/hooks.txt:342

12212

#: en/help_topics/hooks.txt:345

12182

12213

msgid ""

12183

12214

"merge_request_body\n"

12184

12215

"~~~~~~~~~~~~~~~~~~"

12185

12216

msgstr ""

12186

12217

12187

#: en/help_topics/hooks.txt:345

12218

#: en/help_topics/hooks.txt:348

12188

12219

msgid "Introduced in: 1.15.0"

12189

12220

msgstr ""

12190

12221

12191

#: en/help_topics/hooks.txt:347

12222

#: en/help_topics/hooks.txt:350

12192

12223

msgid ""

12193

12224

"Called with a MergeRequestBodyParams when a body is needed for a merge\n"

12194

12225

"request. Callbacks must return a body. If more than one callback is\n"

12195

12226

"registered, the output of one callback is provided to the next."

12196

12227

msgstr ""

12197

12228

12198

#: en/help_topics/hooks.txt:351

12229

#: en/help_topics/hooks.txt:354

12199

12230

msgid ""

12200

12231

"MessageEditorHooks\n"

12201

12232

"------------------"

12202

12233

msgstr ""

12203

12234

12204

#: en/help_topics/hooks.txt:354

12235

#: en/help_topics/hooks.txt:357

12205

12236

msgid ""

12206

12237

"commit_message_template\n"

12207

12238

"~~~~~~~~~~~~~~~~~~~~~~~"

12208

12239

msgstr ""

12209

12240

12210

#: en/help_topics/hooks.txt:357

12241

#: en/help_topics/hooks.txt:360

12211

12242

msgid "Introduced in: 1.10"

12212

12243

msgstr ""

12213

12244

12214

#: en/help_topics/hooks.txt:359

12245

#: en/help_topics/hooks.txt:362

12215

12246

msgid ""

12216

12247

"Called when a commit message is being generated.\n"

12217

12248

"commit_message_template is called with the bzrlib.commit.Commit object\n"

12222

12253

"second, and so on."

12223

12254

msgstr ""

12224

12255

12225

#: en/help_topics/hooks.txt:367

12256

#: en/help_topics/hooks.txt:370

12226

12257

msgid ""

12227

12258

"set_commit_message\n"

12228

12259

"~~~~~~~~~~~~~~~~~~"

12229

12260

msgstr ""

12230

12261

12231

#: en/help_topics/hooks.txt:372

12262

#: en/help_topics/hooks.txt:375

12232

12263

msgid ""

12233

12264

"Set a fixed commit message. set_commit_message is called with the\n"

12234

12265

"bzrlib.commit.Commit object (so you can also change e.g. revision\n"

12237

12268

"should use the message editor as normal."

12238

12269

msgstr ""

12239

12270

12240

#: en/help_topics/hooks.txt:378

12271

#: en/help_topics/hooks.txt:381

12241

12272

msgid ""

12242

12273

"MutableTreeHooks\n"

12243

12274

"----------------"

12244

12275

msgstr ""

12245

12276

12246

#: en/help_topics/hooks.txt:381

12277

#: en/help_topics/hooks.txt:384

12247

12278

msgid ""

12248

12279

"post_build_tree\n"

12249

12280

"~~~~~~~~~~~~~~~"

12250

12281

msgstr ""

12251

12282

12252

#: en/help_topics/hooks.txt:386

12283

#: en/help_topics/hooks.txt:389

12253

12284

msgid ""

12254

12285

"Called after a completely new tree is built. The hook is called with\n"

12255

12286

"the tree as its only argument."

12256

12287

msgstr ""

12257

12288

12258

#: en/help_topics/hooks.txt:392

12289

#: en/help_topics/hooks.txt:395

12259

12290

msgid "Introduced in: 2.0"

12260

12291

msgstr ""

12261

12292

12262

#: en/help_topics/hooks.txt:394

12293

#: en/help_topics/hooks.txt:397

12263

12294

msgid ""

12264

12295

"Called after a commit is performed on a tree. The hook is called with\n"

12265

12296

"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"

12267

12298

"that object."

12268

12299

msgstr ""

12269

12300

12270

#: en/help_topics/hooks.txt:399

12301

#: en/help_topics/hooks.txt:402

12271

12302

msgid ""

12272

12303

"post_transform\n"

12273

12304

"~~~~~~~~~~~~~~"

12274

12305

msgstr ""

12275

12306

12276

#: en/help_topics/hooks.txt:404

12307

#: en/help_topics/hooks.txt:407

12277

12308

msgid ""

12278

12309

"Called after a tree transform has been performed on a tree. The hook\n"

12279

12310

"is called with the tree that is being transformed and the transform."

12280

12311

msgstr ""

12281

12312

12282

#: en/help_topics/hooks.txt:407

12313

#: en/help_topics/hooks.txt:410

12283

12314

msgid ""

12284

12315

"pre_transform\n"

12285

12316

"~~~~~~~~~~~~~"

12286

12317

msgstr ""

12287

12318

12288

#: en/help_topics/hooks.txt:412

12319

#: en/help_topics/hooks.txt:415

12289

12320

msgid ""

12290

12321

"Called before a tree transform on this tree. The hook is called with\n"

12291

12322

"the tree that is being transformed and the transform."

12292

12323

msgstr ""

12293

12324

12294

#: en/help_topics/hooks.txt:415

12325

#: en/help_topics/hooks.txt:418

12295

12326

msgid ""

12296

12327

"start_commit\n"

12297

12328

"~~~~~~~~~~~~"

12298

12329

msgstr ""

12299

12330

12300

#: en/help_topics/hooks.txt:420

12331

#: en/help_topics/hooks.txt:423

12301

12332

msgid ""

12302

12333

"Called before a commit is performed on a tree. The start commit hook\n"

12303

12334

"is able to change the tree before the commit takes place. start_commit\n"

12305

12336

"being performed on."

12306

12337

msgstr ""

12307

12338

12308

#: en/help_topics/hooks.txt:425

12339

#: en/help_topics/hooks.txt:428

12309

12340

msgid ""

12310

12341

"SmartClientHooks\n"

12311

12342

"----------------"

12312

12343

msgstr ""

12313

12344

12314

#: en/help_topics/hooks.txt:428

12345

#: en/help_topics/hooks.txt:431

12315

12346

msgid ""

12316

12347

"call\n"

12317

12348

"~~~~"

12318

12349

msgstr ""

12319

12350

12320

#: en/help_topics/hooks.txt:431

12351

#: en/help_topics/hooks.txt:434

12321

12352

msgid "Introduced in: unknown"

12322

12353

msgstr ""

12323

12354

12324

#: en/help_topics/hooks.txt:433

12355

#: en/help_topics/hooks.txt:436

12325

12356

msgid ""

12326

12357

"Called when the smart client is submitting a request to the smart\n"

12327

12358

"server. Called with a bzrlib.smart.client.CallHookParams object.\n"

12328

12359

"Streaming request bodies, and responses, are not accessible."

12329

12360

msgstr ""

12330

12361

12331

#: en/help_topics/hooks.txt:437

12362

#: en/help_topics/hooks.txt:440

12332

12363

msgid ""

12333

12364

"SmartServerHooks\n"

12334

12365

"----------------"

12335

12366

msgstr ""

12336

12367

12337

#: en/help_topics/hooks.txt:440

12368

#: en/help_topics/hooks.txt:443

12338

12369

msgid ""

12339

12370

"server_exception\n"

12340

12371

"~~~~~~~~~~~~~~~~"

12341

12372

msgstr ""

12342

12373

12343

#: en/help_topics/hooks.txt:445

12374

#: en/help_topics/hooks.txt:448

12344

12375

msgid ""

12345

12376

"Called by the bzr server when an exception occurs. server_exception is\n"

12346

12377

"called with the sys.exc_info() tuple return true for the hook if the\n"

12348

12379

"normally."

12349

12380

msgstr ""

12350

12381

12351

#: en/help_topics/hooks.txt:450

12382

#: en/help_topics/hooks.txt:453

12352

12383

msgid ""

12353

12384

"server_started\n"

12354

12385

"~~~~~~~~~~~~~~"

12355

12386

msgstr ""

12356

12387

12357

#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472

12388

#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475

12358

12389

msgid "Introduced in: 0.16"

12359

12390

msgstr ""

12360

12391

12361

#: en/help_topics/hooks.txt:455

12392

#: en/help_topics/hooks.txt:458

12362

12393

msgid ""

12363

12394

"Called by the bzr server when it starts serving a directory.\n"

12364

12395

"server_started is called with (backing urls, public url), where\n"

12367

12398

"served."

12368

12399

msgstr ""

12369

12400

12370

#: en/help_topics/hooks.txt:461

12401

#: en/help_topics/hooks.txt:464

12371

12402

msgid ""

12372

12403

"server_started_ex\n"

12373

12404

"~~~~~~~~~~~~~~~~~"

12374

12405

msgstr ""

12375

12406

12376

#: en/help_topics/hooks.txt:466

12407

#: en/help_topics/hooks.txt:469

12377

12408

msgid ""

12378

12409

"Called by the bzr server when it starts serving a directory.\n"

12379

12410

"server_started is called with (backing_urls, server_obj)."

12380

12411

msgstr ""

12381

12412

12382

#: en/help_topics/hooks.txt:469

12413

#: en/help_topics/hooks.txt:472

12383

12414

msgid ""

12384

12415

"server_stopped\n"

12385

12416

"~~~~~~~~~~~~~~"

12386

12417

msgstr ""

12387

12418

12388

#: en/help_topics/hooks.txt:474

12419

#: en/help_topics/hooks.txt:477

12389

12420

msgid ""

12390

12421

"Called by the bzr server when it stops serving a directory.\n"

12391

12422

"server_stopped is called with the same parameters as the\n"

12392

12423

"server_started hook: (backing_urls, public_url)."

12393

12424

msgstr ""

12394

12425

12395

#: en/help_topics/hooks.txt:478

12426

#: en/help_topics/hooks.txt:481

12396

12427

msgid ""

12397

12428

"StatusHooks\n"

12398

12429

"-----------"

12399

12430

msgstr ""

12400

12431

12401

#: en/help_topics/hooks.txt:481

12432

#: en/help_topics/hooks.txt:484

12402

12433

msgid ""

12403

12434

"post_status\n"

12404

12435

"~~~~~~~~~~~"

12405

12436

msgstr ""

12406

12437

12407

#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495

12438

#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498

12408

12439

msgid "Introduced in: 2.3"

12409

12440

msgstr ""

12410

12441

12411

#: en/help_topics/hooks.txt:486

12442

#: en/help_topics/hooks.txt:489

12412

12443

msgid ""

12413

12444

"Called with argument StatusHookParams after Bazaar has displayed the\n"

12414

12445

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12417

12448

"status command. to_file is the output stream for writing."

12418

12449

msgstr ""

12419

12450

12420

#: en/help_topics/hooks.txt:492

12451

#: en/help_topics/hooks.txt:495

12421

12452

msgid ""

12422

12453

"pre_status\n"

12423

12454

"~~~~~~~~~~"

12424

12455

msgstr ""

12425

12456

12426

#: en/help_topics/hooks.txt:497

12457

#: en/help_topics/hooks.txt:500

12427

12458

msgid ""

12428

12459

"Called with argument StatusHookParams before Bazaar displays the\n"

12429

12460

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12432

12463

"status command. to_file is the output stream for writing."

12433

12464

msgstr ""

12434

12465

12435

#: en/help_topics/hooks.txt:503

12466

#: en/help_topics/hooks.txt:506

12436

12467

msgid ""

12437

12468

"TransportHooks\n"

12438

12469

"--------------"

12439

12470

msgstr ""

12440

12471

12441

#: en/help_topics/hooks.txt:506

12472

#: en/help_topics/hooks.txt:509

12442

12473

msgid ""

12443

12474

"post_connect\n"

12444

12475

"~~~~~~~~~~~~"

12445

12476

msgstr ""

12446

12477

12447

#: en/help_topics/hooks.txt:511

12478

#: en/help_topics/hooks.txt:514

12448

12479

msgid ""

12449

12480

"Called after a new connection is established or a reconnect occurs.\n"

12450

12481

"The sole argument passed is either the connected transport or smart\n"

12451

12482

"medium instance."

12452

12483

msgstr ""

12453

12484

12454

#: en/help_topics/hooks.txt:515

12485

#: en/help_topics/hooks.txt:518

12455

12486

msgid ""

12456

12487

"RioVersionInfoBuilderHooks\n"

12457

12488

"--------------------------"

12458

12489

msgstr ""

12459

12490

12460

#: en/help_topics/hooks.txt:518

12491

#: en/help_topics/hooks.txt:521

12461

12492

msgid ""

12462

12493

"revision\n"

12463

12494

"~~~~~~~~"

12464

12495

msgstr ""

12465

12496

12466

#: en/help_topics/hooks.txt:523

12497

#: en/help_topics/hooks.txt:526

12467

12498

msgid ""

12468

12499

"Invoked when adding information about a revision to the RIO stanza\n"

12469

12500

"that is printed. revision is called with a revision object and a RIO\n"