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

7

msgstr ""

8

"Project-Id-Version: bzr\n"

9

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

10

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

10

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

11

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

12

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

13

"Language-Team: Bosnian <bs@li.org>\n"

16

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

17

"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18

"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19

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

20

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

19

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

20

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

21

22

#: bzrlib/add.py:95

23

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

27

msgid "Unstacking"

28

msgstr ""

29

30

#: bzrlib/branch.py:3183

30

#: bzrlib/branch.py:3205

31

#, python-format

32

msgid "Pushed up to revision %d."

33

msgstr ""

34

35

#: bzrlib/branch.py:3185

35

#: bzrlib/branch.py:3207

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

42

#: bzrlib/branch.py:3210

43

msgid "No new revisions or tags to push."

44

msgstr ""

45

46

#: bzrlib/branch.py:3190

46

#: bzrlib/branch.py:3212

47

msgid "No new revisions to push."

48

msgstr ""

49

50

#: bzrlib/branch.py:3210

50

#: bzrlib/branch.py:3232

51

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

52

msgstr ""

53

54

#: bzrlib/branch.py:3213

54

#: bzrlib/branch.py:3235

55

#, python-format

56

msgid "found error:%s"

57

msgstr ""

58

59

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

59

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

60

#, python-format

61

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

62

msgstr ""

63

64

#: bzrlib/builtins.py:130

64

#: bzrlib/builtins.py:218

65

#, python-format

66

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

67

msgstr ""

68

69

#: bzrlib/builtins.py:215

69

#: bzrlib/builtins.py:303

70

msgid "Display status summary."

71

msgstr ""

72

73

#: bzrlib/builtins.py:217

73

#: bzrlib/builtins.py:305

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

79

#: bzrlib/builtins.py:308

80

msgid ""

81

"added\n"

82

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

83

msgstr ""

84

85

#: bzrlib/builtins.py:223

85

#: bzrlib/builtins.py:311

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

92

#: bzrlib/builtins.py:315

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

100

#: bzrlib/builtins.py:320

101

msgid ""

102

"modified\n"

103

" Text has changed since the previous revision."

104

msgstr ""

105

106

#: bzrlib/builtins.py:235

106

#: bzrlib/builtins.py:323

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

112

#: bzrlib/builtins.py:326

113

msgid ""

114

"unknown\n"

115

" Not versioned and not matching an ignore pattern."

116

msgstr ""

117

118

#: bzrlib/builtins.py:241

118

#: bzrlib/builtins.py:329

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

126

#: bzrlib/builtins.py:334

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

132

#: bzrlib/builtins.py:337

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

139

#: bzrlib/builtins.py:341

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

147

#: bzrlib/builtins.py:346

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

155

#: bzrlib/builtins.py:351

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

161

#: bzrlib/builtins.py:354

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

168

#: bzrlib/builtins.py:363

169

msgid "Use short status indicators."

170

msgstr ""

171

172

#: bzrlib/builtins.py:277

172

#: bzrlib/builtins.py:365

173

msgid "Only show versioned files."

174

msgstr ""

175

176

#: bzrlib/builtins.py:279

176

#: bzrlib/builtins.py:367

177

msgid "Don't show pending merges."

178

msgstr ""

179

180

#: bzrlib/builtins.py:282

180

#: bzrlib/builtins.py:370

181

msgid "Do not mark object type using indicator."

182

msgstr ""

183

184

#: bzrlib/builtins.py:297

184

#: bzrlib/builtins.py:385

185

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

186

msgstr ""

187

188

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

188

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

189

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

190

msgstr ""

191

192

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

192

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

193

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

194

msgstr ""

195

196

#: bzrlib/builtins.py:351

196

#: bzrlib/builtins.py:439

197

#, python-format

198

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

199

msgstr ""

200

201

#: bzrlib/builtins.py:362

201

#: bzrlib/builtins.py:450

202

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

203

msgstr ""

204

205

#: bzrlib/builtins.py:369

205

#: bzrlib/builtins.py:457

206

msgid "You cannot specify a NULL revision."

207

msgstr ""

208

209

#: bzrlib/builtins.py:461

209

#: bzrlib/builtins.py:549

210

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

211

msgstr ""

212

213

#: bzrlib/builtins.py:463

213

#: bzrlib/builtins.py:551

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

219

#: bzrlib/builtins.py:554

220

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

221

msgstr ""

222

223

#: bzrlib/builtins.py:472

223

#: bzrlib/builtins.py:560

224

msgid ""

225

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

226

msgstr ""

227

228

#: bzrlib/builtins.py:486

228

#: bzrlib/builtins.py:574

229

msgid "No working tree to remove"

230

msgstr ""

231

232

#: bzrlib/builtins.py:488

232

#: bzrlib/builtins.py:576

233

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

234

msgstr ""

235

236

#: bzrlib/builtins.py:497

236

#: bzrlib/builtins.py:585

237

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

238

msgstr ""

239

240

#: bzrlib/builtins.py:537

240

#: bzrlib/builtins.py:625

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

246

#: bzrlib/builtins.py:636

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

252

#: bzrlib/builtins.py:640

253

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

254

msgstr ""

255

256

#: bzrlib/builtins.py:556

256

#: bzrlib/builtins.py:644

257

msgid "Show current revision number."

258

msgstr ""

259

260

#: bzrlib/builtins.py:558

260

#: bzrlib/builtins.py:646

261

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

262

msgstr ""

263

264

#: bzrlib/builtins.py:571

264

#: bzrlib/builtins.py:659

265

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

266

msgstr ""

267

268

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

268

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

269

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

270

msgstr ""

271

272

#: bzrlib/builtins.py:612

272

#: bzrlib/builtins.py:700

273

msgid "Show revno of working tree."

274

msgstr ""

275

276

#: bzrlib/builtins.py:660

276

#: bzrlib/builtins.py:748

277

msgid "Add specified files or directories."

278

msgstr ""

279

280

#: bzrlib/builtins.py:662

280

#: bzrlib/builtins.py:750

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

287

#: bzrlib/builtins.py:754

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

298

#: bzrlib/builtins.py:762

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

304

#: bzrlib/builtins.py:765

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

310

#: bzrlib/builtins.py:768

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

318

#: bzrlib/builtins.py:773

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

324

#: bzrlib/builtins.py:776

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

335

#: bzrlib/builtins.py:784

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

341

#: bzrlib/builtins.py:787

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

348

#: bzrlib/builtins.py:794

349

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

350

msgstr ""

351

352

#: bzrlib/builtins.py:712

352

#: bzrlib/builtins.py:800

353

msgid "Lookup file ids from this tree."

354

msgstr ""

355

356

#: bzrlib/builtins.py:748

356

#: bzrlib/builtins.py:836

357

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

358

msgstr ""

359

360

#: bzrlib/builtins.py:753

360

#: bzrlib/builtins.py:841

361

msgid "Create a new versioned directory."

362

msgstr ""

363

364

#: bzrlib/builtins.py:755

364

#: bzrlib/builtins.py:843

365

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

366

msgstr ""

367

368

#: bzrlib/builtins.py:762

368

#: bzrlib/builtins.py:850

369

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

370

msgstr ""

371

372

#: bzrlib/builtins.py:796

372

#: bzrlib/builtins.py:884

373

#, python-format

374

msgid "added %s\n"

375

msgstr ""

376

377

#: bzrlib/builtins.py:838

377

#: bzrlib/builtins.py:926

378

#, python-format

379

msgid "invalid kind %r specified"

380

msgstr ""

381

382

#: bzrlib/builtins.py:875

382

#: bzrlib/builtins.py:963

383

msgid "Move or rename a file."

384

msgstr ""

385

386

#: bzrlib/builtins.py:877

386

#: bzrlib/builtins.py:965

387

msgid " bzr mv SOURCE... DESTINATION"

388

msgstr ""

389

390

#: bzrlib/builtins.py:879

390

#: bzrlib/builtins.py:967

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

397

#: bzrlib/builtins.py:971

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

406

#: bzrlib/builtins.py:977

407

msgid "Files cannot be moved between branches."

408

msgstr ""

409

410

#: bzrlib/builtins.py:896

410

#: bzrlib/builtins.py:984

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

416

#: bzrlib/builtins.py:986

417

msgid "Automatically guess renames."

418

msgstr ""

419

420

#: bzrlib/builtins.py:899

420

#: bzrlib/builtins.py:987

421

msgid "Avoid making changes when guessing renames."

422

msgstr ""

423

424

#: bzrlib/builtins.py:908

424

#: bzrlib/builtins.py:996

425

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

426

msgstr ""

427

428

#: bzrlib/builtins.py:912

428

#: bzrlib/builtins.py:1000

429

msgid "missing file argument"

430

msgstr ""

431

432

#: bzrlib/builtins.py:916

432

#: bzrlib/builtins.py:1004

433

msgid "can not move root of branch"

434

msgstr ""

435

436

#: bzrlib/builtins.py:922

436

#: bzrlib/builtins.py:1010

437

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

438

msgstr ""

439

440

#: bzrlib/builtins.py:925

440

#: bzrlib/builtins.py:1013

441

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

442

msgstr ""

443

444

#: bzrlib/builtins.py:962

444

#: bzrlib/builtins.py:1050

445

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

446

msgstr ""

447

448

#: bzrlib/builtins.py:1014

448

#: bzrlib/builtins.py:1102

449

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

450

msgstr ""

451

452

#: bzrlib/builtins.py:1016

452

#: bzrlib/builtins.py:1104

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

460

#: bzrlib/builtins.py:1109

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

467

#: bzrlib/builtins.py:1113

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

474

#: bzrlib/builtins.py:1117

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

482

#: bzrlib/builtins.py:1122

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

489

#: bzrlib/builtins.py:1126

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

496

#: bzrlib/builtins.py:1134

497

msgid "Show logs of pulled revisions."

498

msgstr ""

499

500

#: bzrlib/builtins.py:1048

500

#: bzrlib/builtins.py:1136

501

msgid ""

502

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

503

msgstr ""

504

505

#: bzrlib/builtins.py:1051

505

#: bzrlib/builtins.py:1139

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

511

#: bzrlib/builtins.py:1168

512

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

513

msgstr ""

514

515

#: bzrlib/builtins.py:1096

515

#: bzrlib/builtins.py:1184

516

msgid "No pull location known or specified."

517

msgstr ""

518

519

#: bzrlib/builtins.py:1102

519

#: bzrlib/builtins.py:1190

520

#, python-format

521

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

522

msgstr ""

523

524

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

524

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

525

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

526

msgstr ""

527

528

#: bzrlib/builtins.py:1150

528

#: bzrlib/builtins.py:1238

529

msgid "Update a mirror of this branch."

530

msgstr ""

531

532

#: bzrlib/builtins.py:1152

532

#: bzrlib/builtins.py:1240

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

538

#: bzrlib/builtins.py:1243

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

544

#: bzrlib/builtins.py:1246

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

551

#: bzrlib/builtins.py:1250

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

557

#: bzrlib/builtins.py:1253

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

564

#: bzrlib/builtins.py:1257

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

572

#: bzrlib/builtins.py:1262

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

579

#: bzrlib/builtins.py:1273 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:1188

584

#: bzrlib/builtins.py:1276

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

590

#: bzrlib/builtins.py:1281

591

msgid ""

592

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

593

"branch."

594

msgstr ""

595

596

#: bzrlib/builtins.py:1196

596

#: bzrlib/builtins.py:1284

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

603

#: bzrlib/builtins.py:1289 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:1204

609

#: bzrlib/builtins.py:1292

610

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

611

msgstr ""

612

613

#: bzrlib/builtins.py:1248

613

#: bzrlib/builtins.py:1336

614

msgid "Could not determine branch to refer to."

615

msgstr ""

616

617

#: bzrlib/builtins.py:1257

617

#: bzrlib/builtins.py:1345

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:1263 bzrlib/foreign.py:306

624

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

625

msgid "No push location known or specified."

626

msgstr ""

627

628

#: bzrlib/builtins.py:1267

628

#: bzrlib/builtins.py:1355

629

#, python-format

630

msgid "Using saved push location: %s"

631

msgstr ""

632

633

#: bzrlib/builtins.py:1277

633

#: bzrlib/builtins.py:1365

634

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

635

msgstr ""

636

637

#: bzrlib/builtins.py:1279

637

#: bzrlib/builtins.py:1367

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

648

#: bzrlib/builtins.py:1374

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

654

#: bzrlib/builtins.py:1377

655

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

656

msgstr ""

657

658

#: bzrlib/builtins.py:1299

658

#: bzrlib/builtins.py:1387

659

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

660

msgstr ""

661

662

#: bzrlib/builtins.py:1301

662

#: bzrlib/builtins.py:1389

663

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

664

msgstr ""

665

666

#: bzrlib/builtins.py:1304

666

#: bzrlib/builtins.py:1392

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

672

#: bzrlib/builtins.py:1396

673

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

674

msgstr ""

675

676

#: bzrlib/builtins.py:1310

676

#: bzrlib/builtins.py:1398

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

682

#: bzrlib/builtins.py:1403

683

msgid "Bind new branch to from location."

684

msgstr ""

685

686

#: bzrlib/builtins.py:1362

686

#: bzrlib/builtins.py:1450

687

#, python-format

688

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

689

msgstr ""

690

691

#: bzrlib/builtins.py:1374

691

#: bzrlib/builtins.py:1462

692

#, python-format

693

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

694

msgstr ""

695

696

#: bzrlib/builtins.py:1393

696

#: bzrlib/builtins.py:1481

697

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

698

msgstr ""

699

700

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

700

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

701

#, python-format

702

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

703

msgstr ""

704

705

#: bzrlib/builtins.py:1407

705

#: bzrlib/builtins.py:1500

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

712

#: bzrlib/builtins.py:1505

713

#, python-format

714

msgid "New branch bound to %s"

715

msgstr ""

716

717

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

717

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

718

#, python-format

719

msgid "Switched to branch: %s"

720

msgstr ""

721

722

#: bzrlib/builtins.py:1422

722

#: bzrlib/builtins.py:1515

723

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

724

msgstr ""

725

726

#: bzrlib/builtins.py:1424

726

#: bzrlib/builtins.py:1517

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

732

#: bzrlib/builtins.py:1524

733

msgid ""

734

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

735

"location."

736

msgstr ""

737

738

#: bzrlib/builtins.py:1461

738

#: bzrlib/builtins.py:1554

739

msgid "(default)"

740

msgstr ""

741

742

#: bzrlib/builtins.py:1473

742

#: bzrlib/builtins.py:1566

743

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

744

msgstr ""

745

746

#: bzrlib/builtins.py:1475

746

#: bzrlib/builtins.py:1568

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

756

#: bzrlib/builtins.py:1573

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

768

#: bzrlib/builtins.py:1580

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

778

#: bzrlib/builtins.py:1590

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

786

#: bzrlib/builtins.py:1597

787

msgid "Get file contents from this tree."

788

msgstr ""

789

790

#: bzrlib/builtins.py:1506

790

#: bzrlib/builtins.py:1599

791

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

792

msgstr ""

793

794

#: bzrlib/builtins.py:1547

794

#: bzrlib/builtins.py:1640

795

msgid ""

796

"Show list of renamed files.\n"

797

" "

798

msgstr ""

799

800

#: bzrlib/builtins.py:1577

800

#: bzrlib/builtins.py:1670

801

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

802

msgstr ""

803

804

#: bzrlib/builtins.py:1579

804

#: bzrlib/builtins.py:1672

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

811

#: bzrlib/builtins.py:1676

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

817

#: bzrlib/builtins.py:1679

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

825

#: bzrlib/builtins.py:1684

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

831

#: bzrlib/builtins.py:1687

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

841

#: bzrlib/builtins.py:1694

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

848

#: bzrlib/builtins.py:1710

849

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

850

msgstr ""

851

852

#: bzrlib/builtins.py:1625

852

#: bzrlib/builtins.py:1718

853

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

854

msgstr ""

855

856

#: bzrlib/builtins.py:1656

856

#: bzrlib/builtins.py:1749

857

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

858

msgstr ""

859

860

#: bzrlib/builtins.py:1672

860

#: bzrlib/builtins.py:1765

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

867

#: bzrlib/builtins.py:1771

868

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

869

msgstr ""

870

871

#: bzrlib/builtins.py:1682

871

#: bzrlib/builtins.py:1775

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

877

#: bzrlib/builtins.py:1784

878

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

879

msgstr ""

880

881

#: bzrlib/builtins.py:1693

881

#: bzrlib/builtins.py:1786

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

887

#: bzrlib/builtins.py:1789

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

894

#: bzrlib/builtins.py:1793

895

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

896

msgstr ""

897

898

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

899

#: bzrlib/builtins.py:6389

898

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

899

#: bzrlib/builtins.py:6442

900

msgid ":Examples:"

901

msgstr ""

902

903

#: bzrlib/builtins.py:1704

903

#: bzrlib/builtins.py:1797

904

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

905

msgstr ""

906

907

#: bzrlib/builtins.py:1706

907

#: bzrlib/builtins.py:1799

908

msgid " bzr info"

909

msgstr ""

910

911

#: bzrlib/builtins.py:1708

911

#: bzrlib/builtins.py:1801

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

918

#: bzrlib/builtins.py:1805

919

msgid " bzr info -v"

920

msgstr ""

921

922

#: bzrlib/builtins.py:1714

922

#: bzrlib/builtins.py:1807

923

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

924

msgstr ""

925

926

#: bzrlib/builtins.py:1716

926

#: bzrlib/builtins.py:1809

927

msgid " bzr info -vv"

928

msgstr ""

929

930

#: bzrlib/builtins.py:1735

930

#: bzrlib/builtins.py:1828

931

msgid "Remove files or directories."

932

msgstr ""

933

934

#: bzrlib/builtins.py:1737

934

#: bzrlib/builtins.py:1830

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

943

#: bzrlib/builtins.py:1838

944

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

945

msgstr ""

946

947

#: bzrlib/builtins.py:1747

947

#: bzrlib/builtins.py:1840

948

msgid "The file deletion mode to be used."

949

msgstr ""

950

951

#: bzrlib/builtins.py:1748

951

#: bzrlib/builtins.py:1841

952

msgid "Deletion Strategy"

953

msgstr ""

954

955

#: bzrlib/builtins.py:1749

955

#: bzrlib/builtins.py:1842

956

msgid "Backup changed files (default)."

957

msgstr ""

958

959

#: bzrlib/builtins.py:1750

959

#: bzrlib/builtins.py:1843

960

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

961

msgstr ""

962

963

#: bzrlib/builtins.py:1751

963

#: bzrlib/builtins.py:1844

964

msgid "Don't backup changed files."

965

msgstr ""

966

967

#: bzrlib/builtins.py:1752

967

#: bzrlib/builtins.py:1845

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

973

#: bzrlib/builtins.py:1854

974

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

975

msgstr ""

976

977

#: bzrlib/builtins.py:1778

977

#: bzrlib/builtins.py:1871

978

msgid "No matching files."

979

msgstr ""

980

981

#: bzrlib/builtins.py:1839

981

#: bzrlib/builtins.py:1932

982

msgid "Reconcile bzr metadata in a branch."

983

msgstr ""

984

985

#: bzrlib/builtins.py:1841

985

#: bzrlib/builtins.py:1934

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

993

#: bzrlib/builtins.py:1939

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

1001

#: bzrlib/builtins.py:1944

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

1007

#: bzrlib/builtins.py:1947

1008

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

1009

msgstr ""

1010

1011

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

1011

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

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

1018

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

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

1024

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

1025

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

1026

msgstr ""

1027

1028

#: bzrlib/builtins.py:1922

1028

#: bzrlib/builtins.py:2015

1029

msgid "Make a directory into a versioned branch."

1030

msgstr ""

1031

1032

#: bzrlib/builtins.py:1924

1032

#: bzrlib/builtins.py:2017

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

1038

#: bzrlib/builtins.py:2020

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

1046

#: bzrlib/builtins.py:2025

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

1052

#: bzrlib/builtins.py:2028

1053

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

1054

msgstr ""

1055

1056

#: bzrlib/builtins.py:1937

1056

#: bzrlib/builtins.py:2030

1057

msgid ""

1058

" cd ~/project\n"

1059

" bzr init\n"

1062

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

1063

msgstr ""

1064

1065

#: bzrlib/builtins.py:1948

1065

#: bzrlib/builtins.py:2041

1066

msgid ""

1067

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

1068

msgstr ""

1069

1070

#: bzrlib/builtins.py:1951

1070

#: bzrlib/builtins.py:2044

1071

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

1072

msgstr ""

1073

1074

#: bzrlib/builtins.py:1959

1074

#: bzrlib/builtins.py:2052

1075

msgid ""

1076

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

1077

msgstr ""

1078

1079

#: bzrlib/builtins.py:1962

1079

#: bzrlib/builtins.py:2055

1080

msgid "Create a branch without a working tree."

1081

msgstr ""

1082

1083

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

1083

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

1090

#: bzrlib/builtins.py:2109

1091

msgid ""

1092

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

1093

msgstr ""

1094

1095

#: bzrlib/builtins.py:2027

1095

#: bzrlib/builtins.py:2120

1096

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

1097

msgstr ""

1098

1099

#: bzrlib/builtins.py:2036

1099

#: bzrlib/builtins.py:2129

1100

#, python-format

1101

msgid "Using shared repository: %s\n"

1102

msgstr ""

1103

1104

#: bzrlib/builtins.py:2040

1104

#: bzrlib/builtins.py:2133

1105

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

1106

msgstr ""

1107

1108

#: bzrlib/builtins.py:2042

1108

#: bzrlib/builtins.py:2135

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

1116

#: bzrlib/builtins.py:2140

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

1126

#: bzrlib/builtins.py:2147

1127

msgid ""

1128

":Examples:\n"

1129

" Create a shared repository holding just branches::"

1130

msgstr ""

1131

1132

#: bzrlib/builtins.py:2057

1132

#: bzrlib/builtins.py:2150

1133

msgid ""

1134

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

1135

" bzr init repo/trunk"

1136

msgstr ""

1137

1138

#: bzrlib/builtins.py:2060

1138

#: bzrlib/builtins.py:2153

1139

msgid " Make a lightweight checkout elsewhere::"

1140

msgstr ""

1141

1142

#: bzrlib/builtins.py:2062

1142

#: bzrlib/builtins.py:2155

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

1149

#: bzrlib/builtins.py:2163

1150

msgid ""

1151

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

1152

msgstr ""

1153

1154

#: bzrlib/builtins.py:2074

1154

#: bzrlib/builtins.py:2167

1155

msgid "Repository format"

1156

msgstr ""

1157

1158

#: bzrlib/builtins.py:2076

1158

#: bzrlib/builtins.py:2169

1159

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

1160

msgstr ""

1161

1162

#: bzrlib/builtins.py:2102

1162

#: bzrlib/builtins.py:2195

1163

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

1164

msgstr ""

1165

1166

#: bzrlib/builtins.py:2104

1166

#: bzrlib/builtins.py:2197

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

1176

#: bzrlib/builtins.py:2204

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

1182

#: bzrlib/builtins.py:2207

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

1192

#: bzrlib/builtins.py:2214

1193

msgid ""

1194

":Exit values:\n"

1195

" 1 - changed\n"

1198

" 0 - no change"

1199

msgstr ""

1200

1201

#: bzrlib/builtins.py:2127

1201

#: bzrlib/builtins.py:2220

1202

msgid ""

1203

":Examples:\n"

1204

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

1205

msgstr ""

1206

1207

#: bzrlib/builtins.py:2130

1207

#: bzrlib/builtins.py:2223

1208

msgid " bzr diff"

1209

msgstr ""

1210

1211

#: bzrlib/builtins.py:2132

1211

#: bzrlib/builtins.py:2225

1212

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

1213

msgstr ""

1214

1215

#: bzrlib/builtins.py:2134

1215

#: bzrlib/builtins.py:2227

1216

msgid " bzr diff -r1"

1217

msgstr ""

1218

1219

#: bzrlib/builtins.py:2136

1219

#: bzrlib/builtins.py:2229

1220

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

1221

msgstr ""

1222

1223

#: bzrlib/builtins.py:2138

1223

#: bzrlib/builtins.py:2231

1224

msgid " bzr diff -r1..3"

1225

msgstr ""

1226

1227

#: bzrlib/builtins.py:2140

1227

#: bzrlib/builtins.py:2233

1228

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

1229

msgstr ""

1230

1231

#: bzrlib/builtins.py:2142

1231

#: bzrlib/builtins.py:2235

1232

msgid " bzr diff -r1..3 xxx"

1233

msgstr ""

1234

1235

#: bzrlib/builtins.py:2144

1235

#: bzrlib/builtins.py:2237

1236

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

1237

msgstr ""

1238

1239

#: bzrlib/builtins.py:2146

1239

#: bzrlib/builtins.py:2239

1240

msgid " bzr diff -c2"

1241

msgstr ""

1242

1243

#: bzrlib/builtins.py:2148

1243

#: bzrlib/builtins.py:2241

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

1250

#: bzrlib/builtins.py:2245

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

1257

#: bzrlib/builtins.py:2249

1258

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

1259

msgstr ""

1260

1261

#: bzrlib/builtins.py:2158

1261

#: bzrlib/builtins.py:2251

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

1267

#: bzrlib/builtins.py:2254

1268

msgid " bzr diff -r-2.."

1269

msgstr ""

1270

1271

#: bzrlib/builtins.py:2163

1271

#: bzrlib/builtins.py:2256

1272

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

1273

msgstr ""

1274

1275

#: bzrlib/builtins.py:2165

1275

#: bzrlib/builtins.py:2258

1276

msgid " bzr diff NEWS"

1277

msgstr ""

1278

1279

#: bzrlib/builtins.py:2167

1279

#: bzrlib/builtins.py:2260

1280

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

1281

msgstr ""

1282

1283

#: bzrlib/builtins.py:2169

1283

#: bzrlib/builtins.py:2262

1284

msgid " bzr diff xxx/NEWS"

1285

msgstr ""

1286

1287

#: bzrlib/builtins.py:2171

1287

#: bzrlib/builtins.py:2264

1288

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

1289

msgstr ""

1290

1291

#: bzrlib/builtins.py:2173

1291

#: bzrlib/builtins.py:2266

1292

msgid " bzr diff --old xxx"

1293

msgstr ""

1294

1295

#: bzrlib/builtins.py:2175

1295

#: bzrlib/builtins.py:2268

1296

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

1297

msgstr ""

1298

1299

#: bzrlib/builtins.py:2177

1299

#: bzrlib/builtins.py:2270

1300

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

1301

msgstr ""

1302

1303

#: bzrlib/builtins.py:2179

1303

#: bzrlib/builtins.py:2272

1304

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

1305

msgstr ""

1306

1307

#: bzrlib/builtins.py:2181

1307

#: bzrlib/builtins.py:2274

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

1316

#: bzrlib/builtins.py:2284

1317

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

1318

msgstr ""

1319

1320

#: bzrlib/builtins.py:2194

1320

#: bzrlib/builtins.py:2287

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

1326

#: bzrlib/builtins.py:2290

1327

msgid "Branch/tree to compare from."

1328

msgstr ""

1329

1330

#: bzrlib/builtins.py:2201

1330

#: bzrlib/builtins.py:2294

1331

msgid "Branch/tree to compare to."

1332

msgstr ""

1333

1334

#: bzrlib/builtins.py:2207

1334

#: bzrlib/builtins.py:2300

1335

msgid "Use this command to compare files."

1336

msgstr ""

1337

1338

#: bzrlib/builtins.py:2212

1338

#: bzrlib/builtins.py:2305

1339

msgid "Diff format to use."

1340

msgstr ""

1341

1342

#: bzrlib/builtins.py:2214

1342

#: bzrlib/builtins.py:2307

1343

msgid "Diff format"

1344

msgstr ""

1345

1346

#: bzrlib/builtins.py:2236

1346

#: bzrlib/builtins.py:2329

1347

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

1348

msgstr ""

1349

1350

#: bzrlib/builtins.py:2240

1350

#: bzrlib/builtins.py:2333

1351

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

1352

msgstr ""

1353

1354

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

1355

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

1354

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

1355

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

1356

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

1357

msgstr ""

1358

1359

#: bzrlib/builtins.py:2265

1359

#: bzrlib/builtins.py:2358

1360

msgid ""

1361

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

1362

" "

1363

msgstr ""

1364

1365

#: bzrlib/builtins.py:2343

1365

#: bzrlib/builtins.py:2436

1366

msgid "Show the tree root directory."

1367

msgstr ""

1368

1369

#: bzrlib/builtins.py:2345

1369

#: bzrlib/builtins.py:2438

1370

msgid ""

1371

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

1372

"directory."

1373

msgstr ""

1374

1375

#: bzrlib/builtins.py:2360

1375

#: bzrlib/builtins.py:2453

1376

msgid "The limit argument must be an integer."

1377

msgstr ""

1378

1379

#: bzrlib/builtins.py:2368

1379

#: bzrlib/builtins.py:2461

1380

msgid "The levels argument must be an integer."

1381

msgstr ""

1382

1383

#: bzrlib/builtins.py:2373

1383

#: bzrlib/builtins.py:2466

1384

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

1385

msgstr ""

1386

1387

#: bzrlib/builtins.py:2375

1387

#: bzrlib/builtins.py:2468

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

1395

#: bzrlib/builtins.py:2473

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

1402

#: bzrlib/builtins.py:2477

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

1412

#: bzrlib/builtins.py:2484

1413

msgid ":Output control:"

1414

msgstr ""

1415

1416

#: bzrlib/builtins.py:2393

1416

#: bzrlib/builtins.py:2486

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

1424

#: bzrlib/builtins.py:2491

1425

msgid ""

1426

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

1427

" displayed::"

1428

msgstr ""

1429

1430

#: bzrlib/builtins.py:2401

1430

#: bzrlib/builtins.py:2494

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

1439

#: bzrlib/builtins.py:2500

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

1446

#: bzrlib/builtins.py:2504

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

1453

#: bzrlib/builtins.py:2508

1454

msgid ":Ordering control:"

1455

msgstr ""

1456

1457

#: bzrlib/builtins.py:2417

1457

#: bzrlib/builtins.py:2510

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

1465

#: bzrlib/builtins.py:2515

1466

msgid ":Revision filtering:"

1467

msgstr ""

1468

1469

#: bzrlib/builtins.py:2424

1469

#: bzrlib/builtins.py:2517

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

1475

#: bzrlib/builtins.py:2520

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

1483

#: bzrlib/builtins.py:2525

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

1489

#: bzrlib/builtins.py:2528

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

1499

#: bzrlib/builtins.py:2535

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

1509

#: bzrlib/builtins.py:2542

1510

msgid ":Path filtering:"

1511

msgstr ""

1512

1513

#: bzrlib/builtins.py:2451

1513

#: bzrlib/builtins.py:2544

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

1520

#: bzrlib/builtins.py:2548

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

1527

#: bzrlib/builtins.py:2552

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

1533

#: bzrlib/builtins.py:2555

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

1540

#: bzrlib/builtins.py:2559

1541

msgid " In this case:"

1542

msgstr ""

1543

1544

#: bzrlib/builtins.py:2468

1544

#: bzrlib/builtins.py:2561

1545

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

1546

msgstr ""

1547

1548

#: bzrlib/builtins.py:2470

1548

#: bzrlib/builtins.py:2563

1549

msgid ""

1550

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

1551

msgstr ""

1552

1553

#: bzrlib/builtins.py:2472

1553

#: bzrlib/builtins.py:2565

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

1559

#: bzrlib/builtins.py:2568

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

1565

#: bzrlib/builtins.py:2571

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

1572

#: bzrlib/builtins.py:2575

1573

msgid ":Other filtering:"

1574

msgstr ""

1575

1576

#: bzrlib/builtins.py:2484

1576

#: bzrlib/builtins.py:2577

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

1585

#: bzrlib/builtins.py:2583

1586

msgid ":Tips & tricks:"

1587

msgstr ""

1588

1589

#: bzrlib/builtins.py:2492

1589

#: bzrlib/builtins.py:2585

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

1598

#: bzrlib/builtins.py:2591

1599

msgid ""

1600

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

1601

msgstr ""

1602

1603

#: bzrlib/builtins.py:2500

1603

#: bzrlib/builtins.py:2593

1604

msgid ""

1605

" [ALIASES]\n"

1606

" tip = log -r-1\n"

1608

" show = log -v -p"

1609

msgstr ""

1610

1611

#: bzrlib/builtins.py:2505

1611

#: bzrlib/builtins.py:2598

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

1618

#: bzrlib/builtins.py:2602

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

1624

#: bzrlib/builtins.py:2605

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

1632

#: bzrlib/builtins.py:2610

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

1640

#: bzrlib/builtins.py:2615

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

1648

#: bzrlib/builtins.py:2624

1649

msgid "Show from oldest to newest."

1650

msgstr ""

1651

1652

#: bzrlib/builtins.py:2534

1652

#: bzrlib/builtins.py:2627

1653

msgid "Show files changed in each revision."

1654

msgstr ""

1655

1656

#: bzrlib/builtins.py:2540

1656

#: bzrlib/builtins.py:2633

1657

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

1658

msgstr ""

1659

1660

#: bzrlib/builtins.py:2544

1660

#: bzrlib/builtins.py:2637

1661

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

1662

msgstr ""

1663

1664

#: bzrlib/builtins.py:2545

1664

#: bzrlib/builtins.py:2638

1665

msgid "Authors"

1666

msgstr ""

1667

1668

#: bzrlib/builtins.py:2550

1668

#: bzrlib/builtins.py:2643

1669

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

1670

msgstr ""

1671

1672

#: bzrlib/builtins.py:2560

1672

#: bzrlib/builtins.py:2653

1673

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

1674

msgstr ""

1675

1676

#: bzrlib/builtins.py:2565

1676

#: bzrlib/builtins.py:2658

1677

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

1678

msgstr ""

1679

1680

#: bzrlib/builtins.py:2567

1680

#: bzrlib/builtins.py:2660

1681

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

1682

msgstr ""

1683

1684

#: bzrlib/builtins.py:2571

1684

#: bzrlib/builtins.py:2664

1685

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

1686

msgstr ""

1687

1688

#: bzrlib/builtins.py:2573

1688

#: bzrlib/builtins.py:2666

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

1694

#: bzrlib/builtins.py:2670

1695

msgid "Show digital signature validity."

1696

msgstr ""

1697

1698

#: bzrlib/builtins.py:2580

1698

#: bzrlib/builtins.py:2673

1699

msgid "Show revisions whose properties match this expression."

1700

msgstr ""

1701

1702

#: bzrlib/builtins.py:2584

1702

#: bzrlib/builtins.py:2677

1703

msgid "Show revisions whose message matches this expression."

1704

msgstr ""

1705

1706

#: bzrlib/builtins.py:2588

1706

#: bzrlib/builtins.py:2681

1707

msgid "Show revisions whose committer matches this expression."

1708

msgstr ""

1709

1710

#: bzrlib/builtins.py:2592

1710

#: bzrlib/builtins.py:2685

1711

msgid "Show revisions whose authors match this expression."

1712

msgstr ""

1713

1714

#: bzrlib/builtins.py:2596

1714

#: bzrlib/builtins.py:2689

1715

msgid "Show revisions whose bugs match this expression."

1716

msgstr ""

1717

1718

#: bzrlib/builtins.py:2650

1718

#: bzrlib/builtins.py:2743

1719

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

1720

msgstr ""

1721

1722

#: bzrlib/builtins.py:2678

1722

#: bzrlib/builtins.py:2771

1723

#, python-format

1724

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

1725

msgstr ""

1726

1727

#: bzrlib/builtins.py:2795

1727

#: bzrlib/builtins.py:2888

1728

#, python-format

1729

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

1730

msgstr ""

1731

1732

#: bzrlib/builtins.py:2811

1732

#: bzrlib/builtins.py:2904

1733

#, python-format

1734

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

1735

msgstr ""

1736

1737

#: bzrlib/builtins.py:2856

1737

#: bzrlib/builtins.py:2949

1738

msgid ""

1739

"List files in a tree.\n"

1740

" "

1741

msgstr ""

1742

1743

#: bzrlib/builtins.py:2865

1743

#: bzrlib/builtins.py:2958

1744

msgid "Recurse into subdirectories."

1745

msgstr ""

1746

1747

#: bzrlib/builtins.py:2867

1747

#: bzrlib/builtins.py:2960

1748

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

1749

msgstr ""

1750

1751

#: bzrlib/builtins.py:2869

1751

#: bzrlib/builtins.py:2962

1752

msgid "Print unknown files."

1753

msgstr ""

1754

1755

#: bzrlib/builtins.py:2870

1755

#: bzrlib/builtins.py:2963

1756

msgid "Print versioned files."

1757

msgstr ""

1758

1759

#: bzrlib/builtins.py:2873

1759

#: bzrlib/builtins.py:2966

1760

msgid "Print ignored files."

1761

msgstr ""

1762

1763

#: bzrlib/builtins.py:2875

1763

#: bzrlib/builtins.py:2968

1764

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

1765

msgstr ""

1766

1767

#: bzrlib/builtins.py:2888

1767

#: bzrlib/builtins.py:2981

1768

msgid "invalid kind specified"

1769

msgstr ""

1770

1771

#: bzrlib/builtins.py:2891

1771

#: bzrlib/builtins.py:2984

1772

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

1773

msgstr ""

1774

1775

#: bzrlib/builtins.py:2900

1775

#: bzrlib/builtins.py:2993

1776

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

1777

msgstr ""

1778

1779

#: bzrlib/builtins.py:2987

1779

#: bzrlib/builtins.py:3080

1780

msgid "Ignore specified files or patterns."

1781

msgstr ""

1782

1783

#: bzrlib/builtins.py:2989

1783

#: bzrlib/builtins.py:3082

1784

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

1785

msgstr ""

1786

1787

#: bzrlib/builtins.py:2991

1787

#: bzrlib/builtins.py:3084

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

1796

#: bzrlib/builtins.py:3090

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

1804

#: bzrlib/builtins.py:3095

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

1813

#: bzrlib/builtins.py:3101

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

1820

#: bzrlib/builtins.py:3105

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

1826

#: bzrlib/builtins.py:3108

1827

msgid ""

1828

":Notes: \n"

1829

" \n"

1831

" the shell on Unix."

1832

msgstr ""

1833

1834

#: bzrlib/builtins.py:3020

1834

#: bzrlib/builtins.py:3113

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

1840

#: bzrlib/builtins.py:3116

1841

msgid ""

1842

":Examples:\n"

1843

" Ignore the top level Makefile::"

1844

msgstr ""

1845

1846

#: bzrlib/builtins.py:3026

1846

#: bzrlib/builtins.py:3119

1847

msgid " bzr ignore ./Makefile"

1848

msgstr ""

1849

1850

#: bzrlib/builtins.py:3028

1850

#: bzrlib/builtins.py:3121

1851

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

1852

msgstr ""

1853

1854

#: bzrlib/builtins.py:3030

1854

#: bzrlib/builtins.py:3123

1855

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

1856

msgstr ""

1857

1858

#: bzrlib/builtins.py:3032

1858

#: bzrlib/builtins.py:3125

1859

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

1860

msgstr ""

1861

1862

#: bzrlib/builtins.py:3034

1862

#: bzrlib/builtins.py:3127

1863

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

1864

msgstr ""

1865

1866

#: bzrlib/builtins.py:3036

1866

#: bzrlib/builtins.py:3129

1867

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

1868

msgstr ""

1869

1870

#: bzrlib/builtins.py:3038

1870

#: bzrlib/builtins.py:3131

1871

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

1872

msgstr ""

1873

1874

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

1874

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

1875

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

1876

msgstr ""

1877

1878

#: bzrlib/builtins.py:3042

1878

#: bzrlib/builtins.py:3135

1879

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

1880

msgstr ""

1881

1882

#: bzrlib/builtins.py:3046

1882

#: bzrlib/builtins.py:3139

1883

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

1884

msgstr ""

1885

1886

#: bzrlib/builtins.py:3048

1886

#: bzrlib/builtins.py:3141

1887

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

1888

msgstr ""

1889

1890

#: bzrlib/builtins.py:3050

1890

#: bzrlib/builtins.py:3143

1891

msgid ""

1892

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

1893

" \n"

1899

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

1900

msgstr ""

1901

1902

#: bzrlib/builtins.py:3064

1902

#: bzrlib/builtins.py:3157

1903

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

1904

msgstr ""

1905

1906

#: bzrlib/builtins.py:3076

1906

#: bzrlib/builtins.py:3169

1907

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

1908

msgstr ""

1909

1910

#: bzrlib/builtins.py:3087

1910

#: bzrlib/builtins.py:3180

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

1917

#: bzrlib/builtins.py:3189

1918

msgid "NAME_PATTERN should not be an absolute path"

1919

msgstr ""

1920

1921

#: bzrlib/builtins.py:3109

1921

#: bzrlib/builtins.py:3202

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

1931

#: bzrlib/builtins.py:3209

1932

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

1933

msgstr ""

1934

1935

#: bzrlib/builtins.py:3118

1935

#: bzrlib/builtins.py:3211

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

1941

#: bzrlib/builtins.py:3214

1942

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

1943

msgstr ""

1944

1945

#: bzrlib/builtins.py:3123

1945

#: bzrlib/builtins.py:3216

1946

msgid " bzr ls --ignored"

1947

msgstr ""

1948

1949

#: bzrlib/builtins.py:3157

1949

#: bzrlib/builtins.py:3250

1950

#, python-format

1951

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

1952

msgstr ""

1953

1954

#: bzrlib/builtins.py:3164

1954

#: bzrlib/builtins.py:3257

1955

msgid ""

1956

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

1957

msgstr ""

1958

1959

#: bzrlib/builtins.py:3166

1959

#: bzrlib/builtins.py:3259

1960

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

1961

msgstr ""

1962

1963

#: bzrlib/builtins.py:3168

1963

#: bzrlib/builtins.py:3261

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

1970

#: bzrlib/builtins.py:3265

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

1977

#: bzrlib/builtins.py:3269

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

1983

#: bzrlib/builtins.py:3272

1984

msgid ""

1985

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

1986

msgstr ""

1987

1988

#: bzrlib/builtins.py:3181

1988

#: bzrlib/builtins.py:3274

1989

msgid ""

1990

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

1991

" Supported formats Autodetected by extension\n"

1998

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

1999

msgstr ""

2000

2001

#: bzrlib/builtins.py:3195

2001

#: bzrlib/builtins.py:3288

2002

msgid "Type of file to export to."

2003

msgstr ""

2004

2005

#: bzrlib/builtins.py:3198

2005

#: bzrlib/builtins.py:3291

2006

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

2007

msgstr ""

2008

2009

#: bzrlib/builtins.py:3202

2009

#: bzrlib/builtins.py:3295

2010

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

2011

msgstr ""

2012

2013

#: bzrlib/builtins.py:3204

2013

#: bzrlib/builtins.py:3297

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

2019

#: bzrlib/builtins.py:3300

2020

msgid ""

2021

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

2022

msgstr ""

2023

2024

#: bzrlib/builtins.py:3226

2024

#: bzrlib/builtins.py:3319

2025

msgid "--uncommitted requires a working tree"

2026

msgstr ""

2027

2028

#: bzrlib/builtins.py:3235

2028

#: bzrlib/builtins.py:3328

2029

#, python-format

2030

msgid "Unsupported export format: %s"

2031

msgstr ""

2032

2033

#: bzrlib/builtins.py:3239

2033

#: bzrlib/builtins.py:3332

2034

msgid ""

2035

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

2036

msgstr ""

2037

2038

#: bzrlib/builtins.py:3241

2038

#: bzrlib/builtins.py:3334

2039

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

2040

msgstr ""

2041

2042

#: bzrlib/builtins.py:3243

2042

#: bzrlib/builtins.py:3336

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

2048

#: bzrlib/builtins.py:3342

2049

msgid "The path name in the old tree."

2050

msgstr ""

2051

2052

#: bzrlib/builtins.py:3250

2052

#: bzrlib/builtins.py:3343

2053

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

2054

msgstr ""

2055

2056

#: bzrlib/builtins.py:3261

2056

#: bzrlib/builtins.py:3354

2057

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

2058

msgstr ""

2059

2060

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

2060

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

2061

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

2062

msgstr ""

2063

2064

#: bzrlib/builtins.py:3321

2064

#: bzrlib/builtins.py:3414

2065

msgid "Commit changes into a new revision."

2066

msgstr ""

2067

2068

#: bzrlib/builtins.py:3323

2068

#: bzrlib/builtins.py:3416

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

2078

#: bzrlib/builtins.py:3423

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

2085

#: bzrlib/builtins.py:3427

2086

msgid ":Selective commits:"

2087

msgstr ""

2088

2089

#: bzrlib/builtins.py:3336

2089

#: bzrlib/builtins.py:3429

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

2096

#: bzrlib/builtins.py:3433

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

2103

#: bzrlib/builtins.py:3437

2104

msgid " bzr commit foo -x foo/bar"

2105

msgstr ""

2106

2107

#: bzrlib/builtins.py:3346

2107

#: bzrlib/builtins.py:3439

2108

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

2109

msgstr ""

2110

2111

#: bzrlib/builtins.py:3348

2111

#: bzrlib/builtins.py:3441

2112

msgid ":Custom authors:"

2113

msgstr ""

2114

2115

#: bzrlib/builtins.py:3350

2115

#: bzrlib/builtins.py:3443

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

2125

#: bzrlib/builtins.py:3450

2126

msgid ":Checks:"

2127

msgstr ""

2128

2129

#: bzrlib/builtins.py:3359

2129

#: bzrlib/builtins.py:3452

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

2138

#: bzrlib/builtins.py:3458

2139

msgid ":Things to note:"

2140

msgstr ""

2141

2142

#: bzrlib/builtins.py:3367

2142

#: bzrlib/builtins.py:3460

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

2149

#: bzrlib/builtins.py:3464

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

2157

#: bzrlib/builtins.py:3474

2158

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

2159

msgstr ""

2160

2161

#: bzrlib/builtins.py:3384

2161

#: bzrlib/builtins.py:3477

2162

msgid "Description of the new revision."

2163

msgstr ""

2164

2165

#: bzrlib/builtins.py:3387

2165

#: bzrlib/builtins.py:3480

2166

msgid "Commit even if nothing has changed."

2167

msgstr ""

2168

2169

#: bzrlib/builtins.py:3391

2169

#: bzrlib/builtins.py:3484

2170

msgid "Take commit message from this file."

2171

msgstr ""

2172

2173

#: bzrlib/builtins.py:3393

2173

#: bzrlib/builtins.py:3486

2174

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

2175

msgstr ""

2176

2177

#: bzrlib/builtins.py:3396

2177

#: bzrlib/builtins.py:3489

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

2183

#: bzrlib/builtins.py:3492

2184

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

2185

msgstr ""

2186

2187

#: bzrlib/builtins.py:3402

2187

#: bzrlib/builtins.py:3495

2188

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

2189

msgstr ""

2190

2191

#: bzrlib/builtins.py:3405

2191

#: bzrlib/builtins.py:3498

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

2197

#: bzrlib/builtins.py:3504

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

2203

#: bzrlib/builtins.py:3507

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

2209

#: bzrlib/builtins.py:3525

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

2217

#: bzrlib/builtins.py:3534

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

2225

#: bzrlib/builtins.py:3543

2226

#, python-format

2227

msgid "Unrecognized bug %s. Commit refused."

2228

msgstr ""

2229

2230

#: bzrlib/builtins.py:3453

2230

#: bzrlib/builtins.py:3546

2231

#, python-format

2232

msgid ""

2233

"%s\n"

2234

"Commit refused."

2235

msgstr ""

2236

2237

#: bzrlib/builtins.py:3477

2237

#: bzrlib/builtins.py:3570

2238

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

2239

msgstr ""

2240

2241

#: bzrlib/builtins.py:3517

2241

#: bzrlib/builtins.py:3610

2242

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

2243

msgstr ""

2244

2245

#: bzrlib/builtins.py:3546

2245

#: bzrlib/builtins.py:3639

2246

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

2247

msgstr ""

2248

2249

#: bzrlib/builtins.py:3549

2249

#: bzrlib/builtins.py:3642

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

2255

#: bzrlib/builtins.py:3662

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

2261

#: bzrlib/builtins.py:3666

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

2267

#: bzrlib/builtins.py:3670

2268

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

2269

msgstr ""

2270

2271

#: bzrlib/builtins.py:3580

2271

#: bzrlib/builtins.py:3673

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

2278

#: bzrlib/builtins.py:3681

2279

msgid ""

2280

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

2281

msgstr ""

2282

2283

#: bzrlib/builtins.py:3590

2283

#: bzrlib/builtins.py:3683

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

2289

#: bzrlib/builtins.py:3686

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

2295

#: bzrlib/builtins.py:3689

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

2302

#: bzrlib/builtins.py:3693

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

2309

#: bzrlib/builtins.py:3697

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

2317

#: bzrlib/builtins.py:3702

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

2324

#: bzrlib/builtins.py:3706

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

2333

#: bzrlib/builtins.py:3712

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

2340

#: bzrlib/builtins.py:3717

2341

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

2342

msgstr ""

2343

2344

#: bzrlib/builtins.py:3626

2344

#: bzrlib/builtins.py:3719

2345

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

2346

msgstr ""

2347

2348

#: bzrlib/builtins.py:3628

2348

#: bzrlib/builtins.py:3721

2349

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

2350

msgstr ""

2351

2352

#: bzrlib/builtins.py:3630

2352

#: bzrlib/builtins.py:3723

2353

msgid " bzr check --repo bar"

2354

msgstr ""

2355

2356

#: bzrlib/builtins.py:3632

2356

#: bzrlib/builtins.py:3725

2357

msgid " Check everything at 'baz'::"

2358

msgstr ""

2359

2360

#: bzrlib/builtins.py:3634

2360

#: bzrlib/builtins.py:3727

2361

msgid " bzr check baz"

2362

msgstr ""

2363

2364

#: bzrlib/builtins.py:3640

2364

#: bzrlib/builtins.py:3733

2365

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

2366

msgstr ""

2367

2368

#: bzrlib/builtins.py:3642

2368

#: bzrlib/builtins.py:3735

2369

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

2370

msgstr ""

2371

2372

#: bzrlib/builtins.py:3644

2372

#: bzrlib/builtins.py:3737

2373

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

2374

msgstr ""

2375

2376

#: bzrlib/builtins.py:3658

2376

#: bzrlib/builtins.py:3751

2377

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

2378

msgstr ""

2379

2380

#: bzrlib/builtins.py:3660

2380

#: bzrlib/builtins.py:3753

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

2389

#: bzrlib/builtins.py:3759

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

2399

#: bzrlib/builtins.py:3766

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

2410

#: bzrlib/builtins.py:3774

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

2418

#: bzrlib/builtins.py:3779

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

2424

#: bzrlib/builtins.py:3787

2425

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

2426

msgstr ""

2427

2428

#: bzrlib/builtins.py:3698

2428

#: bzrlib/builtins.py:3791

2429

msgid "Branch format"

2430

msgstr ""

2431

2432

#: bzrlib/builtins.py:3700

2432

#: bzrlib/builtins.py:3793

2433

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

2434

msgstr ""

2435

2436

#: bzrlib/builtins.py:3702

2436

#: bzrlib/builtins.py:3795

2437

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

2438

msgstr ""

2439

2440

#: bzrlib/builtins.py:3717

2440

#: bzrlib/builtins.py:3810

2441

msgid "Show or set bzr user id."

2442

msgstr ""

2443

2444

#: bzrlib/builtins.py:3719

2444

#: bzrlib/builtins.py:3812

2445

msgid ""

2446

":Examples:\n"

2447

" Show the email of the current user::"

2448

msgstr ""

2449

2450

#: bzrlib/builtins.py:3722

2450

#: bzrlib/builtins.py:3815

2451

msgid " bzr whoami --email"

2452

msgstr ""

2453

2454

#: bzrlib/builtins.py:3724

2454

#: bzrlib/builtins.py:3817

2455

msgid " Set the current user::"

2456

msgstr ""

2457

2458

#: bzrlib/builtins.py:3726

2458

#: bzrlib/builtins.py:3819

2459

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

2460

msgstr ""

2461

2462

#: bzrlib/builtins.py:3730

2462

#: bzrlib/builtins.py:3823

2463

msgid "Display email address only."

2464

msgstr ""

2465

2466

#: bzrlib/builtins.py:3732

2466

#: bzrlib/builtins.py:3825

2467

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

2468

msgstr ""

2469

2470

#: bzrlib/builtins.py:3758

2470

#: bzrlib/builtins.py:3851

2471

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

2472

msgstr ""

2473

2474

#: bzrlib/builtins.py:3780

2474

#: bzrlib/builtins.py:3873

2475

msgid "Print or set the branch nickname."

2476

msgstr ""

2477

2478

#: bzrlib/builtins.py:3782

2478

#: bzrlib/builtins.py:3875

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

2482

msgstr ""

2483

2484

#: bzrlib/builtins.py:3785

2484

#: bzrlib/builtins.py:3878

2485

msgid ""

2486

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

2487

"locally."

2488

msgstr ""

2489

2490

#: bzrlib/builtins.py:3805

2490

#: bzrlib/builtins.py:3898

2491

msgid "Set/unset and display aliases."

2492

msgstr ""

2493

2494

#: bzrlib/builtins.py:3807

2494

#: bzrlib/builtins.py:3900

2495

msgid ""

2496

":Examples:\n"

2497

" Show the current aliases::"

2498

msgstr ""

2499

2500

#: bzrlib/builtins.py:3810

2500

#: bzrlib/builtins.py:3903

2501

msgid " bzr alias"

2502

msgstr ""

2503

2504

#: bzrlib/builtins.py:3812

2504

#: bzrlib/builtins.py:3905

2505

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

2506

msgstr ""

2507

2508

#: bzrlib/builtins.py:3814

2508

#: bzrlib/builtins.py:3907

2509

msgid " bzr alias ll"

2510

msgstr ""

2511

2512

#: bzrlib/builtins.py:3816

2512

#: bzrlib/builtins.py:3909

2513

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

2514

msgstr ""

2515

2516

#: bzrlib/builtins.py:3818

2516

#: bzrlib/builtins.py:3911

2517

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

2518

msgstr ""

2519

2520

#: bzrlib/builtins.py:3820

2520

#: bzrlib/builtins.py:3913

2521

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

2522

msgstr ""

2523

2524

#: bzrlib/builtins.py:3822

2524

#: bzrlib/builtins.py:3915

2525

msgid " bzr alias --remove ll"

2526

msgstr ""

2527

2528

#: bzrlib/builtins.py:3827

2528

#: bzrlib/builtins.py:3920

2529

msgid "Remove the alias."

2530

msgstr ""

2531

2532

#: bzrlib/builtins.py:3845

2532

#: bzrlib/builtins.py:3938

2533

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

2534

msgstr ""

2535

2536

#: bzrlib/builtins.py:4026

2536

#: bzrlib/builtins.py:4119

2537

msgid ""

2538

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

2539

msgstr ""

2540

2541

#: bzrlib/builtins.py:4043

2541

#: bzrlib/builtins.py:4136

2542

msgid ""

2543

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

2544

msgstr ""

2545

2546

#: bzrlib/builtins.py:4090

2546

#: bzrlib/builtins.py:4183

2547

msgid "Show version of bzr."

2548

msgstr ""

2549

2550

#: bzrlib/builtins.py:4094

2550

#: bzrlib/builtins.py:4187

2551

msgid "Print just the version number."

2552

msgstr ""

2553

2554

#: bzrlib/builtins.py:4113

2554

#: bzrlib/builtins.py:4206

2555

msgid "It sure does!\n"

2556

msgstr ""

2557

2558

#: bzrlib/builtins.py:4137

2558

#: bzrlib/builtins.py:4230

2559

#, python-format

2560

msgid "merge base is revision %s\n"

2561

msgstr ""

2562

2563

#: bzrlib/builtins.py:4141

2563

#: bzrlib/builtins.py:4234

2564

msgid "Perform a three-way merge."

2565

msgstr ""

2566

2567

#: bzrlib/builtins.py:4143

2567

#: bzrlib/builtins.py:4236

2568

msgid ""

2569

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

2570

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

2575

"the current working tree."

2576

msgstr ""

2577

2578

#: bzrlib/builtins.py:4151

2578

#: bzrlib/builtins.py:4244

2579

msgid ""

2580

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

2581

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

2582

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

2583

msgstr ""

2584

2585

#: bzrlib/builtins.py:4155

2585

#: bzrlib/builtins.py:4248

2586

msgid ""

2587

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

2588

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

2589

msgstr ""

2590

2591

#: bzrlib/builtins.py:4158

2591

#: bzrlib/builtins.py:4251

2592

msgid ""

2593

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

2594

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

2599

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

2600

msgstr ""

2601

2602

#: bzrlib/builtins.py:4166

2602

#: bzrlib/builtins.py:4259

2603

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

2604

msgstr ""

2605

2606

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

2606

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

2607

msgid ""

2608

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

2609

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

2610

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

2611

"before you should commit."

2611

"before you can commit."

2612

msgstr ""

2613

2614

#: bzrlib/builtins.py:4173

2614

#: bzrlib/builtins.py:4266

2615

msgid ""

2616

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

2617

msgstr ""

2618

2619

#: bzrlib/builtins.py:4175

2619

#: bzrlib/builtins.py:4268

2620

msgid ""

2621

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

2622

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

2624

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

2625

msgstr ""

2626

2627

#: bzrlib/builtins.py:4180

2627

#: bzrlib/builtins.py:4273

2628

msgid ""

2629

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

2630

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

2631

"committed to record the result of the merge."

2632

msgstr ""

2633

2634

#: bzrlib/builtins.py:4184

2634

#: bzrlib/builtins.py:4277

2635

msgid ""

2636

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

2637

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

2640

"merge revision which has more than two parents."

2641

msgstr ""

2642

2643

#: bzrlib/builtins.py:4190

2643

#: bzrlib/builtins.py:4283

2644

msgid ""

2645

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

2646

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

2647

"can be given."

2648

msgstr ""

2649

2650

#: bzrlib/builtins.py:4194

2650

#: bzrlib/builtins.py:4287

2651

msgid ""

2652

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

2653

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

2654

msgstr ""

2655

2656

#: bzrlib/builtins.py:4197

2656

#: bzrlib/builtins.py:4290

2657

msgid ""

2658

":Examples:\n"

2659

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

2660

msgstr ""

2661

2662

#: bzrlib/builtins.py:4200

2662

#: bzrlib/builtins.py:4293

2663

msgid " bzr merge ../bzr.dev"

2664

msgstr ""

2665

2666

#: bzrlib/builtins.py:4202

2666

#: bzrlib/builtins.py:4295

2667

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

2668

msgstr ""

2669

2670

#: bzrlib/builtins.py:4204

2670

#: bzrlib/builtins.py:4297

2671

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

2672

msgstr ""

2673

2674

#: bzrlib/builtins.py:4206

2674

#: bzrlib/builtins.py:4299

2675

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

2676

msgstr ""

2677

2678

#: bzrlib/builtins.py:4208

2678

#: bzrlib/builtins.py:4301

2679

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

2680

msgstr ""

2681

2682

#: bzrlib/builtins.py:4210

2682

#: bzrlib/builtins.py:4303

2683

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

2684

msgstr ""

2685

2686

#: bzrlib/builtins.py:4212

2686

#: bzrlib/builtins.py:4305

2687

msgid " bzr merge /tmp/merge"

2688

msgstr ""

2689

2690

#: bzrlib/builtins.py:4214

2690

#: bzrlib/builtins.py:4307

2691

msgid ""

2692

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

2693

" feature1a and feature1b:"

2694

msgstr ""

2695

2696

#: bzrlib/builtins.py:4217

2696

#: bzrlib/builtins.py:4310

2697

msgid ""

2698

" bzr merge ../feature1a\n"

2699

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

2700

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

2701

msgstr ""

2702

2703

#: bzrlib/builtins.py:4229

2703

#: bzrlib/builtins.py:4322

2704

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

2705

msgstr ""

2706

2707

#: bzrlib/builtins.py:4235

2707

#: bzrlib/builtins.py:4328

2708

msgid ""

2709

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

2710

msgstr ""

2711

2712

#: bzrlib/builtins.py:4237

2712

#: bzrlib/builtins.py:4330

2713

msgid ""

2714

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

2715

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

2716

"commit the result."

2717

msgstr ""

2718

2719

#: bzrlib/builtins.py:4242

2719

#: bzrlib/builtins.py:4335

2720

msgid ""

2721

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

2722

msgstr ""

2723

2724

#: bzrlib/builtins.py:4244

2724

#: bzrlib/builtins.py:4337

2725

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

2726

msgstr ""

2727

2728

#: bzrlib/builtins.py:4246

2728

#: bzrlib/builtins.py:4339

2729

msgid "Select changes interactively."

2730

msgstr ""

2731

2732

#: bzrlib/builtins.py:4268

2732

#: bzrlib/builtins.py:4361

2733

msgid ""

2734

"Merging into empty branches not currently supported, "

2735

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

2736

msgstr ""

2737

2738

#: bzrlib/builtins.py:4295

2738

#: bzrlib/builtins.py:4388

2739

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

2740

msgstr ""

2741

2742

#: bzrlib/builtins.py:4306

2742

#: bzrlib/builtins.py:4399

2743

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

2744

msgstr ""

2745

2746

#: bzrlib/builtins.py:4326

2746

#: bzrlib/builtins.py:4419

2747

msgid "merger: "

2748

msgstr ""

2749

2750

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

2750

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

2751

msgid "Nothing to do."

2752

msgstr ""

2753

2754

#: bzrlib/builtins.py:4332

2754

#: bzrlib/builtins.py:4425

2755

msgid "Cannot pull individual files"

2756

msgstr ""

2757

2758

#: bzrlib/builtins.py:4340

2758

#: bzrlib/builtins.py:4433

2759

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

2760

msgstr ""

2761

2762

#: bzrlib/builtins.py:4398

2762

#: bzrlib/builtins.py:4491

2763

#, python-format

2764

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

2765

msgstr ""

2766

2767

#: bzrlib/builtins.py:4407

2767

#: bzrlib/builtins.py:4500

2768

#, python-format

2769

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

2770

msgstr ""

2771

2772

#: bzrlib/builtins.py:4411

2772

#: bzrlib/builtins.py:4504

2773

msgid "Cannot do conflict reduction and show base."

2774

msgstr ""

2775

2776

#: bzrlib/builtins.py:4522

2776

#: bzrlib/builtins.py:4615

2777

msgid "No location specified or remembered"

2778

msgstr ""

2779

2780

#: bzrlib/builtins.py:4524

2780

#: bzrlib/builtins.py:4617

2781

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

2782

msgstr ""

2783

2784

#: bzrlib/builtins.py:4530

2784

#: bzrlib/builtins.py:4623

2785

msgid "Redo a merge."

2786

msgstr ""

2787

2788

#: bzrlib/builtins.py:4532

2788

#: bzrlib/builtins.py:4625

2789

msgid ""

2790

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

2791

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

2792

"lets you try different ones on different files."

2793

msgstr ""

2794

2795

#: bzrlib/builtins.py:4536

2795

#: bzrlib/builtins.py:4629

2796

msgid ""

2797

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

2798

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

2799

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

2800

msgstr ""

2801

2802

#: bzrlib/builtins.py:4540

2802

#: bzrlib/builtins.py:4633

2803

msgid ""

2804

":Examples:\n"

2805

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

2806

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

2807

msgstr ""

2808

2809

#: bzrlib/builtins.py:4544

2809

#: bzrlib/builtins.py:4637

2810

msgid " bzr remerge --show-base"

2811

msgstr ""

2812

2813

#: bzrlib/builtins.py:4546

2813

#: bzrlib/builtins.py:4639

2814

msgid ""

2815

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

2816

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

2817

msgstr ""

2818

2819

#: bzrlib/builtins.py:4549

2819

#: bzrlib/builtins.py:4642

2820

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

2821

msgstr ""

2822

2823

#: bzrlib/builtins.py:4556

2823

#: bzrlib/builtins.py:4649

2824

msgid "Show base revision text in conflicts."

2825

msgstr ""

2826

2827

#: bzrlib/builtins.py:4568

2827

#: bzrlib/builtins.py:4661

2828

msgid ""

2829

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

2830

"merges."

2831

msgstr ""

2832

2833

#: bzrlib/builtins.py:4624

2833

#: bzrlib/builtins.py:4717

2834

msgid "Revert files to a previous revision."

2835

msgstr ""

2836

2837

#: bzrlib/builtins.py:4626

2837

#: bzrlib/builtins.py:4719

2838

msgid ""

2839

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

2840

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

2841

"last committed revision is used."

2842

msgstr ""

2843

2844

#: bzrlib/builtins.py:4630

2844

#: bzrlib/builtins.py:4723

2845

msgid ""

2846

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

2847

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

2850

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

2851

msgstr ""

2852

2853

#: bzrlib/builtins.py:4636

2853

#: bzrlib/builtins.py:4729

2854

msgid ""

2855

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

2856

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

2857

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

2858

msgstr ""

2859

2860

#: bzrlib/builtins.py:4640

2860

#: bzrlib/builtins.py:4733

2861

msgid ""

2862

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

2863

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

2865

"reverted."

2866

msgstr ""

2867

2868

#: bzrlib/builtins.py:4645

2868

#: bzrlib/builtins.py:4738

2869

msgid ""

2870

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

2871

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

2873

"deleted."

2874

msgstr ""

2875

2876

#: bzrlib/builtins.py:4650

2876

#: bzrlib/builtins.py:4743

2877

msgid ""

2878

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

2879

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

2885

"reverting any files."

2886

msgstr ""

2887

2888

#: bzrlib/builtins.py:4659

2888

#: bzrlib/builtins.py:4752

2889

msgid ""

2890

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

2891

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

2899

"target branches."

2900

msgstr ""

2901

2902

#: bzrlib/builtins.py:4673

2902

#: bzrlib/builtins.py:4766

2903

msgid "Do not save backups of reverted files."

2904

msgstr ""

2905

2906

#: bzrlib/builtins.py:4675

2906

#: bzrlib/builtins.py:4768

2907

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

2908

msgstr ""

2909

2910

#: bzrlib/builtins.py:4706

2910

#: bzrlib/builtins.py:4799

2911

msgid ""

2912

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

2913

" "

2914

msgstr ""

2915

2916

#: bzrlib/builtins.py:4711

2916

#: bzrlib/builtins.py:4804

2917

msgid "Show help on all commands."

2918

msgstr ""

2919

2920

#: bzrlib/builtins.py:4740

2920

#: bzrlib/builtins.py:4833

2921

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

2922

msgstr ""

2923

2924

#: bzrlib/builtins.py:4742

2924

#: bzrlib/builtins.py:4835

2925

msgid "OTHER_BRANCH may be local or remote."

2926

msgstr ""

2927

2928

#: bzrlib/builtins.py:4744

2928

#: bzrlib/builtins.py:4837

2929

msgid ""

2930

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

2931

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

2936

" 0 - no missing revisions"

2937

msgstr ""

2938

2939

#: bzrlib/builtins.py:4754

2939

#: bzrlib/builtins.py:4847

2940

msgid ""

2941

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

2942

" remembered pull location::"

2943

msgstr ""

2944

2945

#: bzrlib/builtins.py:4757

2945

#: bzrlib/builtins.py:4850

2946

msgid " bzr missing"

2947

msgstr ""

2948

2949

#: bzrlib/builtins.py:4759

2949

#: bzrlib/builtins.py:4852

2950

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

2951

msgstr ""

2952

2953

#: bzrlib/builtins.py:4761

2953

#: bzrlib/builtins.py:4854

2954

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

2955

msgstr ""

2956

2957

#: bzrlib/builtins.py:4763

2957

#: bzrlib/builtins.py:4856

2958

msgid ""

2959

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

2960

" branch::"

2961

msgstr ""

2962

2963

#: bzrlib/builtins.py:4766

2963

#: bzrlib/builtins.py:4859

2964

msgid " bzr missing -r ..-10"

2965

msgstr ""

2966

2967

#: bzrlib/builtins.py:4768

2967

#: bzrlib/builtins.py:4861

2968

msgid ""

2969

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

2970

" branch::"

2971

msgstr ""

2972

2973

#: bzrlib/builtins.py:4771

2973

#: bzrlib/builtins.py:4864

2974

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

2975

msgstr ""

2976

2977

#: bzrlib/builtins.py:4778

2977

#: bzrlib/builtins.py:4871

2978

msgid "Reverse the order of revisions."

2979

msgstr ""

2980

2981

#: bzrlib/builtins.py:4780

2981

#: bzrlib/builtins.py:4873

2982

msgid "Display changes in the local branch only."

2983

msgstr ""

2984

2985

#: bzrlib/builtins.py:4781

2985

#: bzrlib/builtins.py:4874

2986

msgid "Same as --mine-only."

2987

msgstr ""

2988

2989

#: bzrlib/builtins.py:4783

2989

#: bzrlib/builtins.py:4876

2990

msgid "Display changes in the remote branch only."

2991

msgstr ""

2992

2993

#: bzrlib/builtins.py:4784

2993

#: bzrlib/builtins.py:4877

2994

msgid "Same as --theirs-only."

2995

msgstr ""

2996

2997

#: bzrlib/builtins.py:4789

2997

#: bzrlib/builtins.py:4882

2998

msgid ""

2999

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

3000

"details."

3001

msgstr ""

3002

3003

#: bzrlib/builtins.py:4793

3003

#: bzrlib/builtins.py:4886

3004

msgid ""

3005

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

3006

"details."

3007

msgstr ""

3008

3009

#: bzrlib/builtins.py:4796

3009

#: bzrlib/builtins.py:4889

3010

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

3011

msgstr ""

3012

3013

#: bzrlib/builtins.py:4850

3013

#: bzrlib/builtins.py:4943

3014

msgid "No peer location known or specified."

3015

msgstr ""

3016

3017

#: bzrlib/builtins.py:4854

3017

#: bzrlib/builtins.py:4947

3018

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

3019

msgstr ""

3020

3021

#: bzrlib/builtins.py:4887

3021

#: bzrlib/builtins.py:4980

3022

#, python-format

3023

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

3024

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

3025

msgstr[0] ""

3026

msgstr[1] ""

3027

3028

#: bzrlib/builtins.py:4903

3028

#: bzrlib/builtins.py:4996

3029

#, python-format

3030

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

3031

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

3032

msgstr[0] ""

3033

msgstr[1] ""

3034

3035

#: bzrlib/builtins.py:4915

3035

#: bzrlib/builtins.py:5008

3036

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

3037

msgstr ""

3038

3039

#: bzrlib/builtins.py:4918

3039

#: bzrlib/builtins.py:5011

3040

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

3041

msgstr ""

3042

3043

#: bzrlib/builtins.py:4923

3043

#: bzrlib/builtins.py:5016

3044

msgid "Branches are up to date.\n"

3045

msgstr ""

3046

3047

#: bzrlib/builtins.py:4934

3047

#: bzrlib/builtins.py:5027

3048

msgid "Compress the data within a repository."

3049

msgstr ""

3050

3051

#: bzrlib/builtins.py:4936

3051

#: bzrlib/builtins.py:5029

3052

msgid ""

3053

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

3054

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

3055

"normally not required to be done manually."

3056

msgstr ""

3057

3058

#: bzrlib/builtins.py:4940

3058

#: bzrlib/builtins.py:5033

3059

msgid ""

3060

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

3061

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

3064

"used."

3065

msgstr ""

3066

3067

#: bzrlib/builtins.py:4946

3067

#: bzrlib/builtins.py:5039

3068

msgid ""

3069

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

3070

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

3072

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

3073

msgstr ""

3074

3075

#: bzrlib/builtins.py:4955

3075

#: bzrlib/builtins.py:5048

3076

msgid "Delete obsolete packs to save disk space."

3077

msgstr ""

3078

3079

#: bzrlib/builtins.py:4969

3079

#: bzrlib/builtins.py:5062

3080

msgid "List the installed plugins."

3081

msgstr ""

3082

3083

#: bzrlib/builtins.py:4971

3083

#: bzrlib/builtins.py:5064

3084

msgid ""

3085

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

3086

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

3087

msgstr ""

3088

3089

#: bzrlib/builtins.py:4974

3089

#: bzrlib/builtins.py:5067

3090

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

3091

msgstr ""

3092

3093

#: bzrlib/builtins.py:4976

3093

#: bzrlib/builtins.py:5069

3094

msgid ""

3095

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

3096

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

3099

"customizing log output."

3100

msgstr ""

3101

3102

#: bzrlib/builtins.py:4982

3102

#: bzrlib/builtins.py:5075

3103

msgid ""

3104

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

3105

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

3107

"plugins using the Python programming language."

3108

msgstr ""

3109

3110

#: bzrlib/builtins.py:4998

3110

#: bzrlib/builtins.py:5091

3111

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

3112

msgstr ""

3113

3114

#: bzrlib/builtins.py:5001

3114

#: bzrlib/builtins.py:5094

3115

msgid "Produce long-format testament."

3116

msgstr ""

3117

3118

#: bzrlib/builtins.py:5003

3118

#: bzrlib/builtins.py:5096

3119

msgid "Produce a strict-format testament."

3120

msgstr ""

3121

3122

#: bzrlib/builtins.py:5029

3122

#: bzrlib/builtins.py:5122

3123

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

3124

msgstr ""

3125

3126

#: bzrlib/builtins.py:5031

3126

#: bzrlib/builtins.py:5124

3127

msgid ""

3128

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

3129

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

3130

msgstr ""

3131

3132

#: bzrlib/builtins.py:5034

3132

#: bzrlib/builtins.py:5127

3133

msgid ""

3134

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

3135

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

3136

msgstr ""

3137

3138

#: bzrlib/builtins.py:5042

3138

#: bzrlib/builtins.py:5135

3139

msgid "Show annotations on all lines."

3140

msgstr ""

3141

3142

#: bzrlib/builtins.py:5043

3142

#: bzrlib/builtins.py:5136

3143

msgid "Show commit date in annotations."

3144

msgstr ""

3145

3146

#: bzrlib/builtins.py:5130

3146

#: bzrlib/builtins.py:5223

3147

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

3148

msgstr ""

3149

3150

#: bzrlib/builtins.py:5142

3150

#: bzrlib/builtins.py:5235

3151

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

3152

msgstr ""

3153

3154

#: bzrlib/builtins.py:5146

3154

#: bzrlib/builtins.py:5239

3155

msgid ""

3156

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

3157

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

3158

msgstr ""

3159

3160

#: bzrlib/builtins.py:5149

3160

#: bzrlib/builtins.py:5242

3161

msgid ""

3162

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

3163

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

3164

msgstr ""

3165

3166

#: bzrlib/builtins.py:5152

3166

#: bzrlib/builtins.py:5245

3167

msgid ""

3168

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

3169

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

3170

"that of the master."

3171

msgstr ""

3172

3173

#: bzrlib/builtins.py:5167

3173

#: bzrlib/builtins.py:5260

3174

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

3175

msgstr ""

3176

3177

#: bzrlib/builtins.py:5172

3177

#: bzrlib/builtins.py:5265

3178

msgid "Branch is already bound"

3179

msgstr ""

3180

3181

#: bzrlib/builtins.py:5174

3181

#: bzrlib/builtins.py:5267

3182

msgid "No location supplied and no previous location known"

3183

msgstr ""

3184

3185

#: bzrlib/builtins.py:5180

3185

#: bzrlib/builtins.py:5273

3186

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

3187

msgstr ""

3188

3189

#: bzrlib/builtins.py:5187

3189

#: bzrlib/builtins.py:5280

3190

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

3191

msgstr ""

3192

3193

#: bzrlib/builtins.py:5189

3193

#: bzrlib/builtins.py:5282

3194

msgid ""

3195

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

3196

"commits will be local only."

3197

msgstr ""

3198

3199

#: bzrlib/builtins.py:5200

3199

#: bzrlib/builtins.py:5293

3200

msgid "Local branch is not bound"

3201

msgstr ""

3202

3203

#: bzrlib/builtins.py:5204

3203

#: bzrlib/builtins.py:5297

3204

msgid "Remove the last committed revision."

3205

msgstr ""

3206

3207

#: bzrlib/builtins.py:5206

3207

#: bzrlib/builtins.py:5299

3208

msgid ""

3209

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

3210

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

3211

"remove anything."

3212

msgstr ""

3213

3214

#: bzrlib/builtins.py:5210

3214

#: bzrlib/builtins.py:5303

3215

msgid ""

3216

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

3217

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

3218

"branch at revision 15."

3219

msgstr ""

3220

3221

#: bzrlib/builtins.py:5214

3221

#: bzrlib/builtins.py:5307

3222

msgid ""

3223

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

3224

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

3225

"the commit."

3226

msgstr ""

3227

3228

#: bzrlib/builtins.py:5225

3228

#: bzrlib/builtins.py:5318

3229

msgid "Don't actually make changes."

3230

msgstr ""

3231

3232

#: bzrlib/builtins.py:5226

3232

#: bzrlib/builtins.py:5319

3233

msgid "Say yes to all questions."

3234

msgstr ""

3235

3236

#: bzrlib/builtins.py:5228

3236

#: bzrlib/builtins.py:5321

3237

msgid "Keep tags that point to removed revisions."

3238

msgstr ""

3239

3240

#: bzrlib/builtins.py:5230

3240

#: bzrlib/builtins.py:5323

3241

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

3242

msgstr ""

3243

3244

#: bzrlib/builtins.py:5279

3244

#: bzrlib/builtins.py:5372

3245

msgid "No revisions to uncommit.\n"

3246

msgstr ""

3247

3248

#: bzrlib/builtins.py:5294

3248

#: bzrlib/builtins.py:5387

3249

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

3250

msgstr ""

3251

3252

#: bzrlib/builtins.py:5297

3252

#: bzrlib/builtins.py:5390

3253

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

3254

msgstr ""

3255

3256

#: bzrlib/builtins.py:5301

3256

#: bzrlib/builtins.py:5394

3257

msgid "Uncommit these revisions"

3258

msgstr ""

3259

3260

#: bzrlib/builtins.py:5304

3260

#: bzrlib/builtins.py:5397

3261

msgid "Canceled\n"

3262

msgstr ""

3263

3264

#: bzrlib/builtins.py:5311

3264

#: bzrlib/builtins.py:5404

3265

#, python-format

3266

msgid ""

3267

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

3268

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

3269

msgstr ""

3270

3271

#: bzrlib/builtins.py:5316

3271

#: bzrlib/builtins.py:5409

3272

msgid "Break a dead lock."

3273

msgstr ""

3274

3275

#: bzrlib/builtins.py:5318

3275

#: bzrlib/builtins.py:5411

3276

msgid ""

3277

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

3278

"config file."

3279

msgstr ""

3280

3281

#: bzrlib/builtins.py:5321

3281

#: bzrlib/builtins.py:5414

3282

msgid ""

3283

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

3284

"holding the lock has been stopped."

3285

msgstr ""

3286

3287

#: bzrlib/builtins.py:5324

3287

#: bzrlib/builtins.py:5417

3288

msgid ""

3289

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

3290

"[location]' command."

3291

msgstr ""

3292

3293

#: bzrlib/builtins.py:5327

3293

#: bzrlib/builtins.py:5420

3294

msgid ""

3295

":Examples:\n"

3296

" bzr break-lock\n"

3298

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

3299

msgstr ""

3300

3301

#: bzrlib/builtins.py:5336

3301

#: bzrlib/builtins.py:5429

3302

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

3303

msgstr ""

3304

3305

#: bzrlib/builtins.py:5338

3305

#: bzrlib/builtins.py:5431

3306

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

3307

msgstr ""

3308

3309

#: bzrlib/builtins.py:5373

3309

#: bzrlib/builtins.py:5466

3310

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

3311

msgstr ""

3312

3313

#: bzrlib/builtins.py:5374

3313

#: bzrlib/builtins.py:5467

3314

msgid "Run the bzr server."

3315

msgstr ""

3316

3317

#: bzrlib/builtins.py:5380

3317

#: bzrlib/builtins.py:5473

3318

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

3319

msgstr ""

3320

3321

#: bzrlib/builtins.py:5381

3321

#: bzrlib/builtins.py:5474

3322

msgid "protocol"

3323

msgstr ""

3324

3325

#: bzrlib/builtins.py:5382

3325

#: bzrlib/builtins.py:5475

3326

msgid "Protocol to serve."

3327

msgstr ""

3328

3329

#: bzrlib/builtins.py:5386

3329

#: bzrlib/builtins.py:5479

3330

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

3334

msgstr ""

3335

3336

#: bzrlib/builtins.py:5392

3336

#: bzrlib/builtins.py:5485

3337

msgid "Serve contents of this directory."

3338

msgstr ""

3339

3340

#: bzrlib/builtins.py:5394

3340

#: bzrlib/builtins.py:5487

3341

msgid ""

3342

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

3343

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

3346

"uncontrolled write access to your file system."

3347

msgstr ""

3348

3349

#: bzrlib/builtins.py:5403

3349

#: bzrlib/builtins.py:5496

3350

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

3351

msgstr ""

3352

3353

#: bzrlib/builtins.py:5453

3353

#: bzrlib/builtins.py:5546

3354

msgid "Combine a tree into its containing tree."

3355

msgstr ""

3356

3357

#: bzrlib/builtins.py:5455

3357

#: bzrlib/builtins.py:5548

3358

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

3359

msgstr ""

3360

3361

#: bzrlib/builtins.py:5457

3361

#: bzrlib/builtins.py:5550

3362

msgid ""

3363

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

3364

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

3365

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

3366

msgstr ""

3367

3368

#: bzrlib/builtins.py:5461

3368

#: bzrlib/builtins.py:5554

3369

msgid ""

3370

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

3371

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

3372

"and all history is preserved."

3373

msgstr ""

3374

3375

#: bzrlib/builtins.py:5479

3375

#: bzrlib/builtins.py:5572

3376

#, python-format

3377

msgid ""

3378

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

3379

"You can use bzr upgrade on the repository."

3380

msgstr ""

3381

3382

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

3382

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

3383

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

3384

msgstr ""

3385

3386

#: bzrlib/builtins.py:5499

3386

#: bzrlib/builtins.py:5592

3387

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

3388

msgstr ""

3389

3390

#: bzrlib/builtins.py:5501

3390

#: bzrlib/builtins.py:5594

3391

msgid ""

3392

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

3393

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

3394

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

3395

msgstr ""

3396

3397

#: bzrlib/builtins.py:5505

3397

#: bzrlib/builtins.py:5598

3398

msgid ""

3399

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

3400

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

3401

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

3402

msgstr ""

3403

3404

#: bzrlib/builtins.py:5585

3404

#: bzrlib/builtins.py:5678

3405

msgid "No submit branch specified or known"

3406

msgstr ""

3407

3408

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

3408

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

3409

msgid "No public branch specified or known"

3410

msgstr ""

3411

3412

#: bzrlib/builtins.py:5598

3412

#: bzrlib/builtins.py:5691

3413

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

3414

msgstr ""

3415

3416

#: bzrlib/builtins.py:5607

3416

#: bzrlib/builtins.py:5700

3417

msgid "No revisions to bundle."

3418

msgstr ""

3419

3420

#: bzrlib/builtins.py:5626

3420

#: bzrlib/builtins.py:5719

3421

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

3422

msgstr ""

3423

3424

#: bzrlib/builtins.py:5628

3424

#: bzrlib/builtins.py:5721

3425

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

3426

msgstr ""

3427

3428

#: bzrlib/builtins.py:5630

3428

#: bzrlib/builtins.py:5723

3429

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

3430

msgstr ""

3431

3432

#: bzrlib/builtins.py:5632

3432

#: bzrlib/builtins.py:5725

3433

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

3434

msgstr ""

3435

3436

#: bzrlib/builtins.py:5634

3436

#: bzrlib/builtins.py:5727

3437

msgid ""

3438

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

3439

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

3440

" branch."

3441

msgstr ""

3442

3443

#: bzrlib/builtins.py:5638

3443

#: bzrlib/builtins.py:5731

3444

msgid ""

3445

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

3446

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

3447

msgstr ""

3448

3449

#: bzrlib/builtins.py:5641

3449

#: bzrlib/builtins.py:5734

3450

msgid ""

3451

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

3452

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

3453

"the source branch."

3454

msgstr ""

3455

3456

#: bzrlib/builtins.py:5645

3456

#: bzrlib/builtins.py:5738

3457

msgid ""

3458

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

3459

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

3462

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

3463

msgstr ""

3464

3465

#: bzrlib/builtins.py:5651

3465

#: bzrlib/builtins.py:5744

3466

msgid ""

3467

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

3468

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

3471

"be changed using --from."

3472

msgstr ""

3473

3474

#: bzrlib/builtins.py:5657

3474

#: bzrlib/builtins.py:5750

3475

msgid ""

3476

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

3477

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

3480

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

3481

msgstr ""

3482

3483

#: bzrlib/builtins.py:5663

3483

#: bzrlib/builtins.py:5756

3484

msgid ""

3485

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

3486

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

3488

"in the merge directive."

3489

msgstr ""

3490

3491

#: bzrlib/builtins.py:5668

3491

#: bzrlib/builtins.py:5761

3492

msgid ""

3493

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

3494

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

3495

msgstr ""

3496

3497

#: bzrlib/builtins.py:5671

3497

#: bzrlib/builtins.py:5764

3498

msgid ""

3499

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

3500

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

3501

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

3502

msgstr ""

3503

3504

#: bzrlib/builtins.py:5675

3504

#: bzrlib/builtins.py:5768

3505

msgid ""

3506

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

3507

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

3513

"supported clients."

3514

msgstr ""

3515

3516

#: bzrlib/builtins.py:5682

3516

#: bzrlib/builtins.py:5775

3517

msgid ""

3518

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

3519

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

3521

"in the submit branch."

3522

msgstr ""

3523

3524

#: bzrlib/builtins.py:5687

3524

#: bzrlib/builtins.py:5780

3525

msgid ""

3526

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

3527

"and\n"

3531

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

3532

msgstr ""

3533

3534

#: bzrlib/builtins.py:5693

3534

#: bzrlib/builtins.py:5786

3535

msgid ""

3536

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

3537

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

3538

msgstr ""

3539

3540

#: bzrlib/builtins.py:5696

3540

#: bzrlib/builtins.py:5789

3541

msgid ""

3542

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

3543

"into\n"

3545

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

3546

msgstr ""

3547

3548

#: bzrlib/builtins.py:5720

3548

#: bzrlib/builtins.py:5813

3549

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

3550

msgstr ""

3551

3552

#: bzrlib/builtins.py:5724

3552

#: bzrlib/builtins.py:5817

3553

msgid ""

3554

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

3555

"strict disables the check."

3556

msgstr ""

3557

3558

#: bzrlib/builtins.py:5726

3558

#: bzrlib/builtins.py:5819

3559

msgid "Mail the request to this address."

3560

msgstr ""

3561

3562

#: bzrlib/builtins.py:5730

3562

#: bzrlib/builtins.py:5823

3563

msgid "Body for the email."

3564

msgstr ""

3565

3566

#: bzrlib/builtins.py:5783

3566

#: bzrlib/builtins.py:5876

3567

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

3568

msgstr ""

3569

3570

#: bzrlib/builtins.py:5784

3570

#: bzrlib/builtins.py:5877

3571

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

3572

msgstr ""

3573

3574

#: bzrlib/builtins.py:5787

3574

#: bzrlib/builtins.py:5880

3575

msgid "Remember submit and public branch."

3576

msgstr ""

3577

3578

#: bzrlib/builtins.py:5789

3578

#: bzrlib/builtins.py:5882

3579

msgid ""

3580

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

3581

"working directory."

3582

msgstr ""

3583

3584

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

3584

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

3585

msgid "format"

3586

msgstr ""

3587

3588

#: bzrlib/builtins.py:5800

3588

#: bzrlib/builtins.py:5893

3589

msgid "Use the specified output format."

3590

msgstr ""

3591

3592

#: bzrlib/builtins.py:5822

3592

#: bzrlib/builtins.py:5915

3593

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

3594

msgstr ""

3595

3596

#: bzrlib/builtins.py:5824

3596

#: bzrlib/builtins.py:5917

3597

msgid ""

3598

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

3599

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

3600

"created tag."

3601

msgstr ""

3602

3603

#: bzrlib/builtins.py:5828

3603

#: bzrlib/builtins.py:5921

3604

msgid ""

3605

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

3606

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

3607

msgstr ""

3608

3609

#: bzrlib/builtins.py:5831

3609

#: bzrlib/builtins.py:5924

3610

msgid ""

3611

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

3612

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

3613

msgstr ""

3614

3615

#: bzrlib/builtins.py:5834

3615

#: bzrlib/builtins.py:5927

3616

msgid ""

3617

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

3618

"``bzr\n"

3619

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

3620

msgstr ""

3621

3622

#: bzrlib/builtins.py:5837

3622

#: bzrlib/builtins.py:5930

3623

msgid ""

3624

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

3625

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

3627

"details."

3628

msgstr ""

3629

3630

#: bzrlib/builtins.py:5847

3630

#: bzrlib/builtins.py:5940

3631

msgid "Delete this tag rather than placing it."

3632

msgstr ""

3633

3634

#: bzrlib/builtins.py:5850

3634

#: bzrlib/builtins.py:5943

3635

msgid "Branch in which to place the tag."

3636

msgstr ""

3637

3638

#: bzrlib/builtins.py:5852

3638

#: bzrlib/builtins.py:5945

3639

msgid "Replace existing tags."

3640

msgstr ""

3641

3642

#: bzrlib/builtins.py:5867

3642

#: bzrlib/builtins.py:5960

3643

msgid "No tag specified to delete."

3644

msgstr ""

3645

3646

#: bzrlib/builtins.py:5869

3646

#: bzrlib/builtins.py:5962

3647

#, python-format

3648

msgid "Deleted tag %s."

3649

msgstr ""

3650

3651

#: bzrlib/builtins.py:5883

3651

#: bzrlib/builtins.py:5976

3652

msgid "Please specify a tag name."

3653

msgstr ""

3654

3655

#: bzrlib/builtins.py:5891

3655

#: bzrlib/builtins.py:5984

3656

#, python-format

3657

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

3658

msgstr ""

3659

3660

#: bzrlib/builtins.py:5895

3660

#: bzrlib/builtins.py:5988

3661

#, python-format

3662

msgid "Created tag %s."

3663

msgstr ""

3664

3665

#: bzrlib/builtins.py:5897

3665

#: bzrlib/builtins.py:5990

3666

#, python-format

3667

msgid "Updated tag %s."

3668

msgstr ""

3669

3670

#: bzrlib/builtins.py:5901

3670

#: bzrlib/builtins.py:5994

3671

msgid "List tags."

3672

msgstr ""

3673

3674

#: bzrlib/builtins.py:5903

3674

#: bzrlib/builtins.py:5996

3675

msgid ""

3676

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

3677

msgstr ""

3678

3679

#: bzrlib/builtins.py:5909

3679

#: bzrlib/builtins.py:6002

3680

msgid "Branch whose tags should be displayed."

3681

msgstr ""

3682

3683

#: bzrlib/builtins.py:5911

3683

#: bzrlib/builtins.py:6004

3684

msgid "Sort tags by different criteria."

3685

msgstr ""

3686

3687

#: bzrlib/builtins.py:5911

3687

#: bzrlib/builtins.py:6004

3688

msgid "Sorting"

3689

msgstr ""

3690

3691

#: bzrlib/builtins.py:5980

3691

#: bzrlib/builtins.py:6073

3692

msgid "Reconfigure the type of a bzr directory."

3693

msgstr ""

3694

3695

#: bzrlib/builtins.py:5982

3695

#: bzrlib/builtins.py:6075

3696

msgid "A target configuration must be specified."

3697

msgstr ""

3698

3699

#: bzrlib/builtins.py:5984

3699

#: bzrlib/builtins.py:6077

3700

msgid ""

3701

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

3702

"The order of preference is\n"

3707

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

3708

msgstr ""

3709

3710

#: bzrlib/builtins.py:5998

3710

#: bzrlib/builtins.py:6091

3711

msgid "Tree type"

3712

msgstr ""

3713

3714

#: bzrlib/builtins.py:5999

3714

#: bzrlib/builtins.py:6092

3715

msgid "The relation between branch and tree."

3716

msgstr ""

3717

3718

#: bzrlib/builtins.py:6001

3718

#: bzrlib/builtins.py:6094

3719

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

3720

msgstr ""

3721

3722

#: bzrlib/builtins.py:6002

3722

#: bzrlib/builtins.py:6095

3723

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

3724

msgstr ""

3725

3726

#: bzrlib/builtins.py:6003

3726

#: bzrlib/builtins.py:6096

3727

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

3728

msgstr ""

3729

3730

#: bzrlib/builtins.py:6004

3730

#: bzrlib/builtins.py:6097

3731

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

3732

msgstr ""

3733

3734

#: bzrlib/builtins.py:6009

3734

#: bzrlib/builtins.py:6102

3735

msgid "Repository type"

3736

msgstr ""

3737

3738

#: bzrlib/builtins.py:6010

3738

#: bzrlib/builtins.py:6103

3739

msgid "Location fo the repository."

3740

msgstr ""

3741

3742

#: bzrlib/builtins.py:6012

3742

#: bzrlib/builtins.py:6105

3743

msgid ""

3744

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

3745

msgstr ""

3746

3747

#: bzrlib/builtins.py:6014

3747

#: bzrlib/builtins.py:6107

3748

msgid "Reconfigure to use a shared repository."

3749

msgstr ""

3750

3751

#: bzrlib/builtins.py:6018

3751

#: bzrlib/builtins.py:6111

3752

msgid "Trees in Repository"

3753

msgstr ""

3754

3755

#: bzrlib/builtins.py:6019

3755

#: bzrlib/builtins.py:6112

3756

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

3757

msgstr ""

3758

3759

#: bzrlib/builtins.py:6021

3759

#: bzrlib/builtins.py:6114

3760

msgid ""

3761

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

3762

msgstr ""

3763

3764

#: bzrlib/builtins.py:6023

3764

#: bzrlib/builtins.py:6116

3765

msgid ""

3766

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

3767

msgstr ""

3768

3769

#: bzrlib/builtins.py:6026

3769

#: bzrlib/builtins.py:6119

3770

msgid "Branch to bind checkout to."

3771

msgstr ""

3772

3773

#: bzrlib/builtins.py:6028

3773

#: bzrlib/builtins.py:6121

3774

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

3775

msgstr ""

3776

3777

#: bzrlib/builtins.py:6031

3777

#: bzrlib/builtins.py:6124

3778

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

3779

msgstr ""

3780

3781

#: bzrlib/builtins.py:6035

3781

#: bzrlib/builtins.py:6128

3782

msgid ""

3783

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

3784

"data into it."

3785

msgstr ""

3786

3787

#: bzrlib/builtins.py:6045

3787

#: bzrlib/builtins.py:6138

3788

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

3789

msgstr ""

3790

3791

#: bzrlib/builtins.py:6059

3791

#: bzrlib/builtins.py:6152

3792

msgid "No target configuration specified"

3793

msgstr ""

3794

3795

#: bzrlib/builtins.py:6094

3795

#: bzrlib/builtins.py:6187

3796

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

3797

msgstr ""

3798

3799

#: bzrlib/builtins.py:6096

3799

#: bzrlib/builtins.py:6189

3800

msgid ""

3801

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

3802

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

3804

"of the new location and binds to it."

3805

msgstr ""

3806

3807

#: bzrlib/builtins.py:6101

3807

#: bzrlib/builtins.py:6194

3808

msgid ""

3809

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

3810

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

3811

msgstr ""

3812

3813

#: bzrlib/builtins.py:6104

3813

#: bzrlib/builtins.py:6197

3814

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

3815

msgstr ""

3816

3817

#: bzrlib/builtins.py:6106

3817

#: bzrlib/builtins.py:6199

3818

msgid ""

3819

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

3820

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

3822

"/path/to/newbranch."

3823

msgstr ""

3824

3825

#: bzrlib/builtins.py:6111

3825

#: bzrlib/builtins.py:6204

3826

msgid ""

3827

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

3828

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

3829

"that of the master."

3830

msgstr ""

3831

3832

#: bzrlib/builtins.py:6119

3832

#: bzrlib/builtins.py:6212

3833

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

3834

msgstr ""

3835

3836

#: bzrlib/builtins.py:6122

3836

#: bzrlib/builtins.py:6215

3837

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

3838

msgstr ""

3839

3840

#: bzrlib/builtins.py:6134

3840

#: bzrlib/builtins.py:6229

3841

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

3842

msgstr ""

3843

3844

#: bzrlib/builtins.py:6145

3844

#: bzrlib/builtins.py:6242

3845

msgid "cannot create branch without source branch"

3846

msgstr ""

3847

3848

#: bzrlib/builtins.py:6209

3848

#: bzrlib/builtins.py:6262

3849

msgid "Manage filtered views."

3850

msgstr ""

3851

3852

#: bzrlib/builtins.py:6211

3852

#: bzrlib/builtins.py:6264

3853

msgid ""

3854

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

3855

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

3859

"must be within the current view."

3860

msgstr ""

3861

3862

#: bzrlib/builtins.py:6218

3862

#: bzrlib/builtins.py:6271

3863

msgid ""

3864

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

3865

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

3867

"and switch between them."

3868

msgstr ""

3869

3870

#: bzrlib/builtins.py:6223

3870

#: bzrlib/builtins.py:6276

3871

msgid ""

3872

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

3873

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

3875

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

3876

msgstr ""

3877

3878

#: bzrlib/builtins.py:6228

3878

#: bzrlib/builtins.py:6281

3879

msgid ""

3880

":Examples:\n"

3881

" To define the current view::"

3882

msgstr ""

3883

3884

#: bzrlib/builtins.py:6231

3884

#: bzrlib/builtins.py:6284

3885

msgid " bzr view file1 dir1 ..."

3886

msgstr ""

3887

3888

#: bzrlib/builtins.py:6233

3888

#: bzrlib/builtins.py:6286

3889

msgid " To list the current view::"

3890

msgstr ""

3891

3892

#: bzrlib/builtins.py:6235

3892

#: bzrlib/builtins.py:6288

3893

msgid " bzr view"

3894

msgstr ""

3895

3896

#: bzrlib/builtins.py:6237

3896

#: bzrlib/builtins.py:6290

3897

msgid " To delete the current view::"

3898

msgstr ""

3899

3900

#: bzrlib/builtins.py:6239

3900

#: bzrlib/builtins.py:6292

3901

msgid " bzr view --delete"

3902

msgstr ""

3903

3904

#: bzrlib/builtins.py:6241

3904

#: bzrlib/builtins.py:6294

3905

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

3906

msgstr ""

3907

3908

#: bzrlib/builtins.py:6243

3908

#: bzrlib/builtins.py:6296

3909

msgid " bzr view --switch off"

3910

msgstr ""

3911

3912

#: bzrlib/builtins.py:6245

3912

#: bzrlib/builtins.py:6298

3913

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

3914

msgstr ""

3915

3916

#: bzrlib/builtins.py:6247

3916

#: bzrlib/builtins.py:6300

3917

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

3918

msgstr ""

3919

3920

#: bzrlib/builtins.py:6249

3920

#: bzrlib/builtins.py:6302

3921

msgid " To list a named view::"

3922

msgstr ""

3923

3924

#: bzrlib/builtins.py:6251

3924

#: bzrlib/builtins.py:6304

3925

msgid " bzr view --name view-name"

3926

msgstr ""

3927

3928

#: bzrlib/builtins.py:6253

3928

#: bzrlib/builtins.py:6306

3929

msgid " To delete a named view::"

3930

msgstr ""

3931

3932

#: bzrlib/builtins.py:6255

3932

#: bzrlib/builtins.py:6308

3933

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

3934

msgstr ""

3935

3936

#: bzrlib/builtins.py:6257

3936

#: bzrlib/builtins.py:6310

3937

msgid " To switch to a named view::"

3938

msgstr ""

3939

3940

#: bzrlib/builtins.py:6259

3940

#: bzrlib/builtins.py:6312

3941

msgid " bzr view --switch view-name"

3942

msgstr ""

3943

3944

#: bzrlib/builtins.py:6261

3944

#: bzrlib/builtins.py:6314

3945

msgid " To list all views defined::"

3946

msgstr ""

3947

3948

#: bzrlib/builtins.py:6263

3948

#: bzrlib/builtins.py:6316

3949

msgid " bzr view --all"

3950

msgstr ""

3951

3952

#: bzrlib/builtins.py:6265

3952

#: bzrlib/builtins.py:6318

3953

msgid " To delete all views::"

3954

msgstr ""

3955

3956

#: bzrlib/builtins.py:6267

3956

#: bzrlib/builtins.py:6320

3957

msgid " bzr view --delete --all"

3958

msgstr ""

3959

3960

#: bzrlib/builtins.py:6274

3960

#: bzrlib/builtins.py:6327

3961

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

3962

msgstr ""

3963

3964

#: bzrlib/builtins.py:6277

3964

#: bzrlib/builtins.py:6330

3965

msgid "Delete the view."

3966

msgstr ""

3967

3968

#: bzrlib/builtins.py:6280

3968

#: bzrlib/builtins.py:6333

3969

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

3970

msgstr ""

3971

3972

#: bzrlib/builtins.py:6284

3972

#: bzrlib/builtins.py:6337

3973

msgid "Name of the view to switch to."

3974

msgstr ""

3975

3976

#: bzrlib/builtins.py:6303

3976

#: bzrlib/builtins.py:6356

3977

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

3978

msgstr ""

3979

3980

#: bzrlib/builtins.py:6306

3980

#: bzrlib/builtins.py:6359

3981

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

3982

msgstr ""

3983

3984

#: bzrlib/builtins.py:6309

3984

#: bzrlib/builtins.py:6362

3985

msgid "Deleted all views.\n"

3986

msgstr ""

3987

3988

#: bzrlib/builtins.py:6311

3988

#: bzrlib/builtins.py:6364

3989

msgid "No current view to delete"

3990

msgstr ""

3991

3992

#: bzrlib/builtins.py:6314

3992

#: bzrlib/builtins.py:6367

3993

#, python-format

3994

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

3995

msgstr ""

3996

3997

#: bzrlib/builtins.py:6318

3997

#: bzrlib/builtins.py:6371

3998

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

3999

msgstr ""

4000

4001

#: bzrlib/builtins.py:6321

4001

#: bzrlib/builtins.py:6374

4002

msgid "Both --switch and --all specified"

4003

msgstr ""

4004

4005

#: bzrlib/builtins.py:6324

4005

#: bzrlib/builtins.py:6377

4006

msgid "No current view to disable"

4007

msgstr ""

4008

4009

#: bzrlib/builtins.py:6326

4009

#: bzrlib/builtins.py:6379

4010

#, python-format

4011

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

4012

msgstr ""

4013

4014

#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352

4014

#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405

4015

msgid "Using '{0}' view: {1}\n"

4016

msgstr ""

4017

4018

#: bzrlib/builtins.py:6333

4018

#: bzrlib/builtins.py:6386

4019

msgid "Views defined:\n"

4020

msgstr ""

4021

4022

#: bzrlib/builtins.py:6342

4022

#: bzrlib/builtins.py:6395

4023

msgid "No views defined.\n"

4024

msgstr ""

4025

4026

#: bzrlib/builtins.py:6349

4026

#: bzrlib/builtins.py:6402

4027

msgid "Cannot change the 'off' pseudo view"

4028

msgstr ""

4029

4030

#: bzrlib/builtins.py:6357

4030

#: bzrlib/builtins.py:6410

4031

msgid "No current view.\n"

4032

msgstr ""

4033

4034

#: bzrlib/builtins.py:6360

4034

#: bzrlib/builtins.py:6413

4035

msgid "'{0}' view is: {1}\n"

4036

msgstr ""

4037

4038

#: bzrlib/builtins.py:6380

4038

#: bzrlib/builtins.py:6433

4039

msgid " <no hooks installed>\n"

4040

msgstr ""

4041

4042

#: bzrlib/builtins.py:6384

4042

#: bzrlib/builtins.py:6437

4043

msgid "Remove a branch."

4044

msgstr ""

4045

4046

#: bzrlib/builtins.py:6386

4046

#: bzrlib/builtins.py:6439

4047

msgid ""

4048

"This will remove the branch from the specified location but \n"

4049

"will keep any working tree or repository in place."

4050

msgstr ""

4051

4052

#: bzrlib/builtins.py:6391

4052

#: bzrlib/builtins.py:6444

4053

msgid " Remove the branch at repo/trunk::"

4054

msgstr ""

4055

4056

#: bzrlib/builtins.py:6393

4056

#: bzrlib/builtins.py:6446

4057

msgid " bzr remove-branch repo/trunk"

4058

msgstr ""

4059

4060

#: bzrlib/builtins.py:6408

4060

#: bzrlib/builtins.py:6461

4061

msgid "Plaintext diff output."

4062

msgstr ""

4063

4064

#: bzrlib/builtins.py:6409

4064

#: bzrlib/builtins.py:6462

4065

msgid "Temporarily set aside some changes from the current tree."

4066

msgstr ""

4067

4068

#: bzrlib/builtins.py:6411

4068

#: bzrlib/builtins.py:6464

4069

msgid ""

4070

"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"

4071

"ie. out of the way, until a later time when you can bring them back from\n"

4074

"will they survive its deletion."

4075

msgstr ""

4076

4077

#: bzrlib/builtins.py:6417

4077

#: bzrlib/builtins.py:6470

4078

msgid "If shelve --list is specified, previously-shelved changes are listed."

4079

msgstr ""

4080

4081

#: bzrlib/builtins.py:6419

4081

#: bzrlib/builtins.py:6472

4082

msgid ""

4083

"Shelve is intended to help separate several sets of changes that have\n"

4084

"been inappropriately mingled. If you just want to get rid of all changes\n"

4086

"shelve all text changes at once, use shelve --all."

4087

msgstr ""

4088

4089

#: bzrlib/builtins.py:6424

4089

#: bzrlib/builtins.py:6477

4090

msgid ""

4091

"If filenames are specified, only the changes to those files will be\n"

4092

"shelved. Other files will be left untouched."

4093

msgstr ""

4094

4095

#: bzrlib/builtins.py:6427

4095

#: bzrlib/builtins.py:6480

4096

msgid ""

4097

"If a revision is specified, changes since that revision will be shelved."

4098

msgstr ""

4099

4100

#: bzrlib/builtins.py:6429

4100

#: bzrlib/builtins.py:6482

4101

msgid ""

4102

"You can put multiple items on the shelf, and by default, 'unshelve' will\n"

4103

"restore the most recently shelved changes."

4104

msgstr ""

4105

4106

#: bzrlib/builtins.py:6432

4106

#: bzrlib/builtins.py:6485

4107

msgid ""

4108

"For complicated changes, it is possible to edit the changes in a separate\n"

4109

"editor program to decide what the file remaining in the working copy\n"

4110

"should look like. To do this, add the configuration option"

4111

msgstr ""

4112

4113

#: bzrlib/builtins.py:6436

4113

#: bzrlib/builtins.py:6489

4114

msgid " change_editor = PROGRAM @new_path @old_path"

4115

msgstr ""

4116

4117

#: bzrlib/builtins.py:6438

4117

#: bzrlib/builtins.py:6491

4118

msgid ""

4119

"where @new_path is replaced with the path of the new version of the \n"

4120

"file and @old_path is replaced with the path of the old version of \n"

4123

" "

4124

msgstr ""

4125

4126

#: bzrlib/builtins.py:6450

4126

#: bzrlib/builtins.py:6503

4127

msgid "Shelve all changes."

4128

msgstr ""

4129

4130

#: bzrlib/builtins.py:6452

4130

#: bzrlib/builtins.py:6505

4131

msgid "Method to use for writing diffs."

4132

msgstr ""

4133

4134

#: bzrlib/builtins.py:6452

4134

#: bzrlib/builtins.py:6505

4135

msgid "writer"

4136

msgstr ""

4137

4138

#: bzrlib/builtins.py:6456

4138

#: bzrlib/builtins.py:6509

4139

msgid "List shelved changes."

4140

msgstr ""

4141

4142

#: bzrlib/builtins.py:6458

4142

#: bzrlib/builtins.py:6511

4143

msgid "Destroy removed changes instead of shelving them."

4144

msgstr ""

4145

4146

#: bzrlib/builtins.py:6487

4146

#: bzrlib/builtins.py:6540

4147

msgid "No shelved changes."

4148

msgstr ""

4149

4150

#: bzrlib/builtins.py:6498

4150

#: bzrlib/builtins.py:6551

4151

msgid "Restore shelved changes."

4152

msgstr ""

4153

4154

#: bzrlib/builtins.py:6500

4154

#: bzrlib/builtins.py:6553

4155

msgid ""

4156

"By default, the most recently shelved changes are restored. However if you\n"

4157

"specify a shelf by id those changes will be restored instead. This works\n"

4158

"best when the changes don't depend on each other."

4159

msgstr ""

4160

4161

#: bzrlib/builtins.py:6509

4161

#: bzrlib/builtins.py:6562

4162

msgid "The action to perform."

4163

msgstr ""

4164

4165

#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694

4165

#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694

4166

msgid "action"

4167

msgstr ""

4168

4169

#: bzrlib/builtins.py:6511

4169

#: bzrlib/builtins.py:6564

4170

msgid "Apply changes and remove from the shelf."

4171

msgstr ""

4172

4173

#: bzrlib/builtins.py:6512

4173

#: bzrlib/builtins.py:6565

4174

msgid "Show changes, but do not apply or remove them."

4175

msgstr ""

4176

4177

#: bzrlib/builtins.py:6513

4177

#: bzrlib/builtins.py:6566

4178

msgid ""

4179

"Instead of unshelving the changes, show the diff that would result from "

4180

"unshelving."

4181

msgstr ""

4182

4183

#: bzrlib/builtins.py:6515

4183

#: bzrlib/builtins.py:6568

4184

msgid "Delete changes without applying them."

4185

msgstr ""

4186

4187

#: bzrlib/builtins.py:6516

4187

#: bzrlib/builtins.py:6569

4188

msgid "Apply changes but don't delete them."

4189

msgstr ""

4190

4191

#: bzrlib/builtins.py:6531

4191

#: bzrlib/builtins.py:6584

4192

msgid "Remove unwanted files from working tree."

4193

msgstr ""

4194

4195

#: bzrlib/builtins.py:6533

4195

#: bzrlib/builtins.py:6586

4196

msgid ""

4197

"By default, only unknown files, not ignored files, are deleted. Versioned\n"

4198

"files are never deleted."

4199

msgstr ""

4200

4201

#: bzrlib/builtins.py:6536

4201

#: bzrlib/builtins.py:6589

4202

msgid ""

4203

"Another class is 'detritus', which includes files emitted by bzr during\n"

4204

"normal operations and selftests. (The value of these files decreases with\n"

4205

"time.)"

4206

msgstr ""

4207

4208

#: bzrlib/builtins.py:6540

4208

#: bzrlib/builtins.py:6593

4209

msgid ""

4210

"If no options are specified, unknown files are deleted. Otherwise, option\n"

4211

"flags are respected, and may be combined."

4212

msgstr ""

4213

4214

#: bzrlib/builtins.py:6543

4214

#: bzrlib/builtins.py:6596

4215

msgid "To check what clean-tree will do, use --dry-run."

4216

msgstr ""

4217

4218

#: bzrlib/builtins.py:6546

4218

#: bzrlib/builtins.py:6599

4219

msgid "Delete all ignored files."

4220

msgstr ""

4221

4222

#: bzrlib/builtins.py:6547

4222

#: bzrlib/builtins.py:6600

4223

msgid ""

4224

"Delete conflict files, merge and revert backups, and failed selftest dirs."

4225

msgstr ""

4226

4227

#: bzrlib/builtins.py:6550

4227

#: bzrlib/builtins.py:6603

4228

msgid "Delete files unknown to bzr (default)."

4229

msgstr ""

4230

4231

#: bzrlib/builtins.py:6551

4231

#: bzrlib/builtins.py:6604

4232

msgid "Show files to delete instead of deleting them."

4233

msgstr ""

4234

4235

#: bzrlib/builtins.py:6553

4235

#: bzrlib/builtins.py:6606

4236

msgid "Do not prompt before deleting."

4237

msgstr ""

4238

4292

msgstr[0] ""

4293

msgstr[1] ""

4294

4295

#: bzrlib/bzrdir.py:489

4295

#: bzrlib/bzrdir.py:490

4296

msgid ""

4297

"making backup of {0}\n"

4298

" to {1}"

4299

msgstr ""

4300

4301

#: bzrlib/bzrdir.py:512

4301

#: bzrlib/bzrdir.py:513

4302

msgid "renamed {0} to {1}"

4303

msgstr ""

4304

4305

#: bzrlib/bzrdir.py:1663

4305

#: bzrlib/bzrdir.py:1652

4306

#, python-format

4307

msgid ""

4308

"Source repository format does not support stacking, using format:\n"

4309

" %s"

4310

msgstr ""

4311

4312

#: bzrlib/bzrdir.py:1683

4312

#: bzrlib/bzrdir.py:1672

4313

#, python-format

4314

msgid ""

4315

"Source branch format does not support stacking, using format:\n"

4316

" %s"

4317

msgstr ""

4318

4319

#: bzrlib/bzrdir.py:1829

4319

#: bzrlib/bzrdir.py:1818

4320

msgid "starting repository conversion"

4321

msgstr ""

4322

4323

#: bzrlib/bzrdir.py:2058

4323

#: bzrlib/bzrdir.py:2039

4324

msgid "Using default stacking branch {0} at {1}"

4325

msgstr ""

4326

4559

msgid "bzr version-info --revision takes exactly one revision specifier"

4560

msgstr ""

4561

4562

#: bzrlib/commands.py:228

4562

#: bzrlib/commands.py:229

4563

#, python-format

4564

msgid "unknown command \"%s\""

4565

msgstr ""

4566

4567

#: bzrlib/commands.py:475

4567

#: bzrlib/commands.py:476

4568

msgid "No help for this command."

4569

msgstr ""

4570

4571

#: bzrlib/commands.py:488

4571

#: bzrlib/commands.py:489

4572

#, python-format

4573

msgid ":Purpose: %s\n"

4574

msgstr ""

4575

4576

#: bzrlib/commands.py:490

4576

#: bzrlib/commands.py:491

4577

#, python-format

4578

msgid ""

4579

":Usage:\n"

4580

"%s\n"

4581

msgstr ""

4582

4583

#: bzrlib/commands.py:492

4583

#: bzrlib/commands.py:493

4584

#, python-format

4585

msgid ":Usage: %s\n"

4586

msgstr ""

4587

4588

#: bzrlib/commands.py:511

4588

#: bzrlib/commands.py:512

4589

#, python-format

4590

msgid ":Options:%s"

4591

msgstr ""

4592

4593

#: bzrlib/commands.py:522

4593

#: bzrlib/commands.py:523

4594

#, python-format

4595

msgid ""

4596

":Description:\n"

4598

"\n"

4599

msgstr ""

4600

4601

#: bzrlib/commands.py:532

4601

#: bzrlib/commands.py:533

4602

#, python-format

4603

msgid ""

4604

"See bzr help %s for more details and examples.\n"

4605

"\n"

4606

msgstr ""

4607

4608

#: bzrlib/commands.py:537

4608

#: bzrlib/commands.py:538

4609

msgid ":Aliases: "

4610

msgstr ""

4611

4612

#: bzrlib/commands.py:541

4612

#: bzrlib/commands.py:542

4613

#, python-format

4614

msgid ":From: plugin \"%s\"\n"

4615

msgstr ""

4616

4617

#: bzrlib/commands.py:553

4617

#: bzrlib/commands.py:554

4618

msgid ":doc:`{0} <{1}-help>`"

4619

msgstr ""

4620

4621

#: bzrlib/commands.py:557

4621

#: bzrlib/commands.py:558

4622

#, python-format

4623

msgid ":See also: %s"

4624

msgstr ""

4625

4626

#: bzrlib/commands.py:815 bzrlib/gpg.py:324

4626

#: bzrlib/commands.py:816 bzrlib/gpg.py:324

4627

msgid "Only ASCII permitted in option names"

4628

msgstr ""

4629

4630

#: bzrlib/commands.py:840 bzrlib/commands.py:848

4630

#: bzrlib/commands.py:841 bzrlib/commands.py:849

4631

msgid "command {0!r} needs one or more {1}"

4632

msgstr ""

4633

4634

#: bzrlib/commands.py:857

4634

#: bzrlib/commands.py:858

4635

msgid "command {0!r} requires argument {1}"

4636

msgstr ""

4637

4638

#: bzrlib/commands.py:864

4638

#: bzrlib/commands.py:865

4639

msgid "extra argument to command {0}: {1}"

4640

msgstr ""

4641

4642

#: bzrlib/commands.py:961

4642

#: bzrlib/commands.py:962

4643

#, python-format

4644

msgid "Profile data written to \"%s\"."

4645

msgstr ""

4741

msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."

4742

msgstr ""

4743

4744

#: bzrlib/config.py:2499

4744

#: bzrlib/config.py:2485

4745

msgid "{0} is not an SI unit."

4746

msgstr ""

4747

4748

#: bzrlib/config.py:2956

4748

#: bzrlib/config.py:2949

4749

msgid ""

4750

"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "

4751

"will be saved."

4752

msgstr ""

4753

4754

#: bzrlib/config.py:3100

4754

#: bzrlib/config.py:3093

4755

#, python-format

4756

msgid "Invalid '%s', should be of the form 'name=value'"

4757

msgstr ""

4758

4759

#: bzrlib/config.py:3969

4759

#: bzrlib/config.py:3962

4760

msgid "Display, set or remove a configuration option."

4761

msgstr ""

4762

4763

#: bzrlib/config.py:3971

4763

#: bzrlib/config.py:3964

4764

msgid "Display the active value for a given option."

4765

msgstr ""

4766

4767

#: bzrlib/config.py:3973

4767

#: bzrlib/config.py:3966

4768

msgid ""

4769

"If --all is specified, NAME is interpreted as a regular expression and all\n"

4770

"matching options are displayed mentioning their scope. The active value\n"

4771

"that bzr will take into account is the first one displayed for each option."

4772

msgstr ""

4773

4774

#: bzrlib/config.py:3977

4774

#: bzrlib/config.py:3970

4775

msgid "If no NAME is given, --all .* is implied."

4776

msgstr ""

4777

4778

#: bzrlib/config.py:3979

4778

#: bzrlib/config.py:3972

4779

msgid ""

4780

"Setting a value is achieved by using name=value without spaces. The value\n"

4781

"is set in the most relevant scope and can be checked by displaying the\n"

4782

"option again."

4783

msgstr ""

4784

4785

#: bzrlib/config.py:3991

4785

#: bzrlib/config.py:3984

4786

msgid "Reduce the scope to the specified configuration file."

4787

msgstr ""

4788

4789

#: bzrlib/config.py:3995

4789

#: bzrlib/config.py:3988

4790

msgid "Display all the defined values for the matching options."

4791

msgstr ""

4792

4793

#: bzrlib/config.py:3997

4793

#: bzrlib/config.py:3990

4794

msgid "Remove the option from the configuration file."

4795

msgstr ""

4796

4870

msgstr[0] ""

4871

msgstr[1] ""

4872

4873

#: bzrlib/controldir.py:698

4873

#: bzrlib/controldir.py:710

4874

msgid "{0} is{1} redirected to {2}"

4875

msgstr ""

4876

4976

msgid "The value '%(value)s' is not a valid value."

4977

msgstr ""

4978

4979

#: bzrlib/errors.py:424

4980

msgid "Bad value \"%(value)s\" for option \"%(name)s\"."

4981

msgstr ""

4982

4979

4983

#: bzrlib/errors.py:443

4980

4984

msgid "Generic path error: %(path)r%(extra)s)"

4981

4985

msgstr ""

5075

5079

msgstr ""

5076

5080

5077

5081

#: bzrlib/errors.py:705

5082

msgid "A control directory already exists: \"%(path)s\"."

5083

msgstr ""

5084

5085

#: bzrlib/errors.py:710

5078

5086

msgid "Already a branch: \"%(path)s\"."

5079

5087

msgstr ""

5080

5088

5081

#: bzrlib/errors.py:711

5089

#: bzrlib/errors.py:715

5090

msgid "Parent branch already exists: \"%(path)s\"."

5091

msgstr ""

5092

5093

#: bzrlib/errors.py:721

5082

5094

msgid ""

5083

5095

"Directory contains a branch, but no working tree (use bzr checkout if you "

5084

5096

"wish to build a working tree): \"%(path)s\""

5085

5097

msgstr ""

5086

5098

5087

#: bzrlib/errors.py:716

5099

#: bzrlib/errors.py:726

5088

5100

msgid ""

5089

5101

"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""

5090

5102

msgstr ""

5091

5103

5092

#: bzrlib/errors.py:726

5104

#: bzrlib/errors.py:736

5093

5105

msgid ""

5094

5106

"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""

5095

5107

msgstr ""

5096

5108

5097

#: bzrlib/errors.py:736

5109

#: bzrlib/errors.py:746

5098

5110

msgid "No repository present: \"%(path)s\""

5099

5111

msgstr ""

5100

5112

5101

#: bzrlib/errors.py:743

5113

#: bzrlib/errors.py:753

5102

5114

msgid ""

5103

5115

"Unsupported branch format: %(format)s\n"

5104

5116

"Please run 'bzr upgrade'"

5105

5117

msgstr ""

5106

5118

5107

#: bzrlib/errors.py:749

5119

#: bzrlib/errors.py:759

5108

5120

msgid "Unknown %(kind)s format: %(format)r"

5109

5121

msgstr ""

5110

5122

5111

#: bzrlib/errors.py:758

5123

#: bzrlib/errors.py:768

5112

5124

msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."

5113

5125

msgstr ""

5114

5126

5115

#: bzrlib/errors.py:768

5127

#: bzrlib/errors.py:778

5116

5128

msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"

5117

5129

msgstr ""

5118

5130

5119

#: bzrlib/errors.py:783

5131

#: bzrlib/errors.py:793

5120

5132

msgid ""

5121

5133

"%(target)s\n"

5122

5134

"is not compatible with\n"

5124

5136

"%(details)s"

5125

5137

msgstr ""

5126

5138

5127

#: bzrlib/errors.py:799

5139

#: bzrlib/errors.py:809

5128

5140

msgid "Revision is not compatible with %(repo_format)s"

5129

5141

msgstr ""

5130

5142

5131

#: bzrlib/errors.py:809

5143

#: bzrlib/errors.py:819

5132

5144

msgid "%(context_info)s%(path)s is already versioned."

5133

5145

msgstr ""

5134

5146

5135

#: bzrlib/errors.py:830

5147

#: bzrlib/errors.py:840

5136

5148

msgid "%(context_info)s%(path)s is not versioned."

5137

5149

msgstr ""

5138

5150

5139

#: bzrlib/errors.py:851

5151

#: bzrlib/errors.py:861

5140

5152

msgid "Path(s) are not versioned: %(paths_as_string)s"

5141

5153

msgstr ""

5142

5154

5143

#: bzrlib/errors.py:862

5155

#: bzrlib/errors.py:872

5144

5156

msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"

5145

5157

msgstr ""

5146

5158

5147

#: bzrlib/errors.py:881

5159

#: bzrlib/errors.py:891

5148

5160

msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""

5149

5161

msgstr ""

5150

5162

5151

#: bzrlib/errors.py:889

5163

#: bzrlib/errors.py:899

5152

5164

msgid ""

5153

5165

"Filename %(filename)r is not valid in your current filesystem encoding "

5154

5166

"%(fs_encoding)s"

5155

5167

msgstr ""

5156

5168

5157

#: bzrlib/errors.py:900

5169

#: bzrlib/errors.py:910

5158

5170

msgid "Cannot operate on \"%(filename)s\" because it is a control file"

5159

5171

msgstr ""

5160

5172

5161

#: bzrlib/errors.py:918

5173

#: bzrlib/errors.py:928

5162

5174

msgid "The lock for '%(lock_description)s' is in use and cannot be broken."

5163

5175

msgstr ""

5164

5176

5165

#: bzrlib/errors.py:957

5177

#: bzrlib/errors.py:967

5166

5178

msgid "Cannot lock %(lock)s: %(why)s"

5167

5179

msgstr ""

5168

5180

5169

#: bzrlib/errors.py:967

5181

#: bzrlib/errors.py:977

5170

5182

msgid ""

5171

5183

"A transaction related operation was attempted after the transaction finished."

5172

5184

msgstr ""

5173

5185

5174

#: bzrlib/errors.py:994

5186

#: bzrlib/errors.py:1004

5175

5187

msgid "Cannot lock: transport is read only: %(transport)s"

5176

5188

msgstr ""

5177

5189

5178

#: bzrlib/errors.py:1002

5190

#: bzrlib/errors.py:1012

5179

5191

msgid "Could not acquire lock \"%(lock)s\": %(msg)s"

5180

5192

msgstr ""

5181

5193

5182

#: bzrlib/errors.py:1013

5194

#: bzrlib/errors.py:1023

5183

5195

msgid ""

5184

5196

"Lock was broken while still open: %(lock)s - check storage consistency!"

5185

5197

msgstr ""

5186

5198

5187

#: bzrlib/errors.py:1024

5199

#: bzrlib/errors.py:1034

5188

5200

msgid ""

5189

5201

"Lock was released and re-acquired before being broken: %(lock)s: held by "

5190

5202

"%(holder)r, wanted to break %(target)r"

5191

5203

msgstr ""

5192

5204

5193

#: bzrlib/errors.py:1036

5205

#: bzrlib/errors.py:1046

5194

5206

msgid ""

5195

5207

"Lock is apparently held, but corrupted: %(corruption_info)s\n"

5196

5208

"Use 'bzr break-lock' to clear it"

5197

5209

msgstr ""

5198

5210

5199

#: bzrlib/errors.py:1049

5211

#: bzrlib/errors.py:1059

5200

5212

msgid "Lock not held: %(lock)s"

5201

5213

msgstr ""

5202

5214

5203

#: bzrlib/errors.py:1078

5215

#: bzrlib/errors.py:1088

5204

5216

msgid "No changes to commit"

5205

5217

msgstr ""

5206

5218

5207

#: bzrlib/errors.py:1083

5219

#: bzrlib/errors.py:1093

5208

5220

msgid ""

5209

5221

"Selected-file commit of merges is not supported yet: files %(files_str)s"

5210

5222

msgstr ""

5211

5223

5212

#: bzrlib/errors.py:1093

5224

#: bzrlib/errors.py:1103

5213

5225

msgid ""

5214

5226

"Excluding paths during commit is not supported by repository at "

5215

5227

"%(repository)r."

5216

5228

msgstr ""

5217

5229

5218

#: bzrlib/errors.py:1102

5230

#: bzrlib/errors.py:1112

5219

5231

msgid ""

5220

5232

"The specified commit message contains characters unsupported by the current "

5221

5233

"encoding."

5222

5234

msgstr ""

5223

5235

5224

#: bzrlib/errors.py:1108

5236

#: bzrlib/errors.py:1118

5225

5237

msgid "Upgrade URL cannot work with readonly URLs."

5226

5238

msgstr ""

5227

5239

5228

#: bzrlib/errors.py:1113

5240

#: bzrlib/errors.py:1123

5229

5241

msgid "The branch format %(format)s is already at the most recent format."

5230

5242

msgstr ""

5231

5243

5232

#: bzrlib/errors.py:1136

5244

#: bzrlib/errors.py:1146

5233

5245

msgid "Option --change does not accept revision ranges"

5234

5246

msgstr ""

5235

5247

5236

#: bzrlib/errors.py:1141

5248

#: bzrlib/errors.py:1151

5237

5249

msgid "No namespace registered for string: %(spec)r"

5238

5250

msgstr ""

5239

5251

5240

#: bzrlib/errors.py:1160

5252

#: bzrlib/errors.py:1170

5241

5253

msgid ""

5242

5254

"Requested revision: '%(spec)s' does not exist in branch: "

5243

5255

"%(branch_url)s%(extra)s"

5244

5256

msgstr ""

5245

5257

5246

#: bzrlib/errors.py:1174

5258

#: bzrlib/errors.py:1184

5247

5259

msgid ""

5248

5260

"Operation denied because it would change the main history, which is not "

5249

5261

"permitted by the append_revisions_only setting on branch \"%(location)s\"."

5250

5262

msgstr ""

5251

5263

5252

#: bzrlib/errors.py:1185

5264

#: bzrlib/errors.py:1195

5253

5265

msgid ""

5254

5266

"These branches have diverged. Use the missing command to see how.\n"

5255

5267

"Use the merge command to reconcile them."

5256

5268

msgstr ""

5257

5269

5258

#: bzrlib/errors.py:1205

5270

#: bzrlib/errors.py:1215

5259

5271

msgid ""

5260

5272

"Branches have no common ancestor, and no merge base revision was specified."

5261

5273

msgstr ""

5262

5274

5263

#: bzrlib/errors.py:1211

5275

#: bzrlib/errors.py:1221

5264

5276

msgid ""

5265

5277

"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."

5266

5278

msgstr ""

5267

5279

5268

#: bzrlib/errors.py:1217

5280

#: bzrlib/errors.py:1227

5269

5281

msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"

5270

5282

msgstr ""

5271

5283

5272

#: bzrlib/errors.py:1226

5284

#: bzrlib/errors.py:1236

5273

5285

msgid ""

5274

5286

"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."

5275

5287

msgstr ""

5276

5288

5277

#: bzrlib/errors.py:1235

5289

#: bzrlib/errors.py:1245

5278

5290

msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"

5279

5291

msgstr ""

5280

5292

5281

#: bzrlib/errors.py:1244

5293

#: bzrlib/errors.py:1254

5282

5294

msgid "Branch %(branch)s has no commits."

5283

5295

msgstr ""

5284

5296

5285

#: bzrlib/errors.py:1262

5297

#: bzrlib/errors.py:1272

5286

5298

msgid ""

5287

5299

"Bound branch %(branch)s is out of date with master branch "

5288

5300

"%(master)s.%(extra_help)s"

5289

5301

msgstr ""

5290

5302

5291

#: bzrlib/errors.py:1274

5303

#: bzrlib/errors.py:1284

5292

5304

msgid ""

5293

5305

"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "

5294

5306

"bound to %(remote)s."

5295

5307

msgstr ""

5296

5308

5297

#: bzrlib/errors.py:1286

5309

#: bzrlib/errors.py:1296

5298

5310

msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"

5299

5311

msgstr ""

5300

5312

5301

#: bzrlib/errors.py:1295

5313

#: bzrlib/errors.py:1305

5302

5314

msgid ""

5303

5315

"Unable to connect to target of bound branch %(branch)s => %(target)s: "

5304

5316

"%(error)s"

5305

5317

msgstr ""

5306

5318

5307

#: bzrlib/errors.py:1307

5319

#: bzrlib/errors.py:1317

5308

5320

msgid "Error in processing weave: %(msg)s"

5309

5321

msgstr ""

5310

5322

5311

#: bzrlib/errors.py:1316

5323

#: bzrlib/errors.py:1326

5312

5324

msgid "Revision {%(revision_id)s} already present in %(weave)s"

5313

5325

msgstr ""

5314

5326

5315

#: bzrlib/errors.py:1327

5327

#: bzrlib/errors.py:1337

5316

5328

msgid "Revision {%(revision_id)s} not present in %(weave)s"

5317

5329

msgstr ""

5318

5330

5319

#: bzrlib/errors.py:1337

5331

#: bzrlib/errors.py:1347

5320

5332

msgid "Weave invariant violated: %(what)s"

5321

5333

msgstr ""

5322

5334

5323

#: bzrlib/errors.py:1346

5335

#: bzrlib/errors.py:1356

5324

5336

msgid "Parents are mismatched between two revisions. %(msg)s"

5325

5337

msgstr ""

5326

5338

5327

#: bzrlib/errors.py:1368

5339

#: bzrlib/errors.py:1378

5328

5340

msgid ""

5329

5341

"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "

5330

5342

"%(weave_b)s"

5331

5343

msgstr ""

5332

5344

5333

#: bzrlib/errors.py:1380

5345

#: bzrlib/errors.py:1390

5334

5346

msgid "Versioned file error"

5335

5347

msgstr ""

5336

5348

5337

#: bzrlib/errors.py:1385

5349

#: bzrlib/errors.py:1395

5338

5350

msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."

5339

5351

msgstr ""

5340

5352

5341

#: bzrlib/errors.py:1395

5353

#: bzrlib/errors.py:1405

5342

5354

msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."

5343

5355

msgstr ""

5344

5356

5345

#: bzrlib/errors.py:1405

5357

#: bzrlib/errors.py:1415

5346

5358

msgid "Text did not match its checksum: %(msg)s"

5347

5359

msgstr ""

5348

5360

5349

#: bzrlib/errors.py:1531

5361

#: bzrlib/errors.py:1541

5350

5362

msgid "Export format %(format)r not supported"

5351

5363

msgstr ""

5352

5364

5353

#: bzrlib/errors.py:1540

5365

#: bzrlib/errors.py:1550

5354

5366

msgid "Transport error: %(msg)s %(orig_error)s"

5355

5367

msgstr ""

5356

5368

5357

#: bzrlib/errors.py:1566

5369

#: bzrlib/errors.py:1576

5358

5370

msgid "Generic bzr smart protocol error: %(details)s"

5359

5371

msgstr ""

5360

5372

5361

#: bzrlib/errors.py:1574

5373

#: bzrlib/errors.py:1584

5362

5374

msgid "Received bad protocol version marker: %(marker)r"

5363

5375

msgstr ""

5364

5376

5365

#: bzrlib/errors.py:1606

5377

#: bzrlib/errors.py:1616

5366

5378

msgid "Transport operation not possible: %(msg)s %(orig_error)s"

5367

5379

msgstr ""

5368

5380

5369

#: bzrlib/errors.py:1611

5381

#: bzrlib/errors.py:1621

5370

5382

msgid "Connection error: %(msg)s %(orig_error)s"

5371

5383

msgstr ""

5372

5384

5373

#: bzrlib/errors.py:1616

5385

#: bzrlib/errors.py:1626

5374

5386

msgid "%(msg)s %(host)s%(port)s%(orig_error)s"

5375

5387

msgstr ""

5376

5388

5377

#: bzrlib/errors.py:1637

5389

#: bzrlib/errors.py:1647

5378

5390

msgid "Connection closed: %(msg)s %(orig_error)s"

5379

5391

msgstr ""

5380

5392

5381

#: bzrlib/errors.py:1642

5393

#: bzrlib/errors.py:1652

5382

5394

msgid "Connection Timeout: %(msg)s%(orig_error)s"

5383

5395

msgstr ""

5384

5396

5385

#: bzrlib/errors.py:1647

5397

#: bzrlib/errors.py:1657

5386

5398

msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"

5387

5399

msgstr ""

5388

5400

5389

#: bzrlib/errors.py:1657

5401

#: bzrlib/errors.py:1667

5390

5402

msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"

5391

5403

msgstr ""

5392

5404

5393

#: bzrlib/errors.py:1672

5405

#: bzrlib/errors.py:1682

5406

msgid "Certificate error: %(error)s"

5407

msgstr ""

5408

5409

#: bzrlib/errors.py:1690

5394

5410

msgid "Invalid http range %(range)r for %(path)s: %(msg)s"

5395

5411

msgstr ""

5396

5412

5397

#: bzrlib/errors.py:1686

5413

#: bzrlib/errors.py:1704

5398

5414

msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"

5399

5415

msgstr ""

5400

5416

5401

#: bzrlib/errors.py:1694

5417

#: bzrlib/errors.py:1712

5402

5418

msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"

5403

5419

msgstr ""

5404

5420

5405

#: bzrlib/errors.py:1703

5421

#: bzrlib/errors.py:1721

5406

5422

msgid "%(source)s is%(permanently)s redirected to %(target)s"

5407

5423

msgstr ""

5408

5424

5409

#: bzrlib/errors.py:1717

5425

#: bzrlib/errors.py:1735

5410

5426

msgid "Too many redirections"

5411

5427

msgstr ""

5412

5428

5413

#: bzrlib/errors.py:1722

5429

#: bzrlib/errors.py:1740

5414

5430

msgid "Working tree has conflicts."

5415

5431

msgstr ""

5416

5432

5417

#: bzrlib/errors.py:1726

5433

#: bzrlib/errors.py:1744

5418

5434

msgid "Config file %(filename)s is not UTF-8 encoded\n"

5419

5435

msgstr ""

5420

5436

5421

#: bzrlib/errors.py:1735

5437

#: bzrlib/errors.py:1753

5422

5438

msgid ""

5423

5439

"Error(s) parsing config file %(filename)s:\n"

5424

5440

"%(errors)s"

5425

5441

msgstr ""

5426

5442

5427

#: bzrlib/errors.py:1746

5428

msgid "Bad value \"%(value)s\" for option \"%(name)s\"."

5443

#: bzrlib/errors.py:1763

5444

msgid ""

5445

"Bad value \"%(value)s\" for option \"%(name)s\".\n"

5446

"See ``bzr help %(name)s``"

5429

5447

msgstr ""

5430

5448

5431

#: bzrlib/errors.py:1754

5449

#: bzrlib/errors.py:1773

5432

5450

msgid "%(username)r does not seem to contain a reasonable email address"

5433

5451

msgstr ""

5434

5452

5435

#: bzrlib/errors.py:1763

5453

#: bzrlib/errors.py:1782

5436

5454

msgid "Failed to GPG sign data with command \"%(command_line)s\""

5437

5455

msgstr ""

5438

5456

5439

#: bzrlib/errors.py:1771

5457

#: bzrlib/errors.py:1790

5440

5458

msgid "Failed to verify GPG signature data with error \"%(error)s\""

5441

5459

msgstr ""

5442

5460

5443

#: bzrlib/errors.py:1779

5461

#: bzrlib/errors.py:1798

5444

5462

msgid "Unable to import library \"%(library)s\": %(error)s"

5445

5463

msgstr ""

5446

5464

5447

#: bzrlib/errors.py:1787

5465

#: bzrlib/errors.py:1806

5448

5466

msgid "python-gpgme is not installed, it is needed to verify signatures"

5449

5467

msgstr ""

5450

5468

5451

#: bzrlib/errors.py:1795

5469

#: bzrlib/errors.py:1814

5452

5470

msgid ""

5453

5471

"The working tree for %(basedir)s has changed since the last commit, but "

5454

5472

"weave merge requires that it be unchanged"

5455

5473

msgstr ""

5456

5474

5457

#: bzrlib/errors.py:1805

5475

#: bzrlib/errors.py:1824

5458

5476

msgid ""

5459

5477

"Can't reprocess and show base, because reprocessing obscures the "

5460

5478

"relationship of conflicting lines to the base"

5461

5479

msgstr ""

5462

5480

5463

#: bzrlib/errors.py:1811

5481

#: bzrlib/errors.py:1830

5464

5482

msgid "Cycle in graph %(graph)r"

5465

5483

msgstr ""

5466

5484

5467

#: bzrlib/errors.py:1839

5485

#: bzrlib/errors.py:1858

5468

5486

msgid "File %(filename)s is not conflicted."

5469

5487

msgstr ""

5470

5488

5471

#: bzrlib/errors.py:1861

5489

#: bzrlib/errors.py:1880

5472

5490

msgid "No bundle was found in \"%(filename)s\"."

5473

5491

msgstr ""

5474

5492

5475

#: bzrlib/errors.py:1870

5493

#: bzrlib/errors.py:1889

5476

5494

msgid "Unable to handle bundle version %(version)s: %(msg)s"

5477

5495

msgstr ""

5478

5496

5479

#: bzrlib/errors.py:1880

5497

#: bzrlib/errors.py:1899

5480

5498

msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"

5481

5499

msgstr ""

5482

5500

5483

#: bzrlib/errors.py:1893

5501

#: bzrlib/errors.py:1912

5484

5502

msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"

5485

5503

msgstr ""

5486

5504

5487

#: bzrlib/errors.py:1903

5505

#: bzrlib/errors.py:1922

5488

5506

msgid "Key %(key)s is already present in map"

5489

5507

msgstr ""

5490

5508

5491

#: bzrlib/errors.py:1908

5509

#: bzrlib/errors.py:1927

5492

5510

msgid "The prefix %(prefix)s is in the help search path twice."

5493

5511

msgstr ""

5494

5512

5495

#: bzrlib/errors.py:1918

5513

#: bzrlib/errors.py:1937

5496

5514

msgid ""

5497

5515

"No final name for trans_id %(trans_id)r\n"

5498

5516

"file-id: %(file_id)r\n"

5499

5517

"root trans-id: %(root_trans_id)r\n"

5500

5518

msgstr ""

5501

5519

5502

#: bzrlib/errors.py:1950

5520

#: bzrlib/errors.py:1969

5503

5521

msgid "Attempt to reuse a transform that has already been applied."

5504

5522

msgstr ""

5505

5523

5506

#: bzrlib/errors.py:1955

5524

#: bzrlib/errors.py:1974

5507

5525

msgid "Moving the root directory is not supported at this time"

5508

5526

msgstr ""

5509

5527

5510

#: bzrlib/errors.py:1960

5528

#: bzrlib/errors.py:1979

5511

5529

msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"

5512

5530

msgstr ""

5513

5531

5514

#: bzrlib/errors.py:1971

5532

#: bzrlib/errors.py:1990

5515

5533

msgid ""

5516

5534

"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5517

5535

msgstr ""

5518

5536

5519

#: bzrlib/errors.py:2007

5537

#: bzrlib/errors.py:2026

5520

5538

msgid ""

5521

5539

"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5522

5540

msgstr ""

5523

5541

5524

#: bzrlib/errors.py:2037

5542

#: bzrlib/errors.py:2056

5525

5543

msgid "Unable to import paramiko (required for sftp support): %(error)s"

5526

5544

msgstr ""

5527

5545

5528

#: bzrlib/errors.py:2045

5546

#: bzrlib/errors.py:2064

5529

5547

msgid "Nothing to merge."

5530

5548

msgstr ""

5531

5549

5532

#: bzrlib/errors.py:2050

5550

#: bzrlib/errors.py:2069

5533

5551

msgid "Format %(format)s cannot be initialised by this version of bzr."

5534

5552

msgstr ""

5535

5553

5536

#: bzrlib/errors.py:2059

5554

#: bzrlib/errors.py:2078

5537

5555

msgid ""

5538

5556

"Cannot convert from format %(from_format)s to format %(format)s. "

5539

5557

"%(problem)s"

5540

5558

msgstr ""

5541

5559

5542

#: bzrlib/errors.py:2071

5560

#: bzrlib/errors.py:2090

5543

5561

msgid "Could not find an appropriate Differ for file \"%(path)s\""

5544

5562

msgstr ""

5545

5563

5546

#: bzrlib/errors.py:2079

5564

#: bzrlib/errors.py:2098

5547

5565

msgid "%(exe_name)s could not be found on this machine"

5548

5566

msgstr ""

5549

5567

5550

#: bzrlib/errors.py:2087

5568

#: bzrlib/errors.py:2106

5551

5569

msgid "Diff is not installed on this machine: %(msg)s"

5552

5570

msgstr ""

5553

5571

5554

#: bzrlib/errors.py:2095

5572

#: bzrlib/errors.py:2114

5555

5573

msgid "Diff3 is not installed on this machine."

5556

5574

msgstr ""

5557

5575

5558

#: bzrlib/errors.py:2101

5576

#: bzrlib/errors.py:2120

5559

5577

msgid "The content being inserted is already present."

5560

5578

msgstr ""

5561

5579

5562

#: bzrlib/errors.py:2106

5580

#: bzrlib/errors.py:2125

5563

5581

msgid ""

5564

5582

"This tree contains left-over files from a failed operation.\n"

5565

5583

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5567

5585

" keep, and delete it when you are done."

5568

5586

msgstr ""

5569

5587

5570

#: bzrlib/errors.py:2117

5588

#: bzrlib/errors.py:2136

5571

5589

msgid ""

5572

5590

"This tree contains left-over files from a failed operation.\n"

5573

5591

" Please examine %(pending_deletion)s to see if it contains any files you\n"

5574

5592

" wish to keep, and delete it when you are done."

5575

5593

msgstr ""

5576

5594

5577

#: bzrlib/errors.py:2127

5595

#: bzrlib/errors.py:2146

5578

5596

msgid ""

5579

5597

"Unable to delete transform temporary directory %(limbo_dir)s.\n"

5580

5598

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5582

5600

" keep, and delete it when you are done."

5583

5601

msgstr ""

5584

5602

5585

#: bzrlib/errors.py:2138

5603

#: bzrlib/errors.py:2157

5586

5604

msgid ""

5587

5605

"Unable to delete transform temporary directory %(pending_deletion)s. Please "

5588

5606

"examine %(pending_deletion)s to see if it contains any files you wish to "

5589

5607

"keep, and delete it when you are done."

5590

5608

msgstr ""

5591

5609

5592

#: bzrlib/errors.py:2148

5610

#: bzrlib/errors.py:2167

5593

5611

msgid "Working tree is out of date, please run 'bzr update'.%(more)s"

5594

5612

msgstr ""

5595

5613

5596

#: bzrlib/errors.py:2162

5614

#: bzrlib/errors.py:2181

5597

5615

msgid ""

5598

5616

"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."

5599

5617

msgstr ""

5600

5618

5601

#: bzrlib/errors.py:2175

5619

#: bzrlib/errors.py:2194

5602

5620

msgid "Error in merge modified format"

5603

5621

msgstr ""

5604

5622

5605

#: bzrlib/errors.py:2180

5623

#: bzrlib/errors.py:2199

5606

5624

msgid "Format error in conflict listings"

5607

5625

msgstr ""

5608

5626

5609

#: bzrlib/errors.py:2184

5627

#: bzrlib/errors.py:2203

5610

5628

msgid ""

5611

5629

"Inconsistency in dirstate file %(dirstate_path)s.\n"

5612

5630

"Error: %(description)s"

5613

5631

msgstr ""

5614

5632

5615

#: bzrlib/errors.py:2195

5633

#: bzrlib/errors.py:2214

5616

5634

msgid ""

5617

5635

"An error has been detected in the repository %(repo_path)s.\n"

5618

5636

"Please run bzr reconcile on this repository."

5619

5637

msgstr ""

5620

5638

5621

#: bzrlib/errors.py:2206

5639

#: bzrlib/errors.py:2225

5622

5640

msgid ""

5623

5641

"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"

5624

5642

"reason: %(reason)s"

5625

5643

msgstr ""

5626

5644

5627

#: bzrlib/errors.py:2219

5645

#: bzrlib/errors.py:2238

5628

5646

msgid ""

5629

5647

"An inconsistent delta was supplied: %(delta)r\n"

5630

5648

"reason: %(reason)s"

5631

5649

msgstr ""

5632

5650

5633

#: bzrlib/errors.py:2231

5651

#: bzrlib/errors.py:2250

5634

5652

msgid "To use this feature you must upgrade your branch at %(path)s."

5635

5653

msgstr ""

5636

5654

5637

#: bzrlib/errors.py:2240

5655

#: bzrlib/errors.py:2259

5638

5656

msgid "To use this feature you must upgrade your repository at %(path)s."

5639

5657

msgstr ""

5640

5658

5641

#: bzrlib/errors.py:2245

5659

#: bzrlib/errors.py:2264

5642

5660

msgid ""

5643

5661

"To use this feature you must upgrade your branch at %(path)s to a format "

5644

5662

"which supports rich roots."

5645

5663

msgstr ""

5646

5664

5647

#: bzrlib/errors.py:2251

5665

#: bzrlib/errors.py:2270

5648

5666

msgid "Cannot perform local-only commits on unbound branches."

5649

5667

msgstr ""

5650

5668

5651

#: bzrlib/errors.py:2256

5669

#: bzrlib/errors.py:2275

5652

5670

msgid "The method %(mname)s is not supported on objects of type %(tname)s."

5653

5671

msgstr ""

5654

5672

5655

#: bzrlib/errors.py:2277

5673

#: bzrlib/errors.py:2296

5656

5674

msgid "Ghost tags not supported by format %(format)r."

5657

5675

msgstr ""

5658

5676

5659

#: bzrlib/errors.py:2285

5677

#: bzrlib/errors.py:2304

5660

5678

msgid "File is binary but should be text."

5661

5679

msgstr ""

5662

5680

5663

#: bzrlib/errors.py:2290

5681

#: bzrlib/errors.py:2309

5664

5682

msgid "The path %(path)s is not permitted on this platform"

5665

5683

msgstr ""

5666

5684

5667

#: bzrlib/errors.py:2299

5685

#: bzrlib/errors.py:2318

5668

5686

msgid ""

5669

5687

"Testament did not match expected value.\n"

5670

5688

" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"

5671

5689

" {%(measured)s}"

5672

5690

msgstr ""

5673

5691

5674

#: bzrlib/errors.py:2311

5692

#: bzrlib/errors.py:2330

5675

5693

msgid "Not a bzr revision-bundle: %(text)r"

5676

5694

msgstr ""

5677

5695

5678

#: bzrlib/errors.py:2320

5696

#: bzrlib/errors.py:2339

5679

5697

msgid "Bad bzr revision-bundle: %(text)r"

5680

5698

msgstr ""

5681

5699

5682

#: bzrlib/errors.py:2329

5700

#: bzrlib/errors.py:2348

5683

5701

msgid "Malformed bzr revision-bundle header: %(text)r"

5684

5702

msgstr ""

5685

5703

5686

#: bzrlib/errors.py:2334

5704

#: bzrlib/errors.py:2353

5687

5705

msgid "Malformed patches in bzr revision-bundle: %(text)r"

5688

5706

msgstr ""

5689

5707

5690

#: bzrlib/errors.py:2339

5708

#: bzrlib/errors.py:2358

5691

5709

msgid "Malformed footer in bzr revision-bundle: %(text)r"

5692

5710

msgstr ""

5693

5711

5694

#: bzrlib/errors.py:2344

5712

#: bzrlib/errors.py:2363

5695

5713

msgid "End of line marker was not \\n in bzr revision-bundle"

5696

5714

msgstr ""

5697

5715

5698

#: bzrlib/errors.py:2354

5716

#: bzrlib/errors.py:2373

5699

5717

msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"

5700

5718

msgstr ""

5701

5719

5702

#: bzrlib/errors.py:2364

5720

#: bzrlib/errors.py:2383

5703

5721

msgid "Root class for inventory serialization errors"

5704

5722

msgstr ""

5705

5723

5706

#: bzrlib/errors.py:2368

5724

#: bzrlib/errors.py:2387

5707

5725

msgid ""

5708

5726

"The inventory was not in the expected format:\n"

5709

5727

" %(msg)s"

5710

5728

msgstr ""

5711

5729

5712

#: bzrlib/errors.py:2377

5730

#: bzrlib/errors.py:2396

5713

5731

msgid "This operation requires rich root data storage"

5714

5732

msgstr ""

5715

5733

5716

#: bzrlib/errors.py:2390

5734

#: bzrlib/errors.py:2409

5717

5735

msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"

5718

5736

msgstr ""

5719

5737

5720

#: bzrlib/errors.py:2399

5738

#: bzrlib/errors.py:2418

5721

5739

msgid ""

5722

5740

"Don't know how to handle SSH connections. Please set BZR_SSH environment "

5723

5741

"variable."

5724

5742

msgstr ""

5725

5743

5726

#: bzrlib/errors.py:2406

5744

#: bzrlib/errors.py:2425

5727

5745

msgid ""

5728

5746

"Could not determine revno for {%(revision_id)s} because its ancestry shows a "

5729

5747

"ghost at {%(ghost_revision_id)s}"

5730

5748

msgstr ""

5731

5749

5732

#: bzrlib/errors.py:2416

5750

#: bzrlib/errors.py:2435

5733

5751

msgid "Ghost revision {%(revision_id)s} cannot be used here."

5734

5752

msgstr ""

5735

5753

5736

#: bzrlib/errors.py:2467

5754

#: bzrlib/errors.py:2486

5737

5755

msgid ""

5738

5756

"A merge directive must provide either a bundle or a public branch location."

5739

5757

msgstr ""

5740

5758

5741

#: bzrlib/errors.py:2474

5759

#: bzrlib/errors.py:2493

5742

5760

msgid "Bad merge directive payload %(start)r"

5743

5761

msgstr ""

5744

5762

5745

#: bzrlib/errors.py:2484

5763

#: bzrlib/errors.py:2503

5746

5764

msgid "Preview patch does not match requested changes."

5747

5765

msgstr ""

5748

5766

5749

#: bzrlib/errors.py:2490

5767

#: bzrlib/errors.py:2509

5750

5768

msgid "Patch_type was %(patch_type)s, but no patch was supplied."

5751

5769

msgstr ""

5752

5770

5753

#: bzrlib/errors.py:2500

5771

#: bzrlib/errors.py:2519

5754

5772

msgid ""

5755

5773

"Your branch does not have all of the revisions required in order to merge "

5756

5774

"this merge directive and the target location specified in the merge "

5757

5775

"directive is not a branch: %(location)s."

5758

5776

msgstr ""

5759

5777

5760

#: bzrlib/errors.py:2512

5778

#: bzrlib/errors.py:2531

5761

5779

msgid "Unsupported entry kind %(kind)s"

5762

5780

msgstr ""

5763

5781

5764

#: bzrlib/errors.py:2520

5782

#: bzrlib/errors.py:2539

5765

5783

msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"

5766

5784

msgstr ""

5767

5785

5768

#: bzrlib/errors.py:2530

5786

#: bzrlib/errors.py:2549

5769

5787

msgid "Subsume target %(other_tree)s needs to be upgraded."

5770

5788

msgstr ""

5771

5789

5772

#: bzrlib/errors.py:2549

5790

#: bzrlib/errors.py:2568

5773

5791

msgid "No such tag: %(tag_name)s"

5774

5792

msgstr ""

5775

5793

5776

#: bzrlib/errors.py:2557

5794

#: bzrlib/errors.py:2576

5777

5795

msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."

5778

5796

msgstr ""

5779

5797

5780

#: bzrlib/errors.py:2566

5798

#: bzrlib/errors.py:2585

5781

5799

msgid "Tag %(tag_name)s already exists."

5782

5800

msgstr ""

5783

5801

5784

#: bzrlib/errors.py:2574

5802

#: bzrlib/errors.py:2593

5785

5803

msgid ""

5786

5804

"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "

5787

5805

"bugs\" for more information on this feature."

5788

5806

msgstr ""

5789

5807

5790

#: bzrlib/errors.py:2584

5808

#: bzrlib/errors.py:2603

5791

5809

msgid ""

5792

5810

"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"

5793

5811

msgstr ""

5794

5812

5795

#: bzrlib/errors.py:2594

5813

#: bzrlib/errors.py:2613

5796

5814

msgid ""

5797

5815

"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"

5798

5816

msgstr ""

5799

5817

5800

#: bzrlib/errors.py:2604

5818

#: bzrlib/errors.py:2623

5801

5819

msgid "Invalid line in bugs property: '%(line)s'"

5802

5820

msgstr ""

5803

5821

5804

#: bzrlib/errors.py:2612

5822

#: bzrlib/errors.py:2631

5805

5823

msgid "Invalid bug status: '%(status)s'"

5806

5824

msgstr ""

5807

5825

5808

#: bzrlib/errors.py:2620

5826

#: bzrlib/errors.py:2639

5809

5827

msgid "Could not understand response from smart server: %(response_tuple)r"

5810

5828

msgstr ""

5811

5829

5812

#: bzrlib/errors.py:2659

5830

#: bzrlib/errors.py:2678

5813

5831

msgid "Server sent an unexpected error: %(error_tuple)r"

5814

5832

msgstr ""

5815

5833

5816

#: bzrlib/errors.py:2678

5834

#: bzrlib/errors.py:2697

5817

5835

msgid "Unrecognised container format: %(container_format)r"

5818

5836

msgstr ""

5819

5837

5820

#: bzrlib/errors.py:2686

5838

#: bzrlib/errors.py:2705

5821

5839

msgid "Unexpected end of container stream"

5822

5840

msgstr ""

5823

5841

5824

#: bzrlib/errors.py:2691

5842

#: bzrlib/errors.py:2710

5825

5843

msgid "Unknown record type: %(record_type)r"

5826

5844

msgstr ""

5827

5845

5828

#: bzrlib/errors.py:2699

5846

#: bzrlib/errors.py:2718

5829

5847

msgid "Invalid record: %(reason)s"

5830

5848

msgstr ""

5831

5849

5832

#: bzrlib/errors.py:2707

5850

#: bzrlib/errors.py:2726

5833

5851

msgid "Container has data after end marker: %(excess)r"

5834

5852

msgstr ""

5835

5853

5836

#: bzrlib/errors.py:2715

5854

#: bzrlib/errors.py:2734

5837

5855

msgid "Container has multiple records with the same name: %(name)s"

5838

5856

msgstr ""

5839

5857

5840

#: bzrlib/errors.py:2728

5858

#: bzrlib/errors.py:2747

5841

5859

msgid "Corrupt or incompatible data stream: %(reason)s"

5842

5860

msgstr ""

5843

5861

5844

#: bzrlib/errors.py:2736

5862

#: bzrlib/errors.py:2755

5845

5863

msgid "SMTP error: %(error)s"

5846

5864

msgstr ""

5847

5865

5848

#: bzrlib/errors.py:2744

5866

#: bzrlib/errors.py:2763

5849

5867

msgid "No message supplied."

5850

5868

msgstr ""

5851

5869

5852

#: bzrlib/errors.py:2749

5870

#: bzrlib/errors.py:2768

5853

5871

msgid "No mail-to address (--mail-to) or output (-o) specified."

5854

5872

msgstr ""

5855

5873

5856

#: bzrlib/errors.py:2754

5874

#: bzrlib/errors.py:2773

5857

5875

msgid "Unknown mail client: %(mail_client)s"

5858

5876

msgstr ""

5859

5877

5860

#: bzrlib/errors.py:2762

5878

#: bzrlib/errors.py:2781

5861

5879

msgid ""

5862

5880

"Unable to find mail client with the following names: "

5863

5881

"%(mail_command_list_string)s"

5864

5882

msgstr ""

5865

5883

5866

#: bzrlib/errors.py:2772

5884

#: bzrlib/errors.py:2791

5867

5885

msgid "SMTP connection to %(host)s refused"

5868

5886

msgstr ""

5869

5887

5870

#: bzrlib/errors.py:2781

5888

#: bzrlib/errors.py:2800

5871

5889

msgid "Please specify smtp_server. No server at default %(host)s."

5872

5890

msgstr ""

5873

5891

5874

#: bzrlib/errors.py:2795

5892

#: bzrlib/errors.py:2814

5875

5893

msgid ""

5876

5894

"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"

5877

5895

"reconfigure."

5878

5896

msgstr ""

5879

5897

5880

#: bzrlib/errors.py:2807

5898

#: bzrlib/errors.py:2826

5881

5899

msgid "'%(display_url)s' is already a branch."

5882

5900

msgstr ""

5883

5901

5884

#: bzrlib/errors.py:2812

5902

#: bzrlib/errors.py:2831

5885

5903

msgid "'%(display_url)s' is already a tree."

5886

5904

msgstr ""

5887

5905

5888

#: bzrlib/errors.py:2817

5906

#: bzrlib/errors.py:2836

5889

5907

msgid "'%(display_url)s' is already a checkout."

5890

5908

msgstr ""

5891

5909

5892

#: bzrlib/errors.py:2822

5910

#: bzrlib/errors.py:2841

5893

5911

msgid "'%(display_url)s' is already a lightweight checkout."

5894

5912

msgstr ""

5895

5913

5896

#: bzrlib/errors.py:2827

5914

#: bzrlib/errors.py:2846

5897

5915

msgid "'%(display_url)s' is already using a shared repository."

5898

5916

msgstr ""

5899

5917

5900

#: bzrlib/errors.py:2832

5918

#: bzrlib/errors.py:2851

5901

5919

msgid "'%(display_url)s' is already standalone."

5902

5920

msgstr ""

5903

5921

5904

#: bzrlib/errors.py:2837

5922

#: bzrlib/errors.py:2856

5905

5923

msgid "Shared repository '%(display_url)s' already creates working trees."

5906

5924

msgstr ""

5907

5925

5908

#: bzrlib/errors.py:2843

5926

#: bzrlib/errors.py:2862

5909

5927

msgid ""

5910

5928

"Shared repository '%(display_url)s' already doesn't create working trees."

5911

5929

msgstr ""

5912

5930

5913

#: bzrlib/errors.py:2849

5931

#: bzrlib/errors.py:2868

5914

5932

msgid "Requested reconfiguration of '%(display_url)s' is not supported."

5915

5933

msgstr ""

5916

5934

5917

#: bzrlib/errors.py:2854

5935

#: bzrlib/errors.py:2873

5918

5936

msgid "No location could be found to bind to at %(display_url)s."

5919

5937

msgstr ""

5920

5938

5921

#: bzrlib/errors.py:2859

5939

#: bzrlib/errors.py:2878

5922

5940

msgid ""

5923

5941

"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "

5924

5942

"status).%(more)s"

5925

5943

msgstr ""

5926

5944

5927

#: bzrlib/errors.py:2878

5945

#: bzrlib/errors.py:2897

5928

5946

msgid ""

5929

5947

"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"

5930

5948

"list).%(more)s"

5931

5949

msgstr ""

5932

5950

5933

#: bzrlib/errors.py:2884

5951

#: bzrlib/errors.py:2903

5934

5952

msgid "Variable {%(name)s} is not available."

5935

5953

msgstr ""

5936

5954

5937

#: bzrlib/errors.py:2892

5955

#: bzrlib/errors.py:2911

5938

5956

msgid "No template specified."

5939

5957

msgstr ""

5940

5958

5941

#: bzrlib/errors.py:2897

5959

#: bzrlib/errors.py:2916

5942

5960

msgid "Unable to create symlink %(path_str)son this platform"

5943

5961

msgstr ""

5944

5962

5945

#: bzrlib/errors.py:2912

5963

#: bzrlib/errors.py:2931

5946

5964

msgid ""

5947

5965

"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "

5948

5966

"\"original\", \"local\"."

5949

5967

msgstr ""

5950

5968

5951

#: bzrlib/errors.py:2946

5969

#: bzrlib/errors.py:2965

5952

5970

msgid ""

5953

5971

"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"

5954

5972

msgstr ""

5955

5973

5956

#: bzrlib/errors.py:2958

5974

#: bzrlib/errors.py:2977

5957

5975

msgid "The \"%(config_id)s\" configuration does not exist."

5958

5976

msgstr ""

5959

5977

5960

#: bzrlib/errors.py:2966

5978

#: bzrlib/errors.py:2985

5961

5979

msgid "The \"%(option_name)s\" configuration option does not exist."

5962

5980

msgstr ""

5963

5981

5964

#: bzrlib/errors.py:2974

5982

#: bzrlib/errors.py:2993

5965

5983

msgid "The alias \"%(alias_name)s\" does not exist."

5966

5984

msgstr ""

5967

5985

5968

#: bzrlib/errors.py:2988

5986

#: bzrlib/errors.py:3007

5969

5987

msgid "\"%(alias_name)s\" is not a valid location alias."

5970

5988

msgstr ""

5971

5989

5972

#: bzrlib/errors.py:2996

5990

#: bzrlib/errors.py:3015

5973

5991

msgid "No %(alias_name)s location assigned."

5974

5992

msgstr ""

5975

5993

5976

#: bzrlib/errors.py:3004

5994

#: bzrlib/errors.py:3023

5977

5995

msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."

5978

5996

msgstr ""

5979

5997

5980

#: bzrlib/errors.py:3014

5998

#: bzrlib/errors.py:3033

5981

5999

msgid "Unknown rules detected: %(unknowns_str)s."

5982

6000

msgstr ""

5983

6001

5984

#: bzrlib/errors.py:3025

6002

#: bzrlib/errors.py:3044

5985

6003

msgid "Tip change rejected: %(msg)s"

5986

6004

msgstr ""

5987

6005

5988

#: bzrlib/errors.py:3033

6006

#: bzrlib/errors.py:3052

5989

6007

msgid "Shelf corrupt."

5990

6008

msgstr ""

5991

6009

5992

#: bzrlib/errors.py:3038

6010

#: bzrlib/errors.py:3057

5993

6011

msgid "Corruption while decompressing repository file%(orig_error)s"

5994

6012

msgstr ""

5995

6013

5996

#: bzrlib/errors.py:3050

6014

#: bzrlib/errors.py:3069

5997

6015

msgid "No changes are shelved with id \"%(shelf_id)d\"."

5998

6016

msgstr ""

5999

6017

6000

#: bzrlib/errors.py:3058

6018

#: bzrlib/errors.py:3077

6001

6019

msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."

6002

6020

msgstr ""

6003

6021

6004

#: bzrlib/errors.py:3066

6022

#: bzrlib/errors.py:3085

6005

6023

msgid ""

6006

6024

"An attempt to access a url outside the server jail was made: '%(url)s'."

6007

6025

msgstr ""

6008

6026

6009

#: bzrlib/errors.py:3074

6027

#: bzrlib/errors.py:3093

6010

6028

msgid "The user aborted the operation."

6011

6029

msgstr ""

6012

6030

6013

#: bzrlib/errors.py:3079

6031

#: bzrlib/errors.py:3098

6014

6032

msgid "Branching '%(url)s'(%(format)s) must create a working tree."

6015

6033

msgstr ""

6016

6034

6017

#: bzrlib/errors.py:3089

6035

#: bzrlib/errors.py:3108

6018

6036

msgid "No such view: %(view_name)s."

6019

6037

msgstr ""

6020

6038

6021

#: bzrlib/errors.py:3099

6039

#: bzrlib/errors.py:3118

6022

6040

msgid ""

6023

6041

"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "

6024

6042

"to a later format."

6025

6043

msgstr ""

6026

6044

6027

#: bzrlib/errors.py:3108

6045

#: bzrlib/errors.py:3127

6028

6046

msgid ""

6029

6047

"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"

6030

6048

msgstr ""

6031

6049

6032

#: bzrlib/errors.py:3175

6050

#: bzrlib/errors.py:3194

6033

6051

msgid "%(bzrdir)r does not support co-located branches."

6034

6052

msgstr ""

6035

6053

6036

#: bzrlib/errors.py:3181

6054

#: bzrlib/errors.py:3200

6037

6055

msgid ""

6038

6056

"Unable to determine your name.\n"

6039

6057

"Please, set your name with the 'whoami' command.\n"

6040

6058

"E.g. bzr whoami \"Your Name <name@example.com>\""

6041

6059

msgstr ""

6042

6060

6043

#: bzrlib/errors.py:3190

6061

#: bzrlib/errors.py:3209

6044

6062

msgid "Invalid pattern(s) found. %(msg)s"

6045

6063

msgstr ""

6046

6064

6047

#: bzrlib/errors.py:3198

6065

#: bzrlib/errors.py:3217

6048

6066

msgid ""

6049

6067

"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "

6050

6068

"unbind` to fix."

6051

6069

msgstr ""

6052

6070

6053

#: bzrlib/errors.py:3209

6071

#: bzrlib/errors.py:3228

6054

6072

msgid "Loop involving %(refs)r while expanding \"%(string)s\"."

6055

6073

msgstr ""

6056

6074

6057

#: bzrlib/errors.py:3218

6075

#: bzrlib/errors.py:3237

6058

6076

msgid "Option %(name)s is not defined while expanding \"%(string)s\"."

6059

6077

msgstr ""

6060

6078

6061

#: bzrlib/errors.py:3227

6079

#: bzrlib/errors.py:3246

6062

6080

msgid ""

6063

6081

"No compatible object available for operations from %(source)r to %(target)r."

6064

6082

msgstr ""

6065

6083

6066

#: bzrlib/errors.py:3237

6084

#: bzrlib/errors.py:3256

6067

6085

msgid ""

6068

6086

"VFS requests over the smart server are not allowed. Encountered: %(method)s, "

6069

6087

"%(arguments)s."

6070

6088

msgstr ""

6071

6089

6072

#: bzrlib/errors.py:3247

6090

#: bzrlib/errors.py:3266

6073

6091

msgid ""

6074

6092

"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "

6075

6093

"format %(format)r"

6076

6094

msgstr ""

6077

6095

6078

#: bzrlib/errors.py:3259

6096

#: bzrlib/errors.py:3278

6079

6097

msgid ""

6080

6098

"Missing feature %(feature)s not provided by this version of Bazaar or any "

6081

6099

"plugin."

6082

6100

msgstr ""

6083

6101

6084

#: bzrlib/errors.py:3272

6102

#: bzrlib/errors.py:3291

6085

6103

msgid "Binary files section encountered."

6086

6104

msgstr ""

6087

6105

6088

#: bzrlib/errors.py:3280

6106

#: bzrlib/errors.py:3299

6089

6107

msgid ""

6090

6108

"Malformed patch header. %(desc)s\n"

6091

6109

"%(line)r"

6092

6110

msgstr ""

6093

6111

6094

#: bzrlib/errors.py:3289

6112

#: bzrlib/errors.py:3308

6095

6113

msgid ""

6096

6114

"Malformed hunk header. %(desc)s\n"

6097

6115

"%(line)r"

6098

6116

msgstr ""

6099

6117

6100

#: bzrlib/errors.py:3298

6118

#: bzrlib/errors.py:3317

6101

6119

msgid ""

6102

6120

"Malformed line. %(desc)s\n"

6103

6121

"%(line)r"

6104

6122

msgstr ""

6105

6123

6106

#: bzrlib/errors.py:3308

6124

#: bzrlib/errors.py:3327

6107

6125

msgid ""

6108

6126

"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "

6109

6127

"but patch says it should be \"%(patch_line)s\""

6110

6128

msgstr ""

6111

6129

6112

#: bzrlib/errors.py:3319

6130

#: bzrlib/errors.py:3338

6113

6131

msgid "The feature %(feature)s has already been registered."

6114

6132

msgstr ""

6115

6133

6439

6457

msgid "lstat/stat of ({0!r}): {1!r}"

6440

6458

msgstr ""

6441

6459

6442

#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008

6460

#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019

6443

6461

#, python-format

6444

6462

msgid "sorry, %r not allowed in path"

6445

6463

msgstr ""

6446

6464

6447

#: bzrlib/osutils.py:1226

6465

#: bzrlib/osutils.py:1237

6448

6466

#, python-format

6449

6467

msgid "%r is too short to calculate a relative path"

6450

6468

msgstr ""

6888

6906

msgid "Created new branch."

6889

6907

msgstr ""

6890

6908

6891

#: bzrlib/push.py:98

6909

#: bzrlib/push.py:97

6892

6910

#, python-format

6893

6911

msgid ""

6894

6912

"Target directory %s already contains a .bzr directory, but it is not valid."

7015

7033

msgid "%s is now not stacked\n"

7016

7034

msgstr ""

7017

7035

7018

#: bzrlib/remote.py:1180 bzrlib/repository.py:289

7036

#: bzrlib/remote.py:1228 bzrlib/repository.py:289

7019

7037

#, python-format

7020

7038

msgid "bzr: ERROR (ignored): %s"

7021

7039

msgstr ""

7022

7040

7023

#: bzrlib/remote.py:2493

7041

#: bzrlib/remote.py:2541

7024

7042

msgid "Copying repository content as tarball..."

7025

7043

msgstr ""

7026

7044

7235

7253

msgid "listening on port: %s"

7236

7254

msgstr ""

7237

7255

7238

#: bzrlib/switch.py:69

7256

#: bzrlib/switch.py:73

7239

7257

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

7240

7258

msgstr ""

7241

7259

7242

#: bzrlib/switch.py:96

7260

#: bzrlib/switch.py:100

7243

7261

msgid ""

7244

7262

"Cannot switch as local commits found in the checkout. Commit these to the "

7245

7263

"bound branch or use --force to throw them away."

7246

7264

msgstr ""

7247

7265

7248

#: bzrlib/switch.py:101

7266

#: bzrlib/switch.py:105

7249

7267

#, python-format

7250

7268

msgid ""

7251

7269

"Unable to connect to current master branch %(target)s: %(error)s To switch "

7252

7270

"anyway, use --force."

7253

7271

msgstr ""

7254

7272

7255

#: bzrlib/switch.py:110

7273

#: bzrlib/switch.py:125

7256

7274

msgid "Cannot switch a branch, only a checkout."

7257

7275

msgstr ""

7258

7276

7259

#: bzrlib/switch.py:146

7277

#: bzrlib/switch.py:163

7260

7278

#, python-format

7261

7279

msgid "Tree is up to date at revision %d."

7262

7280

msgstr ""

7263

7281

7264

#: bzrlib/switch.py:152

7282

#: bzrlib/switch.py:169

7265

7283

#, python-format

7266

7284

msgid "Updated to revision %d."

7267

7285

msgstr ""

7268

7286

7269

#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743

7287

#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747

7270

7288

msgid "Apply phase"

7271

7289

msgstr ""

7272

7290

7273

#: bzrlib/transform.py:1769 bzrlib/transform.py:1837

7291

#: bzrlib/transform.py:1773 bzrlib/transform.py:1841

7274

7292

msgid "removing file"

7275

7293

msgstr ""

7276

7294

7277

#: bzrlib/transform.py:1787 bzrlib/transform.py:1872

7295

#: bzrlib/transform.py:1791 bzrlib/transform.py:1876

7278

7296

msgid "adding file"

7279

7297

msgstr ""

7280

7298

7281

#: bzrlib/transform.py:2587

7299

#: bzrlib/transform.py:2591

7282

7300

msgid "Building tree"

7283

7301

msgstr ""

7284

7302

7285

#: bzrlib/transform.py:2677 bzrlib/transform.py:2704

7303

#: bzrlib/transform.py:2681 bzrlib/transform.py:2708

7286

7304

msgid "Adding file contents"

7287

7305

msgstr ""

7288

7306

7289

#: bzrlib/transform.py:3024

7307

#: bzrlib/transform.py:3028

7290

7308

msgid "Resolution pass"

7291

7309

msgstr ""

7292

7310

7435

7453

7436

7454

#: dummy/help_topics/basic/detail.txt:1

7437

7455

msgid ""

7438

"Bazaar 2.5b5 -- a free distributed version-control tool\n"

7456

"Bazaar 2.5b6 -- a free distributed version-control tool\n"

7439

7457

"http://bazaar.canonical.com/"

7440

7458

msgstr ""

7441

7459

11701

11719

"~~~~~~~~~~~~~~~~~~~~~~"

11702

11720

msgstr ""

11703

11721

11704

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402

11722

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418

11705

11723

msgid "Introduced in: 1.4"

11706

11724

msgstr ""

11707

11725

11893

11911

msgstr ""

11894

11912

11895

11913

#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196

11896

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448

11914

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464

11897

11915

msgid "Introduced in: 1.17"

11898

11916

msgstr ""

11899

11917

11949

11967

#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226

11950

11968

#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241

11951

11969

#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370

11952

#: en/help_topics/hooks.txt:427

11970

#: en/help_topics/hooks.txt:443

11953

11971

msgid "Introduced in: 2.4"

11954

11972

msgstr ""

11955

11973

12050

12068

msgstr ""

12051

12069

12052

12070

#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297

12053

#: en/help_topics/hooks.txt:505

12071

#: en/help_topics/hooks.txt:521

12054

12072

msgid "Introduced in: 1.15"

12055

12073

msgstr ""

12056

12074

12132

12150

msgstr ""

12133

12151

12134

12152

#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334

12135

#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493

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

12136

12155

msgid "Introduced in: 2.5"

12137

12156

msgstr ""

12138

12157

12251

12270

12252

12271

#: en/help_topics/hooks.txt:399

12253

12272

msgid ""

12273

"post_transform\n"

12274

"~~~~~~~~~~~~~~"

12275

msgstr ""

12276

12277

#: en/help_topics/hooks.txt:404

12278

msgid ""

12279

"Called after a tree transform has been performed on a tree. The hook\n"

12280

"is called with the tree that is being transformed and the transform."

12281

msgstr ""

12282

12283

#: en/help_topics/hooks.txt:407

12284

msgid ""

12285

"pre_transform\n"

12286

"~~~~~~~~~~~~~"

12287

msgstr ""

12288

12289

#: en/help_topics/hooks.txt:412

12290

msgid ""

12291

"Called before a tree transform on this tree. The hook is called with\n"

12292

"the tree that is being transformed and the transform."

12293

msgstr ""

12294

12295

#: en/help_topics/hooks.txt:415

12296

msgid ""

12254

12297

"start_commit\n"

12255

12298

"~~~~~~~~~~~~"

12256

12299

msgstr ""

12257

12300

12258

#: en/help_topics/hooks.txt:404

12301

#: en/help_topics/hooks.txt:420

12259

12302

msgid ""

12260

12303

"Called before a commit is performed on a tree. The start commit hook\n"

12261

12304

"is able to change the tree before the commit takes place. start_commit\n"

12263

12306

"being performed on."

12264

12307

msgstr ""

12265

12308

12266

#: en/help_topics/hooks.txt:409

12309

#: en/help_topics/hooks.txt:425

12267

12310

msgid ""

12268

12311

"SmartClientHooks\n"

12269

12312

"----------------"

12270

12313

msgstr ""

12271

12314

12272

#: en/help_topics/hooks.txt:412

12315

#: en/help_topics/hooks.txt:428

12273

12316

msgid ""

12274

12317

"call\n"

12275

12318

"~~~~"

12276

12319

msgstr ""

12277

12320

12278

#: en/help_topics/hooks.txt:415

12321

#: en/help_topics/hooks.txt:431

12279

12322

msgid "Introduced in: unknown"

12280

12323

msgstr ""

12281

12324

12282

#: en/help_topics/hooks.txt:417

12325

#: en/help_topics/hooks.txt:433

12283

12326

msgid ""

12284

12327

"Called when the smart client is submitting a request to the smart\n"

12285

12328

"server. Called with a bzrlib.smart.client.CallHookParams object.\n"

12286

12329

"Streaming request bodies, and responses, are not accessible."

12287

12330

msgstr ""

12288

12331

12289

#: en/help_topics/hooks.txt:421

12332

#: en/help_topics/hooks.txt:437

12290

12333

msgid ""

12291

12334

"SmartServerHooks\n"

12292

12335

"----------------"

12293

12336

msgstr ""

12294

12337

12295

#: en/help_topics/hooks.txt:424

12338

#: en/help_topics/hooks.txt:440

12296

12339

msgid ""

12297

12340

"server_exception\n"

12298

12341

"~~~~~~~~~~~~~~~~"

12299

12342

msgstr ""

12300

12343

12301

#: en/help_topics/hooks.txt:429

12344

#: en/help_topics/hooks.txt:445

12302

12345

msgid ""

12303

12346

"Called by the bzr server when an exception occurs. server_exception is\n"

12304

12347

"called with the sys.exc_info() tuple return true for the hook if the\n"

12306

12349

"normally."

12307

12350

msgstr ""

12308

12351

12309

#: en/help_topics/hooks.txt:434

12352

#: en/help_topics/hooks.txt:450

12310

12353

msgid ""

12311

12354

"server_started\n"

12312

12355

"~~~~~~~~~~~~~~"

12313

12356

msgstr ""

12314

12357

12315

#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456

12358

#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472

12316

12359

msgid "Introduced in: 0.16"

12317

12360

msgstr ""

12318

12361

12319

#: en/help_topics/hooks.txt:439

12362

#: en/help_topics/hooks.txt:455

12320

12363

msgid ""

12321

12364

"Called by the bzr server when it starts serving a directory.\n"

12322

12365

"server_started is called with (backing urls, public url), where\n"

12325

12368

"served."

12326

12369

msgstr ""

12327

12370

12328

#: en/help_topics/hooks.txt:445

12371

#: en/help_topics/hooks.txt:461

12329

12372

msgid ""

12330

12373

"server_started_ex\n"

12331

12374

"~~~~~~~~~~~~~~~~~"

12332

12375

msgstr ""

12333

12376

12334

#: en/help_topics/hooks.txt:450

12377

#: en/help_topics/hooks.txt:466

12335

12378

msgid ""

12336

12379

"Called by the bzr server when it starts serving a directory.\n"

12337

12380

"server_started is called with (backing_urls, server_obj)."

12338

12381

msgstr ""

12339

12382

12340

#: en/help_topics/hooks.txt:453

12383

#: en/help_topics/hooks.txt:469

12341

12384

msgid ""

12342

12385

"server_stopped\n"

12343

12386

"~~~~~~~~~~~~~~"

12344

12387

msgstr ""

12345

12388

12346

#: en/help_topics/hooks.txt:458

12389

#: en/help_topics/hooks.txt:474

12347

12390

msgid ""

12348

12391

"Called by the bzr server when it stops serving a directory.\n"

12349

12392

"server_stopped is called with the same parameters as the\n"

12350

12393

"server_started hook: (backing_urls, public_url)."

12351

12394

msgstr ""

12352

12395

12353

#: en/help_topics/hooks.txt:462

12396

#: en/help_topics/hooks.txt:478

12354

12397

msgid ""

12355

12398

"StatusHooks\n"

12356

12399

"-----------"

12357

12400

msgstr ""

12358

12401

12359

#: en/help_topics/hooks.txt:465

12402

#: en/help_topics/hooks.txt:481

12360

12403

msgid ""

12361

12404

"post_status\n"

12362

12405

"~~~~~~~~~~~"

12363

12406

msgstr ""

12364

12407

12365

#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479

12408

#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495

12366

12409

msgid "Introduced in: 2.3"

12367

12410

msgstr ""

12368

12411

12369

#: en/help_topics/hooks.txt:470

12412

#: en/help_topics/hooks.txt:486

12370

12413

msgid ""

12371

12414

"Called with argument StatusHookParams after Bazaar has displayed the\n"

12372

12415

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12375

12418

"status command. to_file is the output stream for writing."

12376

12419

msgstr ""

12377

12420

12378

#: en/help_topics/hooks.txt:476

12421

#: en/help_topics/hooks.txt:492

12379

12422

msgid ""

12380

12423

"pre_status\n"

12381

12424

"~~~~~~~~~~"

12382

12425

msgstr ""

12383

12426

12384

#: en/help_topics/hooks.txt:481

12427

#: en/help_topics/hooks.txt:497

12385

12428

msgid ""

12386

12429

"Called with argument StatusHookParams before Bazaar displays the\n"

12387

12430

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12390

12433

"status command. to_file is the output stream for writing."

12391

12434

msgstr ""

12392

12435

12393

#: en/help_topics/hooks.txt:487

12436

#: en/help_topics/hooks.txt:503

12394

12437

msgid ""

12395

12438

"TransportHooks\n"

12396

12439

"--------------"

12397

12440

msgstr ""

12398

12441

12399

#: en/help_topics/hooks.txt:490

12442

#: en/help_topics/hooks.txt:506

12400

12443

msgid ""

12401

12444

"post_connect\n"

12402

12445

"~~~~~~~~~~~~"

12403

12446

msgstr ""

12404

12447

12405

#: en/help_topics/hooks.txt:495

12448

#: en/help_topics/hooks.txt:511

12406

12449

msgid ""

12407

12450

"Called after a new connection is established or a reconnect occurs.\n"

12408

12451

"The sole argument passed is either the connected transport or smart\n"

12409

12452

"medium instance."

12410

12453

msgstr ""

12411

12454

12412

#: en/help_topics/hooks.txt:499

12455

#: en/help_topics/hooks.txt:515

12413

12456

msgid ""

12414

12457

"RioVersionInfoBuilderHooks\n"

12415

12458

"--------------------------"

12416

12459

msgstr ""

12417

12460

12418

#: en/help_topics/hooks.txt:502

12461

#: en/help_topics/hooks.txt:518

12419

12462

msgid ""

12420

12463

"revision\n"

12421

12464

"~~~~~~~~"

12422

12465

msgstr ""

12423

12466

12424

#: en/help_topics/hooks.txt:507

12467

#: en/help_topics/hooks.txt:523

12425

12468

msgid ""

12426

12469

"Invoked when adding information about a revision to the RIO stanza\n"

12427

12470

"that is printed. revision is called with a revision object and a RIO\n"