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

10

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

11

"PO-Revision-Date: 2012-02-21 11:04+0000\n"

12

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

13

"Language-Team: Arabic <ar@li.org>\n"

16

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

17

"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "

18

"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"

19

"X-Launchpad-Export-Date: 2012-02-22 06:50+0000\n"

20

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

19

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

20

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

21

22

#: bzrlib/add.py:95

22

#: bzrlib/add.py:93

23

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

24

msgstr ""

25

26

#: bzrlib/branch.py:872

26

#: bzrlib/branch.py:854

27

msgid "Unstacking"

28

msgstr ""

29

30

#: bzrlib/branch.py:3205

30

#: bzrlib/branch.py:3121

31

#, python-format

32

msgid "Pushed up to revision %d."

33

msgstr ""

34

35

#: bzrlib/branch.py:3207

35

#: bzrlib/branch.py:3123

36

#, python-format

37

msgid "%d tag updated."

38

msgid_plural "%d tags updated."

39

msgstr[0] ""

40

msgstr[1] ""

41

42

#: bzrlib/branch.py:3210

42

#: bzrlib/branch.py:3126

43

msgid "No new revisions or tags to push."

44

msgstr ""

45

46

#: bzrlib/branch.py:3212

46

#: bzrlib/branch.py:3128

47

msgid "No new revisions to push."

48

msgstr ""

49

50

#: bzrlib/branch.py:3232

50

#: bzrlib/branch.py:3148

51

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

52

msgstr ""

53

54

#: bzrlib/branch.py:3235

54

#: bzrlib/branch.py:3151

55

#, python-format

56

msgid "found error:%s"

57

msgstr ""

58

59

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

59

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

60

#, python-format

61

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

62

msgstr ""

63

64

#: bzrlib/builtins.py:218

64

#: bzrlib/builtins.py:260

65

#, python-format

66

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

67

msgstr ""

68

69

#: bzrlib/builtins.py:303

69

#: bzrlib/builtins.py:315

70

msgid "Display status summary."

71

msgstr ""

72

73

#: bzrlib/builtins.py:305

73

#: bzrlib/builtins.py:317

74

msgid ""

75

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

76

"grouped by state. Possible states are:"

77

msgstr ""

78

79

#: bzrlib/builtins.py:308

79

#: bzrlib/builtins.py:320

80

msgid ""

81

"added\n"

82

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

83

msgstr ""

84

85

#: bzrlib/builtins.py:311

85

#: bzrlib/builtins.py:323

86

msgid ""

87

"removed\n"

88

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

89

" in the working copy."

90

msgstr ""

91

92

#: bzrlib/builtins.py:315

92

#: bzrlib/builtins.py:327

93

msgid ""

94

"renamed\n"

95

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

97

" parent directory was renamed."

98

msgstr ""

99

100

#: bzrlib/builtins.py:320

100

#: bzrlib/builtins.py:332

101

msgid ""

102

"modified\n"

103

" Text has changed since the previous revision."

104

msgstr ""

105

106

#: bzrlib/builtins.py:323

106

#: bzrlib/builtins.py:335

107

msgid ""

108

"kind changed\n"

109

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

110

msgstr ""

111

112

#: bzrlib/builtins.py:326

112

#: bzrlib/builtins.py:338

113

msgid ""

114

"unknown\n"

115

" Not versioned and not matching an ignore pattern."

116

msgstr ""

117

118

#: bzrlib/builtins.py:329

118

#: bzrlib/builtins.py:341

119

msgid ""

120

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

121

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

123

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

124

msgstr ""

125

126

#: bzrlib/builtins.py:334

126

#: bzrlib/builtins.py:346

127

msgid ""

128

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

129

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

130

msgstr ""

131

132

#: bzrlib/builtins.py:337

132

#: bzrlib/builtins.py:349

133

msgid ""

134

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

135

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

136

"use bzr status -SV."

137

msgstr ""

138

139

#: bzrlib/builtins.py:341

139

#: bzrlib/builtins.py:353

140

msgid ""

141

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

142

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

144

"is reported for everything inside that directory."

145

msgstr ""

146

147

#: bzrlib/builtins.py:346

147

#: bzrlib/builtins.py:358

148

msgid ""

149

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

150

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

152

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

153

msgstr ""

154

155

#: bzrlib/builtins.py:351

155

#: bzrlib/builtins.py:363

156

msgid ""

157

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

158

"single revision to the revision argument."

159

msgstr ""

160

161

#: bzrlib/builtins.py:354

161

#: bzrlib/builtins.py:366

162

msgid ""

163

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

164

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

165

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

166

msgstr ""

167

168

#: bzrlib/builtins.py:363

168

#: bzrlib/builtins.py:375

169

msgid "Use short status indicators."

170

msgstr ""

171

172

#: bzrlib/builtins.py:365

172

#: bzrlib/builtins.py:377

173

msgid "Only show versioned files."

174

msgstr ""

175

176

#: bzrlib/builtins.py:367

176

#: bzrlib/builtins.py:379

177

msgid "Don't show pending merges."

178

msgstr ""

179

180

#: bzrlib/builtins.py:370

180

#: bzrlib/builtins.py:382

181

msgid "Do not mark object type using indicator."

182

msgstr ""

183

184

#: bzrlib/builtins.py:385

184

#: bzrlib/builtins.py:397

185

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

186

msgstr ""

187

188

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

188

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

189

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

190

msgstr ""

191

192

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

192

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

193

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

194

msgstr ""

195

196

#: bzrlib/builtins.py:439

196

#: bzrlib/builtins.py:451

197

#, python-format

198

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

199

msgstr ""

200

201

#: bzrlib/builtins.py:450

201

#: bzrlib/builtins.py:462

202

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

203

msgstr ""

204

205

#: bzrlib/builtins.py:457

205

#: bzrlib/builtins.py:469

206

msgid "You cannot specify a NULL revision."

207

msgstr ""

208

209

#: bzrlib/builtins.py:549

209

#: bzrlib/builtins.py:561

210

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

211

msgstr ""

212

213

#: bzrlib/builtins.py:551

213

#: bzrlib/builtins.py:563

214

msgid ""

215

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

216

"this will refuse to run against one."

217

msgstr ""

218

219

#: bzrlib/builtins.py:554

219

#: bzrlib/builtins.py:566

220

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

221

msgstr ""

222

223

#: bzrlib/builtins.py:560

223

#: bzrlib/builtins.py:572

224

msgid ""

225

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

226

msgstr ""

227

228

#: bzrlib/builtins.py:574

228

#: bzrlib/builtins.py:586

229

msgid "No working tree to remove"

230

msgstr ""

231

232

#: bzrlib/builtins.py:576

232

#: bzrlib/builtins.py:588

233

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

234

msgstr ""

235

236

#: bzrlib/builtins.py:585

236

#: bzrlib/builtins.py:597

237

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

238

msgstr ""

239

240

#: bzrlib/builtins.py:625

240

#: bzrlib/builtins.py:637

241

msgid ""

242

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

243

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

244

msgstr ""

245

246

#: bzrlib/builtins.py:636

246

#: bzrlib/builtins.py:648

247

msgid ""

248

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

249

"commit"

250

msgstr ""

251

252

#: bzrlib/builtins.py:640

252

#: bzrlib/builtins.py:652

253

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

254

msgstr ""

255

256

#: bzrlib/builtins.py:644

256

#: bzrlib/builtins.py:656

257

msgid "Show current revision number."

258

msgstr ""

259

260

#: bzrlib/builtins.py:646

260

#: bzrlib/builtins.py:658

261

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

262

msgstr ""

263

264

#: bzrlib/builtins.py:659

264

#: bzrlib/builtins.py:671

265

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

266

msgstr ""

267

268

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

268

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

269

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

270

msgstr ""

271

272

#: bzrlib/builtins.py:700

272

#: bzrlib/builtins.py:712

273

msgid "Show revno of working tree."

274

msgstr ""

275

276

#: bzrlib/builtins.py:748

276

#: bzrlib/builtins.py:760

277

msgid "Add specified files or directories."

278

msgstr ""

279

280

#: bzrlib/builtins.py:750

280

#: bzrlib/builtins.py:762

281

msgid ""

282

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

283

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

284

"any of the named files are already versioned."

285

msgstr ""

286

287

#: bzrlib/builtins.py:754

287

#: bzrlib/builtins.py:766

288

msgid ""

289

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

290

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

295

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

296

msgstr ""

297

298

#: bzrlib/builtins.py:762

298

#: bzrlib/builtins.py:774

299

msgid ""

300

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

301

"unless they are explicitly ignored."

302

msgstr ""

303

304

#: bzrlib/builtins.py:765

304

#: bzrlib/builtins.py:777

305

msgid ""

306

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

307

"are currently unknown."

308

msgstr ""

309

310

#: bzrlib/builtins.py:768

310

#: bzrlib/builtins.py:780

311

msgid ""

312

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

313

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

315

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

316

msgstr ""

317

318

#: bzrlib/builtins.py:773

318

#: bzrlib/builtins.py:785

319

msgid ""

320

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

321

"add them."

322

msgstr ""

323

324

#: bzrlib/builtins.py:776

324

#: bzrlib/builtins.py:788

325

msgid ""

326

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

327

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

332

"into a subdirectory of this one."

333

msgstr ""

334

335

#: bzrlib/builtins.py:784

335

#: bzrlib/builtins.py:796

336

msgid ""

337

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

338

"unless they are explicitly mentioned."

339

msgstr ""

340

341

#: bzrlib/builtins.py:787

341

#: bzrlib/builtins.py:799

342

msgid ""

343

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

344

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

345

"to file size."

346

msgstr ""

347

348

#: bzrlib/builtins.py:794

348

#: bzrlib/builtins.py:806

349

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

350

msgstr ""

351

352

#: bzrlib/builtins.py:800

352

#: bzrlib/builtins.py:813

353

msgid "Lookup file ids from this tree."

354

msgstr ""

355

356

#: bzrlib/builtins.py:836

356

#: bzrlib/builtins.py:849

357

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

358

msgstr ""

359

360

#: bzrlib/builtins.py:841

360

#: bzrlib/builtins.py:854

361

msgid "Create a new versioned directory."

362

msgstr ""

363

364

#: bzrlib/builtins.py:843

364

#: bzrlib/builtins.py:856

365

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

366

msgstr ""

367

368

#: bzrlib/builtins.py:850

368

#: bzrlib/builtins.py:863

369

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

370

msgstr ""

371

372

#: bzrlib/builtins.py:884

372

#: bzrlib/builtins.py:897

373

#, python-format

374

msgid "added %s\n"

375

msgstr ""

376

377

#: bzrlib/builtins.py:926

377

#: bzrlib/builtins.py:939

378

#, python-format

379

msgid "invalid kind %r specified"

380

msgstr ""

381

382

#: bzrlib/builtins.py:963

382

#: bzrlib/builtins.py:976

383

msgid "Move or rename a file."

384

msgstr ""

385

386

#: bzrlib/builtins.py:965

386

#: bzrlib/builtins.py:978

387

msgid " bzr mv SOURCE... DESTINATION"

388

msgstr ""

389

390

#: bzrlib/builtins.py:967

390

#: bzrlib/builtins.py:980

391

msgid ""

392

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

393

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

394

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

395

msgstr ""

396

397

#: bzrlib/builtins.py:971

397

#: bzrlib/builtins.py:984

398

msgid ""

399

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

400

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

403

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

404

msgstr ""

405

406

#: bzrlib/builtins.py:977

406

#: bzrlib/builtins.py:990

407

msgid "Files cannot be moved between branches."

408

msgstr ""

409

410

#: bzrlib/builtins.py:984

410

#: bzrlib/builtins.py:997

411

msgid ""

412

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

413

"moved."

414

msgstr ""

415

416

#: bzrlib/builtins.py:986

416

#: bzrlib/builtins.py:999

417

msgid "Automatically guess renames."

418

msgstr ""

419

420

#: bzrlib/builtins.py:987

420

#: bzrlib/builtins.py:1000

421

msgid "Avoid making changes when guessing renames."

422

msgstr ""

423

424

#: bzrlib/builtins.py:996

424

#: bzrlib/builtins.py:1009

425

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

426

msgstr ""

427

428

#: bzrlib/builtins.py:1000

428

#: bzrlib/builtins.py:1013

429

msgid "missing file argument"

430

msgstr ""

431

432

#: bzrlib/builtins.py:1004

432

#: bzrlib/builtins.py:1017

433

msgid "can not move root of branch"

434

msgstr ""

435

436

#: bzrlib/builtins.py:1010

436

#: bzrlib/builtins.py:1023

437

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

438

msgstr ""

439

440

#: bzrlib/builtins.py:1013

440

#: bzrlib/builtins.py:1026

441

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

442

msgstr ""

443

444

#: bzrlib/builtins.py:1050

444

#: bzrlib/builtins.py:1062

445

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

446

msgstr ""

447

448

#: bzrlib/builtins.py:1102

448

#: bzrlib/builtins.py:1114

449

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

450

msgstr ""

451

452

#: bzrlib/builtins.py:1104

452

#: bzrlib/builtins.py:1116

453

msgid ""

454

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

455

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

457

"parent."

458

msgstr ""

459

460

#: bzrlib/builtins.py:1109

460

#: bzrlib/builtins.py:1121

461

msgid ""

462

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

463

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

464

"be able to pull it again."

465

msgstr ""

466

467

#: bzrlib/builtins.py:1113

467

#: bzrlib/builtins.py:1125

468

msgid ""

469

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

470

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

471

"branches have diverged."

472

msgstr ""

473

474

#: bzrlib/builtins.py:1117

474

#: bzrlib/builtins.py:1129

475

msgid ""

476

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

477

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

479

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

480

msgstr ""

481

482

#: bzrlib/builtins.py:1122

482

#: bzrlib/builtins.py:1134

483

msgid ""

484

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

485

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

486

"-Olog_format=<other_format>."

487

msgstr ""

488

489

#: bzrlib/builtins.py:1126

489

#: bzrlib/builtins.py:1138

490

msgid ""

491

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

492

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

493

"with bzr send."

494

msgstr ""

495

496

#: bzrlib/builtins.py:1134

496

#: bzrlib/builtins.py:1146

497

msgid "Show logs of pulled revisions."

498

msgstr ""

499

500

#: bzrlib/builtins.py:1136

500

#: bzrlib/builtins.py:1148

501

msgid ""

502

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

503

msgstr ""

504

505

#: bzrlib/builtins.py:1139

505

#: bzrlib/builtins.py:1151

506

msgid ""

507

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

508

"master branch."

509

msgstr ""

510

511

#: bzrlib/builtins.py:1168

511

#: bzrlib/builtins.py:1180

512

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

513

msgstr ""

514

515

#: bzrlib/builtins.py:1184

515

#: bzrlib/builtins.py:1196

516

msgid "No pull location known or specified."

517

msgstr ""

518

519

#: bzrlib/builtins.py:1190

519

#: bzrlib/builtins.py:1202

520

#, python-format

521

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

522

msgstr ""

523

524

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

524

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

525

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

526

msgstr ""

527

528

#: bzrlib/builtins.py:1238

528

#: bzrlib/builtins.py:1252

529

msgid "Update a mirror of this branch."

530

msgstr ""

531

532

#: bzrlib/builtins.py:1240

532

#: bzrlib/builtins.py:1254

533

msgid ""

534

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

535

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

536

msgstr ""

537

538

#: bzrlib/builtins.py:1243

538

#: bzrlib/builtins.py:1257

539

msgid ""

540

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

541

"the future."

542

msgstr ""

543

544

#: bzrlib/builtins.py:1246

544

#: bzrlib/builtins.py:1260

545

msgid ""

546

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

547

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

548

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

549

msgstr ""

550

551

#: bzrlib/builtins.py:1250

551

#: bzrlib/builtins.py:1264

552

msgid ""

553

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

554

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

555

msgstr ""

556

557

#: bzrlib/builtins.py:1253

557

#: bzrlib/builtins.py:1267

558

msgid ""

559

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

560

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

561

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

562

msgstr ""

563

564

#: bzrlib/builtins.py:1257

564

#: bzrlib/builtins.py:1271

565

msgid ""

566

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

567

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

569

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

570

msgstr ""

571

572

#: bzrlib/builtins.py:1262

572

#: bzrlib/builtins.py:1276

573

msgid ""

574

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

575

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

576

"-Olog_format=<other_format>."

577

msgstr ""

578

579

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

579

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

580

msgid ""

581

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

582

msgstr ""

583

584

#: bzrlib/builtins.py:1276

584

#: bzrlib/builtins.py:1290

585

msgid ""

586

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

587

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

588

msgstr ""

589

590

#: bzrlib/builtins.py:1281

590

#: bzrlib/builtins.py:1295

591

msgid ""

592

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

593

"branch."

594

msgstr ""

595

596

#: bzrlib/builtins.py:1284

596

#: bzrlib/builtins.py:1298

597

msgid ""

598

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

599

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

600

"the branch created."

601

msgstr ""

602

603

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

603

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

604

msgid ""

605

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

606

"strict disables the check."

607

msgstr ""

608

609

#: bzrlib/builtins.py:1292

609

#: bzrlib/builtins.py:1306

610

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

611

msgstr ""

612

613

#: bzrlib/builtins.py:1336

613

#: bzrlib/builtins.py:1350

614

msgid "Could not determine branch to refer to."

615

msgstr ""

616

617

#: bzrlib/builtins.py:1345

617

#: bzrlib/builtins.py:1359

618

#, python-format

619

msgid ""

620

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

621

"use 'bzr push :parent'."

622

msgstr ""

623

624

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

624

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

625

msgid "No push location known or specified."

626

msgstr ""

627

628

#: bzrlib/builtins.py:1355

628

#: bzrlib/builtins.py:1369

629

#, python-format

630

msgid "Using saved push location: %s"

631

msgstr ""

632

633

#: bzrlib/builtins.py:1365

633

#: bzrlib/builtins.py:1379

634

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

635

msgstr ""

636

637

#: bzrlib/builtins.py:1367

637

#: bzrlib/builtins.py:1381

638

msgid ""

639

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

640

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

645

"create ./foo-bar."

646

msgstr ""

647

648

#: bzrlib/builtins.py:1374

648

#: bzrlib/builtins.py:1388

649

msgid ""

650

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

651

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

652

msgstr ""

653

654

#: bzrlib/builtins.py:1377

654

#: bzrlib/builtins.py:1391

655

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

656

msgstr ""

657

658

#: bzrlib/builtins.py:1387

658

#: bzrlib/builtins.py:1401

659

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

660

msgstr ""

661

662

#: bzrlib/builtins.py:1389

662

#: bzrlib/builtins.py:1403

663

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

664

msgstr ""

665

666

#: bzrlib/builtins.py:1392

666

#: bzrlib/builtins.py:1406

667

msgid ""

668

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

669

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

670

msgstr ""

671

672

#: bzrlib/builtins.py:1396

672

#: bzrlib/builtins.py:1410

673

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

674

msgstr ""

675

676

#: bzrlib/builtins.py:1398

676

#: bzrlib/builtins.py:1412

677

msgid ""

678

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

679

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

680

msgstr ""

681

682

#: bzrlib/builtins.py:1403

682

#: bzrlib/builtins.py:1417

683

msgid "Bind new branch to from location."

684

msgstr ""

685

686

#: bzrlib/builtins.py:1450

686

#: bzrlib/builtins.py:1464

687

#, python-format

688

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

689

msgstr ""

690

691

#: bzrlib/builtins.py:1462

691

#: bzrlib/builtins.py:1476

692

#, python-format

693

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

694

msgstr ""

695

696

#: bzrlib/builtins.py:1481

696

#: bzrlib/builtins.py:1495

697

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

698

msgstr ""

699

700

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

700

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

701

#, python-format

702

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

703

msgstr ""

704

705

#: bzrlib/builtins.py:1500

705

#: bzrlib/builtins.py:1514

706

#, python-format

707

msgid "Branched %d revision."

708

msgid_plural "Branched %d revisions."

709

msgstr[0] ""

710

msgstr[1] ""

711

712

#: bzrlib/builtins.py:1505

712

#: bzrlib/builtins.py:1519

713

#, python-format

714

msgid "New branch bound to %s"

715

msgstr ""

716

717

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

717

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

718

#, python-format

719

msgid "Switched to branch: %s"

720

msgstr ""

721

722

#: bzrlib/builtins.py:1515

722

#: bzrlib/builtins.py:1529

723

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

724

msgstr ""

725

726

#: bzrlib/builtins.py:1517

726

#: bzrlib/builtins.py:1531

727

msgid ""

728

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

729

"location."

730

msgstr ""

731

732

#: bzrlib/builtins.py:1524

732

#: bzrlib/builtins.py:1538

733

msgid ""

734

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

735

"location."

736

msgstr ""

737

738

#: bzrlib/builtins.py:1554

738

#: bzrlib/builtins.py:1567

739

msgid "(default)"

740

msgstr ""

741

742

#: bzrlib/builtins.py:1566

742

#: bzrlib/builtins.py:1579

743

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

744

msgstr ""

745

746

#: bzrlib/builtins.py:1568

746

#: bzrlib/builtins.py:1581

747

msgid ""

748

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

749

"for\n"

753

"location using SFTP."

754

msgstr ""

755

756

#: bzrlib/builtins.py:1573

756

#: bzrlib/builtins.py:1586

757

msgid ""

758

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

759

"will\n"

765

"create ./foo-bar."

766

msgstr ""

767

768

#: bzrlib/builtins.py:1580

768

#: bzrlib/builtins.py:1593

769

msgid ""

770

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

771

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

775

"code.)"

776

msgstr ""

777

778

#: bzrlib/builtins.py:1590

778

#: bzrlib/builtins.py:1603

779

msgid ""

780

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

781

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

783

"commits."

784

msgstr ""

785

786

#: bzrlib/builtins.py:1597

786

#: bzrlib/builtins.py:1610

787

msgid "Get file contents from this tree."

788

msgstr ""

789

790

#: bzrlib/builtins.py:1599

790

#: bzrlib/builtins.py:1612

791

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

792

msgstr ""

793

794

#: bzrlib/builtins.py:1640

794

#: bzrlib/builtins.py:1653

795

msgid ""

796

"Show list of renamed files.\n"

797

" "

798

msgstr ""

799

800

#: bzrlib/builtins.py:1670

800

#: bzrlib/builtins.py:1681

801

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

802

msgstr ""

803

804

#: bzrlib/builtins.py:1672

804

#: bzrlib/builtins.py:1683

805

msgid ""

806

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

807

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

808

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

809

msgstr ""

810

811

#: bzrlib/builtins.py:1676

811

#: bzrlib/builtins.py:1687

812

msgid ""

813

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

814

"that is out of date from its branch."

815

msgstr ""

816

817

#: bzrlib/builtins.py:1679

817

#: bzrlib/builtins.py:1690

818

msgid ""

819

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

820

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

822

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

823

msgstr ""

824

825

#: bzrlib/builtins.py:1684

825

#: bzrlib/builtins.py:1695

826

msgid ""

827

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

828

"the branch from the master."

829

msgstr ""

830

831

#: bzrlib/builtins.py:1687

831

#: bzrlib/builtins.py:1698

832

msgid ""

833

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

834

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

838

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

839

msgstr ""

840

841

#: bzrlib/builtins.py:1694

841

#: bzrlib/builtins.py:1705

842

msgid ""

843

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

844

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

845

"current working directory is used."

846

msgstr ""

847

848

#: bzrlib/builtins.py:1710

848

#: bzrlib/builtins.py:1721

849

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

850

msgstr ""

851

852

#: bzrlib/builtins.py:1718

852

#: bzrlib/builtins.py:1729

853

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

854

msgstr ""

855

856

#: bzrlib/builtins.py:1749

856

#: bzrlib/builtins.py:1760

857

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

858

msgstr ""

859

860

#: bzrlib/builtins.py:1765

860

#: bzrlib/builtins.py:1776

861

#, python-format

862

msgid ""

863

"branch has no revision %s\n"

864

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

865

msgstr ""

866

867

#: bzrlib/builtins.py:1771

867

#: bzrlib/builtins.py:1782

868

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

869

msgstr ""

870

871

#: bzrlib/builtins.py:1775

871

#: bzrlib/builtins.py:1786

872

msgid ""

873

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

874

"can be committed with 'bzr commit'."

875

msgstr ""

876

877

#: bzrlib/builtins.py:1784

877

#: bzrlib/builtins.py:1795

878

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

879

msgstr ""

880

881

#: bzrlib/builtins.py:1786

881

#: bzrlib/builtins.py:1797

882

msgid ""

883

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

884

"tree, branch or repository."

885

msgstr ""

886

887

#: bzrlib/builtins.py:1789

887

#: bzrlib/builtins.py:1800

888

msgid ""

889

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

890

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

891

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

892

msgstr ""

893

894

#: bzrlib/builtins.py:1793

894

#: bzrlib/builtins.py:1804

895

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

896

msgstr ""

897

898

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

899

#: bzrlib/builtins.py:6442

898

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

899

#: bzrlib/builtins.py:6433

900

msgid ":Examples:"

901

msgstr ""

902

903

#: bzrlib/builtins.py:1797

903

#: bzrlib/builtins.py:1808

904

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

905

msgstr ""

906

907

#: bzrlib/builtins.py:1799

907

#: bzrlib/builtins.py:1810

908

msgid " bzr info"

909

msgstr ""

910

911

#: bzrlib/builtins.py:1801

911

#: bzrlib/builtins.py:1812

912

msgid ""

913

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

914

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

915

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

916

msgstr ""

917

918

#: bzrlib/builtins.py:1805

918

#: bzrlib/builtins.py:1816

919

msgid " bzr info -v"

920

msgstr ""

921

922

#: bzrlib/builtins.py:1807

922

#: bzrlib/builtins.py:1818

923

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

924

msgstr ""

925

926

#: bzrlib/builtins.py:1809

926

#: bzrlib/builtins.py:1820

927

msgid " bzr info -vv"

928

msgstr ""

929

930

#: bzrlib/builtins.py:1828

930

#: bzrlib/builtins.py:1839

931

msgid "Remove files or directories."

932

msgstr ""

933

934

#: bzrlib/builtins.py:1830

934

#: bzrlib/builtins.py:1841

935

msgid ""

936

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

937

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

940

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

941

msgstr ""

942

943

#: bzrlib/builtins.py:1838

943

#: bzrlib/builtins.py:1849

944

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

945

msgstr ""

946

947

#: bzrlib/builtins.py:1840

947

#: bzrlib/builtins.py:1851

948

msgid "The file deletion mode to be used."

949

msgstr ""

950

951

#: bzrlib/builtins.py:1841

951

#: bzrlib/builtins.py:1852

952

msgid "Deletion Strategy"

953

msgstr ""

954

955

#: bzrlib/builtins.py:1842

955

#: bzrlib/builtins.py:1853

956

msgid "Backup changed files (default)."

957

msgstr ""

958

959

#: bzrlib/builtins.py:1843

959

#: bzrlib/builtins.py:1854

960

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

961

msgstr ""

962

963

#: bzrlib/builtins.py:1844

963

#: bzrlib/builtins.py:1855

964

msgid "Don't backup changed files."

965

msgstr ""

966

967

#: bzrlib/builtins.py:1845

967

#: bzrlib/builtins.py:1856

968

msgid ""

969

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

970

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

971

msgstr ""

972

973

#: bzrlib/builtins.py:1854

973

#: bzrlib/builtins.py:1865

974

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

975

msgstr ""

976

977

#: bzrlib/builtins.py:1871

977

#: bzrlib/builtins.py:1882

978

msgid "No matching files."

979

msgstr ""

980

981

#: bzrlib/builtins.py:1932

981

#: bzrlib/builtins.py:1943

982

msgid "Reconcile bzr metadata in a branch."

983

msgstr ""

984

985

#: bzrlib/builtins.py:1934

985

#: bzrlib/builtins.py:1945

986

msgid ""

987

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

988

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

990

"advises you to run it."

991

msgstr ""

992

993

#: bzrlib/builtins.py:1939

993

#: bzrlib/builtins.py:1950

994

msgid ""

995

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

996

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

998

"correctly in both branches."

999

msgstr ""

1000

1001

#: bzrlib/builtins.py:1944

1001

#: bzrlib/builtins.py:1955

1002

msgid ""

1003

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

1004

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

1005

msgstr ""

1006

1007

#: bzrlib/builtins.py:1947

1007

#: bzrlib/builtins.py:1958

1008

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

1009

msgstr ""

1010

1011

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

1011

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

1012

msgid ""

1013

"Format for the bzr 2.0 series.\n"

1014

"Uses group-compress storage.\n"

1015

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

1016

msgstr ""

1017

1018

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

1018

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

1019

msgid ""

1020

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

1021

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

1022

msgstr ""

1023

1024

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

1024

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

1025

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

1026

msgstr ""

1027

1028

#: bzrlib/builtins.py:2015

1028

#: bzrlib/builtins.py:2026

1029

msgid "Make a directory into a versioned branch."

1030

msgstr ""

1031

1032

#: bzrlib/builtins.py:2017

1032

#: bzrlib/builtins.py:2028

1033

msgid ""

1034

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

1035

"existing project."

1036

msgstr ""

1037

1038

#: bzrlib/builtins.py:2020

1038

#: bzrlib/builtins.py:2031

1039

msgid ""

1040

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

1041

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

1043

"in the .bzr directory."

1044

msgstr ""

1045

1046

#: bzrlib/builtins.py:2025

1046

#: bzrlib/builtins.py:2036

1047

msgid ""

1048

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

1049

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

1050

msgstr ""

1051

1052

#: bzrlib/builtins.py:2028

1052

#: bzrlib/builtins.py:2039

1053

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

1054

msgstr ""

1055

1056

#: bzrlib/builtins.py:2030

1056

#: bzrlib/builtins.py:2041

1057

msgid ""

1058

" cd ~/project\n"

1059

" bzr init\n"

1062

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

1063

msgstr ""

1064

1065

#: bzrlib/builtins.py:2041

1065

#: bzrlib/builtins.py:2052

1066

msgid ""

1067

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

1068

msgstr ""

1069

1070

#: bzrlib/builtins.py:2044

1070

#: bzrlib/builtins.py:2055

1071

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

1072

msgstr ""

1073

1074

#: bzrlib/builtins.py:2052

1074

#: bzrlib/builtins.py:2063

1075

msgid ""

1076

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

1077

msgstr ""

1078

1079

#: bzrlib/builtins.py:2055

1079

#: bzrlib/builtins.py:2066

1080

msgid "Create a branch without a working tree."

1081

msgstr ""

1082

1083

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

1083

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

1084

#, python-format

1085

msgid ""

1086

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

1087

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

1088

msgstr ""

1089

1090

#: bzrlib/builtins.py:2109

1090

#: bzrlib/builtins.py:2120

1091

msgid ""

1092

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

1093

msgstr ""

1094

1095

#: bzrlib/builtins.py:2120

1095

#: bzrlib/builtins.py:2131

1096

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

1097

msgstr ""

1098

1099

#: bzrlib/builtins.py:2129

1099

#: bzrlib/builtins.py:2140

1100

#, python-format

1101

msgid "Using shared repository: %s\n"

1102

msgstr ""

1103

1104

#: bzrlib/builtins.py:2133

1104

#: bzrlib/builtins.py:2144

1105

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

1106

msgstr ""

1107

1108

#: bzrlib/builtins.py:2135

1108

#: bzrlib/builtins.py:2146

1109

msgid ""

1110

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

1111

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

1113

"speeds up the creation of new branches."

1114

msgstr ""

1115

1116

#: bzrlib/builtins.py:2140

1116

#: bzrlib/builtins.py:2151

1117

msgid ""

1118

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

1119

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

1123

"branches, such as on a server."

1124

msgstr ""

1125

1126

#: bzrlib/builtins.py:2147

1126

#: bzrlib/builtins.py:2158

1127

msgid ""

1128

":Examples:\n"

1129

" Create a shared repository holding just branches::"

1130

msgstr ""

1131

1132

#: bzrlib/builtins.py:2150

1132

#: bzrlib/builtins.py:2161

1133

msgid ""

1134

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

1135

" bzr init repo/trunk"

1136

msgstr ""

1137

1138

#: bzrlib/builtins.py:2153

1138

#: bzrlib/builtins.py:2164

1139

msgid " Make a lightweight checkout elsewhere::"

1140

msgstr ""

1141

1142

#: bzrlib/builtins.py:2155

1142

#: bzrlib/builtins.py:2166

1143

msgid ""

1144

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

1145

" cd trunk-checkout\n"

1146

" (add files here)"

1147

msgstr ""

1148

1149

#: bzrlib/builtins.py:2163

1149

#: bzrlib/builtins.py:2174

1150

msgid ""

1151

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

1152

msgstr ""

1153

1154

#: bzrlib/builtins.py:2167

1154

#: bzrlib/builtins.py:2178

1155

msgid "Repository format"

1156

msgstr ""

1157

1158

#: bzrlib/builtins.py:2169

1158

#: bzrlib/builtins.py:2180

1159

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

1160

msgstr ""

1161

1162

#: bzrlib/builtins.py:2195

1162

#: bzrlib/builtins.py:2206

1163

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

1164

msgstr ""

1165

1166

#: bzrlib/builtins.py:2197

1166

#: bzrlib/builtins.py:2208

1167

msgid ""

1168

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

1169

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

1173

"given."

1174

msgstr ""

1175

1176

#: bzrlib/builtins.py:2204

1176

#: bzrlib/builtins.py:2215

1177

msgid ""

1178

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

1179

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

1180

msgstr ""

1181

1182

#: bzrlib/builtins.py:2207

1182

#: bzrlib/builtins.py:2218

1183

msgid ""

1184

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

1185

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

1189

"in the range."

1190

msgstr ""

1191

1192

#: bzrlib/builtins.py:2214

1192

#: bzrlib/builtins.py:2225

1193

msgid ""

1194

":Exit values:\n"

1195

" 1 - changed\n"

1198

" 0 - no change"

1199

msgstr ""

1200

1201

#: bzrlib/builtins.py:2220

1201

#: bzrlib/builtins.py:2231

1202

msgid ""

1203

":Examples:\n"

1204

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

1205

msgstr ""

1206

1207

#: bzrlib/builtins.py:2223

1207

#: bzrlib/builtins.py:2234

1208

msgid " bzr diff"

1209

msgstr ""

1210

1211

#: bzrlib/builtins.py:2225

1211

#: bzrlib/builtins.py:2236

1212

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

1213

msgstr ""

1214

1215

#: bzrlib/builtins.py:2227

1215

#: bzrlib/builtins.py:2238

1216

msgid " bzr diff -r1"

1217

msgstr ""

1218

1219

#: bzrlib/builtins.py:2229

1219

#: bzrlib/builtins.py:2240

1220

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

1221

msgstr ""

1222

1223

#: bzrlib/builtins.py:2231

1223

#: bzrlib/builtins.py:2242

1224

msgid " bzr diff -r1..3"

1225

msgstr ""

1226

1227

#: bzrlib/builtins.py:2233

1227

#: bzrlib/builtins.py:2244

1228

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

1229

msgstr ""

1230

1231

#: bzrlib/builtins.py:2235

1231

#: bzrlib/builtins.py:2246

1232

msgid " bzr diff -r1..3 xxx"

1233

msgstr ""

1234

1235

#: bzrlib/builtins.py:2237

1235

#: bzrlib/builtins.py:2248

1236

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

1237

msgstr ""

1238

1239

#: bzrlib/builtins.py:2239

1239

#: bzrlib/builtins.py:2250

1240

msgid " bzr diff -c2"

1241

msgstr ""

1242

1243

#: bzrlib/builtins.py:2241

1243

#: bzrlib/builtins.py:2252

1244

msgid ""

1245

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

1246

" \n"

1247

" bzr diff -cX"

1248

msgstr ""

1249

1250

#: bzrlib/builtins.py:2245

1250

#: bzrlib/builtins.py:2256

1251

msgid ""

1252

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

1253

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

1254

" another parent, use::"

1255

msgstr ""

1256

1257

#: bzrlib/builtins.py:2249

1257

#: bzrlib/builtins.py:2260

1258

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

1259

msgstr ""

1260

1261

#: bzrlib/builtins.py:2251

1261

#: bzrlib/builtins.py:2262

1262

msgid ""

1263

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

1264

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

1265

msgstr ""

1266

1267

#: bzrlib/builtins.py:2254

1267

#: bzrlib/builtins.py:2265

1268

msgid " bzr diff -r-2.."

1269

msgstr ""

1270

1271

#: bzrlib/builtins.py:2256

1271

#: bzrlib/builtins.py:2267

1272

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

1273

msgstr ""

1274

1275

#: bzrlib/builtins.py:2258

1275

#: bzrlib/builtins.py:2269

1276

msgid " bzr diff NEWS"

1277

msgstr ""

1278

1279

#: bzrlib/builtins.py:2260

1279

#: bzrlib/builtins.py:2271

1280

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

1281

msgstr ""

1282

1283

#: bzrlib/builtins.py:2262

1283

#: bzrlib/builtins.py:2273

1284

msgid " bzr diff xxx/NEWS"

1285

msgstr ""

1286

1287

#: bzrlib/builtins.py:2264

1287

#: bzrlib/builtins.py:2275

1288

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

1289

msgstr ""

1290

1291

#: bzrlib/builtins.py:2266

1291

#: bzrlib/builtins.py:2277

1292

msgid " bzr diff --old xxx"

1293

msgstr ""

1294

1295

#: bzrlib/builtins.py:2268

1295

#: bzrlib/builtins.py:2279

1296

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

1297

msgstr ""

1298

1299

#: bzrlib/builtins.py:2270

1299

#: bzrlib/builtins.py:2281

1300

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

1301

msgstr ""

1302

1303

#: bzrlib/builtins.py:2272

1303

#: bzrlib/builtins.py:2283

1304

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

1305

msgstr ""

1306

1307

#: bzrlib/builtins.py:2274

1307

#: bzrlib/builtins.py:2285

1308

msgid ""

1309

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

1310

" \n"

1313

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

1314

msgstr ""

1315

1316

#: bzrlib/builtins.py:2284

1316

#: bzrlib/builtins.py:2295

1317

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

1318

msgstr ""

1319

1320

#: bzrlib/builtins.py:2287

1320

#: bzrlib/builtins.py:2298

1321

msgid ""

1322

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

1323

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

1324

msgstr ""

1325

1326

#: bzrlib/builtins.py:2290

1326

#: bzrlib/builtins.py:2301

1327

msgid "Branch/tree to compare from."

1328

msgstr ""

1329

1330

#: bzrlib/builtins.py:2294

1330

#: bzrlib/builtins.py:2305

1331

msgid "Branch/tree to compare to."

1332

msgstr ""

1333

1334

#: bzrlib/builtins.py:2300

1334

#: bzrlib/builtins.py:2311

1335

msgid "Use this command to compare files."

1336

msgstr ""

1337

1338

#: bzrlib/builtins.py:2305

1338

#: bzrlib/builtins.py:2316

1339

msgid "Diff format to use."

1340

msgstr ""

1341

1342

#: bzrlib/builtins.py:2307

1342

#: bzrlib/builtins.py:2318

1343

msgid "Diff format"

1344

msgstr ""

1345

1346

#: bzrlib/builtins.py:2329

1346

#: bzrlib/builtins.py:2340

1347

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

1348

msgstr ""

1349

1350

#: bzrlib/builtins.py:2333

1350

#: bzrlib/builtins.py:2344

1351

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

1352

msgstr ""

1353

1354

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

1355

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

1354

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

1355

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

1356

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

1357

msgstr ""

1358

1359

#: bzrlib/builtins.py:2358

1359

#: bzrlib/builtins.py:2369

1360

msgid ""

1361

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

1362

" "

1363

msgstr ""

1364

1365

#: bzrlib/builtins.py:2436

1365

#: bzrlib/builtins.py:2446

1366

msgid "Show the tree root directory."

1367

msgstr ""

1368

1369

#: bzrlib/builtins.py:2438

1369

#: bzrlib/builtins.py:2448

1370

msgid ""

1371

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

1372

"directory."

1373

msgstr ""

1374

1375

#: bzrlib/builtins.py:2453

1375

#: bzrlib/builtins.py:2463

1376

msgid "The limit argument must be an integer."

1377

msgstr ""

1378

1379

#: bzrlib/builtins.py:2461

1379

#: bzrlib/builtins.py:2471

1380

msgid "The levels argument must be an integer."

1381

msgstr ""

1382

1383

#: bzrlib/builtins.py:2466

1383

#: bzrlib/builtins.py:2476

1384

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

1385

msgstr ""

1386

1387

#: bzrlib/builtins.py:2468

1387

#: bzrlib/builtins.py:2478

1388

msgid ""

1389

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

1390

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

1392

"Here are some simple examples::"

1393

msgstr ""

1394

1395

#: bzrlib/builtins.py:2473

1395

#: bzrlib/builtins.py:2483

1396

msgid ""

1397

" bzr log log the current branch\n"

1398

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

1399

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

1400

msgstr ""

1401

1402

#: bzrlib/builtins.py:2477

1402

#: bzrlib/builtins.py:2487

1403

msgid ""

1404

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

1405

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

1409

"were merged."

1410

msgstr ""

1411

1412

#: bzrlib/builtins.py:2484

1412

#: bzrlib/builtins.py:2494

1413

msgid ":Output control:"

1414

msgstr ""

1415

1416

#: bzrlib/builtins.py:2486

1416

#: bzrlib/builtins.py:2496

1417

msgid ""

1418

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

1419

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

1421

" for more details on log formats."

1422

msgstr ""

1423

1424

#: bzrlib/builtins.py:2491

1424

#: bzrlib/builtins.py:2501

1425

msgid ""

1426

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

1427

" displayed::"

1428

msgstr ""

1429

1430

#: bzrlib/builtins.py:2494

1430

#: bzrlib/builtins.py:2504

1431

msgid ""

1432

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

1433

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

1436

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

1437

msgstr ""

1438

1439

#: bzrlib/builtins.py:2500

1439

#: bzrlib/builtins.py:2510

1440

msgid ""

1441

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

1442

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

1443

" just the top level (mainline)."

1444

msgstr ""

1445

1446

#: bzrlib/builtins.py:2504

1446

#: bzrlib/builtins.py:2514

1447

msgid ""

1448

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

1449

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

1450

" instead, use the -vv option."

1451

msgstr ""

1452

1453

#: bzrlib/builtins.py:2508

1453

#: bzrlib/builtins.py:2518

1454

msgid ":Ordering control:"

1455

msgstr ""

1456

1457

#: bzrlib/builtins.py:2510

1457

#: bzrlib/builtins.py:2520

1458

msgid ""

1459

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

1460

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

1462

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

1463

msgstr ""

1464

1465

#: bzrlib/builtins.py:2515

1465

#: bzrlib/builtins.py:2525

1466

msgid ":Revision filtering:"

1467

msgstr ""

1468

1469

#: bzrlib/builtins.py:2517

1469

#: bzrlib/builtins.py:2527

1470

msgid ""

1471

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

1472

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

1473

msgstr ""

1474

1475

#: bzrlib/builtins.py:2520

1475

#: bzrlib/builtins.py:2530

1476

msgid ""

1477

" -rX display revision X\n"

1478

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

1480

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

1481

msgstr ""

1482

1483

#: bzrlib/builtins.py:2525

1483

#: bzrlib/builtins.py:2535

1484

msgid ""

1485

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

1486

" Some common examples are given below::"

1487

msgstr ""

1488

1489

#: bzrlib/builtins.py:2528

1489

#: bzrlib/builtins.py:2538

1490

msgid ""

1491

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

1492

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

1496

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

1497

msgstr ""

1498

1499

#: bzrlib/builtins.py:2535

1499

#: bzrlib/builtins.py:2545

1500

msgid ""

1501

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

1502

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

1506

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

1507

msgstr ""

1508

1509

#: bzrlib/builtins.py:2542

1509

#: bzrlib/builtins.py:2552

1510

msgid ":Path filtering:"

1511

msgstr ""

1512

1513

#: bzrlib/builtins.py:2544

1513

#: bzrlib/builtins.py:2554

1514

msgid ""

1515

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

1516

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

1517

" nominated files or directories."

1518

msgstr ""

1519

1520

#: bzrlib/builtins.py:2548

1520

#: bzrlib/builtins.py:2558

1521

msgid ""

1522

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

1523

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

1524

" the end or start of the range."

1525

msgstr ""

1526

1527

#: bzrlib/builtins.py:2552

1527

#: bzrlib/builtins.py:2562

1528

msgid ""

1529

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

1530

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

1531

msgstr ""

1532

1533

#: bzrlib/builtins.py:2555

1533

#: bzrlib/builtins.py:2565

1534

msgid ""

1535

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

1536

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

1537

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

1538

msgstr ""

1539

1540

#: bzrlib/builtins.py:2559

1540

#: bzrlib/builtins.py:2569

1541

msgid " In this case:"

1542

msgstr ""

1543

1544

#: bzrlib/builtins.py:2561

1544

#: bzrlib/builtins.py:2571

1545

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

1546

msgstr ""

1547

1548

#: bzrlib/builtins.py:2563

1548

#: bzrlib/builtins.py:2573

1549

msgid ""

1550

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

1551

msgstr ""

1552

1553

#: bzrlib/builtins.py:2565

1553

#: bzrlib/builtins.py:2575

1554

msgid ""

1555

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

1556

" the original file in revision 2."

1557

msgstr ""

1558

1559

#: bzrlib/builtins.py:2568

1559

#: bzrlib/builtins.py:2578

1560

msgid ""

1561

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

1562

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

1563

msgstr ""

1564

1565

#: bzrlib/builtins.py:2571

1565

#: bzrlib/builtins.py:2581

1566

msgid ""

1567

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

1568

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

1569

" until it was last renamed)."

1570

msgstr ""

1571

1572

#: bzrlib/builtins.py:2575

1572

#: bzrlib/builtins.py:2585

1573

msgid ":Other filtering:"

1574

msgstr ""

1575

1576

#: bzrlib/builtins.py:2577

1576

#: bzrlib/builtins.py:2587

1577

msgid ""

1578

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

1579

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

1582

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

1583

msgstr ""

1584

1585

#: bzrlib/builtins.py:2583

1585

#: bzrlib/builtins.py:2593

1586

msgid ":Tips & tricks:"

1587

msgstr ""

1588

1589

#: bzrlib/builtins.py:2585

1589

#: bzrlib/builtins.py:2595

1590

msgid ""

1591

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

1592

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

1595

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

1596

msgstr ""

1597

1598

#: bzrlib/builtins.py:2591

1598

#: bzrlib/builtins.py:2601

1599

msgid ""

1600

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

1601

msgstr ""

1602

1603

#: bzrlib/builtins.py:2593

1603

#: bzrlib/builtins.py:2603

1604

msgid ""

1605

" [ALIASES]\n"

1606

" tip = log -r-1\n"

1608

" show = log -v -p"

1609

msgstr ""

1610

1611

#: bzrlib/builtins.py:2598

1611

#: bzrlib/builtins.py:2608

1612

msgid ""

1613

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

1614

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

1615

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

1616

msgstr ""

1617

1618

#: bzrlib/builtins.py:2602

1618

#: bzrlib/builtins.py:2612

1619

msgid ""

1620

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

1621

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

1622

msgstr ""

1623

1624

#: bzrlib/builtins.py:2605

1624

#: bzrlib/builtins.py:2615

1625

msgid ""

1626

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

1627

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

1629

" be given when using the -v option."

1630

msgstr ""

1631

1632

#: bzrlib/builtins.py:2610

1632

#: bzrlib/builtins.py:2620

1633

msgid ""

1634

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

1635

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

1637

" a list of words but not others."

1638

msgstr ""

1639

1640

#: bzrlib/builtins.py:2615

1640

#: bzrlib/builtins.py:2625

1641

msgid ""

1642

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

1643

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

1645

" trading disk space for faster speed."

1646

msgstr ""

1647

1648

#: bzrlib/builtins.py:2624

1648

#: bzrlib/builtins.py:2634

1649

msgid "Show from oldest to newest."

1650

msgstr ""

1651

1652

#: bzrlib/builtins.py:2627

1652

#: bzrlib/builtins.py:2637

1653

msgid "Show files changed in each revision."

1654

msgstr ""

1655

1656

#: bzrlib/builtins.py:2633

1656

#: bzrlib/builtins.py:2643

1657

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

1658

msgstr ""

1659

1660

#: bzrlib/builtins.py:2637

1660

#: bzrlib/builtins.py:2647

1661

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

1662

msgstr ""

1663

1664

#: bzrlib/builtins.py:2638

1664

#: bzrlib/builtins.py:2648

1665

msgid "Authors"

1666

msgstr ""

1667

1668

#: bzrlib/builtins.py:2643

1668

#: bzrlib/builtins.py:2653

1669

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

1670

msgstr ""

1671

1672

#: bzrlib/builtins.py:2653

1672

#: bzrlib/builtins.py:2663

1673

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

1674

msgstr ""

1675

1676

#: bzrlib/builtins.py:2658

1676

#: bzrlib/builtins.py:2668

1677

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

1678

msgstr ""

1679

1680

#: bzrlib/builtins.py:2660

1680

#: bzrlib/builtins.py:2670

1681

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

1682

msgstr ""

1683

1684

#: bzrlib/builtins.py:2664

1684

#: bzrlib/builtins.py:2674

1685

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

1686

msgstr ""

1687

1688

#: bzrlib/builtins.py:2666

1688

#: bzrlib/builtins.py:2676

1689

msgid ""

1690

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

1691

"rX..Y)."

1692

msgstr ""

1693

1694

#: bzrlib/builtins.py:2670

1694

#: bzrlib/builtins.py:2680

1695

msgid "Show digital signature validity."

1696

msgstr ""

1697

1698

#: bzrlib/builtins.py:2673

1698

#: bzrlib/builtins.py:2683

1699

msgid "Show revisions whose properties match this expression."

1700

msgstr ""

1701

1702

#: bzrlib/builtins.py:2677

1702

#: bzrlib/builtins.py:2687

1703

msgid "Show revisions whose message matches this expression."

1704

msgstr ""

1705

1706

#: bzrlib/builtins.py:2681

1706

#: bzrlib/builtins.py:2691

1707

msgid "Show revisions whose committer matches this expression."

1708

msgstr ""

1709

1710

#: bzrlib/builtins.py:2685

1710

#: bzrlib/builtins.py:2695

1711

msgid "Show revisions whose authors match this expression."

1712

msgstr ""

1713

1714

#: bzrlib/builtins.py:2689

1714

#: bzrlib/builtins.py:2699

1715

msgid "Show revisions whose bugs match this expression."

1716

msgstr ""

1717

1718

#: bzrlib/builtins.py:2743

1718

#: bzrlib/builtins.py:2753

1719

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

1720

msgstr ""

1721

1722

#: bzrlib/builtins.py:2771

1722

#: bzrlib/builtins.py:2781

1723

#, python-format

1724

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

1725

msgstr ""

1726

1727

#: bzrlib/builtins.py:2888

1727

#: bzrlib/builtins.py:2898

1728

#, python-format

1729

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

1730

msgstr ""

1731

1732

#: bzrlib/builtins.py:2904

1732

#: bzrlib/builtins.py:2914

1733

#, python-format

1734

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

1735

msgstr ""

1736

1737

#: bzrlib/builtins.py:2949

1737

#: bzrlib/builtins.py:2959

1738

msgid ""

1739

"List files in a tree.\n"

1740

" "

1741

msgstr ""

1742

1743

#: bzrlib/builtins.py:2958

1743

#: bzrlib/builtins.py:2968

1744

msgid "Recurse into subdirectories."

1745

msgstr ""

1746

1747

#: bzrlib/builtins.py:2960

1747

#: bzrlib/builtins.py:2970

1748

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

1749

msgstr ""

1750

1751

#: bzrlib/builtins.py:2962

1751

#: bzrlib/builtins.py:2972

1752

msgid "Print unknown files."

1753

msgstr ""

1754

1755

#: bzrlib/builtins.py:2963

1755

#: bzrlib/builtins.py:2973

1756

msgid "Print versioned files."

1757

msgstr ""

1758

1759

#: bzrlib/builtins.py:2966

1759

#: bzrlib/builtins.py:2976

1760

msgid "Print ignored files."

1761

msgstr ""

1762

1763

#: bzrlib/builtins.py:2968

1763

#: bzrlib/builtins.py:2978

1764

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

1765

msgstr ""

1766

1767

#: bzrlib/builtins.py:2981

1767

#: bzrlib/builtins.py:2991

1768

msgid "invalid kind specified"

1769

msgstr ""

1770

1771

#: bzrlib/builtins.py:2984

1771

#: bzrlib/builtins.py:2994

1772

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

1773

msgstr ""

1774

1775

#: bzrlib/builtins.py:2993

1775

#: bzrlib/builtins.py:3003

1776

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

1777

msgstr ""

1778

1779

#: bzrlib/builtins.py:3080

1779

#: bzrlib/builtins.py:3090

1780

msgid "Ignore specified files or patterns."

1781

msgstr ""

1782

1783

#: bzrlib/builtins.py:3082

1783

#: bzrlib/builtins.py:3092

1784

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

1785

msgstr ""

1786

1787

#: bzrlib/builtins.py:3084

1787

#: bzrlib/builtins.py:3094

1788

msgid ""

1789

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

1790

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

1793

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

1794

msgstr ""

1795

1796

#: bzrlib/builtins.py:3090

1796

#: bzrlib/builtins.py:3100

1797

msgid ""

1798

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

1799

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

1801

"it."

1802

msgstr ""

1803

1804

#: bzrlib/builtins.py:3095

1804

#: bzrlib/builtins.py:3105

1805

msgid ""

1806

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

1807

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

1810

"can be edited directly using an editor."

1811

msgstr ""

1812

1813

#: bzrlib/builtins.py:3101

1813

#: bzrlib/builtins.py:3111

1814

msgid ""

1815

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

1816

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

1817

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

1818

msgstr ""

1819

1820

#: bzrlib/builtins.py:3105

1820

#: bzrlib/builtins.py:3115

1821

msgid ""

1822

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

1823

"precedence over the '!' exception patterns."

1824

msgstr ""

1825

1826

#: bzrlib/builtins.py:3108

1826

#: bzrlib/builtins.py:3118

1827

msgid ""

1828

":Notes: \n"

1829

" \n"

1831

" the shell on Unix."

1832

msgstr ""

1833

1834

#: bzrlib/builtins.py:3113

1834

#: bzrlib/builtins.py:3123

1835

msgid ""

1836

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

1837

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

1838

msgstr ""

1839

1840

#: bzrlib/builtins.py:3116

1840

#: bzrlib/builtins.py:3126

1841

msgid ""

1842

":Examples:\n"

1843

" Ignore the top level Makefile::"

1844

msgstr ""

1845

1846

#: bzrlib/builtins.py:3119

1846

#: bzrlib/builtins.py:3129

1847

msgid " bzr ignore ./Makefile"

1848

msgstr ""

1849

1850

#: bzrlib/builtins.py:3121

1850

#: bzrlib/builtins.py:3131

1851

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

1852

msgstr ""

1853

1854

#: bzrlib/builtins.py:3123

1854

#: bzrlib/builtins.py:3133

1855

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

1856

msgstr ""

1857

1858

#: bzrlib/builtins.py:3125

1858

#: bzrlib/builtins.py:3135

1859

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

1860

msgstr ""

1861

1862

#: bzrlib/builtins.py:3127

1862

#: bzrlib/builtins.py:3137

1863

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

1864

msgstr ""

1865

1866

#: bzrlib/builtins.py:3129

1866

#: bzrlib/builtins.py:3139

1867

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

1868

msgstr ""

1869

1870

#: bzrlib/builtins.py:3131

1870

#: bzrlib/builtins.py:3141

1871

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

1872

msgstr ""

1873

1874

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

1874

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

1875

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

1876

msgstr ""

1877

1878

#: bzrlib/builtins.py:3135

1878

#: bzrlib/builtins.py:3145

1879

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

1880

msgstr ""

1881

1882

#: bzrlib/builtins.py:3139

1882

#: bzrlib/builtins.py:3149

1883

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

1884

msgstr ""

1885

1886

#: bzrlib/builtins.py:3141

1886

#: bzrlib/builtins.py:3151

1887

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

1888

msgstr ""

1889

1890

#: bzrlib/builtins.py:3143

1890

#: bzrlib/builtins.py:3153

1891

msgid ""

1892

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

1893

" \n"

1899

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

1900

msgstr ""

1901

1902

#: bzrlib/builtins.py:3157

1902

#: bzrlib/builtins.py:3167

1903

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

1904

msgstr ""

1905

1906

#: bzrlib/builtins.py:3169

1906

#: bzrlib/builtins.py:3179

1907

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

1908

msgstr ""

1909

1910

#: bzrlib/builtins.py:3180

1910

#: bzrlib/builtins.py:3190

1911

#, python-format

1912

msgid "Invalid ignore pattern found. %s"

1913

msgid_plural "Invalid ignore patterns found. %s"

1914

msgstr[0] ""

1915

msgstr[1] ""

1916

1917

#: bzrlib/builtins.py:3189

1917

#: bzrlib/builtins.py:3199

1918

msgid "NAME_PATTERN should not be an absolute path"

1919

msgstr ""

1920

1921

#: bzrlib/builtins.py:3202

1921

#: bzrlib/builtins.py:3212

1922

#, python-format

1923

msgid ""

1924

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

1928

"them.\n"

1929

msgstr ""

1930

1931

#: bzrlib/builtins.py:3209

1931

#: bzrlib/builtins.py:3219

1932

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

1933

msgstr ""

1934

1935

#: bzrlib/builtins.py:3211

1935

#: bzrlib/builtins.py:3221

1936

msgid ""

1937

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

1938

"be ignored."

1939

msgstr ""

1940

1941

#: bzrlib/builtins.py:3214

1941

#: bzrlib/builtins.py:3224

1942

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

1943

msgstr ""

1944

1945

#: bzrlib/builtins.py:3216

1945

#: bzrlib/builtins.py:3226

1946

msgid " bzr ls --ignored"

1947

msgstr ""

1948

1949

#: bzrlib/builtins.py:3250

1949

#: bzrlib/builtins.py:3260

1950

#, python-format

1951

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

1952

msgstr ""

1953

1954

#: bzrlib/builtins.py:3257

1954

#: bzrlib/builtins.py:3267

1955

msgid ""

1956

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

1957

msgstr ""

1958

1959

#: bzrlib/builtins.py:3259

1959

#: bzrlib/builtins.py:3269

1960

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

1961

msgstr ""

1962

1963

#: bzrlib/builtins.py:3261

1963

#: bzrlib/builtins.py:3271

1964

msgid ""

1965

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

1966

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

1967

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

1968

msgstr ""

1969

1970

#: bzrlib/builtins.py:3265

1970

#: bzrlib/builtins.py:3275

1971

msgid ""

1972

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

1973

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

1974

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

1975

msgstr ""

1976

1977

#: bzrlib/builtins.py:3269

1977

#: bzrlib/builtins.py:3279

1978

msgid ""

1979

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

1980

"directory will be used."

1981

msgstr ""

1982

1983

#: bzrlib/builtins.py:3272

1983

#: bzrlib/builtins.py:3282

1984

msgid ""

1985

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

1986

msgstr ""

1987

1988

#: bzrlib/builtins.py:3274

1988

#: bzrlib/builtins.py:3284

1989

msgid ""

1990

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

1991

" Supported formats Autodetected by extension\n"

1998

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

1999

msgstr ""

2000

2001

#: bzrlib/builtins.py:3288

2001

#: bzrlib/builtins.py:3298

2002

msgid "Type of file to export to."

2003

msgstr ""

2004

2005

#: bzrlib/builtins.py:3291

2005

#: bzrlib/builtins.py:3301

2006

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

2007

msgstr ""

2008

2009

#: bzrlib/builtins.py:3295

2009

#: bzrlib/builtins.py:3305

2010

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

2011

msgstr ""

2012

2013

#: bzrlib/builtins.py:3297

2013

#: bzrlib/builtins.py:3307

2014

msgid ""

2015

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

2016

"changed."

2017

msgstr ""

2018

2019

#: bzrlib/builtins.py:3300

2019

#: bzrlib/builtins.py:3310

2020

msgid ""

2021

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

2022

msgstr ""

2023

2024

#: bzrlib/builtins.py:3319

2024

#: bzrlib/builtins.py:3329

2025

msgid "--uncommitted requires a working tree"

2026

msgstr ""

2027

2028

#: bzrlib/builtins.py:3328

2028

#: bzrlib/builtins.py:3338

2029

#, python-format

2030

msgid "Unsupported export format: %s"

2031

msgstr ""

2032

2033

#: bzrlib/builtins.py:3332

2033

#: bzrlib/builtins.py:3342

2034

msgid ""

2035

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

2036

msgstr ""

2037

2038

#: bzrlib/builtins.py:3334

2038

#: bzrlib/builtins.py:3344

2039

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

2040

msgstr ""

2041

2042

#: bzrlib/builtins.py:3336

2042

#: bzrlib/builtins.py:3346

2043

msgid ""

2044

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

2045

"binary file."

2046

msgstr ""

2047

2048

#: bzrlib/builtins.py:3342

2048

#: bzrlib/builtins.py:3352

2049

msgid "The path name in the old tree."

2050

msgstr ""

2051

2052

#: bzrlib/builtins.py:3343

2052

#: bzrlib/builtins.py:3353

2053

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

2054

msgstr ""

2055

2056

#: bzrlib/builtins.py:3354

2056

#: bzrlib/builtins.py:3364

2057

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

2058

msgstr ""

2059

2060

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

2060

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

2061

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

2062

msgstr ""

2063

2064

#: bzrlib/builtins.py:3414

2064

#: bzrlib/builtins.py:3424

2065

msgid "Commit changes into a new revision."

2066

msgstr ""

2067

2068

#: bzrlib/builtins.py:3416

2068

#: bzrlib/builtins.py:3426

2069

msgid ""

2070

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

2071

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

2075

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

2076

msgstr ""

2077

2078

#: bzrlib/builtins.py:3423

2078

#: bzrlib/builtins.py:3433

2079

msgid ""

2080

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

2081

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

2082

"as explained below."

2083

msgstr ""

2084

2085

#: bzrlib/builtins.py:3427

2085

#: bzrlib/builtins.py:3437

2086

msgid ":Selective commits:"

2087

msgstr ""

2088

2089

#: bzrlib/builtins.py:3429

2089

#: bzrlib/builtins.py:3439

2090

msgid ""

2091

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

2092

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

2093

" everything within it is committed."

2094

msgstr ""

2095

2096

#: bzrlib/builtins.py:3433

2096

#: bzrlib/builtins.py:3443

2097

msgid ""

2098

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

2099

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

2100

" within foo/bar::"

2101

msgstr ""

2102

2103

#: bzrlib/builtins.py:3437

2103

#: bzrlib/builtins.py:3447

2104

msgid " bzr commit foo -x foo/bar"

2105

msgstr ""

2106

2107

#: bzrlib/builtins.py:3439

2107

#: bzrlib/builtins.py:3449

2108

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

2109

msgstr ""

2110

2111

#: bzrlib/builtins.py:3441

2111

#: bzrlib/builtins.py:3451

2112

msgid ":Custom authors:"

2113

msgstr ""

2114

2115

#: bzrlib/builtins.py:3443

2115

#: bzrlib/builtins.py:3453

2116

msgid ""

2117

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

2118

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

2122

" author."

2123

msgstr ""

2124

2125

#: bzrlib/builtins.py:3450

2125

#: bzrlib/builtins.py:3460

2126

msgid ":Checks:"

2127

msgstr ""

2128

2129

#: bzrlib/builtins.py:3452

2129

#: bzrlib/builtins.py:3462

2130

msgid ""

2131

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

2132

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

2135

" for details."

2136

msgstr ""

2137

2138

#: bzrlib/builtins.py:3458

2138

#: bzrlib/builtins.py:3468

2139

msgid ":Things to note:"

2140

msgstr ""

2141

2142

#: bzrlib/builtins.py:3460

2142

#: bzrlib/builtins.py:3470

2143

msgid ""

2144

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

2145

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

2146

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

2147

msgstr ""

2148

2149

#: bzrlib/builtins.py:3464

2149

#: bzrlib/builtins.py:3474

2150

msgid ""

2151

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

2152

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

2154

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

2155

msgstr ""

2156

2157

#: bzrlib/builtins.py:3474

2157

#: bzrlib/builtins.py:3484

2158

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

2159

msgstr ""

2160

2161

#: bzrlib/builtins.py:3477

2161

#: bzrlib/builtins.py:3487

2162

msgid "Description of the new revision."

2163

msgstr ""

2164

2165

#: bzrlib/builtins.py:3480

2165

#: bzrlib/builtins.py:3490

2166

msgid "Commit even if nothing has changed."

2167

msgstr ""

2168

2169

#: bzrlib/builtins.py:3484

2169

#: bzrlib/builtins.py:3494

2170

msgid "Take commit message from this file."

2171

msgstr ""

2172

2173

#: bzrlib/builtins.py:3486

2173

#: bzrlib/builtins.py:3496

2174

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

2175

msgstr ""

2176

2177

#: bzrlib/builtins.py:3489

2177

#: bzrlib/builtins.py:3499

2178

msgid ""

2179

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

2180

"08:00:00 +0100'."

2181

msgstr ""

2182

2183

#: bzrlib/builtins.py:3492

2183

#: bzrlib/builtins.py:3502

2184

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

2185

msgstr ""

2186

2187

#: bzrlib/builtins.py:3495

2187

#: bzrlib/builtins.py:3505

2188

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

2189

msgstr ""

2190

2191

#: bzrlib/builtins.py:3498

2191

#: bzrlib/builtins.py:3508

2192

msgid ""

2193

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

2194

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

2195

msgstr ""

2196

2197

#: bzrlib/builtins.py:3504

2197

#: bzrlib/builtins.py:3514

2198

msgid ""

2199

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

2200

"the message editor."

2201

msgstr ""

2202

2203

#: bzrlib/builtins.py:3507

2203

#: bzrlib/builtins.py:3517

2204

msgid ""

2205

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

2206

"can not be natively represented."

2207

msgstr ""

2208

2209

#: bzrlib/builtins.py:3525

2209

#: bzrlib/builtins.py:3535

2210

#, python-format

2211

msgid ""

2212

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

2214

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

2215

msgstr ""

2216

2217

#: bzrlib/builtins.py:3534

2217

#: bzrlib/builtins.py:3544

2218

#, python-format

2219

msgid ""

2220

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

2222

"Commit refused."

2223

msgstr ""

2224

2225

#: bzrlib/builtins.py:3543

2225

#: bzrlib/builtins.py:3553

2226

#, python-format

2227

msgid "Unrecognized bug %s. Commit refused."

2228

msgstr ""

2229

2230

#: bzrlib/builtins.py:3546

2230

#: bzrlib/builtins.py:3556

2231

#, python-format

2232

msgid ""

2233

"%s\n"

2234

"Commit refused."

2235

msgstr ""

2236

2237

#: bzrlib/builtins.py:3570

2237

#: bzrlib/builtins.py:3580

2238

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

2239

msgstr ""

2240

2241

#: bzrlib/builtins.py:3610

2241

#: bzrlib/builtins.py:3620

2242

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

2243

msgstr ""

2244

2245

#: bzrlib/builtins.py:3639

2245

#: bzrlib/builtins.py:3649

2246

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

2247

msgstr ""

2248

2249

#: bzrlib/builtins.py:3642

2249

#: bzrlib/builtins.py:3652

2250

msgid ""

2251

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

2252

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

2253

msgstr ""

2254

2255

#: bzrlib/builtins.py:3662

2255

#: bzrlib/builtins.py:3672

2256

msgid ""

2257

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

2258

"-unchanged to force an empty commit."

2259

msgstr ""

2260

2261

#: bzrlib/builtins.py:3666

2261

#: bzrlib/builtins.py:3676

2262

msgid ""

2263

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

2264

"resolve FILE\" to resolve."

2265

msgstr ""

2266

2267

#: bzrlib/builtins.py:3670

2267

#: bzrlib/builtins.py:3680

2268

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

2269

msgstr ""

2270

2271

#: bzrlib/builtins.py:3673

2271

#: bzrlib/builtins.py:3683

2272

msgid ""

2273

"\n"

2274

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

2275

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

2276

msgstr ""

2277

2278

#: bzrlib/builtins.py:3681

2278

#: bzrlib/builtins.py:3691

2279

msgid ""

2280

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

2281

msgstr ""

2282

2283

#: bzrlib/builtins.py:3683

2283

#: bzrlib/builtins.py:3693

2284

msgid ""

2285

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

2286

"to detect data corruption or bzr bugs."

2287

msgstr ""

2288

2289

#: bzrlib/builtins.py:3686

2289

#: bzrlib/builtins.py:3696

2290

msgid ""

2291

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

2292

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

2293

msgstr ""

2294

2295

#: bzrlib/builtins.py:3689

2295

#: bzrlib/builtins.py:3699

2296

msgid ""

2297

"revisions\n"

2298

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

2299

" indicate a problem."

2300

msgstr ""

2301

2302

#: bzrlib/builtins.py:3693

2302

#: bzrlib/builtins.py:3703

2303

msgid ""

2304

"versionedfiles\n"

2305

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

2306

" doesn't indicate a problem."

2307

msgstr ""

2308

2309

#: bzrlib/builtins.py:3697

2309

#: bzrlib/builtins.py:3707

2310

msgid ""

2311

"unreferenced ancestors\n"

2312

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

2314

" subtle problem that Bazaar can work around."

2315

msgstr ""

2316

2317

#: bzrlib/builtins.py:3702

2317

#: bzrlib/builtins.py:3712

2318

msgid ""

2319

"unique file texts\n"

2320

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

2321

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

2322

msgstr ""

2323

2324

#: bzrlib/builtins.py:3706

2324

#: bzrlib/builtins.py:3716

2325

msgid ""

2326

"repeated file texts\n"

2327

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

2330

" indicate a problem."

2331

msgstr ""

2332

2333

#: bzrlib/builtins.py:3712

2333

#: bzrlib/builtins.py:3722

2334

msgid ""

2335

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

2336

"given\n"

2337

"location will be checked."

2338

msgstr ""

2339

2340

#: bzrlib/builtins.py:3717

2340

#: bzrlib/builtins.py:3727

2341

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

2342

msgstr ""

2343

2344

#: bzrlib/builtins.py:3719

2344

#: bzrlib/builtins.py:3729

2345

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

2346

msgstr ""

2347

2348

#: bzrlib/builtins.py:3721

2348

#: bzrlib/builtins.py:3731

2349

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

2350

msgstr ""

2351

2352

#: bzrlib/builtins.py:3723

2352

#: bzrlib/builtins.py:3733

2353

msgid " bzr check --repo bar"

2354

msgstr ""

2355

2356

#: bzrlib/builtins.py:3725

2356

#: bzrlib/builtins.py:3735

2357

msgid " Check everything at 'baz'::"

2358

msgstr ""

2359

2360

#: bzrlib/builtins.py:3727

2360

#: bzrlib/builtins.py:3737

2361

msgid " bzr check baz"

2362

msgstr ""

2363

2364

#: bzrlib/builtins.py:3733

2364

#: bzrlib/builtins.py:3743

2365

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

2366

msgstr ""

2367

2368

#: bzrlib/builtins.py:3735

2368

#: bzrlib/builtins.py:3745

2369

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

2370

msgstr ""

2371

2372

#: bzrlib/builtins.py:3737

2372

#: bzrlib/builtins.py:3747

2373

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

2374

msgstr ""

2375

2376

#: bzrlib/builtins.py:3751

2376

#: bzrlib/builtins.py:3761

2377

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

2378

msgstr ""

2379

2380

#: bzrlib/builtins.py:3753

2380

#: bzrlib/builtins.py:3763

2381

msgid ""

2382

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

2383

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

2386

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

2387

msgstr ""

2388

2389

#: bzrlib/builtins.py:3759

2389

#: bzrlib/builtins.py:3769

2390

msgid ""

2391

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

2392

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

2396

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

2397

msgstr ""

2398

2399

#: bzrlib/builtins.py:3766

2399

#: bzrlib/builtins.py:3776

2400

msgid ""

2401

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

2402

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

2407

"afterwards."

2408

msgstr ""

2409

2410

#: bzrlib/builtins.py:3774

2410

#: bzrlib/builtins.py:3784

2411

msgid ""

2412

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

2413

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

2415

"tried."

2416

msgstr ""

2417

2418

#: bzrlib/builtins.py:3779

2418

#: bzrlib/builtins.py:3789

2419

msgid ""

2420

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

2421

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

2422

msgstr ""

2423

2424

#: bzrlib/builtins.py:3787

2424

#: bzrlib/builtins.py:3797

2425

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

2426

msgstr ""

2427

2428

#: bzrlib/builtins.py:3791

2428

#: bzrlib/builtins.py:3801

2429

msgid "Branch format"

2430

msgstr ""

2431

2432

#: bzrlib/builtins.py:3793

2432

#: bzrlib/builtins.py:3803

2433

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

2434

msgstr ""

2435

2436

#: bzrlib/builtins.py:3795

2436

#: bzrlib/builtins.py:3805

2437

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

2438

msgstr ""

2439

2440

#: bzrlib/builtins.py:3810

2440

#: bzrlib/builtins.py:3820

2441

msgid "Show or set bzr user id."

2442

msgstr ""

2443

2444

#: bzrlib/builtins.py:3812

2444

#: bzrlib/builtins.py:3822

2445

msgid ""

2446

":Examples:\n"

2447

" Show the email of the current user::"

2448

msgstr ""

2449

2450

#: bzrlib/builtins.py:3815

2450

#: bzrlib/builtins.py:3825

2451

msgid " bzr whoami --email"

2452

msgstr ""

2453

2454

#: bzrlib/builtins.py:3817

2454

#: bzrlib/builtins.py:3827

2455

msgid " Set the current user::"

2456

msgstr ""

2457

2458

#: bzrlib/builtins.py:3819

2458

#: bzrlib/builtins.py:3829

2459

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

2460

msgstr ""

2461

2462

#: bzrlib/builtins.py:3823

2462

#: bzrlib/builtins.py:3833

2463

msgid "Display email address only."

2464

msgstr ""

2465

2466

#: bzrlib/builtins.py:3825

2466

#: bzrlib/builtins.py:3835

2467

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

2468

msgstr ""

2469

2470

#: bzrlib/builtins.py:3851

2470

#: bzrlib/builtins.py:3861

2471

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

2472

msgstr ""

2473

2474

#: bzrlib/builtins.py:3873

2474

#: bzrlib/builtins.py:3885

2475

msgid "Print or set the branch nickname."

2476

msgstr ""

2477

2478

#: bzrlib/builtins.py:3875

2478

#: bzrlib/builtins.py:3887

2479

msgid ""

2480

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

2481

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

2480

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

2481

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

2482

"current nickname, execute with no argument."

2482

2483

msgstr ""

2483

2484

#: bzrlib/builtins.py:3878

2485

#: bzrlib/builtins.py:3891

2485

2486

msgid ""

2486

2487

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

2487

2488

"locally."

2488

2489

msgstr ""

2489

2490

#: bzrlib/builtins.py:3898

2491

#: bzrlib/builtins.py:3911

2491

2492

msgid "Set/unset and display aliases."

2492

2493

msgstr ""

2493

2494

#: bzrlib/builtins.py:3900

2495

#: bzrlib/builtins.py:3913

2495

2496

msgid ""

2496

2497

":Examples:\n"

2497

2498

" Show the current aliases::"

2498

2499

msgstr ""

2499

2500

#: bzrlib/builtins.py:3903

2501

#: bzrlib/builtins.py:3916

2501

2502

msgid " bzr alias"

2502

2503

msgstr ""

2503

2504

#: bzrlib/builtins.py:3905

2505

#: bzrlib/builtins.py:3918

2505

2506

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

2506

2507

msgstr ""

2507

2508

#: bzrlib/builtins.py:3907

2509

#: bzrlib/builtins.py:3920

2509

2510

msgid " bzr alias ll"

2510

2511

msgstr ""

2511

2512

#: bzrlib/builtins.py:3909

2513

#: bzrlib/builtins.py:3922

2513

2514

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

2514

2515

msgstr ""

2515

2516

#: bzrlib/builtins.py:3911

2517

#: bzrlib/builtins.py:3924

2517

2518

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

2518

2519

msgstr ""

2519

2520

#: bzrlib/builtins.py:3913

2521

#: bzrlib/builtins.py:3926

2521

2522

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

2522

2523

msgstr ""

2523

2524

#: bzrlib/builtins.py:3915

2525

#: bzrlib/builtins.py:3928

2525

2526

msgid " bzr alias --remove ll"

2526

2527

msgstr ""

2527

2528

#: bzrlib/builtins.py:3920

2529

#: bzrlib/builtins.py:3933

2529

2530

msgid "Remove the alias."

2530

2531

msgstr ""

2531

2532

#: bzrlib/builtins.py:3938

2533

#: bzrlib/builtins.py:3951

2533

2534

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

2534

2535

msgstr ""

2535

2536

#: bzrlib/builtins.py:4119

2537

#: bzrlib/builtins.py:4132

2537

2538

msgid ""

2538

2539

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

2539

2540

msgstr ""

2540

2541

#: bzrlib/builtins.py:4136

2542

#: bzrlib/builtins.py:4149

2542

2543

msgid ""

2543

2544

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

2544

2545

msgstr ""

2545

2546

#: bzrlib/builtins.py:4183

2547

#: bzrlib/builtins.py:4196

2547

2548

msgid "Show version of bzr."

2548

2549

msgstr ""

2549

2550

#: bzrlib/builtins.py:4187

2551

#: bzrlib/builtins.py:4200

2551

2552

msgid "Print just the version number."

2552

2553

msgstr ""

2553

2554

#: bzrlib/builtins.py:4206

2555

#: bzrlib/builtins.py:4219

2555

2556

msgid "It sure does!\n"

2556

2557

msgstr ""

2557

2558

#: bzrlib/builtins.py:4230

2559

#: bzrlib/builtins.py:4243

2559

2560

#, python-format

2560

2561

msgid "merge base is revision %s\n"

2561

2562

msgstr ""

2562

2563

#: bzrlib/builtins.py:4234

2564

#: bzrlib/builtins.py:4247

2564

2565

msgid "Perform a three-way merge."

2565

2566

msgstr ""

2566

2567

#: bzrlib/builtins.py:4236

2568

#: bzrlib/builtins.py:4249

2568

2569

msgid ""

2569

2570

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

2570

2571

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

2575

2576

"the current working tree."

2576

2577

msgstr ""

2577

2578

#: bzrlib/builtins.py:4244

2579

#: bzrlib/builtins.py:4257

2579

2580

msgid ""

2580

2581

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

2581

2582

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

2582

2583

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

2583

2584

msgstr ""

2584

2585

#: bzrlib/builtins.py:4248

2586

#: bzrlib/builtins.py:4261

2586

2587

msgid ""

2587

2588

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

2588

2589

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

2589

2590

msgstr ""

2590

2591

#: bzrlib/builtins.py:4251

2592

#: bzrlib/builtins.py:4264

2592

2593

msgid ""

2593

2594

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

2594

2595

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

2599

2600

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

2600

2601

msgstr ""

2601

2602

#: bzrlib/builtins.py:4259

2603

#: bzrlib/builtins.py:4272

2603

2604

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

2604

2605

msgstr ""

2605

2606

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

2607

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

2607

2608

msgid ""

2608

2609

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

2609

2610

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

2611

2612

"before you can commit."

2612

2613

msgstr ""

2613

2614

#: bzrlib/builtins.py:4266

2615

#: bzrlib/builtins.py:4279

2615

2616

msgid ""

2616

2617

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

2617

2618

msgstr ""

2618

2619

#: bzrlib/builtins.py:4268

2620

#: bzrlib/builtins.py:4281

2620

2621

msgid ""

2621

2622

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

2622

2623

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

2624

2625

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

2625

2626

msgstr ""

2626

2627

#: bzrlib/builtins.py:4273

2628

#: bzrlib/builtins.py:4286

2628

2629

msgid ""

2629

2630

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

2630

2631

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

2631

2632

"committed to record the result of the merge."

2632

2633

msgstr ""

2633

2634

#: bzrlib/builtins.py:4277

2635

#: bzrlib/builtins.py:4290

2635

2636

msgid ""

2636

2637

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

2637

2638

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

2640

2641

"merge revision which has more than two parents."

2641

2642

msgstr ""

2642

2643

#: bzrlib/builtins.py:4283

2644

#: bzrlib/builtins.py:4296

2644

2645

msgid ""

2645

2646

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

2646

2647

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

2647

2648

"can be given."

2648

2649

msgstr ""

2649

2650

#: bzrlib/builtins.py:4287

2651

#: bzrlib/builtins.py:4300

2651

2652

msgid ""

2652

2653

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

2653

2654

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

2654

2655

msgstr ""

2655

2656

#: bzrlib/builtins.py:4290

2657

#: bzrlib/builtins.py:4303

2657

2658

msgid ""

2658

2659

":Examples:\n"

2659

2660

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

2660

2661

msgstr ""

2661

2662

#: bzrlib/builtins.py:4293

2663

#: bzrlib/builtins.py:4306

2663

2664

msgid " bzr merge ../bzr.dev"

2664

2665

msgstr ""

2665

2666

#: bzrlib/builtins.py:4295

2667

#: bzrlib/builtins.py:4308

2667

2668

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

2668

2669

msgstr ""

2669

2670

#: bzrlib/builtins.py:4297

2671

#: bzrlib/builtins.py:4310

2671

2672

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

2672

2673

msgstr ""

2673

2674

#: bzrlib/builtins.py:4299

2675

#: bzrlib/builtins.py:4312

2675

2676

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

2676

2677

msgstr ""

2677

2678

#: bzrlib/builtins.py:4301

2679

#: bzrlib/builtins.py:4314

2679

2680

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

2680

2681

msgstr ""

2681

2682

#: bzrlib/builtins.py:4303

2683

#: bzrlib/builtins.py:4316

2683

2684

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

2684

2685

msgstr ""

2685

2686

#: bzrlib/builtins.py:4305

2687

#: bzrlib/builtins.py:4318

2687

2688

msgid " bzr merge /tmp/merge"

2688

2689

msgstr ""

2689

2690

#: bzrlib/builtins.py:4307

2691

#: bzrlib/builtins.py:4320

2691

2692

msgid ""

2692

2693

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

2693

2694

" feature1a and feature1b:"

2694

2695

msgstr ""

2695

2696

#: bzrlib/builtins.py:4310

2697

#: bzrlib/builtins.py:4323

2697

2698

msgid ""

2698

2699

" bzr merge ../feature1a\n"

2699

2700

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

2700

2701

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

2701

2702

msgstr ""

2702

2703

#: bzrlib/builtins.py:4322

2704

#: bzrlib/builtins.py:4335

2704

2705

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

2705

2706

msgstr ""

2706

2707

#: bzrlib/builtins.py:4328

2708

#: bzrlib/builtins.py:4341

2708

2709

msgid ""

2709

2710

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

2710

2711

msgstr ""

2711

2712

#: bzrlib/builtins.py:4330

2713

#: bzrlib/builtins.py:4343

2713

2714

msgid ""

2714

2715

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

2715

2716

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

2716

2717

"commit the result."

2717

2718

msgstr ""

2718

2719

#: bzrlib/builtins.py:4335

2720

#: bzrlib/builtins.py:4348

2720

2721

msgid ""

2721

2722

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

2722

2723

msgstr ""

2723

2724

#: bzrlib/builtins.py:4337

2725

#: bzrlib/builtins.py:4350

2725

2726

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

2726

2727

msgstr ""

2727

2728

#: bzrlib/builtins.py:4339

2729

#: bzrlib/builtins.py:4352

2729

2730

msgid "Select changes interactively."

2730

2731

msgstr ""

2731

2732

#: bzrlib/builtins.py:4361

2733

#: bzrlib/builtins.py:4374

2733

2734

msgid ""

2734

2735

"Merging into empty branches not currently supported, "

2735

2736

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

2736

2737

msgstr ""

2737

2738

#: bzrlib/builtins.py:4388

2739

#: bzrlib/builtins.py:4401

2739

2740

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

2740

2741

msgstr ""

2741

2742

#: bzrlib/builtins.py:4399

2743

#: bzrlib/builtins.py:4412

2743

2744

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

2744

2745

msgstr ""

2745

2746

#: bzrlib/builtins.py:4419

2747

#: bzrlib/builtins.py:4432

2747

2748

msgid "merger: "

2748

2749

msgstr ""

2749

2750

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

2751

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

2751

2752

msgid "Nothing to do."

2752

2753

msgstr ""

2753

2754

#: bzrlib/builtins.py:4425

2755

#: bzrlib/builtins.py:4438

2755

2756

msgid "Cannot pull individual files"

2756

2757

msgstr ""

2757

2758

#: bzrlib/builtins.py:4433

2759

#: bzrlib/builtins.py:4446

2759

2760

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

2760

2761

msgstr ""

2761

2762

#: bzrlib/builtins.py:4491

2763

#: bzrlib/builtins.py:4504

2763

2764

#, python-format

2764

2765

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

2765

2766

msgstr ""

2766

2767

#: bzrlib/builtins.py:4500

2768

#: bzrlib/builtins.py:4513

2768

2769

#, python-format

2769

2770

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

2770

2771

msgstr ""

2771

2772

#: bzrlib/builtins.py:4504

2773

#: bzrlib/builtins.py:4517

2773

2774

msgid "Cannot do conflict reduction and show base."

2774

2775

msgstr ""

2775

2776

#: bzrlib/builtins.py:4615

2777

#: bzrlib/builtins.py:4628

2777

2778

msgid "No location specified or remembered"

2778

2779

msgstr ""

2779

2780

#: bzrlib/builtins.py:4617

2781

#: bzrlib/builtins.py:4630

2781

2782

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

2782

2783

msgstr ""

2783

2784

#: bzrlib/builtins.py:4623

2785

#: bzrlib/builtins.py:4636

2785

2786

msgid "Redo a merge."

2786

2787

msgstr ""

2787

2788

#: bzrlib/builtins.py:4625

2789

#: bzrlib/builtins.py:4638

2789

2790

msgid ""

2790

2791

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

2791

2792

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

2792

2793

"lets you try different ones on different files."

2793

2794

msgstr ""

2794

2795

#: bzrlib/builtins.py:4629

2796

#: bzrlib/builtins.py:4642

2796

2797

msgid ""

2797

2798

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

2798

2799

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

2799

2800

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

2800

2801

msgstr ""

2801

2802

#: bzrlib/builtins.py:4633

2803

#: bzrlib/builtins.py:4646

2803

2804

msgid ""

2804

2805

":Examples:\n"

2805

2806

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

2806

2807

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

2807

2808

msgstr ""

2808

2809

#: bzrlib/builtins.py:4637

2810

#: bzrlib/builtins.py:4650

2810

2811

msgid " bzr remerge --show-base"

2811

2812

msgstr ""

2812

2813

#: bzrlib/builtins.py:4639

2814

#: bzrlib/builtins.py:4652

2814

2815

msgid ""

2815

2816

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

2816

2817

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

2817

2818

msgstr ""

2818

2819

#: bzrlib/builtins.py:4642

2820

#: bzrlib/builtins.py:4655

2820

2821

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

2821

2822

msgstr ""

2822

2823

#: bzrlib/builtins.py:4649

2824

#: bzrlib/builtins.py:4662

2824

2825

msgid "Show base revision text in conflicts."

2825

2826

msgstr ""

2826

2827

#: bzrlib/builtins.py:4661

2828

#: bzrlib/builtins.py:4674

2828

2829

msgid ""

2829

2830

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

2830

2831

"merges."

2831

2832

msgstr ""

2832

2833

#: bzrlib/builtins.py:4717

2834

#: bzrlib/builtins.py:4731

2834

2835

msgid "Revert files to a previous revision."

2835

2836

msgstr ""

2836

2837

#: bzrlib/builtins.py:4719

2838

#: bzrlib/builtins.py:4733

2838

2839

msgid ""

2839

2840

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

2840

2841

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

2841

2842

"last committed revision is used."

2842

2843

msgstr ""

2843

2844

#: bzrlib/builtins.py:4723

2845

#: bzrlib/builtins.py:4737

2845

2846

msgid ""

2846

2847

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

2847

2848

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

2850

2851

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

2851

2852

msgstr ""

2852

2853

#: bzrlib/builtins.py:4729

2854

#: bzrlib/builtins.py:4743

2854

2855

msgid ""

2855

2856

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

2856

2857

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

2857

2858

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

2858

2859

msgstr ""

2859

2860

#: bzrlib/builtins.py:4733

2861

#: bzrlib/builtins.py:4747

2861

2862

msgid ""

2862

2863

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

2863

2864

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

2865

2866

"reverted."

2866

2867

msgstr ""

2867

2868

#: bzrlib/builtins.py:4738

2869

#: bzrlib/builtins.py:4752

2869

2870

msgid ""

2870

2871

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

2871

2872

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

2873

2874

"deleted."

2874

2875

msgstr ""

2875

2876

#: bzrlib/builtins.py:4743

2877

#: bzrlib/builtins.py:4757

2877

2878

msgid ""

2878

2879

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

2879

2880

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

2885

2886

"reverting any files."

2886

2887

msgstr ""

2887

2888

#: bzrlib/builtins.py:4752

2889

#: bzrlib/builtins.py:4766

2889

2890

msgid ""

2890

2891

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

2891

2892

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

2899

2900

"target branches."

2900

2901

msgstr ""

2901

2902

#: bzrlib/builtins.py:4766

2903

#: bzrlib/builtins.py:4780

2903

2904

msgid "Do not save backups of reverted files."

2904

2905

msgstr ""

2905

2906

#: bzrlib/builtins.py:4768

2907

#: bzrlib/builtins.py:4782

2907

2908

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

2908

2909

msgstr ""

2909

2910

#: bzrlib/builtins.py:4799

2911

#: bzrlib/builtins.py:4813

2911

2912

msgid ""

2912

2913

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

2913

2914

" "

2914

2915

msgstr ""

2915

2916

#: bzrlib/builtins.py:4804

2917

#: bzrlib/builtins.py:4818

2917

2918

msgid "Show help on all commands."

2918

2919

msgstr ""

2919

2920

#: bzrlib/builtins.py:4833

2921

#: bzrlib/builtins.py:4847

2921

2922

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

2922

2923

msgstr ""

2923

2924

#: bzrlib/builtins.py:4835

2925

#: bzrlib/builtins.py:4849

2925

2926

msgid "OTHER_BRANCH may be local or remote."

2926

2927

msgstr ""

2927

2928

#: bzrlib/builtins.py:4837

2929

#: bzrlib/builtins.py:4851

2929

2930

msgid ""

2930

2931

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

2931

2932

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

2936

2937

" 0 - no missing revisions"

2937

2938

msgstr ""

2938

2939

#: bzrlib/builtins.py:4847

2940

#: bzrlib/builtins.py:4861

2940

2941

msgid ""

2941

2942

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

2942

2943

" remembered pull location::"

2943

2944

msgstr ""

2944

2945

#: bzrlib/builtins.py:4850

2946

#: bzrlib/builtins.py:4864

2946

2947

msgid " bzr missing"

2947

2948

msgstr ""

2948

2949

#: bzrlib/builtins.py:4852

2950

#: bzrlib/builtins.py:4866

2950

2951

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

2951

2952

msgstr ""

2952

2953

#: bzrlib/builtins.py:4854

2954

#: bzrlib/builtins.py:4868

2954

2955

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

2955

2956

msgstr ""

2956

2957

#: bzrlib/builtins.py:4856

2958

#: bzrlib/builtins.py:4870

2958

2959

msgid ""

2959

2960

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

2960

2961

" branch::"

2961

2962

msgstr ""

2962

2963

#: bzrlib/builtins.py:4859

2964

#: bzrlib/builtins.py:4873

2964

2965

msgid " bzr missing -r ..-10"

2965

2966

msgstr ""

2966

2967

#: bzrlib/builtins.py:4861

2968

#: bzrlib/builtins.py:4875

2968

2969

msgid ""

2969

2970

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

2970

2971

" branch::"

2971

2972

msgstr ""

2972

2973

#: bzrlib/builtins.py:4864

2974

#: bzrlib/builtins.py:4878

2974

2975

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

2975

2976

msgstr ""

2976

2977

#: bzrlib/builtins.py:4871

2978

#: bzrlib/builtins.py:4885

2978

2979

msgid "Reverse the order of revisions."

2979

2980

msgstr ""

2980

2981

#: bzrlib/builtins.py:4873

2982

#: bzrlib/builtins.py:4887

2982

2983

msgid "Display changes in the local branch only."

2983

2984

msgstr ""

2984

2985

#: bzrlib/builtins.py:4874

2986

#: bzrlib/builtins.py:4888

2986

2987

msgid "Same as --mine-only."

2987

2988

msgstr ""

2988

2989

#: bzrlib/builtins.py:4876

2990

#: bzrlib/builtins.py:4890

2990

2991

msgid "Display changes in the remote branch only."

2991

2992

msgstr ""

2992

2993

#: bzrlib/builtins.py:4877

2994

#: bzrlib/builtins.py:4891

2994

2995

msgid "Same as --theirs-only."

2995

2996

msgstr ""

2996

2997

#: bzrlib/builtins.py:4882

2998

#: bzrlib/builtins.py:4896

2998

2999

msgid ""

2999

3000

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

3000

3001

"details."

3001

3002

msgstr ""

3002

3003

#: bzrlib/builtins.py:4886

3004

#: bzrlib/builtins.py:4900

3004

3005

msgid ""

3005

3006

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

3006

3007

"details."

3007

3008

msgstr ""

3008

3009

#: bzrlib/builtins.py:4889

3010

#: bzrlib/builtins.py:4903

3010

3011

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

3011

3012

msgstr ""

3012

3013

#: bzrlib/builtins.py:4943

3014

#: bzrlib/builtins.py:4957

3014

3015

msgid "No peer location known or specified."

3015

3016

msgstr ""

3016

3017

#: bzrlib/builtins.py:4947

3018

#: bzrlib/builtins.py:4961

3018

3019

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

3019

3020

msgstr ""

3020

3021

#: bzrlib/builtins.py:4980

3022

#: bzrlib/builtins.py:4994

3022

3023

#, python-format

3023

3024

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

3024

3025

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

3025

3026

msgstr[0] ""

3026

3027

msgstr[1] ""

3027

3028

#: bzrlib/builtins.py:4996

3029

#: bzrlib/builtins.py:5010

3029

3030

#, python-format

3030

3031

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

3031

3032

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

3032

3033

msgstr[0] ""

3033

3034

msgstr[1] ""

3034

3035

#: bzrlib/builtins.py:5008

3036

#: bzrlib/builtins.py:5022

3036

3037

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

3037

3038

msgstr ""

3038

3039

#: bzrlib/builtins.py:5011

3040

#: bzrlib/builtins.py:5025

3040

3041

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

3041

3042

msgstr ""

3042

3043

#: bzrlib/builtins.py:5016

3044

#: bzrlib/builtins.py:5030

3044

3045

msgid "Branches are up to date.\n"

3045

3046

msgstr ""

3046

3047

#: bzrlib/builtins.py:5027

3048

#: bzrlib/builtins.py:5041

3048

3049

msgid "Compress the data within a repository."

3049

3050

msgstr ""

3050

3051

#: bzrlib/builtins.py:5029

3052

#: bzrlib/builtins.py:5043

3052

3053

msgid ""

3053

3054

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

3054

3055

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

3055

3056

"normally not required to be done manually."

3056

3057

msgstr ""

3057

3058

#: bzrlib/builtins.py:5033

3059

#: bzrlib/builtins.py:5047

3059

3060

msgid ""

3060

3061

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

3061

3062

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

3064

3065

"used."

3065

3066

msgstr ""

3066

3067

#: bzrlib/builtins.py:5039

3068

#: bzrlib/builtins.py:5053

3068

3069

msgid ""

3069

3070

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

3070

3071

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

3072

3073

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

3073

3074

msgstr ""

3074

3075

#: bzrlib/builtins.py:5048

3076

#: bzrlib/builtins.py:5062

3076

3077

msgid "Delete obsolete packs to save disk space."

3077

3078

msgstr ""

3078

3079

#: bzrlib/builtins.py:5062

3080

#: bzrlib/builtins.py:5076

3080

3081

msgid "List the installed plugins."

3081

3082

msgstr ""

3082

3083

#: bzrlib/builtins.py:5064

3084

#: bzrlib/builtins.py:5078

3084

3085

msgid ""

3085

3086

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

3086

3087

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

3087

3088

msgstr ""

3088

3089

#: bzrlib/builtins.py:5067

3090

#: bzrlib/builtins.py:5081

3090

3091

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

3091

3092

msgstr ""

3092

3093

#: bzrlib/builtins.py:5069

3094

#: bzrlib/builtins.py:5083

3094

3095

msgid ""

3095

3096

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

3096

3097

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

3099

3100

"customizing log output."

3100

3101

msgstr ""

3101

3102

#: bzrlib/builtins.py:5075

3103

#: bzrlib/builtins.py:5089

3103

3104

msgid ""

3104

3105

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

3105

3106

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

3107

3108

"plugins using the Python programming language."

3108

3109

msgstr ""

3109

3110

#: bzrlib/builtins.py:5091

3111

#: bzrlib/builtins.py:5105

3111

3112

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

3112

3113

msgstr ""

3113

3114

#: bzrlib/builtins.py:5094

3115

#: bzrlib/builtins.py:5108

3115

3116

msgid "Produce long-format testament."

3116

3117

msgstr ""

3117

3118

#: bzrlib/builtins.py:5096

3119

#: bzrlib/builtins.py:5110

3119

3120

msgid "Produce a strict-format testament."

3120

3121

msgstr ""

3121

3122

#: bzrlib/builtins.py:5122

3123

#: bzrlib/builtins.py:5136

3123

3124

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

3124

3125

msgstr ""

3125

3126

#: bzrlib/builtins.py:5124

3127

#: bzrlib/builtins.py:5138

3127

3128

msgid ""

3128

3129

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

3129

3130

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

3130

3131

msgstr ""

3131

3132

#: bzrlib/builtins.py:5127

3133

#: bzrlib/builtins.py:5141

3133

3134

msgid ""

3134

3135

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

3135

3136

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

3136

3137

msgstr ""

3137

3138

#: bzrlib/builtins.py:5135

3139

#: bzrlib/builtins.py:5149

3139

3140

msgid "Show annotations on all lines."

3140

3141

msgstr ""

3141

3142

#: bzrlib/builtins.py:5136

3143

#: bzrlib/builtins.py:5150

3143

3144

msgid "Show commit date in annotations."

3144

3145

msgstr ""

3145

3146

#: bzrlib/builtins.py:5223

3147

#: bzrlib/builtins.py:5237

3147

3148

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

3148

3149

msgstr ""

3149

3150

#: bzrlib/builtins.py:5235

3151

#: bzrlib/builtins.py:5249

3151

3152

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

3152

3153

msgstr ""

3153

3154

#: bzrlib/builtins.py:5239

3155

#: bzrlib/builtins.py:5253

3155

3156

msgid ""

3156

3157

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

3157

3158

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

3158

3159

msgstr ""

3159

3160

#: bzrlib/builtins.py:5242

3161

#: bzrlib/builtins.py:5256

3161

3162

msgid ""

3162

3163

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

3163

3164

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

3164

3165

msgstr ""

3165

3166

#: bzrlib/builtins.py:5245

3167

#: bzrlib/builtins.py:5259

3167

3168

msgid ""

3168

3169

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

3169

3170

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

3170

3171

"that of the master."

3171

3172

msgstr ""

3172

3173

#: bzrlib/builtins.py:5260

3174

#: bzrlib/builtins.py:5274

3174

3175

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

3175

3176

msgstr ""

3176

3177

#: bzrlib/builtins.py:5265

3178

#: bzrlib/builtins.py:5280

3178

3179

msgid "Branch is already bound"

3179

3180

msgstr ""

3180

3181

#: bzrlib/builtins.py:5267

3182

#: bzrlib/builtins.py:5283

3182

3183

msgid "No location supplied and no previous location known"

3183

3184

msgstr ""

3184

3185

#: bzrlib/builtins.py:5273

3186

#: bzrlib/builtins.py:5289

3186

3187

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

3187

3188

msgstr ""

3188

3189

#: bzrlib/builtins.py:5280

3190

#: bzrlib/builtins.py:5296

3190

3191

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

3191

3192

msgstr ""

3192

3193

#: bzrlib/builtins.py:5282

3194

#: bzrlib/builtins.py:5298

3194

3195

msgid ""

3195

3196

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

3196

3197

"commits will be local only."

3197

3198

msgstr ""

3198

3199

#: bzrlib/builtins.py:5293

3200

#: bzrlib/builtins.py:5309

3200

3201

msgid "Local branch is not bound"

3201

3202

msgstr ""

3202

3203

#: bzrlib/builtins.py:5297

3204

#: bzrlib/builtins.py:5313

3204

3205

msgid "Remove the last committed revision."

3205

3206

msgstr ""

3206

3207

#: bzrlib/builtins.py:5299

3208

#: bzrlib/builtins.py:5315

3208

3209

msgid ""

3209

3210

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

3210

3211

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

3211

3212

"remove anything."

3212

3213

msgstr ""

3213

3214

#: bzrlib/builtins.py:5303

3215

#: bzrlib/builtins.py:5319

3215

3216

msgid ""

3216

3217

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

3217

3218

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

3218

3219

"branch at revision 15."

3219

3220

msgstr ""

3220

3221

#: bzrlib/builtins.py:5307

3222

#: bzrlib/builtins.py:5323

3222

3223

msgid ""

3223

3224

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

3224

3225

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

3225

3226

"the commit."

3226

3227

msgstr ""

3227

3228

#: bzrlib/builtins.py:5318

3229

#: bzrlib/builtins.py:5334

3229

3230

msgid "Don't actually make changes."

3230

3231

msgstr ""

3231

3232

#: bzrlib/builtins.py:5319

3233

#: bzrlib/builtins.py:5335

3233

3234

msgid "Say yes to all questions."

3234

3235

msgstr ""

3235

3236

#: bzrlib/builtins.py:5321

3237

#: bzrlib/builtins.py:5337

3237

3238

msgid "Keep tags that point to removed revisions."

3238

3239

msgstr ""

3239

3240

#: bzrlib/builtins.py:5323

3241

#: bzrlib/builtins.py:5339

3241

3242

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

3242

3243

msgstr ""

3243

3244

#: bzrlib/builtins.py:5372

3245

#: bzrlib/builtins.py:5388

3245

3246

msgid "No revisions to uncommit.\n"

3246

3247

msgstr ""

3247

3248

#: bzrlib/builtins.py:5387

3249

#: bzrlib/builtins.py:5403

3249

3250

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

3250

3251

msgstr ""

3251

3252

#: bzrlib/builtins.py:5390

3253

#: bzrlib/builtins.py:5406

3253

3254

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

3254

3255

msgstr ""

3255

3256

#: bzrlib/builtins.py:5394

3257

#: bzrlib/builtins.py:5410

3257

3258

msgid "Uncommit these revisions"

3258

3259

msgstr ""

3259

3260

#: bzrlib/builtins.py:5397

3261

#: bzrlib/builtins.py:5413

3261

3262

msgid "Canceled\n"

3262

3263

msgstr ""

3263

3264

#: bzrlib/builtins.py:5404

3265

#: bzrlib/builtins.py:5420

3265

3266

#, python-format

3266

3267

msgid ""

3267

3268

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

3268

3269

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

3269

3270

msgstr ""

3270

3271

#: bzrlib/builtins.py:5409

3272

#: bzrlib/builtins.py:5425

3272

3273

msgid "Break a dead lock."

3273

3274

msgstr ""

3274

3275

#: bzrlib/builtins.py:5411

3276

#: bzrlib/builtins.py:5427

3276

3277

msgid ""

3277

3278

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

3278

3279

"config file."

3279

3280

msgstr ""

3280

3281

#: bzrlib/builtins.py:5414

3282

#: bzrlib/builtins.py:5430

3282

3283

msgid ""

3283

3284

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

3284

3285

"holding the lock has been stopped."

3285

3286

msgstr ""

3286

3287

#: bzrlib/builtins.py:5417

3288

#: bzrlib/builtins.py:5433

3288

3289

msgid ""

3289

3290

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

3290

3291

"[location]' command."

3291

3292

msgstr ""

3292

3293

#: bzrlib/builtins.py:5420

3294

#: bzrlib/builtins.py:5436

3294

3295

msgid ""

3295

3296

":Examples:\n"

3296

3297

" bzr break-lock\n"

3298

3299

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

3299

3300

msgstr ""

3300

3301

#: bzrlib/builtins.py:5429

3302

#: bzrlib/builtins.py:5445

3302

3303

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

3303

3304

msgstr ""

3304

3305

#: bzrlib/builtins.py:5431

3306

#: bzrlib/builtins.py:5447

3306

3307

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

3307

3308

msgstr ""

3308

3309

#: bzrlib/builtins.py:5466

3310

#: bzrlib/builtins.py:5482

3310

3311

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

3311

3312

msgstr ""

3312

3313

#: bzrlib/builtins.py:5467

3314

#: bzrlib/builtins.py:5483

3314

3315

msgid "Run the bzr server."

3315

3316

msgstr ""

3316

3317

#: bzrlib/builtins.py:5473

3318

#: bzrlib/builtins.py:5489

3318

3319

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

3319

3320

msgstr ""

3320

3321

#: bzrlib/builtins.py:5474

3322

#: bzrlib/builtins.py:5490

3322

3323

msgid "protocol"

3323

3324

msgstr ""

3324

3325

#: bzrlib/builtins.py:5475

3326

#: bzrlib/builtins.py:5491

3326

3327

msgid "Protocol to serve."

3327

3328

msgstr ""

3328

3329

#: bzrlib/builtins.py:5479

3330

#: bzrlib/builtins.py:5495

3331

msgid "Listen for connections on nominated address."

3332

msgstr ""

3333

3334

#: bzrlib/builtins.py:5497

3330

3335

msgid ""

3331

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

3332

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

3333

"The default port depends on the protocol."

3336

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

3337

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

3338

"protocol."

3334

3339

msgstr ""

3335

3340

3336

#: bzrlib/builtins.py:5485

3341

#: bzrlib/builtins.py:5502

3337

3342

msgid "Serve contents of this directory."

3338

3343

msgstr ""

3339

3344

3340

#: bzrlib/builtins.py:5487

3345

#: bzrlib/builtins.py:5504

3341

3346

msgid ""

3342

3347

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

3343

3348

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

3346

3351

"uncontrolled write access to your file system."

3347

3352

msgstr ""

3348

3353

3349

#: bzrlib/builtins.py:5496

3354

#: bzrlib/builtins.py:5513

3350

3355

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

3351

3356

msgstr ""

3352

3357

3353

#: bzrlib/builtins.py:5546

3358

#: bzrlib/builtins.py:5531

3354

3359

msgid "Combine a tree into its containing tree."

3355

3360

msgstr ""

3356

3361

3357

#: bzrlib/builtins.py:5548

3362

#: bzrlib/builtins.py:5533

3358

3363

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

3359

3364

msgstr ""

3360

3365

3361

#: bzrlib/builtins.py:5550

3366

#: bzrlib/builtins.py:5535

3362

3367

msgid ""

3363

3368

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

3364

3369

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

3365

3370

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

3366

3371

msgstr ""

3367

3372

3368

#: bzrlib/builtins.py:5554

3373

#: bzrlib/builtins.py:5539

3369

3374

msgid ""

3370

3375

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

3371

3376

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

3372

3377

"and all history is preserved."

3373

3378

msgstr ""

3374

3379

3375

#: bzrlib/builtins.py:5572

3380

#: bzrlib/builtins.py:5557

3376

3381

#, python-format

3377

3382

msgid ""

3378

3383

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

3379

3384

"You can use bzr upgrade on the repository."

3380

3385

msgstr ""

3381

3386

3382

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

3387

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

3383

3388

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

3384

3389

msgstr ""

3385

3390

3386

#: bzrlib/builtins.py:5592

3391

#: bzrlib/builtins.py:5577

3387

3392

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

3388

3393

msgstr ""

3389

3394

3390

#: bzrlib/builtins.py:5594

3395

#: bzrlib/builtins.py:5579

3391

3396

msgid ""

3392

3397

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

3393

3398

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

3394

3399

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

3395

3400

msgstr ""

3396

3401

3397

#: bzrlib/builtins.py:5598

3402

#: bzrlib/builtins.py:5583

3398

3403

msgid ""

3399

3404

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

3400

3405

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

3401

3406

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

3402

3407

msgstr ""

3403

3408

3404

#: bzrlib/builtins.py:5678

3409

#: bzrlib/builtins.py:5663

3405

3410

msgid "No submit branch specified or known"

3406

3411

msgstr ""

3407

3412

3408

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

3413

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

3409

3414

msgid "No public branch specified or known"

3410

3415

msgstr ""

3411

3416

3412

#: bzrlib/builtins.py:5691

3417

#: bzrlib/builtins.py:5677

3413

3418

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

3414

3419

msgstr ""

3415

3420

3416

#: bzrlib/builtins.py:5700

3421

#: bzrlib/builtins.py:5686

3417

3422

msgid "No revisions to bundle."

3418

3423

msgstr ""

3419

3424

3420

#: bzrlib/builtins.py:5719

3425

#: bzrlib/builtins.py:5705

3421

3426

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

3422

3427

msgstr ""

3423

3428

3424

#: bzrlib/builtins.py:5721

3429

#: bzrlib/builtins.py:5707

3425

3430

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

3426

3431

msgstr ""

3427

3432

3428

#: bzrlib/builtins.py:5723

3433

#: bzrlib/builtins.py:5709

3429

3434

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

3430

3435

msgstr ""

3431

3436

3432

#: bzrlib/builtins.py:5725

3437

#: bzrlib/builtins.py:5711

3433

3438

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

3434

3439

msgstr ""

3435

3440

3436

#: bzrlib/builtins.py:5727

3441

#: bzrlib/builtins.py:5713

3437

3442

msgid ""

3438

3443

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

3439

3444

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

3440

3445

" branch."

3441

3446

msgstr ""

3442

3447

3443

#: bzrlib/builtins.py:5731

3448

#: bzrlib/builtins.py:5717

3444

3449

msgid ""

3445

3450

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

3446

3451

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

3447

3452

msgstr ""

3448

3453

3449

#: bzrlib/builtins.py:5734

3454

#: bzrlib/builtins.py:5720

3450

3455

msgid ""

3451

3456

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

3452

3457

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

3453

3458

"the source branch."

3454

3459

msgstr ""

3455

3460

3456

#: bzrlib/builtins.py:5738

3461

#: bzrlib/builtins.py:5724

3457

3462

msgid ""

3458

3463

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

3459

3464

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

3462

3467

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

3463

3468

msgstr ""

3464

3469

3465

#: bzrlib/builtins.py:5744

3470

#: bzrlib/builtins.py:5730

3466

3471

msgid ""

3467

3472

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

3468

3473

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

3471

3476

"be changed using --from."

3472

3477

msgstr ""

3473

3478

3474

#: bzrlib/builtins.py:5750

3479

#: bzrlib/builtins.py:5736

3475

3480

msgid ""

3476

3481

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

3477

3482

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

3480

3485

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

3481

3486

msgstr ""

3482

3487

3483

#: bzrlib/builtins.py:5756

3488

#: bzrlib/builtins.py:5742

3484

3489

msgid ""

3485

3490

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

3486

3491

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

3488

3493

"in the merge directive."

3489

3494

msgstr ""

3490

3495

3491

#: bzrlib/builtins.py:5761

3496

#: bzrlib/builtins.py:5747

3492

3497

msgid ""

3493

3498

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

3494

3499

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

3495

3500

msgstr ""

3496

3501

3497

#: bzrlib/builtins.py:5764

3502

#: bzrlib/builtins.py:5750

3498

3503

msgid ""

3499

3504

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

3500

3505

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

3501

3506

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

3502

3507

msgstr ""

3503

3508

3504

#: bzrlib/builtins.py:5768

3509

#: bzrlib/builtins.py:5754

3505

3510

msgid ""

3506

3511

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

3507

3512

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

3513

3518

"supported clients."

3514

3519

msgstr ""

3515

3520

3516

#: bzrlib/builtins.py:5775

3521

#: bzrlib/builtins.py:5761

3517

3522

msgid ""

3518

3523

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

3519

3524

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

3521

3526

"in the submit branch."

3522

3527

msgstr ""

3523

3528

3524

#: bzrlib/builtins.py:5780

3529

#: bzrlib/builtins.py:5766

3525

3530

msgid ""

3526

3531

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

3527

3532

"and\n"

3531

3536

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

3532

3537

msgstr ""

3533

3538

3534

#: bzrlib/builtins.py:5786

3539

#: bzrlib/builtins.py:5772

3535

3540

msgid ""

3536

3541

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

3537

3542

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

3538

3543

msgstr ""

3539

3544

3540

#: bzrlib/builtins.py:5789

3545

#: bzrlib/builtins.py:5775

3541

3546

msgid ""

3542

3547

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

3543

3548

"into\n"

3545

3550

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

3546

3551

msgstr ""

3547

3552

3548

#: bzrlib/builtins.py:5813

3553

#: bzrlib/builtins.py:5799

3549

3554

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

3550

3555

msgstr ""

3551

3556

3552

#: bzrlib/builtins.py:5817

3557

#: bzrlib/builtins.py:5803

3553

3558

msgid ""

3554

3559

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

3555

3560

"strict disables the check."

3556

3561

msgstr ""

3557

3562

3558

#: bzrlib/builtins.py:5819

3563

#: bzrlib/builtins.py:5805

3559

3564

msgid "Mail the request to this address."

3560

3565

msgstr ""

3561

3566

3562

#: bzrlib/builtins.py:5823

3567

#: bzrlib/builtins.py:5809

3563

3568

msgid "Body for the email."

3564

3569

msgstr ""

3565

3570

3566

#: bzrlib/builtins.py:5876

3571

#: bzrlib/builtins.py:5862

3567

3572

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

3568

3573

msgstr ""

3569

3574

3570

#: bzrlib/builtins.py:5877

3575

#: bzrlib/builtins.py:5863

3571

3576

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

3572

3577

msgstr ""

3573

3578

3574

#: bzrlib/builtins.py:5880

3579

#: bzrlib/builtins.py:5866

3575

3580

msgid "Remember submit and public branch."

3576

3581

msgstr ""

3577

3582

3578

#: bzrlib/builtins.py:5882

3583

#: bzrlib/builtins.py:5868

3579

3584

msgid ""

3580

3585

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

3581

3586

"working directory."

3582

3587

msgstr ""

3583

3588

3584

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

3589

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

3585

3590

msgid "format"

3586

3591

msgstr ""

3587

3592

3588

#: bzrlib/builtins.py:5893

3593

#: bzrlib/builtins.py:5879

3589

3594

msgid "Use the specified output format."

3590

3595

msgstr ""

3591

3596

3592

#: bzrlib/builtins.py:5915

3597

#: bzrlib/builtins.py:5901

3593

3598

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

3594

3599

msgstr ""

3595

3600

3596

#: bzrlib/builtins.py:5917

3601

#: bzrlib/builtins.py:5903

3597

3602

msgid ""

3598

3603

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

3599

3604

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

3600

3605

"created tag."

3601

3606

msgstr ""

3602

3607

3603

#: bzrlib/builtins.py:5921

3608

#: bzrlib/builtins.py:5907

3604

3609

msgid ""

3605

3610

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

3606

3611

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

3607

3612

msgstr ""

3608

3613

3609

#: bzrlib/builtins.py:5924

3614

#: bzrlib/builtins.py:5910

3610

3615

msgid ""

3611

3616

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

3612

3617

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

3613

3618

msgstr ""

3614

3619

3615

#: bzrlib/builtins.py:5927

3620

#: bzrlib/builtins.py:5913

3616

3621

msgid ""

3617

3622

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

3618

3623

"``bzr\n"

3619

3624

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

3620

3625

msgstr ""

3621

3626

3622

#: bzrlib/builtins.py:5930

3627

#: bzrlib/builtins.py:5916

3623

3628

msgid ""

3624

3629

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

3625

3630

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

3627

3632

"details."

3628

3633

msgstr ""

3629

3634

3630

#: bzrlib/builtins.py:5940

3635

#: bzrlib/builtins.py:5926

3631

3636

msgid "Delete this tag rather than placing it."

3632

3637

msgstr ""

3633

3638

3634

#: bzrlib/builtins.py:5943

3639

#: bzrlib/builtins.py:5929

3635

3640

msgid "Branch in which to place the tag."

3636

3641

msgstr ""

3637

3642

3638

#: bzrlib/builtins.py:5945

3643

#: bzrlib/builtins.py:5931

3639

3644

msgid "Replace existing tags."

3640

3645

msgstr ""

3641

3646

3642

#: bzrlib/builtins.py:5960

3647

#: bzrlib/builtins.py:5946

3643

3648

msgid "No tag specified to delete."

3644

3649

msgstr ""

3645

3650

3651

#: bzrlib/builtins.py:5948

3652

#, python-format

3653

msgid "Deleted tag %s."

3654

msgstr ""

3655

3646

3656

#: bzrlib/builtins.py:5962

3647

#, python-format

3648

msgid "Deleted tag %s."

3649

msgstr ""

3650

3651

#: bzrlib/builtins.py:5976

3652

3657

msgid "Please specify a tag name."

3653

3658

msgstr ""

3654

3659

3655

#: bzrlib/builtins.py:5984

3660

#: bzrlib/builtins.py:5970

3656

3661

#, python-format

3657

3662

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

3658

3663

msgstr ""

3659

3664

3660

#: bzrlib/builtins.py:5988

3665

#: bzrlib/builtins.py:5974

3661

3666

#, python-format

3662

3667

msgid "Created tag %s."

3663

3668

msgstr ""

3664

3669

3665

#: bzrlib/builtins.py:5990

3670

#: bzrlib/builtins.py:5976

3666

3671

#, python-format

3667

3672

msgid "Updated tag %s."

3668

3673

msgstr ""

3669

3674

3670

#: bzrlib/builtins.py:5994

3675

#: bzrlib/builtins.py:5980

3671

3676

msgid "List tags."

3672

3677

msgstr ""

3673

3678

3674

#: bzrlib/builtins.py:5996

3679

#: bzrlib/builtins.py:5982

3675

3680

msgid ""

3676

3681

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

3677

3682

msgstr ""

3678

3683

3679

#: bzrlib/builtins.py:6002

3684

#: bzrlib/builtins.py:5988

3680

3685

msgid "Branch whose tags should be displayed."

3681

3686

msgstr ""

3682

3687

3683

#: bzrlib/builtins.py:6004

3688

#: bzrlib/builtins.py:5990

3684

3689

msgid "Sort tags by different criteria."

3685

3690

msgstr ""

3686

3691

3687

#: bzrlib/builtins.py:6004

3692

#: bzrlib/builtins.py:5990

3688

3693

msgid "Sorting"

3689

3694

msgstr ""

3690

3695

3691

#: bzrlib/builtins.py:6073

3696

#: bzrlib/builtins.py:6059

3692

3697

msgid "Reconfigure the type of a bzr directory."

3693

3698

msgstr ""

3694

3699

3695

#: bzrlib/builtins.py:6075

3700

#: bzrlib/builtins.py:6061

3696

3701

msgid "A target configuration must be specified."

3697

3702

msgstr ""

3698

3703

3699

#: bzrlib/builtins.py:6077

3704

#: bzrlib/builtins.py:6063

3700

3705

msgid ""

3701

3706

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

3702

3707

"The order of preference is\n"

3707

3712

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

3708

3713

msgstr ""

3709

3714

3710

#: bzrlib/builtins.py:6091

3715

#: bzrlib/builtins.py:6077

3711

3716

msgid "Tree type"

3712

3717

msgstr ""

3713

3718

3714

#: bzrlib/builtins.py:6092

3719

#: bzrlib/builtins.py:6078

3715

3720

msgid "The relation between branch and tree."

3716

3721

msgstr ""

3717

3722

3718

#: bzrlib/builtins.py:6094

3723

#: bzrlib/builtins.py:6080

3719

3724

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

3720

3725

msgstr ""

3721

3726

3722

#: bzrlib/builtins.py:6095

3727

#: bzrlib/builtins.py:6081

3723

3728

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

3724

3729

msgstr ""

3725

3730

3726

#: bzrlib/builtins.py:6096

3731

#: bzrlib/builtins.py:6082

3727

3732

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

3728

3733

msgstr ""

3729

3734

3730

#: bzrlib/builtins.py:6097

3735

#: bzrlib/builtins.py:6083

3731

3736

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

3732

3737

msgstr ""

3733

3738

3734

#: bzrlib/builtins.py:6102

3739

#: bzrlib/builtins.py:6088

3735

3740

msgid "Repository type"

3736

3741

msgstr ""

3737

3742

3738

#: bzrlib/builtins.py:6103

3743

#: bzrlib/builtins.py:6089

3739

3744

msgid "Location fo the repository."

3740

3745

msgstr ""

3741

3746

3742

#: bzrlib/builtins.py:6105

3747

#: bzrlib/builtins.py:6091

3743

3748

msgid ""

3744

3749

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

3745

3750

msgstr ""

3746

3751

3747

#: bzrlib/builtins.py:6107

3752

#: bzrlib/builtins.py:6093

3748

3753

msgid "Reconfigure to use a shared repository."

3749

3754

msgstr ""

3750

3755

3751

#: bzrlib/builtins.py:6111

3756

#: bzrlib/builtins.py:6097

3752

3757

msgid "Trees in Repository"

3753

3758

msgstr ""

3754

3759

3755

#: bzrlib/builtins.py:6112

3760

#: bzrlib/builtins.py:6098

3756

3761

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

3757

3762

msgstr ""

3758

3763

3759

#: bzrlib/builtins.py:6114

3764

#: bzrlib/builtins.py:6100

3760

3765

msgid ""

3761

3766

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

3762

3767

msgstr ""

3763

3768

3764

#: bzrlib/builtins.py:6116

3769

#: bzrlib/builtins.py:6102

3765

3770

msgid ""

3766

3771

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

3767

3772

msgstr ""

3768

3773

3769

#: bzrlib/builtins.py:6119

3774

#: bzrlib/builtins.py:6105

3770

3775

msgid "Branch to bind checkout to."

3771

3776

msgstr ""

3772

3777

3773

#: bzrlib/builtins.py:6121

3778

#: bzrlib/builtins.py:6107

3774

3779

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

3775

3780

msgstr ""

3776

3781

3777

#: bzrlib/builtins.py:6124

3782

#: bzrlib/builtins.py:6110

3778

3783

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

3779

3784

msgstr ""

3780

3785

3781

#: bzrlib/builtins.py:6128

3786

#: bzrlib/builtins.py:6114

3782

3787

msgid ""

3783

3788

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

3784

3789

"data into it."

3785

3790

msgstr ""

3786

3791

3792

#: bzrlib/builtins.py:6124

3793

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

3794

msgstr ""

3795

3787

3796

#: bzrlib/builtins.py:6138

3788

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

3789

msgstr ""

3790

3791

#: bzrlib/builtins.py:6152

3792

3797

msgid "No target configuration specified"

3793

3798

msgstr ""

3794

3799

3795

#: bzrlib/builtins.py:6187

3800

#: bzrlib/builtins.py:6173

3796

3801

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

3797

3802

msgstr ""

3798

3803

3799

#: bzrlib/builtins.py:6189

3804

#: bzrlib/builtins.py:6175

3800

3805

msgid ""

3801

3806

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

3802

3807

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

3804

3809

"of the new location and binds to it."

3805

3810

msgstr ""

3806

3811

3807

#: bzrlib/builtins.py:6194

3812

#: bzrlib/builtins.py:6180

3808

3813

msgid ""

3809

3814

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

3810

3815

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

3811

3816

msgstr ""

3812

3817

3813

#: bzrlib/builtins.py:6197

3818

#: bzrlib/builtins.py:6183

3814

3819

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

3815

3820

msgstr ""

3816

3821

3817

#: bzrlib/builtins.py:6199

3822

#: bzrlib/builtins.py:6185

3818

3823

msgid ""

3819

3824

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

3820

3825

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

3822

3827

"/path/to/newbranch."

3823

3828

msgstr ""

3824

3829

3825

#: bzrlib/builtins.py:6204

3830

#: bzrlib/builtins.py:6190

3826

3831

msgid ""

3827

3832

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

3828

3833

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

3829

3834

"that of the master."

3830

3835

msgstr ""

3831

3836

3832

#: bzrlib/builtins.py:6212

3837

#: bzrlib/builtins.py:6198

3833

3838

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

3834

3839

msgstr ""

3835

3840

3841

#: bzrlib/builtins.py:6201

3842

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

3843

msgstr ""

3844

3836

3845

#: bzrlib/builtins.py:6215

3837

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

3838

msgstr ""

3839

3840

#: bzrlib/builtins.py:6229

3841

3846

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

3842

3847

msgstr ""

3843

3848

3844

#: bzrlib/builtins.py:6242

3849

#: bzrlib/builtins.py:6228

3845

3850

msgid "cannot create branch without source branch"

3846

3851

msgstr ""

3847

3852

3848

#: bzrlib/builtins.py:6262

3853

#: bzrlib/builtins.py:6253

3849

3854

msgid "Manage filtered views."

3850

3855

msgstr ""

3851

3856

3852

#: bzrlib/builtins.py:6264

3857

#: bzrlib/builtins.py:6255

3853

3858

msgid ""

3854

3859

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

3855

3860

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

3859

3864

"must be within the current view."

3860

3865

msgstr ""

3861

3866

3862

#: bzrlib/builtins.py:6271

3867

#: bzrlib/builtins.py:6262

3863

3868

msgid ""

3864

3869

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

3865

3870

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

3867

3872

"and switch between them."

3868

3873

msgstr ""

3869

3874

3870

#: bzrlib/builtins.py:6276

3875

#: bzrlib/builtins.py:6267

3871

3876

msgid ""

3872

3877

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

3873

3878

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

3875

3880

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

3876

3881

msgstr ""

3877

3882

3878

#: bzrlib/builtins.py:6281

3883

#: bzrlib/builtins.py:6272

3879

3884

msgid ""

3880

3885

":Examples:\n"

3881

3886

" To define the current view::"

3882

3887

msgstr ""

3883

3888

3884

#: bzrlib/builtins.py:6284

3889

#: bzrlib/builtins.py:6275

3885

3890

msgid " bzr view file1 dir1 ..."

3886

3891

msgstr ""

3887

3892

3888

#: bzrlib/builtins.py:6286

3893

#: bzrlib/builtins.py:6277

3889

3894

msgid " To list the current view::"

3890

3895

msgstr ""

3891

3896

3892

#: bzrlib/builtins.py:6288

3897

#: bzrlib/builtins.py:6279

3893

3898

msgid " bzr view"

3894

3899

msgstr ""

3895

3900

3896

#: bzrlib/builtins.py:6290

3901

#: bzrlib/builtins.py:6281

3897

3902

msgid " To delete the current view::"

3898

3903

msgstr ""

3899

3904

3900

#: bzrlib/builtins.py:6292

3905

#: bzrlib/builtins.py:6283

3901

3906

msgid " bzr view --delete"

3902

3907

msgstr ""

3903

3908

3904

#: bzrlib/builtins.py:6294

3909

#: bzrlib/builtins.py:6285

3905

3910

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

3906

3911

msgstr ""

3907

3912

3908

#: bzrlib/builtins.py:6296

3913

#: bzrlib/builtins.py:6287

3909

3914

msgid " bzr view --switch off"

3910

3915

msgstr ""

3911

3916

3912

#: bzrlib/builtins.py:6298

3917

#: bzrlib/builtins.py:6289

3913

3918

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

3914

3919

msgstr ""

3915

3920

3916

#: bzrlib/builtins.py:6300

3921

#: bzrlib/builtins.py:6291

3917

3922

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

3918

3923

msgstr ""

3919

3924

3920

#: bzrlib/builtins.py:6302

3925

#: bzrlib/builtins.py:6293

3921

3926

msgid " To list a named view::"

3922

3927

msgstr ""

3923

3928

3924

#: bzrlib/builtins.py:6304

3929

#: bzrlib/builtins.py:6295

3925

3930

msgid " bzr view --name view-name"

3926

3931

msgstr ""

3927

3932

3928

#: bzrlib/builtins.py:6306

3933

#: bzrlib/builtins.py:6297

3929

3934

msgid " To delete a named view::"

3930

3935

msgstr ""

3931

3936

3932

#: bzrlib/builtins.py:6308

3937

#: bzrlib/builtins.py:6299

3933

3938

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

3934

3939

msgstr ""

3935

3940

3936

#: bzrlib/builtins.py:6310

3941

#: bzrlib/builtins.py:6301

3937

3942

msgid " To switch to a named view::"

3938

3943

msgstr ""

3939

3944

3940

#: bzrlib/builtins.py:6312

3945

#: bzrlib/builtins.py:6303

3941

3946

msgid " bzr view --switch view-name"

3942

3947

msgstr ""

3943

3948

3944

#: bzrlib/builtins.py:6314

3949

#: bzrlib/builtins.py:6305

3945

3950

msgid " To list all views defined::"

3946

3951

msgstr ""

3947

3952

3948

#: bzrlib/builtins.py:6316

3953

#: bzrlib/builtins.py:6307

3949

3954

msgid " bzr view --all"

3950

3955

msgstr ""

3951

3956

3952

#: bzrlib/builtins.py:6318

3957

#: bzrlib/builtins.py:6309

3953

3958

msgid " To delete all views::"

3954

3959

msgstr ""

3955

3960

3956

#: bzrlib/builtins.py:6320

3961

#: bzrlib/builtins.py:6311

3957

3962

msgid " bzr view --delete --all"

3958

3963

msgstr ""

3959

3964

3960

#: bzrlib/builtins.py:6327

3965

#: bzrlib/builtins.py:6318

3961

3966

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

3962

3967

msgstr ""

3963

3968

3964

#: bzrlib/builtins.py:6330

3969

#: bzrlib/builtins.py:6321

3965

3970

msgid "Delete the view."

3966

3971

msgstr ""

3967

3972

3968

#: bzrlib/builtins.py:6333

3973

#: bzrlib/builtins.py:6324

3969

3974

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

3970

3975

msgstr ""

3971

3976

3972

#: bzrlib/builtins.py:6337

3977

#: bzrlib/builtins.py:6328

3973

3978

msgid "Name of the view to switch to."

3974

3979

msgstr ""

3975

3980

3976

#: bzrlib/builtins.py:6356

3981

#: bzrlib/builtins.py:6347

3977

3982

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

3978

3983

msgstr ""

3979

3984

3980

#: bzrlib/builtins.py:6359

3985

#: bzrlib/builtins.py:6350

3981

3986

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

3982

3987

msgstr ""

3983

3988

3984

#: bzrlib/builtins.py:6362

3989

#: bzrlib/builtins.py:6353

3985

3990

msgid "Deleted all views.\n"

3986

3991

msgstr ""

3987

3992

3988

#: bzrlib/builtins.py:6364

3993

#: bzrlib/builtins.py:6355

3989

3994

msgid "No current view to delete"

3990

3995

msgstr ""

3991

3996

3992

#: bzrlib/builtins.py:6367

3997

#: bzrlib/builtins.py:6358

3993

3998

#, python-format

3994

3999

msgid "Deleted '%s' view.\n"

3995

4000

msgstr ""

3996

4001

3997

#: bzrlib/builtins.py:6371

4002

#: bzrlib/builtins.py:6362

3998

4003

msgid "Both --switch and a file list specified"

3999

4004

msgstr ""

4000

4005

4001

#: bzrlib/builtins.py:6374

4006

#: bzrlib/builtins.py:6365

4002

4007

msgid "Both --switch and --all specified"

4003

4008

msgstr ""

4004

4009

4005

#: bzrlib/builtins.py:6377

4010

#: bzrlib/builtins.py:6368

4006

4011

msgid "No current view to disable"

4007

4012

msgstr ""

4008

4013

4009

#: bzrlib/builtins.py:6379

4014

#: bzrlib/builtins.py:6370

4010

4015

#, python-format

4011

4016

msgid "Disabled '%s' view.\n"

4012

4017

msgstr ""

4013

4018

4014

#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405

4019

#: bzrlib/builtins.py:6374 bzrlib/builtins.py:6396

4015

4020

msgid "Using '{0}' view: {1}\n"

4016

4021

msgstr ""

4017

4022

4023

#: bzrlib/builtins.py:6377

4024

msgid "Views defined:\n"

4025

msgstr ""

4026

4018

4027

#: bzrlib/builtins.py:6386

4019

msgid "Views defined:\n"

4020

msgstr ""

4021

4022

#: bzrlib/builtins.py:6395

4023

4028

msgid "No views defined.\n"

4024

4029

msgstr ""

4025

4030

4026

#: bzrlib/builtins.py:6402

4031

#: bzrlib/builtins.py:6393

4027

4032

msgid "Cannot change the 'off' pseudo view"

4028

4033

msgstr ""

4029

4034

4030

#: bzrlib/builtins.py:6410

4035

#: bzrlib/builtins.py:6401

4031

4036

msgid "No current view.\n"

4032

4037

msgstr ""

4033

4038

4034

#: bzrlib/builtins.py:6413

4039

#: bzrlib/builtins.py:6404

4035

4040

msgid "'{0}' view is: {1}\n"

4036

4041

msgstr ""

4037

4042

4038

#: bzrlib/builtins.py:6433

4043

#: bzrlib/builtins.py:6424

4039

4044

msgid " <no hooks installed>\n"

4040

4045

msgstr ""

4041

4046

4042

#: bzrlib/builtins.py:6437

4047

#: bzrlib/builtins.py:6428

4043

4048

msgid "Remove a branch."

4044

4049

msgstr ""

4045

4050

4046

#: bzrlib/builtins.py:6439

4051

#: bzrlib/builtins.py:6430

4047

4052

msgid ""

4048

4053

"This will remove the branch from the specified location but \n"

4049

4054

"will keep any working tree or repository in place."

4050

4055

msgstr ""

4051

4056

4052

#: bzrlib/builtins.py:6444

4057

#: bzrlib/builtins.py:6435

4053

4058

msgid " Remove the branch at repo/trunk::"

4054

4059

msgstr ""

4055

4060

4056

#: bzrlib/builtins.py:6446

4061

#: bzrlib/builtins.py:6437

4057

4062

msgid " bzr remove-branch repo/trunk"

4058

4063

msgstr ""

4059

4064

4060

#: bzrlib/builtins.py:6461

4065

#: bzrlib/builtins.py:6444

4066

msgid "Remove branch even if it is the active branch."

4067

msgstr ""

4068

4069

#: bzrlib/builtins.py:6458

4070

msgid "Branch is active. Use --force to remove it."

4071

msgstr ""

4072

4073

#: bzrlib/builtins.py:6462

4061

4074

msgid "Plaintext diff output."

4062

4075

msgstr ""

4063

4076

4064

#: bzrlib/builtins.py:6462

4077

#: bzrlib/builtins.py:6463

4065

4078

msgid "Temporarily set aside some changes from the current tree."

4066

4079

msgstr ""

4067

4080

4068

#: bzrlib/builtins.py:6464

4081

#: bzrlib/builtins.py:6465

4069

4082

msgid ""

4070

4083

"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"

4071

4084

"ie. out of the way, until a later time when you can bring them back from\n"

4074

4087

"will they survive its deletion."

4075

4088

msgstr ""

4076

4089

4077

#: bzrlib/builtins.py:6470

4090

#: bzrlib/builtins.py:6471

4078

4091

msgid "If shelve --list is specified, previously-shelved changes are listed."

4079

4092

msgstr ""

4080

4093

4081

#: bzrlib/builtins.py:6472

4094

#: bzrlib/builtins.py:6473

4082

4095

msgid ""

4083

4096

"Shelve is intended to help separate several sets of changes that have\n"

4084

4097

"been inappropriately mingled. If you just want to get rid of all changes\n"

4086

4099

"shelve all text changes at once, use shelve --all."

4087

4100

msgstr ""

4088

4101

4089

#: bzrlib/builtins.py:6477

4102

#: bzrlib/builtins.py:6478

4090

4103

msgid ""

4091

4104

"If filenames are specified, only the changes to those files will be\n"

4092

4105

"shelved. Other files will be left untouched."

4093

4106

msgstr ""

4094

4107

4095

#: bzrlib/builtins.py:6480

4108

#: bzrlib/builtins.py:6481

4096

4109

msgid ""

4097

4110

"If a revision is specified, changes since that revision will be shelved."

4098

4111

msgstr ""

4099

4112

4100

#: bzrlib/builtins.py:6482

4113

#: bzrlib/builtins.py:6483

4101

4114

msgid ""

4102

4115

"You can put multiple items on the shelf, and by default, 'unshelve' will\n"

4103

4116

"restore the most recently shelved changes."

4104

4117

msgstr ""

4105

4118

4106

#: bzrlib/builtins.py:6485

4119

#: bzrlib/builtins.py:6486

4107

4120

msgid ""

4108

4121

"For complicated changes, it is possible to edit the changes in a separate\n"

4109

4122

"editor program to decide what the file remaining in the working copy\n"

4110

4123

"should look like. To do this, add the configuration option"

4111

4124

msgstr ""

4112

4125

4113

#: bzrlib/builtins.py:6489

4126

#: bzrlib/builtins.py:6490

4114

4127

msgid " change_editor = PROGRAM @new_path @old_path"

4115

4128

msgstr ""

4116

4129

4117

#: bzrlib/builtins.py:6491

4130

#: bzrlib/builtins.py:6492

4118

4131

msgid ""

4119

4132

"where @new_path is replaced with the path of the new version of the \n"

4120

4133

"file and @old_path is replaced with the path of the old version of \n"

4123

4136

" "

4124

4137

msgstr ""

4125

4138

4126

#: bzrlib/builtins.py:6503

4139

#: bzrlib/builtins.py:6504

4127

4140

msgid "Shelve all changes."

4128

4141

msgstr ""

4129

4142

4130

#: bzrlib/builtins.py:6505

4143

#: bzrlib/builtins.py:6506

4131

4144

msgid "Method to use for writing diffs."

4132

4145

msgstr ""

4133

4146

4134

#: bzrlib/builtins.py:6505

4147

#: bzrlib/builtins.py:6506

4135

4148

msgid "writer"

4136

4149

msgstr ""

4137

4150

4138

#: bzrlib/builtins.py:6509

4151

#: bzrlib/builtins.py:6510

4139

4152

msgid "List shelved changes."

4140

4153

msgstr ""

4141

4154

4142

#: bzrlib/builtins.py:6511

4155

#: bzrlib/builtins.py:6512

4143

4156

msgid "Destroy removed changes instead of shelving them."

4144

4157

msgstr ""

4145

4158

4146

#: bzrlib/builtins.py:6540

4159

#: bzrlib/builtins.py:6541

4147

4160

msgid "No shelved changes."

4148

4161

msgstr ""

4149

4162

4150

#: bzrlib/builtins.py:6551

4163

#: bzrlib/builtins.py:6552

4151

4164

msgid "Restore shelved changes."

4152

4165

msgstr ""

4153

4166

4154

#: bzrlib/builtins.py:6553

4167

#: bzrlib/builtins.py:6554

4155

4168

msgid ""

4156

4169

"By default, the most recently shelved changes are restored. However if you\n"

4157

4170

"specify a shelf by id those changes will be restored instead. This works\n"

4158

4171

"best when the changes don't depend on each other."

4159

4172

msgstr ""

4160

4173

4161

#: bzrlib/builtins.py:6562

4174

#: bzrlib/builtins.py:6563

4162

4175

msgid "The action to perform."

4163

4176

msgstr ""

4164

4177

4165

#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694

4178

#: bzrlib/builtins.py:6563 bzrlib/conflicts.py:694

4166

4179

msgid "action"

4167

4180

msgstr ""

4168

4181

4169

#: bzrlib/builtins.py:6564

4182

#: bzrlib/builtins.py:6565

4170

4183

msgid "Apply changes and remove from the shelf."

4171

4184

msgstr ""

4172

4185

4173

#: bzrlib/builtins.py:6565

4186

#: bzrlib/builtins.py:6566

4174

4187

msgid "Show changes, but do not apply or remove them."

4175

4188

msgstr ""

4176

4189

4177

#: bzrlib/builtins.py:6566

4190

#: bzrlib/builtins.py:6567

4178

4191

msgid ""

4179

4192

"Instead of unshelving the changes, show the diff that would result from "

4180

4193

"unshelving."

4181

4194

msgstr ""

4182

4195

4183

#: bzrlib/builtins.py:6568

4196

#: bzrlib/builtins.py:6569

4184

4197

msgid "Delete changes without applying them."

4185

4198

msgstr ""

4186

4199

4187

#: bzrlib/builtins.py:6569

4200

#: bzrlib/builtins.py:6570

4188

4201

msgid "Apply changes but don't delete them."

4189

4202

msgstr ""

4190

4203

4191

#: bzrlib/builtins.py:6584

4204

#: bzrlib/builtins.py:6585

4192

4205

msgid "Remove unwanted files from working tree."

4193

4206

msgstr ""

4194

4207

4195

#: bzrlib/builtins.py:6586

4208

#: bzrlib/builtins.py:6587

4196

4209

msgid ""

4197

4210

"By default, only unknown files, not ignored files, are deleted. Versioned\n"

4198

4211

"files are never deleted."

4199

4212

msgstr ""

4200

4213

4201

#: bzrlib/builtins.py:6589

4214

#: bzrlib/builtins.py:6590

4202

4215

msgid ""

4203

4216

"Another class is 'detritus', which includes files emitted by bzr during\n"

4204

4217

"normal operations and selftests. (The value of these files decreases with\n"

4205

4218

"time.)"

4206

4219

msgstr ""

4207

4220

4208

#: bzrlib/builtins.py:6593

4221

#: bzrlib/builtins.py:6594

4209

4222

msgid ""

4210

4223

"If no options are specified, unknown files are deleted. Otherwise, option\n"

4211

4224

"flags are respected, and may be combined."

4212

4225

msgstr ""

4213

4226

4214

#: bzrlib/builtins.py:6596

4227

#: bzrlib/builtins.py:6597

4215

4228

msgid "To check what clean-tree will do, use --dry-run."

4216

4229

msgstr ""

4217

4230

4218

#: bzrlib/builtins.py:6599

4231

#: bzrlib/builtins.py:6600

4219

4232

msgid "Delete all ignored files."

4220

4233

msgstr ""

4221

4234

4222

#: bzrlib/builtins.py:6600

4235

#: bzrlib/builtins.py:6601

4223

4236

msgid ""

4224

4237

"Delete conflict files, merge and revert backups, and failed selftest dirs."

4225

4238

msgstr ""

4226

4239

4227

#: bzrlib/builtins.py:6603

4240

#: bzrlib/builtins.py:6604

4228

4241

msgid "Delete files unknown to bzr (default)."

4229

4242

msgstr ""

4230

4243

4231

#: bzrlib/builtins.py:6604

4244

#: bzrlib/builtins.py:6605

4232

4245

msgid "Show files to delete instead of deleting them."

4233

4246

msgstr ""

4234

4247

4235

#: bzrlib/builtins.py:6606

4248

#: bzrlib/builtins.py:6607

4236

4249

msgid "Do not prompt before deleting."

4237

4250

msgstr ""

4238

4251

4292

4305

msgstr[0] ""

4293

4306

msgstr[1] ""

4294

4307

4295

#: bzrlib/bzrdir.py:490

4308

#: bzrlib/bzrdir.py:486

4296

4309

msgid ""

4297

4310

"making backup of {0}\n"

4298

4311

" to {1}"

4299

4312

msgstr ""

4300

4313

4301

#: bzrlib/bzrdir.py:513

4314

#: bzrlib/bzrdir.py:509

4302

4315

msgid "renamed {0} to {1}"

4303

4316

msgstr ""

4304

4317

4305

#: bzrlib/bzrdir.py:1652

4318

#: bzrlib/bzrdir.py:1638

4306

4319

#, python-format

4307

4320

msgid ""

4308

4321

"Source repository format does not support stacking, using format:\n"

4309

4322

" %s"

4310

4323

msgstr ""

4311

4324

4312

#: bzrlib/bzrdir.py:1672

4325

#: bzrlib/bzrdir.py:1658

4313

4326

#, python-format

4314

4327

msgid ""

4315

4328

"Source branch format does not support stacking, using format:\n"

4316

4329

" %s"

4317

4330

msgstr ""

4318

4331

4319

#: bzrlib/bzrdir.py:1818

4332

#: bzrlib/bzrdir.py:1804

4320

4333

msgid "starting repository conversion"

4321

4334

msgstr ""

4322

4335

4323

#: bzrlib/bzrdir.py:2039

4336

#: bzrlib/bzrdir.py:2025

4324

4337

msgid "Using default stacking branch {0} at {1}"

4325

4338

msgstr ""

4326

4339

4623

4636

msgid ":See also: %s"

4624

4637

msgstr ""

4625

4638

4626

#: bzrlib/commands.py:816 bzrlib/gpg.py:324

4639

#: bzrlib/commands.py:826 bzrlib/gpg.py:347

4627

4640

msgid "Only ASCII permitted in option names"

4628

4641

msgstr ""

4629

4642

4630

#: bzrlib/commands.py:841 bzrlib/commands.py:849

4643

#: bzrlib/commands.py:851 bzrlib/commands.py:859

4631

4644

msgid "command {0!r} needs one or more {1}"

4632

4645

msgstr ""

4633

4646

4634

#: bzrlib/commands.py:858

4647

#: bzrlib/commands.py:868

4635

4648

msgid "command {0!r} requires argument {1}"

4636

4649

msgstr ""

4637

4650

4638

#: bzrlib/commands.py:865

4651

#: bzrlib/commands.py:875

4639

4652

msgid "extra argument to command {0}: {1}"

4640

4653

msgstr ""

4641

4654

4642

#: bzrlib/commands.py:962

4655

#: bzrlib/commands.py:972

4643

4656

#, python-format

4644

4657

msgid "Profile data written to \"%s\"."

4645

4658

msgstr ""

4682

4695

msgid "renamed"

4683

4696

msgstr ""

4684

4697

4685

#: bzrlib/commit.py:977

4698

#: bzrlib/commit.py:976

4686

4699

msgid "unchanged"

4687

4700

msgstr ""

4688

4701

4689

#: bzrlib/commit.py:999

4702

#: bzrlib/commit.py:998

4690

4703

msgid "{0} [{1}] - Stage"

4691

4704

msgstr ""

4692

4705

4693

#: bzrlib/commit.py:1002

4706

#: bzrlib/commit.py:1001

4694

4707

#, python-format

4695

4708

msgid "%s - Stage"

4696

4709

msgstr ""

4697

4710

4711

#: bzrlib/commit_signature_commands.py:34

4712

msgid "Sign all commits by a given committer."

4713

msgstr ""

4714

4698

4715

#: bzrlib/commit_signature_commands.py:36

4699

msgid "Sign all commits by a given committer."

4700

msgstr ""

4701

4702

#: bzrlib/commit_signature_commands.py:38

4703

4716

msgid ""

4704

4717

"If location is not specified the local tree is used.\n"

4705

4718

"If committer is not specified the default committer is used."

4706

4719

msgstr ""

4707

4720

4708

#: bzrlib/commit_signature_commands.py:41

4721

#: bzrlib/commit_signature_commands.py:39

4709

4722

msgid "This does not sign commits that already have signatures."

4710

4723

msgstr ""

4711

4724

4712

#: bzrlib/commit_signature_commands.py:49

4725

#: bzrlib/commit_signature_commands.py:47

4713

4726

msgid ""

4714

4727

"Don't actually sign anything, just print the revisions that would be signed."

4715

4728

msgstr ""

4716

4729

4730

#: bzrlib/commit_signature_commands.py:98

4731

#, python-format

4732

msgid "Signed %d revision.\n"

4733

msgid_plural "Signed %d revisions.\n"

4734

msgstr[0] ""

4735

msgstr[1] ""

4736

4717

4737

#: bzrlib/commit_signature_commands.py:103

4718

4738

msgid "Verify all commit signatures."

4719

4739

msgstr ""

4729

4749

"verification."

4730

4750

msgstr ""

4731

4751

4732

#: bzrlib/commit_signature_commands.py:147

4752

#: bzrlib/commit_signature_commands.py:148

4733

4753

msgid "Cannot verify a range of non-revision-history revisions"

4734

4754

msgstr ""

4735

4755

4736

#: bzrlib/commit_signature_commands.py:168

4756

#: bzrlib/commit_signature_commands.py:166

4737

4757

msgid "All commits signed with verifiable keys"

4738

4758

msgstr ""

4739

4759

4740

#: bzrlib/config.py:475

4760

#: bzrlib/config.py:436

4741

4761

msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."

4742

4762

msgstr ""

4743

4763

4744

#: bzrlib/config.py:2485

4764

#: bzrlib/config.py:2451

4745

4765

msgid "{0} is not an SI unit."

4746

4766

msgstr ""

4747

4767

4748

#: bzrlib/config.py:2949

4768

#: bzrlib/config.py:2970

4749

4769

msgid ""

4750

4770

"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "

4751

4771

"will be saved."

4752

4772

msgstr ""

4753

4773

4754

#: bzrlib/config.py:3093

4774

#: bzrlib/config.py:3114

4755

4775

#, python-format

4756

4776

msgid "Invalid '%s', should be of the form 'name=value'"

4757

4777

msgstr ""

4758

4778

4759

#: bzrlib/config.py:3962

4779

#: bzrlib/config.py:4004

4760

4780

msgid "Display, set or remove a configuration option."

4761

4781

msgstr ""

4762

4782

4763

#: bzrlib/config.py:3964

4783

#: bzrlib/config.py:4006

4764

4784

msgid "Display the active value for a given option."

4765

4785

msgstr ""

4766

4786

4767

#: bzrlib/config.py:3966

4787

#: bzrlib/config.py:4008

4768

4788

msgid ""

4769

4789

"If --all is specified, NAME is interpreted as a regular expression and all\n"

4770

4790

"matching options are displayed mentioning their scope. The active value\n"

4771

4791

"that bzr will take into account is the first one displayed for each option."

4772

4792

msgstr ""

4773

4793

4774

#: bzrlib/config.py:3970

4794

#: bzrlib/config.py:4012

4775

4795

msgid "If no NAME is given, --all .* is implied."

4776

4796

msgstr ""

4777

4797

4778

#: bzrlib/config.py:3972

4798

#: bzrlib/config.py:4014

4779

4799

msgid ""

4780

4800

"Setting a value is achieved by using name=value without spaces. The value\n"

4781

4801

"is set in the most relevant scope and can be checked by displaying the\n"

4782

4802

"option again."

4783

4803

msgstr ""

4784

4804

4785

#: bzrlib/config.py:3984

4805

#: bzrlib/config.py:4026

4786

4806

msgid "Reduce the scope to the specified configuration file."

4787

4807

msgstr ""

4788

4808

4789

#: bzrlib/config.py:3988

4809

#: bzrlib/config.py:4030

4790

4810

msgid "Display all the defined values for the matching options."

4791

4811

msgstr ""

4792

4812

4793

#: bzrlib/config.py:3990

4813

#: bzrlib/config.py:4032

4794

4814

msgid "Remove the option from the configuration file."

4795

4815

msgstr ""

4796

4816

4870

4890

msgstr[0] ""

4871

4891

msgstr[1] ""

4872

4892

4873

#: bzrlib/controldir.py:710

4893

#: bzrlib/controldir.py:712

4874

4894

msgid "{0} is{1} redirected to {2}"

4875

4895

msgstr ""

4876

4896

5087

5107

msgstr ""

5088

5108

5089

5109

#: bzrlib/errors.py:715

5110

msgid "Invalid branch name: %(name)s"

5111

msgstr ""

5112

5113

#: bzrlib/errors.py:724

5090

5114

msgid "Parent branch already exists: \"%(path)s\"."

5091

5115

msgstr ""

5092

5116

5093

#: bzrlib/errors.py:721

5117

#: bzrlib/errors.py:730

5094

5118

msgid ""

5095

5119

"Directory contains a branch, but no working tree (use bzr checkout if you "

5096

5120

"wish to build a working tree): \"%(path)s\""

5097

5121

msgstr ""

5098

5122

5099

#: bzrlib/errors.py:726

5123

#: bzrlib/errors.py:735

5100

5124

msgid ""

5101

5125

"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""

5102

5126

msgstr ""

5103

5127

5104

#: bzrlib/errors.py:736

5128

#: bzrlib/errors.py:745

5105

5129

msgid ""

5106

5130

"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""

5107

5131

msgstr ""

5108

5132

5109

#: bzrlib/errors.py:746

5133

#: bzrlib/errors.py:755

5110

5134

msgid "No repository present: \"%(path)s\""

5111

5135

msgstr ""

5112

5136

5113

#: bzrlib/errors.py:753

5137

#: bzrlib/errors.py:762

5114

5138

msgid ""

5115

5139

"Unsupported branch format: %(format)s\n"

5116

5140

"Please run 'bzr upgrade'"

5117

5141

msgstr ""

5118

5142

5119

#: bzrlib/errors.py:759

5143

#: bzrlib/errors.py:768

5120

5144

msgid "Unknown %(kind)s format: %(format)r"

5121

5145

msgstr ""

5122

5146

5123

#: bzrlib/errors.py:768

5147

#: bzrlib/errors.py:777

5124

5148

msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."

5125

5149

msgstr ""

5126

5150

5127

#: bzrlib/errors.py:778

5151

#: bzrlib/errors.py:787

5128

5152

msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"

5129

5153

msgstr ""

5130

5154

5131

#: bzrlib/errors.py:793

5155

#: bzrlib/errors.py:802

5132

5156

msgid ""

5133

5157

"%(target)s\n"

5134

5158

"is not compatible with\n"

5136

5160

"%(details)s"

5137

5161

msgstr ""

5138

5162

5139

#: bzrlib/errors.py:809

5163

#: bzrlib/errors.py:818

5140

5164

msgid "Revision is not compatible with %(repo_format)s"

5141

5165

msgstr ""

5142

5166

5143

#: bzrlib/errors.py:819

5167

#: bzrlib/errors.py:828

5144

5168

msgid "%(context_info)s%(path)s is already versioned."

5145

5169

msgstr ""

5146

5170

5147

#: bzrlib/errors.py:840

5171

#: bzrlib/errors.py:849

5148

5172

msgid "%(context_info)s%(path)s is not versioned."

5149

5173

msgstr ""

5150

5174

5151

#: bzrlib/errors.py:861

5175

#: bzrlib/errors.py:870

5152

5176

msgid "Path(s) are not versioned: %(paths_as_string)s"

5153

5177

msgstr ""

5154

5178

5155

#: bzrlib/errors.py:872

5179

#: bzrlib/errors.py:881

5156

5180

msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"

5157

5181

msgstr ""

5158

5182

5159

#: bzrlib/errors.py:891

5183

#: bzrlib/errors.py:900

5160

5184

msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""

5161

5185

msgstr ""

5162

5186

5163

#: bzrlib/errors.py:899

5187

#: bzrlib/errors.py:908

5164

5188

msgid ""

5165

5189

"Filename %(filename)r is not valid in your current filesystem encoding "

5166

5190

"%(fs_encoding)s"

5167

5191

msgstr ""

5168

5192

5169

#: bzrlib/errors.py:910

5193

#: bzrlib/errors.py:919

5170

5194

msgid "Cannot operate on \"%(filename)s\" because it is a control file"

5171

5195

msgstr ""

5172

5196

5173

#: bzrlib/errors.py:928

5197

#: bzrlib/errors.py:937

5174

5198

msgid "The lock for '%(lock_description)s' is in use and cannot be broken."

5175

5199

msgstr ""

5176

5200

5177

#: bzrlib/errors.py:967

5201

#: bzrlib/errors.py:976

5178

5202

msgid "Cannot lock %(lock)s: %(why)s"

5179

5203

msgstr ""

5180

5204

5181

#: bzrlib/errors.py:977

5205

#: bzrlib/errors.py:986

5182

5206

msgid ""

5183

5207

"A transaction related operation was attempted after the transaction finished."

5184

5208

msgstr ""

5185

5209

5186

#: bzrlib/errors.py:1004

5210

#: bzrlib/errors.py:1013

5187

5211

msgid "Cannot lock: transport is read only: %(transport)s"

5188

5212

msgstr ""

5189

5213

5190

#: bzrlib/errors.py:1012

5214

#: bzrlib/errors.py:1021

5191

5215

msgid "Could not acquire lock \"%(lock)s\": %(msg)s"

5192

5216

msgstr ""

5193

5217

5194

#: bzrlib/errors.py:1023

5218

#: bzrlib/errors.py:1032

5195

5219

msgid ""

5196

5220

"Lock was broken while still open: %(lock)s - check storage consistency!"

5197

5221

msgstr ""

5198

5222

5199

#: bzrlib/errors.py:1034

5223

#: bzrlib/errors.py:1043

5200

5224

msgid ""

5201

5225

"Lock was released and re-acquired before being broken: %(lock)s: held by "

5202

5226

"%(holder)r, wanted to break %(target)r"

5203

5227

msgstr ""

5204

5228

5205

#: bzrlib/errors.py:1046

5229

#: bzrlib/errors.py:1055

5206

5230

msgid ""

5207

5231

"Lock is apparently held, but corrupted: %(corruption_info)s\n"

5208

5232

"Use 'bzr break-lock' to clear it"

5209

5233

msgstr ""

5210

5234

5211

#: bzrlib/errors.py:1059

5235

#: bzrlib/errors.py:1068

5212

5236

msgid "Lock not held: %(lock)s"

5213

5237

msgstr ""

5214

5238

5215

#: bzrlib/errors.py:1088

5239

#: bzrlib/errors.py:1097

5216

5240

msgid "No changes to commit"

5217

5241

msgstr ""

5218

5242

5219

#: bzrlib/errors.py:1093

5243

#: bzrlib/errors.py:1102

5220

5244

msgid ""

5221

5245

"Selected-file commit of merges is not supported yet: files %(files_str)s"

5222

5246

msgstr ""

5223

5247

5224

#: bzrlib/errors.py:1103

5248

#: bzrlib/errors.py:1112

5225

5249

msgid ""

5226

5250

"Excluding paths during commit is not supported by repository at "

5227

5251

"%(repository)r."

5228

5252

msgstr ""

5229

5253

5230

#: bzrlib/errors.py:1112

5254

#: bzrlib/errors.py:1121

5231

5255

msgid ""

5232

5256

"The specified commit message contains characters unsupported by the current "

5233

5257

"encoding."

5234

5258

msgstr ""

5235

5259

5236

#: bzrlib/errors.py:1118

5260

#: bzrlib/errors.py:1127

5237

5261

msgid "Upgrade URL cannot work with readonly URLs."

5238

5262

msgstr ""

5239

5263

5240

#: bzrlib/errors.py:1123

5264

#: bzrlib/errors.py:1132

5241

5265

msgid "The branch format %(format)s is already at the most recent format."

5242

5266

msgstr ""

5243

5267

5244

#: bzrlib/errors.py:1146

5268

#: bzrlib/errors.py:1155

5245

5269

msgid "Option --change does not accept revision ranges"

5246

5270

msgstr ""

5247

5271

5248

#: bzrlib/errors.py:1151

5272

#: bzrlib/errors.py:1160

5249

5273

msgid "No namespace registered for string: %(spec)r"

5250

5274

msgstr ""

5251

5275

5252

#: bzrlib/errors.py:1170

5276

#: bzrlib/errors.py:1179

5253

5277

msgid ""

5254

5278

"Requested revision: '%(spec)s' does not exist in branch: "

5255

5279

"%(branch_url)s%(extra)s"

5256

5280

msgstr ""

5257

5281

5258

#: bzrlib/errors.py:1184

5282

#: bzrlib/errors.py:1193

5259

5283

msgid ""

5260

5284

"Operation denied because it would change the main history, which is not "

5261

5285

"permitted by the append_revisions_only setting on branch \"%(location)s\"."

5262

5286

msgstr ""

5263

5287

5264

#: bzrlib/errors.py:1195

5288

#: bzrlib/errors.py:1204

5265

5289

msgid ""

5266

5290

"These branches have diverged. Use the missing command to see how.\n"

5267

5291

"Use the merge command to reconcile them."

5268

5292

msgstr ""

5269

5293

5270

#: bzrlib/errors.py:1215

5294

#: bzrlib/errors.py:1224

5271

5295

msgid ""

5272

5296

"Branches have no common ancestor, and no merge base revision was specified."

5273

5297

msgstr ""

5274

5298

5275

#: bzrlib/errors.py:1221

5299

#: bzrlib/errors.py:1230

5276

5300

msgid ""

5277

5301

"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."

5278

5302

msgstr ""

5279

5303

5280

#: bzrlib/errors.py:1227

5304

#: bzrlib/errors.py:1236

5281

5305

msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"

5282

5306

msgstr ""

5283

5307

5284

#: bzrlib/errors.py:1236

5308

#: bzrlib/errors.py:1245

5285

5309

msgid ""

5286

5310

"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."

5287

5311

msgstr ""

5288

5312

5289

#: bzrlib/errors.py:1245

5313

#: bzrlib/errors.py:1254

5290

5314

msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"

5291

5315

msgstr ""

5292

5316

5293

#: bzrlib/errors.py:1254

5317

#: bzrlib/errors.py:1263

5294

5318

msgid "Branch %(branch)s has no commits."

5295

5319

msgstr ""

5296

5320

5297

#: bzrlib/errors.py:1272

5321

#: bzrlib/errors.py:1281

5298

5322

msgid ""

5299

5323

"Bound branch %(branch)s is out of date with master branch "

5300

5324

"%(master)s.%(extra_help)s"

5301

5325

msgstr ""

5302

5326

5303

#: bzrlib/errors.py:1284

5327

#: bzrlib/errors.py:1293

5304

5328

msgid ""

5305

5329

"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "

5306

5330

"bound to %(remote)s."

5307

5331

msgstr ""

5308

5332

5309

#: bzrlib/errors.py:1296

5333

#: bzrlib/errors.py:1305

5310

5334

msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"

5311

5335

msgstr ""

5312

5336

5313

#: bzrlib/errors.py:1305

5337

#: bzrlib/errors.py:1314

5314

5338

msgid ""

5315

5339

"Unable to connect to target of bound branch %(branch)s => %(target)s: "

5316

5340

"%(error)s"

5317

5341

msgstr ""

5318

5342

5319

#: bzrlib/errors.py:1317

5343

#: bzrlib/errors.py:1326

5320

5344

msgid "Error in processing weave: %(msg)s"

5321

5345

msgstr ""

5322

5346

5323

#: bzrlib/errors.py:1326

5347

#: bzrlib/errors.py:1335

5324

5348

msgid "Revision {%(revision_id)s} already present in %(weave)s"

5325

5349

msgstr ""

5326

5350

5327

#: bzrlib/errors.py:1337

5351

#: bzrlib/errors.py:1346

5328

5352

msgid "Revision {%(revision_id)s} not present in %(weave)s"

5329

5353

msgstr ""

5330

5354

5331

#: bzrlib/errors.py:1347

5355

#: bzrlib/errors.py:1356

5332

5356

msgid "Weave invariant violated: %(what)s"

5333

5357

msgstr ""

5334

5358

5335

#: bzrlib/errors.py:1356

5359

#: bzrlib/errors.py:1365

5336

5360

msgid "Parents are mismatched between two revisions. %(msg)s"

5337

5361

msgstr ""

5338

5362

5339

#: bzrlib/errors.py:1378

5363

#: bzrlib/errors.py:1387

5340

5364

msgid ""

5341

5365

"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "

5342

5366

"%(weave_b)s"

5343

5367

msgstr ""

5344

5368

5345

#: bzrlib/errors.py:1390

5369

#: bzrlib/errors.py:1399

5346

5370

msgid "Versioned file error"

5347

5371

msgstr ""

5348

5372

5349

#: bzrlib/errors.py:1395

5373

#: bzrlib/errors.py:1404

5350

5374

msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."

5351

5375

msgstr ""

5352

5376

5353

#: bzrlib/errors.py:1405

5377

#: bzrlib/errors.py:1414

5354

5378

msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."

5355

5379

msgstr ""

5356

5380

5357

#: bzrlib/errors.py:1415

5381

#: bzrlib/errors.py:1424

5358

5382

msgid "Text did not match its checksum: %(msg)s"

5359

5383

msgstr ""

5360

5384

5361

#: bzrlib/errors.py:1541

5385

#: bzrlib/errors.py:1550

5362

5386

msgid "Export format %(format)r not supported"

5363

5387

msgstr ""

5364

5388

5365

#: bzrlib/errors.py:1550

5389

#: bzrlib/errors.py:1559

5366

5390

msgid "Transport error: %(msg)s %(orig_error)s"

5367

5391

msgstr ""

5368

5392

5369

#: bzrlib/errors.py:1576

5393

#: bzrlib/errors.py:1585

5370

5394

msgid "Generic bzr smart protocol error: %(details)s"

5371

5395

msgstr ""

5372

5396

5373

#: bzrlib/errors.py:1584

5397

#: bzrlib/errors.py:1593

5374

5398

msgid "Received bad protocol version marker: %(marker)r"

5375

5399

msgstr ""

5376

5400

5377

#: bzrlib/errors.py:1616

5401

#: bzrlib/errors.py:1625

5378

5402

msgid "Transport operation not possible: %(msg)s %(orig_error)s"

5379

5403

msgstr ""

5380

5404

5381

#: bzrlib/errors.py:1621

5405

#: bzrlib/errors.py:1630

5382

5406

msgid "Connection error: %(msg)s %(orig_error)s"

5383

5407

msgstr ""

5384

5408

5385

#: bzrlib/errors.py:1626

5409

#: bzrlib/errors.py:1635

5386

5410

msgid "%(msg)s %(host)s%(port)s%(orig_error)s"

5387

5411

msgstr ""

5388

5412

5389

#: bzrlib/errors.py:1647

5413

#: bzrlib/errors.py:1656

5390

5414

msgid "Connection closed: %(msg)s %(orig_error)s"

5391

5415

msgstr ""

5392

5416

5393

#: bzrlib/errors.py:1652

5417

#: bzrlib/errors.py:1661

5394

5418

msgid "Connection Timeout: %(msg)s%(orig_error)s"

5395

5419

msgstr ""

5396

5420

5397

#: bzrlib/errors.py:1657

5421

#: bzrlib/errors.py:1666

5398

5422

msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"

5399

5423

msgstr ""

5400

5424

5401

#: bzrlib/errors.py:1667

5425

#: bzrlib/errors.py:1676

5402

5426

msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"

5403

5427

msgstr ""

5404

5428

5405

#: bzrlib/errors.py:1682

5429

#: bzrlib/errors.py:1691

5406

5430

msgid "Certificate error: %(error)s"

5407

5431

msgstr ""

5408

5432

5409

#: bzrlib/errors.py:1690

5433

#: bzrlib/errors.py:1699

5410

5434

msgid "Invalid http range %(range)r for %(path)s: %(msg)s"

5411

5435

msgstr ""

5412

5436

5413

#: bzrlib/errors.py:1704

5437

#: bzrlib/errors.py:1713

5414

5438

msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"

5415

5439

msgstr ""

5416

5440

5417

#: bzrlib/errors.py:1712

5441

#: bzrlib/errors.py:1721

5418

5442

msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"

5419

5443

msgstr ""

5420

5444

5421

#: bzrlib/errors.py:1721

5445

#: bzrlib/errors.py:1730

5422

5446

msgid "%(source)s is%(permanently)s redirected to %(target)s"

5423

5447

msgstr ""

5424

5448

5425

#: bzrlib/errors.py:1735

5449

#: bzrlib/errors.py:1744

5426

5450

msgid "Too many redirections"

5427

5451

msgstr ""

5428

5452

5429

#: bzrlib/errors.py:1740

5453

#: bzrlib/errors.py:1749

5430

5454

msgid "Working tree has conflicts."

5431

5455

msgstr ""

5432

5456

5433

#: bzrlib/errors.py:1744

5457

#: bzrlib/errors.py:1753

5434

5458

msgid "Config file %(filename)s is not UTF-8 encoded\n"

5435

5459

msgstr ""

5436

5460

5437

#: bzrlib/errors.py:1753

5461

#: bzrlib/errors.py:1762

5438

5462

msgid ""

5439

5463

"Error(s) parsing config file %(filename)s:\n"

5440

5464

"%(errors)s"

5441

5465

msgstr ""

5442

5466

5443

#: bzrlib/errors.py:1763

5467

#: bzrlib/errors.py:1772

5444

5468

msgid ""

5445

5469

"Bad value \"%(value)s\" for option \"%(name)s\".\n"

5446

5470

"See ``bzr help %(name)s``"

5447

5471

msgstr ""

5448

5472

5449

#: bzrlib/errors.py:1773

5473

#: bzrlib/errors.py:1782

5450

5474

msgid "%(username)r does not seem to contain a reasonable email address"

5451

5475

msgstr ""

5452

5476

5453

#: bzrlib/errors.py:1782

5477

#: bzrlib/errors.py:1791

5454

5478

msgid "Failed to GPG sign data with command \"%(command_line)s\""

5455

5479

msgstr ""

5456

5480

5457

#: bzrlib/errors.py:1790

5481

#: bzrlib/errors.py:1799

5458

5482

msgid "Failed to verify GPG signature data with error \"%(error)s\""

5459

5483

msgstr ""

5460

5484

5461

#: bzrlib/errors.py:1798

5485

#: bzrlib/errors.py:1807

5462

5486

msgid "Unable to import library \"%(library)s\": %(error)s"

5463

5487

msgstr ""

5464

5488

5465

#: bzrlib/errors.py:1806

5489

#: bzrlib/errors.py:1815

5466

5490

msgid "python-gpgme is not installed, it is needed to verify signatures"

5467

5491

msgstr ""

5468

5492

5469

#: bzrlib/errors.py:1814

5493

#: bzrlib/errors.py:1823

5470

5494

msgid ""

5471

5495

"The working tree for %(basedir)s has changed since the last commit, but "

5472

5496

"weave merge requires that it be unchanged"

5473

5497

msgstr ""

5474

5498

5475

#: bzrlib/errors.py:1824

5499

#: bzrlib/errors.py:1833

5476

5500

msgid ""

5477

5501

"Can't reprocess and show base, because reprocessing obscures the "

5478

5502

"relationship of conflicting lines to the base"

5479

5503

msgstr ""

5480

5504

5481

#: bzrlib/errors.py:1830

5505

#: bzrlib/errors.py:1839

5482

5506

msgid "Cycle in graph %(graph)r"

5483

5507

msgstr ""

5484

5508

5485

#: bzrlib/errors.py:1858

5509

#: bzrlib/errors.py:1867

5486

5510

msgid "File %(filename)s is not conflicted."

5487

5511

msgstr ""

5488

5512

5489

#: bzrlib/errors.py:1880

5513

#: bzrlib/errors.py:1889

5490

5514

msgid "No bundle was found in \"%(filename)s\"."

5491

5515

msgstr ""

5492

5516

5493

#: bzrlib/errors.py:1889

5517

#: bzrlib/errors.py:1898

5494

5518

msgid "Unable to handle bundle version %(version)s: %(msg)s"

5495

5519

msgstr ""

5496

5520

5497

#: bzrlib/errors.py:1899

5521

#: bzrlib/errors.py:1908

5498

5522

msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"

5499

5523

msgstr ""

5500

5524

5501

#: bzrlib/errors.py:1912

5525

#: bzrlib/errors.py:1921

5502

5526

msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"

5503

5527

msgstr ""

5504

5528

5505

#: bzrlib/errors.py:1922

5529

#: bzrlib/errors.py:1931

5506

5530

msgid "Key %(key)s is already present in map"

5507

5531

msgstr ""

5508

5532

5509

#: bzrlib/errors.py:1927

5533

#: bzrlib/errors.py:1936

5510

5534

msgid "The prefix %(prefix)s is in the help search path twice."

5511

5535

msgstr ""

5512

5536

5513

#: bzrlib/errors.py:1937

5537

#: bzrlib/errors.py:1946

5514

5538

msgid ""

5515

5539

"No final name for trans_id %(trans_id)r\n"

5516

5540

"file-id: %(file_id)r\n"

5517

5541

"root trans-id: %(root_trans_id)r\n"

5518

5542

msgstr ""

5519

5543

5520

#: bzrlib/errors.py:1969

5544

#: bzrlib/errors.py:1978

5521

5545

msgid "Attempt to reuse a transform that has already been applied."

5522

5546

msgstr ""

5523

5547

5524

#: bzrlib/errors.py:1974

5548

#: bzrlib/errors.py:1983

5525

5549

msgid "Moving the root directory is not supported at this time"

5526

5550

msgstr ""

5527

5551

5528

#: bzrlib/errors.py:1979

5552

#: bzrlib/errors.py:1988

5529

5553

msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"

5530

5554

msgstr ""

5531

5555

5532

#: bzrlib/errors.py:1990

5556

#: bzrlib/errors.py:1999

5533

5557

msgid ""

5534

5558

"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5535

5559

msgstr ""

5536

5560

5537

#: bzrlib/errors.py:2026

5561

#: bzrlib/errors.py:2035

5538

5562

msgid ""

5539

5563

"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5540

5564

msgstr ""

5541

5565

5542

#: bzrlib/errors.py:2056

5566

#: bzrlib/errors.py:2065

5543

5567

msgid "Unable to import paramiko (required for sftp support): %(error)s"

5544

5568

msgstr ""

5545

5569

5546

#: bzrlib/errors.py:2064

5570

#: bzrlib/errors.py:2073

5547

5571

msgid "Nothing to merge."

5548

5572

msgstr ""

5549

5573

5550

#: bzrlib/errors.py:2069

5574

#: bzrlib/errors.py:2078

5551

5575

msgid "Format %(format)s cannot be initialised by this version of bzr."

5552

5576

msgstr ""

5553

5577

5554

#: bzrlib/errors.py:2078

5578

#: bzrlib/errors.py:2087

5555

5579

msgid ""

5556

5580

"Cannot convert from format %(from_format)s to format %(format)s. "

5557

5581

"%(problem)s"

5558

5582

msgstr ""

5559

5583

5560

#: bzrlib/errors.py:2090

5584

#: bzrlib/errors.py:2099

5561

5585

msgid "Could not find an appropriate Differ for file \"%(path)s\""

5562

5586

msgstr ""

5563

5587

5564

#: bzrlib/errors.py:2098

5588

#: bzrlib/errors.py:2107

5565

5589

msgid "%(exe_name)s could not be found on this machine"

5566

5590

msgstr ""

5567

5591

5568

#: bzrlib/errors.py:2106

5592

#: bzrlib/errors.py:2115

5569

5593

msgid "Diff is not installed on this machine: %(msg)s"

5570

5594

msgstr ""

5571

5595

5572

#: bzrlib/errors.py:2114

5596

#: bzrlib/errors.py:2123

5573

5597

msgid "Diff3 is not installed on this machine."

5574

5598

msgstr ""

5575

5599

5576

#: bzrlib/errors.py:2120

5600

#: bzrlib/errors.py:2129

5577

5601

msgid "The content being inserted is already present."

5578

5602

msgstr ""

5579

5603

5580

#: bzrlib/errors.py:2125

5604

#: bzrlib/errors.py:2134

5581

5605

msgid ""

5582

5606

"This tree contains left-over files from a failed operation.\n"

5583

5607

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5585

5609

" keep, and delete it when you are done."

5586

5610

msgstr ""

5587

5611

5588

#: bzrlib/errors.py:2136

5612

#: bzrlib/errors.py:2145

5589

5613

msgid ""

5590

5614

"This tree contains left-over files from a failed operation.\n"

5591

5615

" Please examine %(pending_deletion)s to see if it contains any files you\n"

5592

5616

" wish to keep, and delete it when you are done."

5593

5617

msgstr ""

5594

5618

5595

#: bzrlib/errors.py:2146

5619

#: bzrlib/errors.py:2155

5596

5620

msgid ""

5597

5621

"Unable to delete transform temporary directory %(limbo_dir)s.\n"

5598

5622

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5600

5624

" keep, and delete it when you are done."

5601

5625

msgstr ""

5602

5626

5603

#: bzrlib/errors.py:2157

5627

#: bzrlib/errors.py:2166

5604

5628

msgid ""

5605

5629

"Unable to delete transform temporary directory %(pending_deletion)s. Please "

5606

5630

"examine %(pending_deletion)s to see if it contains any files you wish to "

5607

5631

"keep, and delete it when you are done."

5608

5632

msgstr ""

5609

5633

5610

#: bzrlib/errors.py:2167

5634

#: bzrlib/errors.py:2176

5611

5635

msgid "Working tree is out of date, please run 'bzr update'.%(more)s"

5612

5636

msgstr ""

5613

5637

5614

#: bzrlib/errors.py:2181

5638

#: bzrlib/errors.py:2190

5615

5639

msgid ""

5616

5640

"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."

5617

5641

msgstr ""

5618

5642

5619

#: bzrlib/errors.py:2194

5643

#: bzrlib/errors.py:2203

5620

5644

msgid "Error in merge modified format"

5621

5645

msgstr ""

5622

5646

5623

#: bzrlib/errors.py:2199

5647

#: bzrlib/errors.py:2208

5624

5648

msgid "Format error in conflict listings"

5625

5649

msgstr ""

5626

5650

5627

#: bzrlib/errors.py:2203

5651

#: bzrlib/errors.py:2212

5628

5652

msgid ""

5629

5653

"Inconsistency in dirstate file %(dirstate_path)s.\n"

5630

5654

"Error: %(description)s"

5631

5655

msgstr ""

5632

5656

5633

#: bzrlib/errors.py:2214

5657

#: bzrlib/errors.py:2223

5634

5658

msgid ""

5635

5659

"An error has been detected in the repository %(repo_path)s.\n"

5636

5660

"Please run bzr reconcile on this repository."

5637

5661

msgstr ""

5638

5662

5639

#: bzrlib/errors.py:2225

5663

#: bzrlib/errors.py:2234

5640

5664

msgid ""

5641

5665

"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"

5642

5666

"reason: %(reason)s"

5643

5667

msgstr ""

5644

5668

5645

#: bzrlib/errors.py:2238

5669

#: bzrlib/errors.py:2247

5646

5670

msgid ""

5647

5671

"An inconsistent delta was supplied: %(delta)r\n"

5648

5672

"reason: %(reason)s"

5649

5673

msgstr ""

5650

5674

5651

#: bzrlib/errors.py:2250

5675

#: bzrlib/errors.py:2259

5652

5676

msgid "To use this feature you must upgrade your branch at %(path)s."

5653

5677

msgstr ""

5654

5678

5655

#: bzrlib/errors.py:2259

5679

#: bzrlib/errors.py:2268

5656

5680

msgid "To use this feature you must upgrade your repository at %(path)s."

5657

5681

msgstr ""

5658

5682

5659

#: bzrlib/errors.py:2264

5683

#: bzrlib/errors.py:2273

5660

5684

msgid ""

5661

5685

"To use this feature you must upgrade your branch at %(path)s to a format "

5662

5686

"which supports rich roots."

5663

5687

msgstr ""

5664

5688

5665

#: bzrlib/errors.py:2270

5689

#: bzrlib/errors.py:2279

5666

5690

msgid "Cannot perform local-only commits on unbound branches."

5667

5691

msgstr ""

5668

5692

5669

#: bzrlib/errors.py:2275

5693

#: bzrlib/errors.py:2284

5670

5694

msgid "The method %(mname)s is not supported on objects of type %(tname)s."

5671

5695

msgstr ""

5672

5696

5673

#: bzrlib/errors.py:2296

5697

#: bzrlib/errors.py:2305

5674

5698

msgid "Ghost tags not supported by format %(format)r."

5675

5699

msgstr ""

5676

5700

5677

#: bzrlib/errors.py:2304

5701

#: bzrlib/errors.py:2313

5678

5702

msgid "File is binary but should be text."

5679

5703

msgstr ""

5680

5704

5681

#: bzrlib/errors.py:2309

5705

#: bzrlib/errors.py:2318

5682

5706

msgid "The path %(path)s is not permitted on this platform"

5683

5707

msgstr ""

5684

5708

5685

#: bzrlib/errors.py:2318

5709

#: bzrlib/errors.py:2327

5686

5710

msgid ""

5687

5711

"Testament did not match expected value.\n"

5688

5712

" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"

5689

5713

" {%(measured)s}"

5690

5714

msgstr ""

5691

5715

5692

#: bzrlib/errors.py:2330

5716

#: bzrlib/errors.py:2339

5693

5717

msgid "Not a bzr revision-bundle: %(text)r"

5694

5718

msgstr ""

5695

5719

5696

#: bzrlib/errors.py:2339

5720

#: bzrlib/errors.py:2348

5697

5721

msgid "Bad bzr revision-bundle: %(text)r"

5698

5722

msgstr ""

5699

5723

5700

#: bzrlib/errors.py:2348

5724

#: bzrlib/errors.py:2357

5701

5725

msgid "Malformed bzr revision-bundle header: %(text)r"

5702

5726

msgstr ""

5703

5727

5704

#: bzrlib/errors.py:2353

5728

#: bzrlib/errors.py:2362

5705

5729

msgid "Malformed patches in bzr revision-bundle: %(text)r"

5706

5730

msgstr ""

5707

5731

5708

#: bzrlib/errors.py:2358

5732

#: bzrlib/errors.py:2367

5709

5733

msgid "Malformed footer in bzr revision-bundle: %(text)r"

5710

5734

msgstr ""

5711

5735

5712

#: bzrlib/errors.py:2363

5736

#: bzrlib/errors.py:2372

5713

5737

msgid "End of line marker was not \\n in bzr revision-bundle"

5714

5738

msgstr ""

5715

5739

5716

#: bzrlib/errors.py:2373

5740

#: bzrlib/errors.py:2382

5717

5741

msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"

5718

5742

msgstr ""

5719

5743

5720

#: bzrlib/errors.py:2383

5744

#: bzrlib/errors.py:2392

5721

5745

msgid "Root class for inventory serialization errors"

5722

5746

msgstr ""

5723

5747

5724

#: bzrlib/errors.py:2387

5748

#: bzrlib/errors.py:2396

5725

5749

msgid ""

5726

5750

"The inventory was not in the expected format:\n"

5727

5751

" %(msg)s"

5728

5752

msgstr ""

5729

5753

5730

#: bzrlib/errors.py:2396

5754

#: bzrlib/errors.py:2405

5731

5755

msgid "This operation requires rich root data storage"

5732

5756

msgstr ""

5733

5757

5734

#: bzrlib/errors.py:2409

5758

#: bzrlib/errors.py:2418

5735

5759

msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"

5736

5760

msgstr ""

5737

5761

5738

#: bzrlib/errors.py:2418

5762

#: bzrlib/errors.py:2427

5739

5763

msgid ""

5740

5764

"Don't know how to handle SSH connections. Please set BZR_SSH environment "

5741

5765

"variable."

5742

5766

msgstr ""

5743

5767

5744

#: bzrlib/errors.py:2425

5768

#: bzrlib/errors.py:2434

5745

5769

msgid ""

5746

5770

"Could not determine revno for {%(revision_id)s} because its ancestry shows a "

5747

5771

"ghost at {%(ghost_revision_id)s}"

5748

5772

msgstr ""

5749

5773

5750

#: bzrlib/errors.py:2435

5774

#: bzrlib/errors.py:2444

5751

5775

msgid "Ghost revision {%(revision_id)s} cannot be used here."

5752

5776

msgstr ""

5753

5777

5754

#: bzrlib/errors.py:2486

5778

#: bzrlib/errors.py:2495

5755

5779

msgid ""

5756

5780

"A merge directive must provide either a bundle or a public branch location."

5757

5781

msgstr ""

5758

5782

5759

#: bzrlib/errors.py:2493

5783

#: bzrlib/errors.py:2502

5760

5784

msgid "Bad merge directive payload %(start)r"

5761

5785

msgstr ""

5762

5786

5763

#: bzrlib/errors.py:2503

5787

#: bzrlib/errors.py:2512

5764

5788

msgid "Preview patch does not match requested changes."

5765

5789

msgstr ""

5766

5790

5767

#: bzrlib/errors.py:2509

5791

#: bzrlib/errors.py:2518

5768

5792

msgid "Patch_type was %(patch_type)s, but no patch was supplied."

5769

5793

msgstr ""

5770

5794

5771

#: bzrlib/errors.py:2519

5795

#: bzrlib/errors.py:2528

5772

5796

msgid ""

5773

5797

"Your branch does not have all of the revisions required in order to merge "

5774

5798

"this merge directive and the target location specified in the merge "

5775

5799

"directive is not a branch: %(location)s."

5776

5800

msgstr ""

5777

5801

5778

#: bzrlib/errors.py:2531

5802

#: bzrlib/errors.py:2540

5779

5803

msgid "Unsupported entry kind %(kind)s"

5780

5804

msgstr ""

5781

5805

5782

#: bzrlib/errors.py:2539

5806

#: bzrlib/errors.py:2548

5783

5807

msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"

5784

5808

msgstr ""

5785

5809

5786

#: bzrlib/errors.py:2549

5810

#: bzrlib/errors.py:2558

5787

5811

msgid "Subsume target %(other_tree)s needs to be upgraded."

5788

5812

msgstr ""

5789

5813

5790

#: bzrlib/errors.py:2568

5814

#: bzrlib/errors.py:2577

5791

5815

msgid "No such tag: %(tag_name)s"

5792

5816

msgstr ""

5793

5817

5794

#: bzrlib/errors.py:2576

5818

#: bzrlib/errors.py:2585

5795

5819

msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."

5796

5820

msgstr ""

5797

5821

5798

#: bzrlib/errors.py:2585

5822

#: bzrlib/errors.py:2594

5799

5823

msgid "Tag %(tag_name)s already exists."

5800

5824

msgstr ""

5801

5825

5802

#: bzrlib/errors.py:2593

5826

#: bzrlib/errors.py:2602

5803

5827

msgid ""

5804

5828

"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "

5805

5829

"bugs\" for more information on this feature."

5806

5830

msgstr ""

5807

5831

5808

#: bzrlib/errors.py:2603

5832

#: bzrlib/errors.py:2612

5809

5833

msgid ""

5810

5834

"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"

5811

5835

msgstr ""

5812

5836

5813

#: bzrlib/errors.py:2613

5837

#: bzrlib/errors.py:2622

5814

5838

msgid ""

5815

5839

"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"

5816

5840

msgstr ""

5817

5841

5818

#: bzrlib/errors.py:2623

5842

#: bzrlib/errors.py:2632

5819

5843

msgid "Invalid line in bugs property: '%(line)s'"

5820

5844

msgstr ""

5821

5845

5822

#: bzrlib/errors.py:2631

5846

#: bzrlib/errors.py:2640

5823

5847

msgid "Invalid bug status: '%(status)s'"

5824

5848

msgstr ""

5825

5849

5826

#: bzrlib/errors.py:2639

5850

#: bzrlib/errors.py:2648

5827

5851

msgid "Could not understand response from smart server: %(response_tuple)r"

5828

5852

msgstr ""

5829

5853

5830

#: bzrlib/errors.py:2678

5854

#: bzrlib/errors.py:2687

5831

5855

msgid "Server sent an unexpected error: %(error_tuple)r"

5832

5856

msgstr ""

5833

5857

5834

#: bzrlib/errors.py:2697

5858

#: bzrlib/errors.py:2706

5835

5859

msgid "Unrecognised container format: %(container_format)r"

5836

5860

msgstr ""

5837

5861

5838

#: bzrlib/errors.py:2705

5862

#: bzrlib/errors.py:2714

5839

5863

msgid "Unexpected end of container stream"

5840

5864

msgstr ""

5841

5865

5842

#: bzrlib/errors.py:2710

5866

#: bzrlib/errors.py:2719

5843

5867

msgid "Unknown record type: %(record_type)r"

5844

5868

msgstr ""

5845

5869

5846

#: bzrlib/errors.py:2718

5870

#: bzrlib/errors.py:2727

5847

5871

msgid "Invalid record: %(reason)s"

5848

5872

msgstr ""

5849

5873

5850

#: bzrlib/errors.py:2726

5874

#: bzrlib/errors.py:2735

5851

5875

msgid "Container has data after end marker: %(excess)r"

5852

5876

msgstr ""

5853

5877

5854

#: bzrlib/errors.py:2734

5878

#: bzrlib/errors.py:2743

5855

5879

msgid "Container has multiple records with the same name: %(name)s"

5856

5880

msgstr ""

5857

5881

5858

#: bzrlib/errors.py:2747

5882

#: bzrlib/errors.py:2756

5859

5883

msgid "Corrupt or incompatible data stream: %(reason)s"

5860

5884

msgstr ""

5861

5885

5862

#: bzrlib/errors.py:2755

5886

#: bzrlib/errors.py:2764

5863

5887

msgid "SMTP error: %(error)s"

5864

5888

msgstr ""

5865

5889

5866

#: bzrlib/errors.py:2763

5890

#: bzrlib/errors.py:2772

5867

5891

msgid "No message supplied."

5868

5892

msgstr ""

5869

5893

5870

#: bzrlib/errors.py:2768

5894

#: bzrlib/errors.py:2777

5871

5895

msgid "No mail-to address (--mail-to) or output (-o) specified."

5872

5896

msgstr ""

5873

5897

5874

#: bzrlib/errors.py:2773

5875

msgid "Unknown mail client: %(mail_client)s"

5876

msgstr ""

5877

5878

#: bzrlib/errors.py:2781

5898

#: bzrlib/errors.py:2782

5879

5899

msgid ""

5880

5900

"Unable to find mail client with the following names: "

5881

5901

"%(mail_command_list_string)s"

5882

5902

msgstr ""

5883

5903

5884

#: bzrlib/errors.py:2791

5904

#: bzrlib/errors.py:2792

5885

5905

msgid "SMTP connection to %(host)s refused"

5886

5906

msgstr ""

5887

5907

5888

#: bzrlib/errors.py:2800

5908

#: bzrlib/errors.py:2801

5889

5909

msgid "Please specify smtp_server. No server at default %(host)s."

5890

5910

msgstr ""

5891

5911

5892

#: bzrlib/errors.py:2814

5912

#: bzrlib/errors.py:2815

5893

5913

msgid ""

5894

5914

"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"

5895

5915

"reconfigure."

5896

5916

msgstr ""

5897

5917

5898

#: bzrlib/errors.py:2826

5918

#: bzrlib/errors.py:2827

5899

5919

msgid "'%(display_url)s' is already a branch."

5900

5920

msgstr ""

5901

5921

5902

#: bzrlib/errors.py:2831

5922

#: bzrlib/errors.py:2832

5903

5923

msgid "'%(display_url)s' is already a tree."

5904

5924

msgstr ""

5905

5925

5906

#: bzrlib/errors.py:2836

5926

#: bzrlib/errors.py:2837

5907

5927

msgid "'%(display_url)s' is already a checkout."

5908

5928

msgstr ""

5909

5929

5910

#: bzrlib/errors.py:2841

5930

#: bzrlib/errors.py:2842

5911

5931

msgid "'%(display_url)s' is already a lightweight checkout."

5912

5932

msgstr ""

5913

5933

5914

#: bzrlib/errors.py:2846

5934

#: bzrlib/errors.py:2847

5915

5935

msgid "'%(display_url)s' is already using a shared repository."

5916

5936

msgstr ""

5917

5937

5918

#: bzrlib/errors.py:2851

5938

#: bzrlib/errors.py:2852

5919

5939

msgid "'%(display_url)s' is already standalone."

5920

5940

msgstr ""

5921

5941

5922

#: bzrlib/errors.py:2856

5942

#: bzrlib/errors.py:2857

5923

5943

msgid "Shared repository '%(display_url)s' already creates working trees."

5924

5944

msgstr ""

5925

5945

5926

#: bzrlib/errors.py:2862

5946

#: bzrlib/errors.py:2863

5927

5947

msgid ""

5928

5948

"Shared repository '%(display_url)s' already doesn't create working trees."

5929

5949

msgstr ""

5930

5950

5931

#: bzrlib/errors.py:2868

5951

#: bzrlib/errors.py:2869

5932

5952

msgid "Requested reconfiguration of '%(display_url)s' is not supported."

5933

5953

msgstr ""

5934

5954

5935

#: bzrlib/errors.py:2873

5955

#: bzrlib/errors.py:2874

5936

5956

msgid "No location could be found to bind to at %(display_url)s."

5937

5957

msgstr ""

5938

5958

5939

#: bzrlib/errors.py:2878

5959

#: bzrlib/errors.py:2879

5940

5960

msgid ""

5941

5961

"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "

5942

5962

"status).%(more)s"

5943

5963

msgstr ""

5944

5964

5945

#: bzrlib/errors.py:2897

5965

#: bzrlib/errors.py:2898

5946

5966

msgid ""

5947

5967

"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"

5948

5968

"list).%(more)s"

5949

5969

msgstr ""

5950

5970

5951

#: bzrlib/errors.py:2903

5971

#: bzrlib/errors.py:2904

5952

5972

msgid "Variable {%(name)s} is not available."

5953

5973

msgstr ""

5954

5974

5955

#: bzrlib/errors.py:2911

5975

#: bzrlib/errors.py:2912

5956

5976

msgid "No template specified."

5957

5977

msgstr ""

5958

5978

5959

#: bzrlib/errors.py:2916

5979

#: bzrlib/errors.py:2917

5960

5980

msgid "Unable to create symlink %(path_str)son this platform"

5961

5981

msgstr ""

5962

5982

5963

#: bzrlib/errors.py:2931

5983

#: bzrlib/errors.py:2932

5964

5984

msgid ""

5965

5985

"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "

5966

5986

"\"original\", \"local\"."

5967

5987

msgstr ""

5968

5988

5969

#: bzrlib/errors.py:2965

5989

#: bzrlib/errors.py:2966

5970

5990

msgid ""

5971

5991

"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"

5972

5992

msgstr ""

5973

5993

5974

#: bzrlib/errors.py:2977

5994

#: bzrlib/errors.py:2978

5975

5995

msgid "The \"%(config_id)s\" configuration does not exist."

5976

5996

msgstr ""

5977

5997

5978

#: bzrlib/errors.py:2985

5998

#: bzrlib/errors.py:2986

5979

5999

msgid "The \"%(option_name)s\" configuration option does not exist."

5980

6000

msgstr ""

5981

6001

5982

#: bzrlib/errors.py:2993

6002

#: bzrlib/errors.py:2994

5983

6003

msgid "The alias \"%(alias_name)s\" does not exist."

5984

6004

msgstr ""

5985

6005

5986

#: bzrlib/errors.py:3007

6006

#: bzrlib/errors.py:3008

5987

6007

msgid "\"%(alias_name)s\" is not a valid location alias."

5988

6008

msgstr ""

5989

6009

5990

#: bzrlib/errors.py:3015

6010

#: bzrlib/errors.py:3016

5991

6011

msgid "No %(alias_name)s location assigned."

5992

6012

msgstr ""

5993

6013

5994

#: bzrlib/errors.py:3023

6014

#: bzrlib/errors.py:3024

5995

6015

msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."

5996

6016

msgstr ""

5997

6017

5998

#: bzrlib/errors.py:3033

6018

#: bzrlib/errors.py:3034

5999

6019

msgid "Unknown rules detected: %(unknowns_str)s."

6000

6020

msgstr ""

6001

6021

6002

#: bzrlib/errors.py:3044

6022

#: bzrlib/errors.py:3045

6003

6023

msgid "Tip change rejected: %(msg)s"

6004

6024

msgstr ""

6005

6025

6006

#: bzrlib/errors.py:3052

6026

#: bzrlib/errors.py:3053

6007

6027

msgid "Shelf corrupt."

6008

6028

msgstr ""

6009

6029

6010

#: bzrlib/errors.py:3057

6030

#: bzrlib/errors.py:3058

6011

6031

msgid "Corruption while decompressing repository file%(orig_error)s"

6012

6032

msgstr ""

6013

6033

6014

#: bzrlib/errors.py:3069

6034

#: bzrlib/errors.py:3070

6015

6035

msgid "No changes are shelved with id \"%(shelf_id)d\"."

6016

6036

msgstr ""

6017

6037

6018

#: bzrlib/errors.py:3077

6038

#: bzrlib/errors.py:3078

6019

6039

msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."

6020

6040

msgstr ""

6021

6041

6022

#: bzrlib/errors.py:3085

6042

#: bzrlib/errors.py:3086

6023

6043

msgid ""

6024

6044

"An attempt to access a url outside the server jail was made: '%(url)s'."

6025

6045

msgstr ""

6026

6046

6027

#: bzrlib/errors.py:3093

6047

#: bzrlib/errors.py:3094

6028

6048

msgid "The user aborted the operation."

6029

6049

msgstr ""

6030

6050

6031

#: bzrlib/errors.py:3098

6051

#: bzrlib/errors.py:3099

6032

6052

msgid "Branching '%(url)s'(%(format)s) must create a working tree."

6033

6053

msgstr ""

6034

6054

6035

#: bzrlib/errors.py:3108

6055

#: bzrlib/errors.py:3109

6036

6056

msgid "No such view: %(view_name)s."

6037

6057

msgstr ""

6038

6058

6039

#: bzrlib/errors.py:3118

6059

#: bzrlib/errors.py:3119

6040

6060

msgid ""

6041

6061

"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "

6042

6062

"to a later format."

6043

6063

msgstr ""

6044

6064

6045

#: bzrlib/errors.py:3127

6065

#: bzrlib/errors.py:3128

6046

6066

msgid ""

6047

6067

"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"

6048

6068

msgstr ""

6049

6069

6050

#: bzrlib/errors.py:3194

6070

#: bzrlib/errors.py:3195

6051

6071

msgid "%(bzrdir)r does not support co-located branches."

6052

6072

msgstr ""

6053

6073

6054

#: bzrlib/errors.py:3200

6074

#: bzrlib/errors.py:3201

6055

6075

msgid ""

6056

6076

"Unable to determine your name.\n"

6057

6077

"Please, set your name with the 'whoami' command.\n"

6058

6078

"E.g. bzr whoami \"Your Name <name@example.com>\""

6059

6079

msgstr ""

6060

6080

6061

#: bzrlib/errors.py:3209

6081

#: bzrlib/errors.py:3210

6062

6082

msgid "Invalid pattern(s) found. %(msg)s"

6063

6083

msgstr ""

6064

6084

6065

#: bzrlib/errors.py:3217

6085

#: bzrlib/errors.py:3218

6066

6086

msgid ""

6067

6087

"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "

6068

6088

"unbind` to fix."

6069

6089

msgstr ""

6070

6090

6071

#: bzrlib/errors.py:3228

6091

#: bzrlib/errors.py:3229

6072

6092

msgid "Loop involving %(refs)r while expanding \"%(string)s\"."

6073

6093

msgstr ""

6074

6094

6075

#: bzrlib/errors.py:3237

6095

#: bzrlib/errors.py:3238

6076

6096

msgid "Option %(name)s is not defined while expanding \"%(string)s\"."

6077

6097

msgstr ""

6078

6098

6079

#: bzrlib/errors.py:3246

6099

#: bzrlib/errors.py:3247

6080

6100

msgid ""

6081

6101

"No compatible object available for operations from %(source)r to %(target)r."

6082

6102

msgstr ""

6083

6103

6084

#: bzrlib/errors.py:3256

6104

#: bzrlib/errors.py:3257

6085

6105

msgid ""

6086

6106

"VFS requests over the smart server are not allowed. Encountered: %(method)s, "

6087

6107

"%(arguments)s."

6088

6108

msgstr ""

6089

6109

6090

#: bzrlib/errors.py:3266

6110

#: bzrlib/errors.py:3267

6091

6111

msgid ""

6092

6112

"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "

6093

6113

"format %(format)r"

6094

6114

msgstr ""

6095

6115

6096

#: bzrlib/errors.py:3278

6116

#: bzrlib/errors.py:3279

6097

6117

msgid ""

6098

6118

"Missing feature %(feature)s not provided by this version of Bazaar or any "

6099

6119

"plugin."

6100

6120

msgstr ""

6101

6121

6102

#: bzrlib/errors.py:3291

6122

#: bzrlib/errors.py:3292

6103

6123

msgid "Binary files section encountered."

6104

6124

msgstr ""

6105

6125

6106

#: bzrlib/errors.py:3299

6126

#: bzrlib/errors.py:3300

6107

6127

msgid ""

6108

6128

"Malformed patch header. %(desc)s\n"

6109

6129

"%(line)r"

6110

6130

msgstr ""

6111

6131

6112

#: bzrlib/errors.py:3308

6132

#: bzrlib/errors.py:3309

6113

6133

msgid ""

6114

6134

"Malformed hunk header. %(desc)s\n"

6115

6135

"%(line)r"

6116

6136

msgstr ""

6117

6137

6118

#: bzrlib/errors.py:3317

6138

#: bzrlib/errors.py:3318

6119

6139

msgid ""

6120

6140

"Malformed line. %(desc)s\n"

6121

6141

"%(line)r"

6122

6142

msgstr ""

6123

6143

6124

#: bzrlib/errors.py:3327

6144

#: bzrlib/errors.py:3328

6125

6145

msgid ""

6126

6146

"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "

6127

6147

"but patch says it should be \"%(patch_line)s\""

6128

6148

msgstr ""

6129

6149

6130

#: bzrlib/errors.py:3338

6150

#: bzrlib/errors.py:3339

6131

6151

msgid "The feature %(feature)s has already been registered."

6132

6152

msgstr ""

6133

6153

6179

6199

"regular push."

6180

6200

msgstr ""

6181

6201

6182

#: bzrlib/gpg.py:119 bzrlib/gpg.py:460

6202

#: bzrlib/gpg.py:366

6203

msgid "No GnuPG key results for pattern: {0}"

6204

msgstr ""

6205

6206

#: bzrlib/gpg.py:439

6183

6207

msgid "{0} commits with valid signatures"

6184

6208

msgstr ""

6185

6209

6186

#: bzrlib/gpg.py:123 bzrlib/gpg.py:465

6210

#: bzrlib/gpg.py:445

6187

6211

msgid "{0} commit with unknown key"

6188

6212

msgid_plural "{0} commits with unknown keys"

6189

6213

msgstr[0] ""

6190

6214

msgstr[1] ""

6191

6215

6192

#: bzrlib/gpg.py:129 bzrlib/gpg.py:472

6216

#: bzrlib/gpg.py:453

6193

6217

msgid "{0} commit not valid"

6194

6218

msgid_plural "{0} commits not valid"

6195

6219

msgstr[0] ""

6196

6220

msgstr[1] ""

6197

6221

6198

#: bzrlib/gpg.py:135 bzrlib/gpg.py:479

6222

#: bzrlib/gpg.py:461

6199

6223

msgid "{0} commit not signed"

6200

6224

msgid_plural "{0} commits not signed"

6201

6225

msgstr[0] ""

6202

6226

msgstr[1] ""

6203

6227

6204

#: bzrlib/gpg.py:141 bzrlib/gpg.py:486

6228

#: bzrlib/gpg.py:469

6205

6229

msgid "{0} commit with key now expired"

6206

6230

msgid_plural "{0} commits with key now expired"

6207

6231

msgstr[0] ""

6208

6232

msgstr[1] ""

6209

6233

6210

#: bzrlib/gpg.py:343

6211

msgid "No GnuPG key results for pattern: {0}"

6212

msgstr ""

6234

#: bzrlib/gpg.py:489

6235

msgid "{0} commit by author {1} with key {2} now expired"

6236

msgid_plural "{0} commits by author {1} with key {2} now expired"

6237

msgstr[0] ""

6238

msgstr[1] ""

6213

6239

6214

#: bzrlib/gpg.py:386

6240

#: bzrlib/gpg.py:505

6215

6241

msgid "{0} signed {1} commit"

6216

6242

msgid_plural "{0} signed {1} commits"

6217

6243

msgstr[0] ""

6218

6244

msgstr[1] ""

6219

6245

6220

#: bzrlib/gpg.py:403 bzrlib/gpg.py:419

6246

#: bzrlib/gpg.py:522 bzrlib/gpg.py:539

6221

6247

msgid "{0} commit by author {1}"

6222

6248

msgid_plural "{0} commits by author {1}"

6223

6249

msgstr[0] ""

6224

6250

msgstr[1] ""

6225

6251

6226

#: bzrlib/gpg.py:433

6252

#: bzrlib/gpg.py:554

6227

6253

msgid "Unknown key {0} signed {1} commit"

6228

6254

msgid_plural "Unknown key {0} signed {1} commits"

6229

6255

msgstr[0] ""

6230

6256

msgstr[1] ""

6231

6257

6232

#: bzrlib/gpg.py:452

6233

msgid "{0} commit by author {1} with key {2} now expired"

6234

msgid_plural "{0} commits by author {1} with key {2} now expired"

6235

msgstr[0] ""

6236

msgstr[1] ""

6237

6238

6258

#: bzrlib/groupcompress.py:1739

6239

6259

#, python-format

6240

6260

msgid "Insert claimed random_id=True, but then inserted %r two times"

6241

6261

msgstr ""

6242

6262

6243

#: bzrlib/hooks.py:331

6263

#: bzrlib/hooks.py:313

6244

6264

#, python-format

6245

6265

msgid "Introduced in: %s"

6246

6266

msgstr ""

6247

6267

6248

#: bzrlib/hooks.py:334

6268

#: bzrlib/hooks.py:316

6249

6269

#, python-format

6250

6270

msgid "Deprecated in: %s"

6251

6271

msgstr ""

6294

6314

"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"

6295

6315

msgstr ""

6296

6316

6297

#: bzrlib/log.py:572

6317

#: bzrlib/log.py:563

6298

6318

msgid "--exclude-common-ancestry requires two different revisions"

6299

6319

msgstr ""

6300

6320

6301

#: bzrlib/log.py:574

6321

#: bzrlib/log.py:565

6302

6322

#, python-format

6303

6323

msgid "invalid direction %r"

6304

6324

msgstr ""

6305

6325

6306

#: bzrlib/log.py:662

6326

#: bzrlib/log.py:653

6307

6327

msgid "Start revision not found in history of end revision."

6308

6328

msgstr ""

6309

6329

6310

#: bzrlib/log.py:1080 bzrlib/log.py:1138

6330

#: bzrlib/log.py:1071 bzrlib/log.py:1129

6311

6331

msgid "Logging revision 0 is invalid."

6312

6332

msgstr ""

6313

6333

6314

#: bzrlib/log.py:1082 bzrlib/log.py:1140

6334

#: bzrlib/log.py:1073 bzrlib/log.py:1131

6315

6335

msgid "Start revision must be older than the end revision."

6316

6336

msgstr ""

6317

6337

6318

#: bzrlib/log.py:1827

6338

#: bzrlib/log.py:1818

6319

6339

#, python-format

6320

6340

msgid "unknown log formatter: %r"

6321

6341

msgstr ""

6322

6342

6323

#: bzrlib/log.py:2123

6343

#: bzrlib/log.py:2114

6324

6344

msgid "fixes bug"

6325

6345

msgid_plural "fixes bugs"

6326

6346

msgstr[0] ""

6335

6355

msgid "%d conflicts encountered."

6336

6356

msgstr ""

6337

6357

6338

#: bzrlib/merge.py:845 bzrlib/merge.py:1933

6358

#: bzrlib/merge.py:845 bzrlib/merge.py:1868

6339

6359

msgid "Preparing file merge"

6340

6360

msgstr ""

6341

6361

6457

6477

msgid "lstat/stat of ({0!r}): {1!r}"

6458

6478

msgstr ""

6459

6479

6460

#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019

6480

#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041

6461

6481

#, python-format

6462

6482

msgid "sorry, %r not allowed in path"

6463

6483

msgstr ""

6464

6484

6465

#: bzrlib/osutils.py:1237

6485

#: bzrlib/osutils.py:1259

6466

6486

#, python-format

6467

6487

msgid "%r is too short to calculate a relative path"

6468

6488

msgstr ""

6501

6521

msgid "Generate only the shell function, don't enable it"

6502

6522

msgstr ""

6503

6523

6504

#: bzrlib/plugins/launchpad/__init__.py:81

6524

#: bzrlib/plugins/launchpad/account.py:66

6525

msgid "Setting ssh/sftp usernames for launchpad.net."

6526

msgstr ""

6527

6528

#: bzrlib/plugins/launchpad/cmds.py:44

6505

6529

msgid "Register a branch with launchpad.net."

6506

6530

msgstr ""

6507

6531

6508

#: bzrlib/plugins/launchpad/__init__.py:83

6532

#: bzrlib/plugins/launchpad/cmds.py:46

6509

6533

msgid ""

6510

6534

"This command lists a bzr branch in the directory of branches on\n"

6511

6535

"launchpad.net. Registration allows the branch to be associated with\n"

6512

6536

"bugs or specifications."

6513

6537

msgstr ""

6514

6538

6515

#: bzrlib/plugins/launchpad/__init__.py:87

6539

#: bzrlib/plugins/launchpad/cmds.py:50

6516

6540

msgid ""

6517

6541

"Before using this command you must register the project to which the\n"

6518

6542

"branch belongs, and create an account for yourself on launchpad.net."

6519

6543

msgstr ""

6520

6544

6521

#: bzrlib/plugins/launchpad/__init__.py:90

6545

#: bzrlib/plugins/launchpad/cmds.py:53

6522

6546

msgid ""

6523

6547

"arguments:\n"

6524

6548

" public_url: The publicly visible url for the branch to register.\n"

6530

6554

" otherwise error."

6531

6555

msgstr ""

6532

6556

6533

#: bzrlib/plugins/launchpad/__init__.py:99

6557

#: bzrlib/plugins/launchpad/cmds.py:62

6534

6558

msgid ""

6535

6559

"example:\n"

6536

6560

" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"

6537

6561

" --project fooproject"

6538

6562

msgstr ""

6539

6563

6540

#: bzrlib/plugins/launchpad/__init__.py:106

6564

#: bzrlib/plugins/launchpad/cmds.py:69

6541

6565

msgid "Launchpad project short name to associate with the branch."

6542

6566

msgstr ""

6543

6567

6544

#: bzrlib/plugins/launchpad/__init__.py:113

6568

#: bzrlib/plugins/launchpad/cmds.py:76

6545

6569

msgid ""

6546

6570

"Short name for the branch; by default taken from the last component of the "

6547

6571

"url."

6548

6572

msgstr ""

6549

6573

6550

#: bzrlib/plugins/launchpad/__init__.py:117

6574

#: bzrlib/plugins/launchpad/cmds.py:80

6551

6575

msgid "One-sentence description of the branch."

6552

6576

msgstr ""

6553

6577

6554

#: bzrlib/plugins/launchpad/__init__.py:120

6578

#: bzrlib/plugins/launchpad/cmds.py:83

6555

6579

msgid "Longer description of the purpose or contents of the branch."

6556

6580

msgstr ""

6557

6581

6558

#: bzrlib/plugins/launchpad/__init__.py:123

6582

#: bzrlib/plugins/launchpad/cmds.py:86

6559

6583

msgid "Branch author's email address, if not yourself."

6560

6584

msgstr ""

6561

6585

6562

#: bzrlib/plugins/launchpad/__init__.py:126

6586

#: bzrlib/plugins/launchpad/cmds.py:89

6563

6587

msgid "The bug this branch fixes."

6564

6588

msgstr ""

6565

6589

6566

#: bzrlib/plugins/launchpad/__init__.py:129

6590

#: bzrlib/plugins/launchpad/cmds.py:92

6567

6591

msgid "Prepare the request but don't actually send it."

6568

6592

msgstr ""

6569

6593

6570

#: bzrlib/plugins/launchpad/__init__.py:151

6594

#: bzrlib/plugins/launchpad/cmds.py:114

6571

6595

msgid ""

6572

6596

"register-branch requires a public branch url - see bzr help register-branch."

6573

6597

msgstr ""

6574

6598

6575

#: bzrlib/plugins/launchpad/__init__.py:159

6599

#: bzrlib/plugins/launchpad/cmds.py:122

6576

6600

msgid "--product is deprecated; please use --project."

6577

6601

msgstr ""

6578

6602

6579

#: bzrlib/plugins/launchpad/__init__.py:191

6603

#: bzrlib/plugins/launchpad/cmds.py:152

6580

6604

msgid "Open a Launchpad branch page in your web browser."

6581

6605

msgstr ""

6582

6606

6583

#: bzrlib/plugins/launchpad/__init__.py:196

6607

#: bzrlib/plugins/launchpad/cmds.py:157

6584

6608

msgid "Do not actually open the browser. Just say the URL we would use."

6585

6609

msgstr ""

6586

6610

6587

#: bzrlib/plugins/launchpad/__init__.py:231

6611

#: bzrlib/plugins/launchpad/cmds.py:192

6588

6612

#, python-format

6589

6613

msgid "Opening %s in web browser"

6590

6614

msgstr ""

6591

6615

6592

#: bzrlib/plugins/launchpad/__init__.py:241

6616

#: bzrlib/plugins/launchpad/cmds.py:200

6593

6617

msgid "Show or set the Launchpad user ID."

6594

6618

msgstr ""

6595

6619

6596

#: bzrlib/plugins/launchpad/__init__.py:243

6620

#: bzrlib/plugins/launchpad/cmds.py:202

6597

6621

msgid ""

6598

6622

"When communicating with Launchpad, some commands need to know your\n"

6599

6623

"Launchpad user ID. This command can be used to set or show the\n"

6600

6624

"user ID that Bazaar will use for such communication."

6601

6625

msgstr ""

6602

6626

6603

#: bzrlib/plugins/launchpad/__init__.py:247

6627

#: bzrlib/plugins/launchpad/cmds.py:206

6604

6628

msgid ""

6605

6629

":Examples:\n"

6606

6630

" Show the Launchpad ID of the current user::"

6607

6631

msgstr ""

6608

6632

6609

#: bzrlib/plugins/launchpad/__init__.py:250

6633

#: bzrlib/plugins/launchpad/cmds.py:209

6610

6634

msgid " bzr launchpad-login"

6611

6635

msgstr ""

6612

6636

6613

#: bzrlib/plugins/launchpad/__init__.py:252

6637

#: bzrlib/plugins/launchpad/cmds.py:211

6614

6638

msgid " Set the Launchpad ID of the current user to 'bob'::"

6615

6639

msgstr ""

6616

6640

6617

#: bzrlib/plugins/launchpad/__init__.py:254

6641

#: bzrlib/plugins/launchpad/cmds.py:213

6618

6642

msgid " bzr launchpad-login bob"

6619

6643

msgstr ""

6620

6644

6621

#: bzrlib/plugins/launchpad/__init__.py:261

6645

#: bzrlib/plugins/launchpad/cmds.py:220

6622

6646

msgid "Don't check that the user name is valid."

6623

6647

msgstr ""

6624

6648

6625

#: bzrlib/plugins/launchpad/__init__.py:276

6626

#: bzrlib/plugins/launchpad/__init__.py:287

6649

#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246

6627

6650

msgid "Launchpad user ID exists and has SSH keys.\n"

6628

6651

msgstr ""

6629

6652

6630

#: bzrlib/plugins/launchpad/__init__.py:279

6653

#: bzrlib/plugins/launchpad/cmds.py:238

6631

6654

msgid "No Launchpad user ID configured.\n"

6632

6655

msgstr ""

6633

6656

6634

#: bzrlib/plugins/launchpad/__init__.py:290

6657

#: bzrlib/plugins/launchpad/cmds.py:249

6635

6658

#, python-format

6636

6659

msgid "Launchpad user ID set to '%s'.\n"

6637

6660

msgstr ""

6638

6661

6639

#: bzrlib/plugins/launchpad/__init__.py:298

6662

#: bzrlib/plugins/launchpad/cmds.py:255

6640

6663

msgid "Ask Launchpad to mirror a branch now."

6641

6664

msgstr ""

6642

6665

6643

#: bzrlib/plugins/launchpad/__init__.py:318

6666

#: bzrlib/plugins/launchpad/cmds.py:272

6644

6667

msgid "Propose merging a branch on Launchpad."

6645

6668

msgstr ""

6646

6669

6647

#: bzrlib/plugins/launchpad/__init__.py:320

6670

#: bzrlib/plugins/launchpad/cmds.py:274

6648

6671

msgid ""

6649

6672

"This will open your usual editor to provide the initial comment. When it\n"

6650

6673

"has created the proposal, it will open it in your default web browser."

6651

6674

msgstr ""

6652

6675

6653

#: bzrlib/plugins/launchpad/__init__.py:323

6676

#: bzrlib/plugins/launchpad/cmds.py:277

6654

6677

msgid ""

6655

6678

"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"

6656

6679

"is not supplied, the remembered submit branch will be used. If no submit\n"

6657

6680

"branch is remembered, the development focus will be used."

6658

6681

msgstr ""

6659

6682

6660

#: bzrlib/plugins/launchpad/__init__.py:327

6683

#: bzrlib/plugins/launchpad/cmds.py:281

6661

6684

msgid ""

6662

6685

"By default, the SUBMIT_BRANCH's review team will be requested to review\n"

6663

6686

"the merge proposal. This can be overriden by specifying --review (-R).\n"

6665

6688

"may optionally be followed by '=' and the review type. For example:"

6666

6689

msgstr ""

6667

6690

6668

#: bzrlib/plugins/launchpad/__init__.py:332

6691

#: bzrlib/plugins/launchpad/cmds.py:286

6669

6692

msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"

6670

6693

msgstr ""

6671

6694

6672

#: bzrlib/plugins/launchpad/__init__.py:334

6695

#: bzrlib/plugins/launchpad/cmds.py:288

6673

6696

msgid ""

6674

6697

"This will propose a merge, request \"jrandom\" to perform a review of\n"

6675

6698

"unspecified type, and request \"review-team\" to perform a \"qa\" review."

6676

6699

msgstr ""

6677

6700

6678

#: bzrlib/plugins/launchpad/__init__.py:339

6701

#: bzrlib/plugins/launchpad/cmds.py:293

6679

6702

msgid "Propose the merge on staging."

6680

6703

msgstr ""

6681

6704

6682

#: bzrlib/plugins/launchpad/__init__.py:341

6705

#: bzrlib/plugins/launchpad/cmds.py:295

6683

6706

msgid "Commit message."

6684

6707

msgstr ""

6685

6708

6686

#: bzrlib/plugins/launchpad/__init__.py:343

6709

#: bzrlib/plugins/launchpad/cmds.py:297

6687

6710

msgid "Mark the proposal as approved immediately."

6688

6711

msgstr ""

6689

6712

6690

#: bzrlib/plugins/launchpad/__init__.py:345

6713

#: bzrlib/plugins/launchpad/cmds.py:298

6714

msgid "The bug this proposal fixes."

6715

msgstr ""

6716

6717

#: bzrlib/plugins/launchpad/cmds.py:300

6691

6718

msgid "Requested reviewer and optional type."

6692

6719

msgstr ""

6693

6720

6694

#: bzrlib/plugins/launchpad/__init__.py:382

6721

#: bzrlib/plugins/launchpad/cmds.py:335

6695

6722

msgid "Find the proposal to merge this revision."

6696

6723

msgstr ""

6697

6724

6698

#: bzrlib/plugins/launchpad/__init__.py:384

6725

#: bzrlib/plugins/launchpad/cmds.py:337

6699

6726

msgid ""

6700

6727

"Finds the merge proposal(s) that discussed landing the specified revision.\n"

6701

6728

"This works only if the selected branch was the merge proposal target, and\n"

6703

6730

"are opened in a web browser."

6704

6731

msgstr ""

6705

6732

6706

#: bzrlib/plugins/launchpad/__init__.py:389

6733

#: bzrlib/plugins/launchpad/cmds.py:342

6707

6734

msgid ""

6708

6735

"Any revision involved in the merge may be specified-- the revision in\n"

6709

6736

"which the merge was performed, or one of the revisions that was merged."

6710

6737

msgstr ""

6711

6738

6712

#: bzrlib/plugins/launchpad/__init__.py:392

6739

#: bzrlib/plugins/launchpad/cmds.py:345

6713

6740

msgid "So, to find the merge proposal that reviewed line 1 of README::"

6714

6741

msgstr ""

6715

6742

6716

#: bzrlib/plugins/launchpad/__init__.py:394

6743

#: bzrlib/plugins/launchpad/cmds.py:347

6717

6744

msgid " bzr lp-find-proposal -r annotate:README:1"

6718

6745

msgstr ""

6719

6746

6720

#: bzrlib/plugins/launchpad/__init__.py:409

6747

#: bzrlib/plugins/launchpad/cmds.py:363

6721

6748

msgid "No review found."

6722

6749

msgstr ""

6723

6750

6724

#: bzrlib/plugins/launchpad/__init__.py:410

6751

#: bzrlib/plugins/launchpad/cmds.py:364

6725

6752

#, python-format

6726

6753

msgid "%d proposals(s) found."

6727

6754

msgstr ""

6728

6755

6729

#: bzrlib/plugins/launchpad/__init__.py:420

6756

#: bzrlib/plugins/launchpad/cmds.py:374

6730

6757

msgid "Finding revision-id"

6731

6758

msgstr ""

6732

6759

6733

#: bzrlib/plugins/launchpad/__init__.py:427

6760

#: bzrlib/plugins/launchpad/cmds.py:381

6734

6761

msgid "Finding merge"

6735

6762

msgstr ""

6736

6763

6737

#: bzrlib/plugins/launchpad/__init__.py:432

6764

#: bzrlib/plugins/launchpad/cmds.py:386

6738

6765

msgid "Finding revno"

6739

6766

msgstr ""

6740

6767

6741

#: bzrlib/plugins/launchpad/__init__.py:437

6768

#: bzrlib/plugins/launchpad/cmds.py:392

6742

6769

msgid "Finding Launchpad branch"

6743

6770

msgstr ""

6744

6771

6745

#: bzrlib/plugins/launchpad/__init__.py:440

6772

#: bzrlib/plugins/launchpad/cmds.py:395

6746

6773

msgid "Finding proposals"

6747

6774

msgstr ""

6748

6775

6749

#: bzrlib/plugins/launchpad/account.py:66

6750

msgid "Setting ssh/sftp usernames for launchpad.net."

6751

msgstr ""

6752

6753

6776

#: bzrlib/plugins/launchpad/lp_api.py:241

6754

6777

#: bzrlib/plugins/launchpad/lp_api.py:246

6755

6778

#, python-format

6793

6816

" remote: {2}"

6794

6817

msgstr ""

6795

6818

6796

#: bzrlib/plugins/launchpad/lp_propose.py:149

6819

#: bzrlib/plugins/launchpad/lp_propose.py:150

6797

6820

#, python-format

6798

6821

msgid "There is already a branch merge proposal: %s"

6799

6822

msgstr ""

6800

6823

6801

#: bzrlib/plugins/weave_fmt/bzrdir.py:236

6824

#: bzrlib/plugins/weave_fmt/bzrdir.py:237

6802

6825

msgid "pb parameter to convert() is deprecated"

6803

6826

msgstr ""

6804

6827

6805

#: bzrlib/plugins/weave_fmt/bzrdir.py:239

6828

#: bzrlib/plugins/weave_fmt/bzrdir.py:240

6806

6829

msgid "starting upgrade from format 4 to 5"

6807

6830

msgstr ""

6808

6831

6809

#: bzrlib/plugins/weave_fmt/bzrdir.py:249

6832

#: bzrlib/plugins/weave_fmt/bzrdir.py:250

6810

6833

msgid "note: upgrade may be faster if all store files are ungzipped first"

6811

6834

msgstr ""

6812

6835

6813

#: bzrlib/plugins/weave_fmt/bzrdir.py:278

6836

#: bzrlib/plugins/weave_fmt/bzrdir.py:279

6814

6837

msgid "converting revision"

6815

6838

msgstr ""

6816

6839

6817

#: bzrlib/plugins/weave_fmt/bzrdir.py:283

6840

#: bzrlib/plugins/weave_fmt/bzrdir.py:284

6818

6841

msgid "upgraded to weaves:"

6819

6842

msgstr ""

6820

6843

6821

#: bzrlib/plugins/weave_fmt/bzrdir.py:284

6844

#: bzrlib/plugins/weave_fmt/bzrdir.py:285

6822

6845

#, python-format

6823

6846

msgid "%6d revisions and inventories"

6824

6847

msgstr ""

6825

6848

6826

#: bzrlib/plugins/weave_fmt/bzrdir.py:286

6849

#: bzrlib/plugins/weave_fmt/bzrdir.py:287

6827

6850

#, python-format

6828

6851

msgid "%6d revisions not present"

6829

6852

msgstr ""

6830

6853

6831

#: bzrlib/plugins/weave_fmt/bzrdir.py:288

6854

#: bzrlib/plugins/weave_fmt/bzrdir.py:289

6832

6855

#, python-format

6833

6856

msgid "%6d texts"

6834

6857

msgstr ""

6835

6858

6836

#: bzrlib/plugins/weave_fmt/bzrdir.py:324

6859

#: bzrlib/plugins/weave_fmt/bzrdir.py:325

6837

6860

msgid "writing weave"

6838

6861

msgstr ""

6839

6862

6840

#: bzrlib/plugins/weave_fmt/bzrdir.py:328

6841

#: bzrlib/plugins/weave_fmt/bzrdir.py:330

6863

#: bzrlib/plugins/weave_fmt/bzrdir.py:329

6864

#: bzrlib/plugins/weave_fmt/bzrdir.py:331

6842

6865

msgid "inventory"

6843

6866

msgstr ""

6844

6867

6845

#: bzrlib/plugins/weave_fmt/bzrdir.py:347

6868

#: bzrlib/plugins/weave_fmt/bzrdir.py:348

6846

6869

msgid "write revision"

6847

6870

msgstr ""

6848

6871

6849

#: bzrlib/plugins/weave_fmt/bzrdir.py:361

6872

#: bzrlib/plugins/weave_fmt/bzrdir.py:362

6850

6873

msgid "loading revision"

6851

6874

msgstr ""

6852

6875

6853

#: bzrlib/plugins/weave_fmt/bzrdir.py:366

6876

#: bzrlib/plugins/weave_fmt/bzrdir.py:367

6854

6877

#, python-format

6855

6878

msgid "revision {%s} not present in branch; will be converted as a ghost"

6856

6879

msgstr ""

6857

6880

6858

#: bzrlib/plugins/weave_fmt/bzrdir.py:506

6881

#: bzrlib/plugins/weave_fmt/bzrdir.py:507

6859

6882

msgid "starting upgrade from format 5 to 6"

6860

6883

msgstr ""

6861

6884

6862

#: bzrlib/plugins/weave_fmt/bzrdir.py:516

6885

#: bzrlib/plugins/weave_fmt/bzrdir.py:517

6863

6886

#, python-format

6864

6887

msgid "adding prefixes to %s"

6865

6888

msgstr ""

6866

6889

6867

#: bzrlib/plugins/weave_fmt/bzrdir.py:556

6890

#: bzrlib/plugins/weave_fmt/bzrdir.py:557

6868

6891

msgid "starting upgrade from format 6 to metadir"

6869

6892

msgstr ""

6870

6893

6871

#: bzrlib/plugins/weave_fmt/bzrdir.py:564

6894

#: bzrlib/plugins/weave_fmt/bzrdir.py:565

6872

6895

msgid "Removing ancestry.weave"

6873

6896

msgstr ""

6874

6897

6875

#: bzrlib/plugins/weave_fmt/bzrdir.py:569

6898

#: bzrlib/plugins/weave_fmt/bzrdir.py:570

6876

6899

msgid "Finding branch files"

6877

6900

msgstr ""

6878

6901

6879

#: bzrlib/plugins/weave_fmt/bzrdir.py:579

6902

#: bzrlib/plugins/weave_fmt/bzrdir.py:580

6880

6903

msgid "Upgrading repository"

6881

6904

msgstr ""

6882

6905

6883

#: bzrlib/plugins/weave_fmt/bzrdir.py:589

6906

#: bzrlib/plugins/weave_fmt/bzrdir.py:590

6884

6907

msgid "Upgrading branch"

6885

6908

msgstr ""

6886

6909

6887

#: bzrlib/plugins/weave_fmt/bzrdir.py:612

6910

#: bzrlib/plugins/weave_fmt/bzrdir.py:613

6888

6911

msgid "No working tree."

6889

6912

msgstr ""

6890

6913

6891

#: bzrlib/plugins/weave_fmt/bzrdir.py:619

6914

#: bzrlib/plugins/weave_fmt/bzrdir.py:620

6892

6915

msgid "Upgrading working tree"

6893

6916

msgstr ""

6894

6917

6895

#: bzrlib/plugins/weave_fmt/bzrdir.py:640

6918

#: bzrlib/plugins/weave_fmt/bzrdir.py:641

6896

6919

#, python-format

6897

6920

msgid "Make %s lock"

6898

6921

msgstr ""

6899

6922

6900

#: bzrlib/plugins/weave_fmt/bzrdir.py:651

6923

#: bzrlib/plugins/weave_fmt/bzrdir.py:652

6901

6924

#, python-format

6902

6925

msgid "Moving %s"

6903

6926

msgstr ""

6924

6947

msgid "Too many redirections trying to make %s."

6925

6948

msgstr ""

6926

6949

6927

#: bzrlib/push.py:147

6950

#: bzrlib/push.py:148

6928

6951

msgid ""

6929

6952

"These branches have diverged. See \"bzr help diverged-branches\" for more "

6930

6953

"information."

6931

6954

msgstr ""

6932

6955

6933

#: bzrlib/push.py:151

6956

#: bzrlib/push.py:152

6934

6957

#, python-format

6935

6958

msgid ""

6936

6959

"It is not possible to losslessly push to %s. You may want to use dpush "

6937

6960

"instead."

6938

6961

msgstr ""

6939

6962

6940

#: bzrlib/push.py:157

6963

#: bzrlib/push.py:158

6941

6964

#, python-format

6942

6965

msgid ""

6943

6966

"At %s you have a valid .bzr control directory, but not a branch or "

7054

7077

msgid "{0} => {1}"

7055

7078

msgstr ""

7056

7079

7057

#: bzrlib/repository.py:1787

7080

#: bzrlib/repository.py:1799

7058

7081

msgid "Moving repository to repository.backup"

7059

7082

msgstr ""

7060

7083

7061

#: bzrlib/repository.py:1794

7084

#: bzrlib/repository.py:1806

7062

7085

msgid "Creating new repository"

7063

7086

msgstr ""

7064

7087

7065

#: bzrlib/repository.py:1799

7088

#: bzrlib/repository.py:1811

7066

7089

msgid "Copying content"

7067

7090

msgstr ""

7068

7091

7069

#: bzrlib/repository.py:1803

7092

#: bzrlib/repository.py:1815

7070

7093

msgid "Deleting old repository content"

7071

7094

msgstr ""

7072

7095

7073

#: bzrlib/repository.py:1805

7096

#: bzrlib/repository.py:1817

7074

7097

msgid "repository converted"

7075

7098

msgstr ""

7076

7099

7078

7101

msgid "Using {0} {1}"

7079

7102

msgstr ""

7080

7103

7081

#: bzrlib/send.py:58

7104

#: bzrlib/send.py:59

7082

7105

#, python-format

7083

7106

msgid "Mail client \"%s\" does not support specifying body"

7084

7107

msgstr ""

7085

7108

7086

#: bzrlib/send.py:62

7109

#: bzrlib/send.py:63

7087

7110

msgid "--remember requires a branch to be specified."

7088

7111

msgstr ""

7089

7112

7090

#: bzrlib/send.py:77

7113

#: bzrlib/send.py:78

7091

7114

msgid "No submit branch known or specified"

7092

7115

msgstr ""

7093

7116

7094

#: bzrlib/send.py:80

7117

#: bzrlib/send.py:81

7095

7118

msgid "Using saved {0} location \"{1}\" to determine what changes to submit."

7096

7119

msgstr ""

7097

7120

7098

#: bzrlib/send.py:98

7121

#: bzrlib/send.py:99

7099

7122

#, python-format

7100

7123

msgid "No such send format '%s'."

7101

7124

msgstr ""

7102

7125

7103

#: bzrlib/send.py:114

7126

#: bzrlib/send.py:115

7104

7127

msgid "bzr send takes at most two one revision identifiers"

7105

7128

msgstr ""

7106

7129

7107

#: bzrlib/send.py:127

7130

#: bzrlib/send.py:128

7108

7131

msgid "No revisions to submit."

7109

7132

msgstr ""

7110

7133

7111

#: bzrlib/send.py:139

7134

#: bzrlib/send.py:140

7112

7135

msgid ""

7113

7136

"- not supported for merge directives that use more than one output file."

7114

7137

msgstr ""

7115

7138

7116

#: bzrlib/send.py:185

7139

#: bzrlib/send.py:186

7117

7140

msgid "Format 0.9 does not permit bundle with no patch"

7118

7141

msgstr ""

7119

7142

7270

7293

"anyway, use --force."

7271

7294

msgstr ""

7272

7295

7273

#: bzrlib/switch.py:125

7296

#: bzrlib/switch.py:129

7274

7297

msgid "Cannot switch a branch, only a checkout."

7275

7298

msgstr ""

7276

7299

7277

#: bzrlib/switch.py:163

7300

#: bzrlib/switch.py:167

7278

7301

#, python-format

7279

7302

msgid "Tree is up to date at revision %d."

7280

7303

msgstr ""

7281

7304

7282

#: bzrlib/switch.py:169

7305

#: bzrlib/switch.py:173

7283

7306

#, python-format

7284

7307

msgid "Updated to revision %d."

7285

7308

msgstr ""

7286

7309

7287

#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747

7310

#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736

7288

7311

msgid "Apply phase"

7289

7312

msgstr ""

7290

7313

7291

#: bzrlib/transform.py:1773 bzrlib/transform.py:1841

7314

#: bzrlib/transform.py:1762 bzrlib/transform.py:1830

7292

7315

msgid "removing file"

7293

7316

msgstr ""

7294

7317

7295

#: bzrlib/transform.py:1791 bzrlib/transform.py:1876

7318

#: bzrlib/transform.py:1780 bzrlib/transform.py:1865

7296

7319

msgid "adding file"

7297

7320

msgstr ""

7298

7321

7299

#: bzrlib/transform.py:2591

7322

#: bzrlib/transform.py:2590

7300

7323

msgid "Building tree"

7301

7324

msgstr ""

7302

7325

7303

#: bzrlib/transform.py:2681 bzrlib/transform.py:2708

7326

#: bzrlib/transform.py:2680 bzrlib/transform.py:2707

7304

7327

msgid "Adding file contents"

7305

7328

msgstr ""

7306

7329

7307

#: bzrlib/transform.py:3028

7330

#: bzrlib/transform.py:3009

7308

7331

msgid "Resolution pass"

7309

7332

msgstr ""

7310

7333

7313

7336

msgid "Authenticated as %s"

7314

7337

msgstr ""

7315

7338

7316

#: bzrlib/tree.py:634

7339

#: bzrlib/tree.py:637

7317

7340

msgid "*** {0} content-filter: {1} => {2!r}"

7318

7341

msgstr ""

7319

7342

7372

7395

msgid "failed to clean-up {0}: {1}"

7373

7396

msgstr ""

7374

7397

7375

#: bzrlib/vf_repository.py:1090

7398

#: bzrlib/vf_repository.py:1091

7376

7399

msgid "inventories"

7377

7400

msgstr ""

7378

7401

7379

#: bzrlib/vf_repository.py:1116

7402

#: bzrlib/vf_repository.py:1117

7380

7403

msgid "texts"

7381

7404

msgstr ""

7382

7405

7383

#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630

7406

#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631

7384

7407

msgid "Calculating text parents"

7385

7408

msgstr ""

7386

7409

7387

#: bzrlib/vf_repository.py:1706

7410

#: bzrlib/vf_repository.py:1707

7388

7411

msgid "Fetch texts"

7389

7412

msgstr ""

7390

7413

7391

#: bzrlib/vf_repository.py:2535

7414

#: bzrlib/vf_repository.py:2536

7392

7415

msgid "loading text store"

7393

7416

msgstr ""

7394

7417

7395

#: bzrlib/vf_repository.py:2541

7418

#: bzrlib/vf_repository.py:2542

7396

7419

msgid "checking text graph"

7397

7420

msgstr ""

7398

7421

7399

#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009

7400

#: bzrlib/vf_repository.py:3124

7422

#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012

7423

#: bzrlib/vf_repository.py:3127

7401

7424

msgid "Transferring revisions"

7402

7425

msgstr ""

7403

7426

7443

7466

msgid "PageFaultCount %8d"

7444

7467

msgstr ""

7445

7468

7446

#: bzrlib/workingtree.py:1478

7469

#: bzrlib/workingtree.py:1482

7447

7470

msgid "Rerun update after fixing the conflicts."

7448

7471

msgstr ""

7449

7472

7453

7476

7454

7477

#: dummy/help_topics/basic/detail.txt:1

7455

7478

msgid ""

7456

"Bazaar 2.5b6 -- a free distributed version-control tool\n"

7479

"Bazaar 2.6.0dev1 -- a free distributed version-control tool\n"

7457

7480

"http://bazaar.canonical.com/"

7458

7481

msgstr ""

7459

7482

11670

11693

msgstr ""

11671

11694

11672

11695

#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56

11673

#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259

11696

#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262

11674

11697

msgid "Introduced in: 2.2"

11675

11698

msgstr ""

11676

11699

11688

11711

"~~~~"

11689

11712

msgstr ""

11690

11713

11691

#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290

11692

#: en/help_topics/hooks.txt:304

11714

#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293

11715

#: en/help_topics/hooks.txt:307

11693

11716

msgid "Introduced in: 1.8"

11694

11717

msgstr ""

11695

11718

11719

11742

"~~~~~~~~~~~~~~~~~~~~~~"

11720

11743

msgstr ""

11721

11744

11722

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418

11745

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421

11723

11746

msgid "Introduced in: 1.4"

11724

11747

msgstr ""

11725

11748

11731

11754

"uncommit will all trigger this hook."

11732

11755

msgstr ""

11733

11756

11734

#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389

11757

#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392

11735

11758

msgid ""

11736

11759

"post_commit\n"

11737

11760

"~~~~~~~~~~~"

11739

11762

11740

11763

#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86

11741

11764

#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110

11742

#: en/help_topics/hooks.txt:145

11743

11765

msgid "Introduced in: 0.15"

11744

11766

msgstr ""

11745

11767

11844

11866

11845

11867

#: en/help_topics/hooks.txt:142

11846

11868

msgid ""

11847

"set_rh\n"

11848

"~~~~~~"

11849

msgstr ""

11850

11851

#: en/help_topics/hooks.txt:147

11852

msgid ""

11853

"Invoked whenever the revision history has been set via\n"

11854

"set_revision_history. The api signature is (branch, revision_history),\n"

11855

"and the branch will be write-locked. The set_rh hook can be expensive\n"

11856

"for bzr to trigger, a better hook to use is\n"

11857

"Branch.post_change_branch_tip."

11858

msgstr ""

11859

11860

#: en/help_topics/hooks.txt:153

11861

msgid ""

11862

11869

"transform_fallback_location\n"

11863

11870

"~~~~~~~~~~~~~~~~~~~~~~~~~~~"

11864

11871

msgstr ""

11865

11872

11866

#: en/help_topics/hooks.txt:156

11873

#: en/help_topics/hooks.txt:145

11867

11874

msgid "Introduced in: 1.9"

11868

11875

msgstr ""

11869

11876

11870

#: en/help_topics/hooks.txt:158

11877

#: en/help_topics/hooks.txt:147

11871

11878

msgid ""

11872

11879

"Called when a stacked branch is activating its fallback locations.\n"

11873

11880

"transform_fallback_location is called with (branch, url), and should\n"

11881

11888

"however undefined."

11882

11889

msgstr ""

11883

11890

11884

#: en/help_topics/hooks.txt:169

11891

#: en/help_topics/hooks.txt:158

11885

11892

msgid ""

11886

11893

"CommandHooks\n"

11887

11894

"------------"

11888

11895

msgstr ""

11889

11896

11890

#: en/help_topics/hooks.txt:172

11897

#: en/help_topics/hooks.txt:161

11891

11898

msgid ""

11892

11899

"extend_command\n"

11893

11900

"~~~~~~~~~~~~~~"

11894

11901

msgstr ""

11895

11902

11896

#: en/help_topics/hooks.txt:175

11903

#: en/help_topics/hooks.txt:164

11897

11904

msgid "Introduced in: 1.13"

11898

11905

msgstr ""

11899

11906

11900

#: en/help_topics/hooks.txt:177

11907

#: en/help_topics/hooks.txt:166

11901

11908

msgid ""

11902

11909

"Called after creating a command object to allow modifications such as\n"

11903

11910

"adding or removing options, docs etc. Called with the new\n"

11904

11911

"bzrlib.commands.Command object."

11905

11912

msgstr ""

11906

11913

11907

#: en/help_topics/hooks.txt:181

11914

#: en/help_topics/hooks.txt:170

11908

11915

msgid ""

11909

11916

"get_command\n"

11910

11917

"~~~~~~~~~~~"

11911

11918

msgstr ""

11912

11919

11913

#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196

11914

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464

11920

#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185

11921

#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467

11915

11922

msgid "Introduced in: 1.17"

11916

11923

msgstr ""

11917

11924

11918

#: en/help_topics/hooks.txt:186

11925

#: en/help_topics/hooks.txt:175

11919

11926

msgid ""

11920

11927

"Called when creating a single command. Called with (cmd_or_None,\n"

11921

11928

"command_name). get_command should either return the cmd_or_None\n"

11925

11932

"plugin_cmds.register_lazy."

11926

11933

msgstr ""

11927

11934

11928

#: en/help_topics/hooks.txt:193

11935

#: en/help_topics/hooks.txt:182

11929

11936

msgid ""

11930

11937

"get_missing_command\n"

11931

11938

"~~~~~~~~~~~~~~~~~~~"

11932

11939

msgstr ""

11933

11940

11934

#: en/help_topics/hooks.txt:198

11941

#: en/help_topics/hooks.txt:187

11935

11942

msgid ""

11936

11943

"Called when creating a single command if no command could be found.\n"

11937

11944

"Called with (command_name). get_missing_command should either return\n"

11938

11945

"None, or a Command object to be used for the command."

11939

11946

msgstr ""

11940

11947

11941

#: en/help_topics/hooks.txt:202

11948

#: en/help_topics/hooks.txt:191

11942

11949

msgid ""

11943

11950

"list_commands\n"

11944

11951

"~~~~~~~~~~~~~"

11945

11952

msgstr ""

11946

11953

11947

#: en/help_topics/hooks.txt:207

11954

#: en/help_topics/hooks.txt:196

11948

11955

msgid ""

11949

11956

"Called when enumerating commands. Called with a set of cmd_name\n"

11950

11957

"strings for all the commands found so far. This set is safe to mutate\n"

11952

11959

"set of command names."

11953

11960

msgstr ""

11954

11961

11955

#: en/help_topics/hooks.txt:212

11962

#: en/help_topics/hooks.txt:201

11963

msgid ""

11964

"post_command\n"

11965

"~~~~~~~~~~~~"

11966

msgstr ""

11967

11968

#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211

11969

msgid "Introduced in: 2.6"

11970

msgstr ""

11971

11972

#: en/help_topics/hooks.txt:206

11973

msgid "Called after executing a command. Called with the command object."

11974

msgstr ""

11975

11976

#: en/help_topics/hooks.txt:208

11977

msgid ""

11978

"pre_command\n"

11979

"~~~~~~~~~~~"

11980

msgstr ""

11981

11982

#: en/help_topics/hooks.txt:213

11983

msgid "Called prior to executing a command. Called with the command object."

11984

msgstr ""

11985

11986

#: en/help_topics/hooks.txt:215

11956

11987

msgid ""

11957

11988

"_ConfigHooks\n"

11958

11989

"------------"

11959

11990

msgstr ""

11960

11991

11961

#: en/help_topics/hooks.txt:215

11992

#: en/help_topics/hooks.txt:218

11962

11993

msgid ""

11963

11994

"get\n"

11964

11995

"~~~"

11965

11996

msgstr ""

11966

11997

11967

#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226

11968

#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241

11969

#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370

11970

#: en/help_topics/hooks.txt:443

11998

#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229

11999

#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244

12000

#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373

12001

#: en/help_topics/hooks.txt:446

11971

12002

msgid "Introduced in: 2.4"

11972

12003

msgstr ""

11973

12004

11974

#: en/help_topics/hooks.txt:220

12005

#: en/help_topics/hooks.txt:223

11975

12006

msgid ""

11976

12007

"Invoked when a config option is read. The signature is (stack, name,\n"

11977

12008

"value)."

11978

12009

msgstr ""

11979

12010

11980

#: en/help_topics/hooks.txt:223

12011

#: en/help_topics/hooks.txt:226

11981

12012

msgid ""

11982

12013

"load\n"

11983

12014

"~~~~"

11984

12015

msgstr ""

11985

12016

11986

#: en/help_topics/hooks.txt:228

12017

#: en/help_topics/hooks.txt:231

11987

12018

msgid "Invoked when a config store is loaded. The signature is (store)."

11988

12019

msgstr ""

11989

12020

11990

#: en/help_topics/hooks.txt:230

12021

#: en/help_topics/hooks.txt:233

11991

12022

msgid ""

11992

12023

"remove\n"

11993

12024

"~~~~~~"

11994

12025

msgstr ""

11995

12026

11996

#: en/help_topics/hooks.txt:235

12027

#: en/help_topics/hooks.txt:238

11997

12028

msgid ""

11998

12029

"Invoked when a config option is removed. The signature is (stack,\n"

11999

12030

"name)."

12000

12031

msgstr ""

12001

12032

12002

#: en/help_topics/hooks.txt:238

12033

#: en/help_topics/hooks.txt:241

12003

12034

msgid ""

12004

12035

"save\n"

12005

12036

"~~~~"

12006

12037

msgstr ""

12007

12038

12008

#: en/help_topics/hooks.txt:243

12039

#: en/help_topics/hooks.txt:246

12009

12040

msgid "Invoked when a config store is saved. The signature is (store)."

12010

12041

msgstr ""

12011

12042

12012

#: en/help_topics/hooks.txt:245

12043

#: en/help_topics/hooks.txt:248

12013

12044

msgid ""

12014

12045

"set\n"

12015

12046

"~~~"

12016

12047

msgstr ""

12017

12048

12018

#: en/help_topics/hooks.txt:250

12049

#: en/help_topics/hooks.txt:253

12019

12050

msgid ""

12020

12051

"Invoked when a config option is set. The signature is (stack, name,\n"

12021

12052

"value)."

12022

12053

msgstr ""

12023

12054

12024

#: en/help_topics/hooks.txt:253

12055

#: en/help_topics/hooks.txt:256

12025

12056

msgid ""

12026

12057

"ControlDirHooks\n"

12027

12058

"---------------"

12028

12059

msgstr ""

12029

12060

12030

#: en/help_topics/hooks.txt:256

12061

#: en/help_topics/hooks.txt:259

12031

12062

msgid ""

12032

12063

"post_repo_init\n"

12033

12064

"~~~~~~~~~~~~~~"

12034

12065

msgstr ""

12035

12066

12036

#: en/help_topics/hooks.txt:261

12067

#: en/help_topics/hooks.txt:264

12037

12068

msgid ""

12038

12069

"Invoked after a repository has been initialized. post_repo_init is\n"

12039

12070

"called with a bzrlib.controldir.RepoInitHookParams."

12040

12071

msgstr ""

12041

12072

12042

#: en/help_topics/hooks.txt:264

12073

#: en/help_topics/hooks.txt:267

12043

12074

msgid ""

12044

12075

"pre_open\n"

12045

12076

"~~~~~~~~"

12046

12077

msgstr ""

12047

12078

12048

#: en/help_topics/hooks.txt:267

12079

#: en/help_topics/hooks.txt:270

12049

12080

msgid "Introduced in: 1.14"

12050

12081

msgstr ""

12051

12082

12052

#: en/help_topics/hooks.txt:269

12083

#: en/help_topics/hooks.txt:272

12053

12084

msgid ""

12054

12085

"Invoked before attempting to open a ControlDir with the transport that\n"

12055

12086

"the open will use."

12056

12087

msgstr ""

12057

12088

12058

#: en/help_topics/hooks.txt:272

12089

#: en/help_topics/hooks.txt:275

12059

12090

msgid ""

12060

12091

"InfoHooks\n"

12061

12092

"---------"

12062

12093

msgstr ""

12063

12094

12064

#: en/help_topics/hooks.txt:275

12095

#: en/help_topics/hooks.txt:278

12065

12096

msgid ""

12066

12097

"repository\n"

12067

12098

"~~~~~~~~~~"

12068

12099

msgstr ""

12069

12100

12070

#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297

12071

#: en/help_topics/hooks.txt:521

12101

#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300

12102

#: en/help_topics/hooks.txt:524

12072

12103

msgid "Introduced in: 1.15"

12073

12104

msgstr ""

12074

12105

12075

#: en/help_topics/hooks.txt:280

12106

#: en/help_topics/hooks.txt:283

12076

12107

msgid ""

12077

12108

"Invoked when displaying the statistics for a repository. repository is\n"

12078

12109

"called with a statistics dictionary as returned by the repository and\n"

12079

12110

"a file-like object to write to."

12080

12111

msgstr ""

12081

12112

12082

#: en/help_topics/hooks.txt:284

12113

#: en/help_topics/hooks.txt:287

12083

12114

msgid ""

12084

12115

"LockHooks\n"

12085

12116

"---------"

12086

12117

msgstr ""

12087

12118

12088

#: en/help_topics/hooks.txt:287

12119

#: en/help_topics/hooks.txt:290

12089

12120

msgid ""

12090

12121

"lock_acquired\n"

12091

12122

"~~~~~~~~~~~~~"

12092

12123

msgstr ""

12093

12124

12094

#: en/help_topics/hooks.txt:292

12125

#: en/help_topics/hooks.txt:295

12095

12126

msgid ""

12096

12127

"Called with a bzrlib.lock.LockResult when a physical lock is acquired."

12097

12128

msgstr ""

12098

12129

12099

#: en/help_topics/hooks.txt:294

12130

#: en/help_topics/hooks.txt:297

12100

12131

msgid ""

12101

12132

"lock_broken\n"

12102

12133

"~~~~~~~~~~~"

12103

12134

msgstr ""

12104

12135

12105

#: en/help_topics/hooks.txt:299

12136

#: en/help_topics/hooks.txt:302

12106

12137

msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."

12107

12138

msgstr ""

12108

12139

12109

#: en/help_topics/hooks.txt:301

12140

#: en/help_topics/hooks.txt:304

12110

12141

msgid ""

12111

12142

"lock_released\n"

12112

12143

"~~~~~~~~~~~~~"

12113

12144

msgstr ""

12114

12145

12115

#: en/help_topics/hooks.txt:306

12146

#: en/help_topics/hooks.txt:309

12116

12147

msgid ""

12117

12148

"Called with a bzrlib.lock.LockResult when a physical lock is released."

12118

12149

msgstr ""

12119

12150

12120

#: en/help_topics/hooks.txt:308

12151

#: en/help_topics/hooks.txt:311

12121

12152

msgid ""

12122

12153

"MergeHooks\n"

12123

12154

"----------"

12124

12155

msgstr ""

12125

12156

12126

#: en/help_topics/hooks.txt:311

12157

#: en/help_topics/hooks.txt:314

12127

12158

msgid ""

12128

12159

"merge_file_content\n"

12129

12160

"~~~~~~~~~~~~~~~~~~"

12130

12161

msgstr ""

12131

12162

12132

#: en/help_topics/hooks.txt:314

12163

#: en/help_topics/hooks.txt:317

12133

12164

msgid "Introduced in: 2.1"

12134

12165

msgstr ""

12135

12166

12136

#: en/help_topics/hooks.txt:316

12167

#: en/help_topics/hooks.txt:319

12137

12168

msgid ""

12138

12169

"Called with a bzrlib.merge.Merger object to create a per file merge\n"

12139

12170

"object when starting a merge. Should return either None or a subclass\n"

12143

12174

"AbstractPerFileMerger API docs for details on how it is used by merge."

12144

12175

msgstr ""

12145

12176

12146

#: en/help_topics/hooks.txt:323

12177

#: en/help_topics/hooks.txt:326

12147

12178

msgid ""

12148

12179

"post_merge\n"

12149

12180

"~~~~~~~~~~"

12150

12181

msgstr ""

12151

12182

12152

#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334

12153

#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402

12154

#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509

12183

#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337

12184

#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405

12185

#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512

12155

12186

msgid "Introduced in: 2.5"

12156

12187

msgstr ""

12157

12188

12158

#: en/help_topics/hooks.txt:328

12189

#: en/help_topics/hooks.txt:331

12159

12190

msgid ""

12160

12191

"Called after a merge. Receives a Merger object as the single argument.\n"

12161

12192

"The return value is ignored."

12162

12193

msgstr ""

12163

12194

12164

#: en/help_topics/hooks.txt:331

12195

#: en/help_topics/hooks.txt:334

12165

12196

msgid ""

12166

12197

"pre_merge\n"

12167

12198

"~~~~~~~~~"

12168

12199

msgstr ""

12169

12200

12170

#: en/help_topics/hooks.txt:336

12201

#: en/help_topics/hooks.txt:339

12171

12202

msgid ""

12172

12203

"Called before a merge. Receives a Merger object as the single\n"

12173

12204

"argument."

12174

12205

msgstr ""

12175

12206

12176

#: en/help_topics/hooks.txt:339

12207

#: en/help_topics/hooks.txt:342

12177

12208

msgid ""

12178

12209

"MergeDirectiveHooks\n"

12179

12210

"-------------------"

12180

12211

msgstr ""

12181

12212

12182

#: en/help_topics/hooks.txt:342

12213

#: en/help_topics/hooks.txt:345

12183

12214

msgid ""

12184

12215

"merge_request_body\n"

12185

12216

"~~~~~~~~~~~~~~~~~~"

12186

12217

msgstr ""

12187

12218

12188

#: en/help_topics/hooks.txt:345

12219

#: en/help_topics/hooks.txt:348

12189

12220

msgid "Introduced in: 1.15.0"

12190

12221

msgstr ""

12191

12222

12192

#: en/help_topics/hooks.txt:347

12223

#: en/help_topics/hooks.txt:350

12193

12224

msgid ""

12194

12225

"Called with a MergeRequestBodyParams when a body is needed for a merge\n"

12195

12226

"request. Callbacks must return a body. If more than one callback is\n"

12196

12227

"registered, the output of one callback is provided to the next."

12197

12228

msgstr ""

12198

12229

12199

#: en/help_topics/hooks.txt:351

12230

#: en/help_topics/hooks.txt:354

12200

12231

msgid ""

12201

12232

"MessageEditorHooks\n"

12202

12233

"------------------"

12203

12234

msgstr ""

12204

12235

12205

#: en/help_topics/hooks.txt:354

12236

#: en/help_topics/hooks.txt:357

12206

12237

msgid ""

12207

12238

"commit_message_template\n"

12208

12239

"~~~~~~~~~~~~~~~~~~~~~~~"

12209

12240

msgstr ""

12210

12241

12211

#: en/help_topics/hooks.txt:357

12242

#: en/help_topics/hooks.txt:360

12212

12243

msgid "Introduced in: 1.10"

12213

12244

msgstr ""

12214

12245

12215

#: en/help_topics/hooks.txt:359

12246

#: en/help_topics/hooks.txt:362

12216

12247

msgid ""

12217

12248

"Called when a commit message is being generated.\n"

12218

12249

"commit_message_template is called with the bzrlib.commit.Commit object\n"

12223

12254

"second, and so on."

12224

12255

msgstr ""

12225

12256

12226

#: en/help_topics/hooks.txt:367

12257

#: en/help_topics/hooks.txt:370

12227

12258

msgid ""

12228

12259

"set_commit_message\n"

12229

12260

"~~~~~~~~~~~~~~~~~~"

12230

12261

msgstr ""

12231

12262

12232

#: en/help_topics/hooks.txt:372

12263

#: en/help_topics/hooks.txt:375

12233

12264

msgid ""

12234

12265

"Set a fixed commit message. set_commit_message is called with the\n"

12235

12266

"bzrlib.commit.Commit object (so you can also change e.g. revision\n"

12238

12269

"should use the message editor as normal."

12239

12270

msgstr ""

12240

12271

12241

#: en/help_topics/hooks.txt:378

12272

#: en/help_topics/hooks.txt:381

12242

12273

msgid ""

12243

12274

"MutableTreeHooks\n"

12244

12275

"----------------"

12245

12276

msgstr ""

12246

12277

12247

#: en/help_topics/hooks.txt:381

12278

#: en/help_topics/hooks.txt:384

12248

12279

msgid ""

12249

12280

"post_build_tree\n"

12250

12281

"~~~~~~~~~~~~~~~"

12251

12282

msgstr ""

12252

12283

12253

#: en/help_topics/hooks.txt:386

12284

#: en/help_topics/hooks.txt:389

12254

12285

msgid ""

12255

12286

"Called after a completely new tree is built. The hook is called with\n"

12256

12287

"the tree as its only argument."

12257

12288

msgstr ""

12258

12289

12259

#: en/help_topics/hooks.txt:392

12290

#: en/help_topics/hooks.txt:395

12260

12291

msgid "Introduced in: 2.0"

12261

12292

msgstr ""

12262

12293

12263

#: en/help_topics/hooks.txt:394

12294

#: en/help_topics/hooks.txt:397

12264

12295

msgid ""

12265

12296

"Called after a commit is performed on a tree. The hook is called with\n"

12266

12297

"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"

12268

12299

"that object."

12269

12300

msgstr ""

12270

12301

12271

#: en/help_topics/hooks.txt:399

12302

#: en/help_topics/hooks.txt:402

12272

12303

msgid ""

12273

12304

"post_transform\n"

12274

12305

"~~~~~~~~~~~~~~"

12275

12306

msgstr ""

12276

12307

12277

#: en/help_topics/hooks.txt:404

12308

#: en/help_topics/hooks.txt:407

12278

12309

msgid ""

12279

12310

"Called after a tree transform has been performed on a tree. The hook\n"

12280

12311

"is called with the tree that is being transformed and the transform."

12281

12312

msgstr ""

12282

12313

12283

#: en/help_topics/hooks.txt:407

12314

#: en/help_topics/hooks.txt:410

12284

12315

msgid ""

12285

12316

"pre_transform\n"

12286

12317

"~~~~~~~~~~~~~"

12287

12318

msgstr ""

12288

12319

12289

#: en/help_topics/hooks.txt:412

12320

#: en/help_topics/hooks.txt:415

12290

12321

msgid ""

12291

12322

"Called before a tree transform on this tree. The hook is called with\n"

12292

12323

"the tree that is being transformed and the transform."

12293

12324

msgstr ""

12294

12325

12295

#: en/help_topics/hooks.txt:415

12326

#: en/help_topics/hooks.txt:418

12296

12327

msgid ""

12297

12328

"start_commit\n"

12298

12329

"~~~~~~~~~~~~"

12299

12330

msgstr ""

12300

12331

12301

#: en/help_topics/hooks.txt:420

12332

#: en/help_topics/hooks.txt:423

12302

12333

msgid ""

12303

12334

"Called before a commit is performed on a tree. The start commit hook\n"

12304

12335

"is able to change the tree before the commit takes place. start_commit\n"

12306

12337

"being performed on."

12307

12338

msgstr ""

12308

12339

12309

#: en/help_topics/hooks.txt:425

12340

#: en/help_topics/hooks.txt:428

12310

12341

msgid ""

12311

12342

"SmartClientHooks\n"

12312

12343

"----------------"

12313

12344

msgstr ""

12314

12345

12315

#: en/help_topics/hooks.txt:428

12346

#: en/help_topics/hooks.txt:431

12316

12347

msgid ""

12317

12348

"call\n"

12318

12349

"~~~~"

12319

12350

msgstr ""

12320

12351

12321

#: en/help_topics/hooks.txt:431

12352

#: en/help_topics/hooks.txt:434

12322

12353

msgid "Introduced in: unknown"

12323

12354

msgstr ""

12324

12355

12325

#: en/help_topics/hooks.txt:433

12356

#: en/help_topics/hooks.txt:436

12326

12357

msgid ""

12327

12358

"Called when the smart client is submitting a request to the smart\n"

12328

12359

"server. Called with a bzrlib.smart.client.CallHookParams object.\n"

12329

12360

"Streaming request bodies, and responses, are not accessible."

12330

12361

msgstr ""

12331

12362

12332

#: en/help_topics/hooks.txt:437

12363

#: en/help_topics/hooks.txt:440

12333

12364

msgid ""

12334

12365

"SmartServerHooks\n"

12335

12366

"----------------"

12336

12367

msgstr ""

12337

12368

12338

#: en/help_topics/hooks.txt:440

12369

#: en/help_topics/hooks.txt:443

12339

12370

msgid ""

12340

12371

"server_exception\n"

12341

12372

"~~~~~~~~~~~~~~~~"

12342

12373

msgstr ""

12343

12374

12344

#: en/help_topics/hooks.txt:445

12375

#: en/help_topics/hooks.txt:448

12345

12376

msgid ""

12346

12377

"Called by the bzr server when an exception occurs. server_exception is\n"

12347

12378

"called with the sys.exc_info() tuple return true for the hook if the\n"

12349

12380

"normally."

12350

12381

msgstr ""

12351

12382

12352

#: en/help_topics/hooks.txt:450

12383

#: en/help_topics/hooks.txt:453

12353

12384

msgid ""

12354

12385

"server_started\n"

12355

12386

"~~~~~~~~~~~~~~"

12356

12387

msgstr ""

12357

12388

12358

#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472

12389

#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475

12359

12390

msgid "Introduced in: 0.16"

12360

12391

msgstr ""

12361

12392

12362

#: en/help_topics/hooks.txt:455

12393

#: en/help_topics/hooks.txt:458

12363

12394

msgid ""

12364

12395

"Called by the bzr server when it starts serving a directory.\n"

12365

12396

"server_started is called with (backing urls, public url), where\n"

12368

12399

"served."

12369

12400

msgstr ""

12370

12401

12371

#: en/help_topics/hooks.txt:461

12402

#: en/help_topics/hooks.txt:464

12372

12403

msgid ""

12373

12404

"server_started_ex\n"

12374

12405

"~~~~~~~~~~~~~~~~~"

12375

12406

msgstr ""

12376

12407

12377

#: en/help_topics/hooks.txt:466

12408

#: en/help_topics/hooks.txt:469

12378

12409

msgid ""

12379

12410

"Called by the bzr server when it starts serving a directory.\n"

12380

12411

"server_started is called with (backing_urls, server_obj)."

12381

12412

msgstr ""

12382

12413

12383

#: en/help_topics/hooks.txt:469

12414

#: en/help_topics/hooks.txt:472

12384

12415

msgid ""

12385

12416

"server_stopped\n"

12386

12417

"~~~~~~~~~~~~~~"

12387

12418

msgstr ""

12388

12419

12389

#: en/help_topics/hooks.txt:474

12420

#: en/help_topics/hooks.txt:477

12390

12421

msgid ""

12391

12422

"Called by the bzr server when it stops serving a directory.\n"

12392

12423

"server_stopped is called with the same parameters as the\n"

12393

12424

"server_started hook: (backing_urls, public_url)."

12394

12425

msgstr ""

12395

12426

12396

#: en/help_topics/hooks.txt:478

12427

#: en/help_topics/hooks.txt:481

12397

12428

msgid ""

12398

12429

"StatusHooks\n"

12399

12430

"-----------"

12400

12431

msgstr ""

12401

12432

12402

#: en/help_topics/hooks.txt:481

12433

#: en/help_topics/hooks.txt:484

12403

12434

msgid ""

12404

12435

"post_status\n"

12405

12436

"~~~~~~~~~~~"

12406

12437

msgstr ""

12407

12438

12408

#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495

12439

#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498

12409

12440

msgid "Introduced in: 2.3"

12410

12441

msgstr ""

12411

12442

12412

#: en/help_topics/hooks.txt:486

12443

#: en/help_topics/hooks.txt:489

12413

12444

msgid ""

12414

12445

"Called with argument StatusHookParams after Bazaar has displayed the\n"

12415

12446

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12418

12449

"status command. to_file is the output stream for writing."

12419

12450

msgstr ""

12420

12451

12421

#: en/help_topics/hooks.txt:492

12452

#: en/help_topics/hooks.txt:495

12422

12453

msgid ""

12423

12454

"pre_status\n"

12424

12455

"~~~~~~~~~~"

12425

12456

msgstr ""

12426

12457

12427

#: en/help_topics/hooks.txt:497

12458

#: en/help_topics/hooks.txt:500

12428

12459

msgid ""

12429

12460

"Called with argument StatusHookParams before Bazaar displays the\n"

12430

12461

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12433

12464

"status command. to_file is the output stream for writing."

12434

12465

msgstr ""

12435

12466

12436

#: en/help_topics/hooks.txt:503

12467

#: en/help_topics/hooks.txt:506

12437

12468

msgid ""

12438

12469

"TransportHooks\n"

12439

12470

"--------------"

12440

12471

msgstr ""

12441

12472

12442

#: en/help_topics/hooks.txt:506

12473

#: en/help_topics/hooks.txt:509

12443

12474

msgid ""

12444

12475

"post_connect\n"

12445

12476

"~~~~~~~~~~~~"

12446

12477

msgstr ""

12447

12478

12448

#: en/help_topics/hooks.txt:511

12479

#: en/help_topics/hooks.txt:514

12449

12480

msgid ""

12450

12481

"Called after a new connection is established or a reconnect occurs.\n"

12451

12482

"The sole argument passed is either the connected transport or smart\n"

12452

12483

"medium instance."

12453

12484

msgstr ""

12454

12485

12455

#: en/help_topics/hooks.txt:515

12486

#: en/help_topics/hooks.txt:518

12456

12487

msgid ""

12457

12488

"RioVersionInfoBuilderHooks\n"

12458

12489

"--------------------------"

12459

12490

msgstr ""

12460

12491

12461

#: en/help_topics/hooks.txt:518

12492

#: en/help_topics/hooks.txt:521

12462

12493

msgid ""

12463

12494

"revision\n"

12464

12495

"~~~~~~~~"

12465

12496

msgstr ""

12466

12497

12467

#: en/help_topics/hooks.txt:523

12498

#: en/help_topics/hooks.txt:526

12468

12499

msgid ""

12469

12500

"Invoked when adding information about a revision to the RIO stanza\n"

12470

12501

"that is printed. revision is called with a revision object and a RIO\n"