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

1

# Galician translation for bzr

2

3

# This file is distributed under the same license as the bzr package.

4

# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.

4

# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.

5

#

6

msgid ""

7

msgstr ""

8

"Project-Id-Version: bzr\n"

9

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

10

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

11

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

12

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

10

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

11

"PO-Revision-Date: 2011-09-16 21:13+0000\n"

12

"Last-Translator: Fran Diéguez <Unknown>\n"

13

"Language-Team: Galician <gl@li.org>\n"

14

"MIME-Version: 1.0\n"

15

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

16

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

17

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

18

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

19

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

18

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

19

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

20

21

#: bzrlib/add.py:95

21

#: bzrlib/add.py:93

22

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

23

msgstr ""

24

25

#: bzrlib/branch.py:872

25

#: bzrlib/branch.py:854

26

msgid "Unstacking"

27

msgstr ""

28

29

#: bzrlib/branch.py:3205

29

#: bzrlib/branch.py:3121

30

#, python-format

31

msgid "Pushed up to revision %d."

32

msgstr ""

33

34

#: bzrlib/branch.py:3207

34

#: bzrlib/branch.py:3123

35

#, python-format

36

msgid "%d tag updated."

37

msgid_plural "%d tags updated."

38

msgstr[0] ""

39

msgstr[1] ""

40

41

#: bzrlib/branch.py:3210

41

#: bzrlib/branch.py:3126

42

msgid "No new revisions or tags to push."

43

msgstr "Non hai revisións ou etiquetas para empurar (push)."

44

45

#: bzrlib/branch.py:3212

45

#: bzrlib/branch.py:3128

46

msgid "No new revisions to push."

47

msgstr "Non hai revisións novas para empurrar (push)."

48

49

#: bzrlib/branch.py:3232

49

#: bzrlib/branch.py:3148

50

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

51

msgstr ""

52

53

#: bzrlib/branch.py:3235

53

#: bzrlib/branch.py:3151

54

#, python-format

55

msgid "found error:%s"

56

msgstr "atopouse un erro: %s"

57

58

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

58

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

59

#, python-format

60

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

61

msgstr "Ignorando os ficheiros fóra da vista. A vista é %s"

62

63

#: bzrlib/builtins.py:218

63

#: bzrlib/builtins.py:260

64

#, python-format

65

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

66

msgstr "bzr %s --revision toma exactamente un identificador de revisión"

67

68

#: bzrlib/builtins.py:303

68

#: bzrlib/builtins.py:315

69

msgid "Display status summary."

70

msgstr "Mostrar o resumo do estado."

71

72

#: bzrlib/builtins.py:305

72

#: bzrlib/builtins.py:317

73

msgid ""

74

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

75

"grouped by state. Possible states are:"

77

"Isto informa sobre ficheiros versionados e descoñecidos, informando\n"

78

"deles agrupados por estado. Os estados posíbeis son:"

79

80

#: bzrlib/builtins.py:308

80

#: bzrlib/builtins.py:320

81

msgid ""

82

"added\n"

83

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

85

"engadido\n"

86

" Versionado na copia de traballo pero non na revisión anterior."

87

88

#: bzrlib/builtins.py:311

88

#: bzrlib/builtins.py:323

89

msgid ""

90

"removed\n"

91

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

95

" Versionado na revisión anterior pero quitado ou eliminado\n"

96

" na copia de traballo."

97

98

#: bzrlib/builtins.py:315

98

#: bzrlib/builtins.py:327

99

msgid ""

100

"renamed\n"

101

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

107

" o texto semella que cambiou. Isto inclúe os ficheiros cuxo\n"

108

" cartafol pai foi renomeado."

109

110

#: bzrlib/builtins.py:320

110

#: bzrlib/builtins.py:332

111

msgid ""

112

"modified\n"

113

" Text has changed since the previous revision."

115

"modificado\n"

116

" O texto cambiou desde a última revisión."

117

118

#: bzrlib/builtins.py:323

118

#: bzrlib/builtins.py:335

119

msgid ""

120

"kind changed\n"

121

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

123

"semella cambiado\n"

124

" O ficheiro semella que foi cambiado (p.ex. de ficheiro a cartafol)"

125

126

#: bzrlib/builtins.py:326

126

#: bzrlib/builtins.py:338

127

msgid ""

128

"unknown\n"

129

" Not versioned and not matching an ignore pattern."

131

"descoñecido\n"

132

" Non versionado e non coincide cun patrón de ignorado."

133

134

#: bzrlib/builtins.py:329

134

#: bzrlib/builtins.py:341

135

msgid ""

136

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

137

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

139

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

140

msgstr ""

141

142

#: bzrlib/builtins.py:334

142

#: bzrlib/builtins.py:346

143

msgid ""

144

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

145

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

147

"Para ver os ficheiros use «bzr ignored». Para máis información\n"

148

"sobre os cambios nos textos dos ficheiros use «bzr diff»."

149

150

#: bzrlib/builtins.py:337

150

#: bzrlib/builtins.py:349

151

msgid ""

152

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

153

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

154

"use bzr status -SV."

155

msgstr ""

156

157

#: bzrlib/builtins.py:341

157

#: bzrlib/builtins.py:353

158

msgid ""

159

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

160

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

162

"is reported for everything inside that directory."

163

msgstr ""

164

165

#: bzrlib/builtins.py:346

165

#: bzrlib/builtins.py:358

166

msgid ""

167

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

168

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

170

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

171

msgstr ""

172

173

#: bzrlib/builtins.py:351

173

#: bzrlib/builtins.py:363

174

msgid ""

175

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

176

"single revision to the revision argument."

178

"Para comparar o cartafol de traballo con unha revisión específica, pase\n"

179

"unha revisión ao argumento «revision»."

180

181

#: bzrlib/builtins.py:354

181

#: bzrlib/builtins.py:366

182

msgid ""

183

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

184

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

185

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

186

msgstr ""

187

188

#: bzrlib/builtins.py:363

188

#: bzrlib/builtins.py:375

189

msgid "Use short status indicators."

190

msgstr "Usar os indicadores de estado curtos"

191

192

#: bzrlib/builtins.py:365

192

#: bzrlib/builtins.py:377

193

msgid "Only show versioned files."

194

msgstr "Mostrar só os ficheiros versionados."

195

196

#: bzrlib/builtins.py:367

196

#: bzrlib/builtins.py:379

197

msgid "Don't show pending merges."

198

msgstr "Non mostrar as combinacións (merge) pendentes"

199

200

#: bzrlib/builtins.py:370

200

#: bzrlib/builtins.py:382

201

msgid "Do not mark object type using indicator."

202

msgstr ""

203

204

#: bzrlib/builtins.py:385

204

#: bzrlib/builtins.py:397

205

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

206

msgstr ""

207

208

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

208

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

209

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

210

msgstr ""

211

212

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

212

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

213

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

214

msgstr "Debe fornecer ou --revision ou un id_de_revision"

215

216

#: bzrlib/builtins.py:439

216

#: bzrlib/builtins.py:451

217

#, python-format

218

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

219

msgstr ""

220

221

#: bzrlib/builtins.py:450

221

#: bzrlib/builtins.py:462

222

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

223

msgstr ""

224

225

#: bzrlib/builtins.py:457

225

#: bzrlib/builtins.py:469

226

msgid "You cannot specify a NULL revision."

227

msgstr ""

228

229

#: bzrlib/builtins.py:549

229

#: bzrlib/builtins.py:561

230

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

231

msgstr ""

232

233

#: bzrlib/builtins.py:551

233

#: bzrlib/builtins.py:563

234

msgid ""

235

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

236

"this will refuse to run against one."

237

msgstr ""

238

239

#: bzrlib/builtins.py:554

239

#: bzrlib/builtins.py:566

240

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

241

msgstr ""

242

243

#: bzrlib/builtins.py:560

243

#: bzrlib/builtins.py:572

244

msgid ""

245

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

246

msgstr ""

247

248

#: bzrlib/builtins.py:574

248

#: bzrlib/builtins.py:586

249

msgid "No working tree to remove"

250

msgstr ""

251

252

#: bzrlib/builtins.py:576

252

#: bzrlib/builtins.py:588

253

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

254

msgstr "Non pode eliminar o cartafol de traballo desde unha ruta remota"

255

256

#: bzrlib/builtins.py:585

256

#: bzrlib/builtins.py:597

257

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

258

msgstr ""

259

260

#: bzrlib/builtins.py:625

260

#: bzrlib/builtins.py:637

261

msgid ""

262

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

263

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

264

msgstr ""

265

266

#: bzrlib/builtins.py:636

266

#: bzrlib/builtins.py:648

267

msgid ""

268

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

269

"commit"

270

msgstr ""

271

272

#: bzrlib/builtins.py:640

272

#: bzrlib/builtins.py:652

273

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

274

msgstr ""

275

276

#: bzrlib/builtins.py:644

276

#: bzrlib/builtins.py:656

277

msgid "Show current revision number."

278

msgstr ""

279

280

#: bzrlib/builtins.py:646

280

#: bzrlib/builtins.py:658

281

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

282

msgstr ""

283

284

#: bzrlib/builtins.py:659

284

#: bzrlib/builtins.py:671

285

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

286

msgstr ""

287

288

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

288

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

289

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

290

msgstr ""

291

292

#: bzrlib/builtins.py:700

292

#: bzrlib/builtins.py:712

293

msgid "Show revno of working tree."

294

msgstr ""

295

296

#: bzrlib/builtins.py:748

296

#: bzrlib/builtins.py:760

297

msgid "Add specified files or directories."

298

msgstr ""

299

300

#: bzrlib/builtins.py:750

300

#: bzrlib/builtins.py:762

301

msgid ""

302

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

303

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

304

"any of the named files are already versioned."

305

msgstr ""

306

307

#: bzrlib/builtins.py:754

307

#: bzrlib/builtins.py:766

308

msgid ""

309

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

310

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

315

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

316

msgstr ""

317

318

#: bzrlib/builtins.py:762

318

#: bzrlib/builtins.py:774

319

msgid ""

320

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

321

"unless they are explicitly ignored."

322

msgstr ""

323

324

#: bzrlib/builtins.py:765

324

#: bzrlib/builtins.py:777

325

msgid ""

326

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

327

"are currently unknown."

328

msgstr ""

329

330

#: bzrlib/builtins.py:768

330

#: bzrlib/builtins.py:780

331

msgid ""

332

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

333

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

335

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

336

msgstr ""

337

338

#: bzrlib/builtins.py:773

338

#: bzrlib/builtins.py:785

339

msgid ""

340

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

341

"add them."

342

msgstr ""

343

344

#: bzrlib/builtins.py:776

344

#: bzrlib/builtins.py:788

345

msgid ""

346

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

347

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

352

"into a subdirectory of this one."

353

msgstr ""

354

355

#: bzrlib/builtins.py:784

355

#: bzrlib/builtins.py:796

356

msgid ""

357

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

358

"unless they are explicitly mentioned."

359

msgstr ""

360

361

#: bzrlib/builtins.py:787

361

#: bzrlib/builtins.py:799

362

msgid ""

363

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

364

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

365

"to file size."

366

msgstr ""

367

368

#: bzrlib/builtins.py:794

368

#: bzrlib/builtins.py:806

369

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

370

msgstr ""

371

372

#: bzrlib/builtins.py:800

372

#: bzrlib/builtins.py:813

373

msgid "Lookup file ids from this tree."

374

msgstr ""

375

376

#: bzrlib/builtins.py:836

376

#: bzrlib/builtins.py:849

377

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

378

msgstr ""

379

380

#: bzrlib/builtins.py:841

380

#: bzrlib/builtins.py:854

381

msgid "Create a new versioned directory."

382

msgstr ""

383

384

#: bzrlib/builtins.py:843

384

#: bzrlib/builtins.py:856

385

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

386

msgstr ""

387

388

#: bzrlib/builtins.py:850

388

#: bzrlib/builtins.py:863

389

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

390

msgstr ""

391

392

#: bzrlib/builtins.py:884

392

#: bzrlib/builtins.py:897

393

#, python-format

394

msgid "added %s\n"

395

msgstr ""

396

397

#: bzrlib/builtins.py:926

397

#: bzrlib/builtins.py:939

398

#, python-format

399

msgid "invalid kind %r specified"

400

msgstr ""

401

402

#: bzrlib/builtins.py:963

402

#: bzrlib/builtins.py:976

403

msgid "Move or rename a file."

404

msgstr ""

405

406

#: bzrlib/builtins.py:965

406

#: bzrlib/builtins.py:978

407

msgid " bzr mv SOURCE... DESTINATION"

408

msgstr ""

409

410

#: bzrlib/builtins.py:967

410

#: bzrlib/builtins.py:980

411

msgid ""

412

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

413

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

414

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

415

msgstr ""

416

417

#: bzrlib/builtins.py:971

417

#: bzrlib/builtins.py:984

418

msgid ""

419

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

420

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

423

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

424

msgstr ""

425

426

#: bzrlib/builtins.py:977

426

#: bzrlib/builtins.py:990

427

msgid "Files cannot be moved between branches."

428

msgstr ""

429

430

#: bzrlib/builtins.py:984

430

#: bzrlib/builtins.py:997

431

msgid ""

432

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

433

"moved."

434

msgstr ""

435

436

#: bzrlib/builtins.py:986

436

#: bzrlib/builtins.py:999

437

msgid "Automatically guess renames."

438

msgstr ""

439

440

#: bzrlib/builtins.py:987

440

#: bzrlib/builtins.py:1000

441

msgid "Avoid making changes when guessing renames."

442

msgstr ""

443

444

#: bzrlib/builtins.py:996

444

#: bzrlib/builtins.py:1009

445

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

446

msgstr ""

447

448

#: bzrlib/builtins.py:1000

448

#: bzrlib/builtins.py:1013

449

msgid "missing file argument"

450

msgstr ""

451

452

#: bzrlib/builtins.py:1004

452

#: bzrlib/builtins.py:1017

453

msgid "can not move root of branch"

454

msgstr ""

455

456

#: bzrlib/builtins.py:1010

456

#: bzrlib/builtins.py:1023

457

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

458

msgstr ""

459

460

#: bzrlib/builtins.py:1013

460

#: bzrlib/builtins.py:1026

461

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

462

msgstr ""

463

464

#: bzrlib/builtins.py:1050

464

#: bzrlib/builtins.py:1062

465

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

466

msgstr ""

467

468

#: bzrlib/builtins.py:1102

468

#: bzrlib/builtins.py:1114

469

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

470

msgstr ""

471

472

#: bzrlib/builtins.py:1104

472

#: bzrlib/builtins.py:1116

473

msgid ""

474

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

475

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

477

"parent."

478

msgstr ""

479

480

#: bzrlib/builtins.py:1109

480

#: bzrlib/builtins.py:1121

481

msgid ""

482

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

483

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

484

"be able to pull it again."

485

msgstr ""

486

487

#: bzrlib/builtins.py:1113

487

#: bzrlib/builtins.py:1125

488

msgid ""

489

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

490

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

491

"branches have diverged."

492

msgstr ""

493

494

#: bzrlib/builtins.py:1117

494

#: bzrlib/builtins.py:1129

495

msgid ""

496

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

497

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

499

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

500

msgstr ""

501

502

#: bzrlib/builtins.py:1122

502

#: bzrlib/builtins.py:1134

503

msgid ""

504

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

505

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

506

"-Olog_format=<other_format>."

507

msgstr ""

508

509

#: bzrlib/builtins.py:1126

509

#: bzrlib/builtins.py:1138

510

msgid ""

511

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

512

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

513

"with bzr send."

514

msgstr ""

515

516

#: bzrlib/builtins.py:1134

516

#: bzrlib/builtins.py:1146

517

msgid "Show logs of pulled revisions."

518

msgstr ""

519

520

#: bzrlib/builtins.py:1136

520

#: bzrlib/builtins.py:1148

521

msgid ""

522

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

523

msgstr ""

524

525

#: bzrlib/builtins.py:1139

525

#: bzrlib/builtins.py:1151

526

msgid ""

527

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

528

"master branch."

529

msgstr ""

530

531

#: bzrlib/builtins.py:1168

531

#: bzrlib/builtins.py:1180

532

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

533

msgstr ""

534

535

#: bzrlib/builtins.py:1184

535

#: bzrlib/builtins.py:1196

536

msgid "No pull location known or specified."

537

msgstr ""

538

539

#: bzrlib/builtins.py:1190

539

#: bzrlib/builtins.py:1202

540

#, python-format

541

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

542

msgstr ""

543

544

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

544

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

545

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

546

msgstr ""

547

548

#: bzrlib/builtins.py:1238

548

#: bzrlib/builtins.py:1252

549

msgid "Update a mirror of this branch."

550

msgstr ""

551

552

#: bzrlib/builtins.py:1240

552

#: bzrlib/builtins.py:1254

553

msgid ""

554

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

555

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

556

msgstr ""

557

558

#: bzrlib/builtins.py:1243

558

#: bzrlib/builtins.py:1257

559

msgid ""

560

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

561

"the future."

562

msgstr ""

563

564

#: bzrlib/builtins.py:1246

564

#: bzrlib/builtins.py:1260

565

msgid ""

566

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

567

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

568

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

569

msgstr ""

570

571

#: bzrlib/builtins.py:1250

571

#: bzrlib/builtins.py:1264

572

msgid ""

573

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

574

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

575

msgstr ""

576

577

#: bzrlib/builtins.py:1253

577

#: bzrlib/builtins.py:1267

578

msgid ""

579

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

580

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

581

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

582

msgstr ""

583

584

#: bzrlib/builtins.py:1257

584

#: bzrlib/builtins.py:1271

585

msgid ""

586

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

587

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

589

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

590

msgstr ""

591

592

#: bzrlib/builtins.py:1262

592

#: bzrlib/builtins.py:1276

593

msgid ""

594

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

595

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

596

"-Olog_format=<other_format>."

597

msgstr ""

598

599

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

599

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

600

msgid ""

601

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

602

msgstr ""

603

604

#: bzrlib/builtins.py:1276

604

#: bzrlib/builtins.py:1290

605

msgid ""

606

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

607

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

608

msgstr ""

609

610

#: bzrlib/builtins.py:1281

610

#: bzrlib/builtins.py:1295

611

msgid ""

612

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

613

"branch."

614

msgstr ""

615

616

#: bzrlib/builtins.py:1284

616

#: bzrlib/builtins.py:1298

617

msgid ""

618

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

619

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

620

"the branch created."

621

msgstr ""

622

623

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

623

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

624

msgid ""

625

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

626

"strict disables the check."

627

msgstr ""

628

629

#: bzrlib/builtins.py:1292

629

#: bzrlib/builtins.py:1306

630

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

631

msgstr ""

632

633

#: bzrlib/builtins.py:1336

633

#: bzrlib/builtins.py:1350

634

msgid "Could not determine branch to refer to."

635

msgstr ""

636

637

#: bzrlib/builtins.py:1345

637

#: bzrlib/builtins.py:1359

638

#, python-format

639

msgid ""

640

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

641

"use 'bzr push :parent'."

642

msgstr ""

643

644

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

644

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

645

msgid "No push location known or specified."

646

msgstr ""

647

648

#: bzrlib/builtins.py:1355

648

#: bzrlib/builtins.py:1369

649

#, python-format

650

msgid "Using saved push location: %s"

651

msgstr ""

652

653

#: bzrlib/builtins.py:1365

653

#: bzrlib/builtins.py:1379

654

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

655

msgstr ""

656

657

#: bzrlib/builtins.py:1367

657

#: bzrlib/builtins.py:1381

658

msgid ""

659

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

660

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

665

"create ./foo-bar."

666

msgstr ""

667

668

#: bzrlib/builtins.py:1374

668

#: bzrlib/builtins.py:1388

669

msgid ""

670

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

671

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

672

msgstr ""

673

674

#: bzrlib/builtins.py:1377

674

#: bzrlib/builtins.py:1391

675

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

676

msgstr ""

677

678

#: bzrlib/builtins.py:1387

678

#: bzrlib/builtins.py:1401

679

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

680

msgstr ""

681

682

#: bzrlib/builtins.py:1389

682

#: bzrlib/builtins.py:1403

683

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

684

msgstr ""

685

686

#: bzrlib/builtins.py:1392

686

#: bzrlib/builtins.py:1406

687

msgid ""

688

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

689

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

690

msgstr ""

691

692

#: bzrlib/builtins.py:1396

692

#: bzrlib/builtins.py:1410

693

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

694

msgstr ""

695

696

#: bzrlib/builtins.py:1398

696

#: bzrlib/builtins.py:1412

697

msgid ""

698

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

699

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

700

msgstr ""

701

702

#: bzrlib/builtins.py:1403

702

#: bzrlib/builtins.py:1417

703

msgid "Bind new branch to from location."

704

msgstr ""

705

706

#: bzrlib/builtins.py:1450

706

#: bzrlib/builtins.py:1464

707

#, python-format

708

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

709

msgstr ""

710

711

#: bzrlib/builtins.py:1462

711

#: bzrlib/builtins.py:1476

712

#, python-format

713

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

714

msgstr ""

715

716

#: bzrlib/builtins.py:1481

716

#: bzrlib/builtins.py:1495

717

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

718

msgstr ""

719

720

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

720

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

721

#, python-format

722

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

723

msgstr ""

724

725

#: bzrlib/builtins.py:1500

725

#: bzrlib/builtins.py:1514

726

#, python-format

727

msgid "Branched %d revision."

728

msgid_plural "Branched %d revisions."

729

msgstr[0] ""

730

msgstr[1] ""

731

732

#: bzrlib/builtins.py:1505

732

#: bzrlib/builtins.py:1519

733

#, python-format

734

msgid "New branch bound to %s"

735

msgstr ""

736

737

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

737

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

738

#, python-format

739

msgid "Switched to branch: %s"

740

msgstr ""

741

742

#: bzrlib/builtins.py:1515

742

#: bzrlib/builtins.py:1529

743

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

744

msgstr ""

745

746

#: bzrlib/builtins.py:1517

746

#: bzrlib/builtins.py:1531

747

msgid ""

748

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

749

"location."

750

msgstr ""

751

752

#: bzrlib/builtins.py:1524

752

#: bzrlib/builtins.py:1538

753

msgid ""

754

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

755

"location."

756

msgstr ""

757

758

#: bzrlib/builtins.py:1554

758

#: bzrlib/builtins.py:1567

759

msgid "(default)"

760

msgstr ""

761

762

#: bzrlib/builtins.py:1566

762

#: bzrlib/builtins.py:1579

763

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

764

msgstr ""

765

766

#: bzrlib/builtins.py:1568

766

#: bzrlib/builtins.py:1581

767

msgid ""

768

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

769

"for\n"

773

"location using SFTP."

774

msgstr ""

775

776

#: bzrlib/builtins.py:1573

776

#: bzrlib/builtins.py:1586

777

msgid ""

778

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

779

"will\n"

785

"create ./foo-bar."

786

msgstr ""

787

788

#: bzrlib/builtins.py:1580

788

#: bzrlib/builtins.py:1593

789

msgid ""

790

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

791

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

795

"code.)"

796

msgstr ""

797

798

#: bzrlib/builtins.py:1590

798

#: bzrlib/builtins.py:1603

799

msgid ""

800

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

801

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

803

"commits."

804

msgstr ""

805

806

#: bzrlib/builtins.py:1597

806

#: bzrlib/builtins.py:1610

807

msgid "Get file contents from this tree."

808

msgstr ""

809

810

#: bzrlib/builtins.py:1599

810

#: bzrlib/builtins.py:1612

811

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

812

msgstr ""

813

814

#: bzrlib/builtins.py:1640

814

#: bzrlib/builtins.py:1653

815

msgid ""

816

"Show list of renamed files.\n"

817

" "

818

msgstr ""

819

820

#: bzrlib/builtins.py:1670

820

#: bzrlib/builtins.py:1681

821

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

822

msgstr ""

823

824

#: bzrlib/builtins.py:1672

824

#: bzrlib/builtins.py:1683

825

msgid ""

826

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

827

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

828

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

829

msgstr ""

830

831

#: bzrlib/builtins.py:1676

831

#: bzrlib/builtins.py:1687

832

msgid ""

833

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

834

"that is out of date from its branch."

835

msgstr ""

836

837

#: bzrlib/builtins.py:1679

837

#: bzrlib/builtins.py:1690

838

msgid ""

839

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

840

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

842

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

843

msgstr ""

844

845

#: bzrlib/builtins.py:1684

845

#: bzrlib/builtins.py:1695

846

msgid ""

847

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

848

"the branch from the master."

849

msgstr ""

850

851

#: bzrlib/builtins.py:1687

851

#: bzrlib/builtins.py:1698

852

msgid ""

853

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

854

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

858

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

859

msgstr ""

860

861

#: bzrlib/builtins.py:1694

861

#: bzrlib/builtins.py:1705

862

msgid ""

863

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

864

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

865

"current working directory is used."

866

msgstr ""

867

868

#: bzrlib/builtins.py:1710

868

#: bzrlib/builtins.py:1721

869

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

870

msgstr ""

871

872

#: bzrlib/builtins.py:1718

872

#: bzrlib/builtins.py:1729

873

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

874

msgstr ""

875

876

#: bzrlib/builtins.py:1749

876

#: bzrlib/builtins.py:1760

877

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

878

msgstr ""

879

880

#: bzrlib/builtins.py:1765

880

#: bzrlib/builtins.py:1776

881

#, python-format

882

msgid ""

883

"branch has no revision %s\n"

884

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

885

msgstr ""

886

887

#: bzrlib/builtins.py:1771

887

#: bzrlib/builtins.py:1782

888

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

889

msgstr ""

890

891

#: bzrlib/builtins.py:1775

891

#: bzrlib/builtins.py:1786

892

msgid ""

893

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

894

"can be committed with 'bzr commit'."

895

msgstr ""

896

897

#: bzrlib/builtins.py:1784

897

#: bzrlib/builtins.py:1795

898

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

899

msgstr ""

900

901

#: bzrlib/builtins.py:1786

901

#: bzrlib/builtins.py:1797

902

msgid ""

903

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

904

"tree, branch or repository."

905

msgstr ""

906

907

#: bzrlib/builtins.py:1789

907

#: bzrlib/builtins.py:1800

908

msgid ""

909

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

910

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

911

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

912

msgstr ""

913

914

#: bzrlib/builtins.py:1793

914

#: bzrlib/builtins.py:1804

915

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

916

msgstr ""

917

918

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

919

#: bzrlib/builtins.py:6442

918

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

919

#: bzrlib/builtins.py:6433

920

msgid ":Examples:"

921

msgstr ""

922

923

#: bzrlib/builtins.py:1797

923

#: bzrlib/builtins.py:1808

924

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

925

msgstr ""

926

927

#: bzrlib/builtins.py:1799

927

#: bzrlib/builtins.py:1810

928

msgid " bzr info"

929

msgstr ""

930

931

#: bzrlib/builtins.py:1801

931

#: bzrlib/builtins.py:1812

932

msgid ""

933

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

934

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

935

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

936

msgstr ""

937

938

#: bzrlib/builtins.py:1805

938

#: bzrlib/builtins.py:1816

939

msgid " bzr info -v"

940

msgstr ""

941

942

#: bzrlib/builtins.py:1807

942

#: bzrlib/builtins.py:1818

943

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

944

msgstr ""

945

946

#: bzrlib/builtins.py:1809

946

#: bzrlib/builtins.py:1820

947

msgid " bzr info -vv"

948

msgstr ""

949

950

#: bzrlib/builtins.py:1828

950

#: bzrlib/builtins.py:1839

951

msgid "Remove files or directories."

952

msgstr ""

953

954

#: bzrlib/builtins.py:1830

954

#: bzrlib/builtins.py:1841

955

msgid ""

956

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

957

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

960

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

961

msgstr ""

962

963

#: bzrlib/builtins.py:1838

963

#: bzrlib/builtins.py:1849

964

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

965

msgstr ""

966

967

#: bzrlib/builtins.py:1840

967

#: bzrlib/builtins.py:1851

968

msgid "The file deletion mode to be used."

969

msgstr ""

970

971

#: bzrlib/builtins.py:1841

971

#: bzrlib/builtins.py:1852

972

msgid "Deletion Strategy"

973

msgstr ""

974

975

#: bzrlib/builtins.py:1842

975

#: bzrlib/builtins.py:1853

976

msgid "Backup changed files (default)."

977

msgstr ""

978

979

#: bzrlib/builtins.py:1843

979

#: bzrlib/builtins.py:1854

980

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

981

msgstr ""

982

983

#: bzrlib/builtins.py:1844

983

#: bzrlib/builtins.py:1855

984

msgid "Don't backup changed files."

985

msgstr ""

986

987

#: bzrlib/builtins.py:1845

987

#: bzrlib/builtins.py:1856

988

msgid ""

989

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

990

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

991

msgstr ""

992

993

#: bzrlib/builtins.py:1854

993

#: bzrlib/builtins.py:1865

994

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

995

msgstr ""

996

997

#: bzrlib/builtins.py:1871

997

#: bzrlib/builtins.py:1882

998

msgid "No matching files."

999

msgstr ""

1000

1001

#: bzrlib/builtins.py:1932

1001

#: bzrlib/builtins.py:1943

1002

msgid "Reconcile bzr metadata in a branch."

1003

msgstr ""

1004

1005

#: bzrlib/builtins.py:1934

1005

#: bzrlib/builtins.py:1945

1006

msgid ""

1007

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

1008

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

1010

"advises you to run it."

1011

msgstr ""

1012

1013

#: bzrlib/builtins.py:1939

1013

#: bzrlib/builtins.py:1950

1014

msgid ""

1015

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

1016

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

1018

"correctly in both branches."

1019

msgstr ""

1020

1021

#: bzrlib/builtins.py:1944

1021

#: bzrlib/builtins.py:1955

1022

msgid ""

1023

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

1024

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

1025

msgstr ""

1026

1027

#: bzrlib/builtins.py:1947

1027

#: bzrlib/builtins.py:1958

1028

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

1029

msgstr ""

1030

1031

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

1031

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

1032

msgid ""

1033

"Format for the bzr 2.0 series.\n"

1034

"Uses group-compress storage.\n"

1035

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

1036

msgstr ""

1037

1038

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

1038

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

1039

msgid ""

1040

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

1041

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

1042

msgstr ""

1043

1044

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

1044

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

1045

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

1046

msgstr ""

1047

1048

#: bzrlib/builtins.py:2015

1048

#: bzrlib/builtins.py:2026

1049

msgid "Make a directory into a versioned branch."

1050

msgstr ""

1051

1052

#: bzrlib/builtins.py:2017

1052

#: bzrlib/builtins.py:2028

1053

msgid ""

1054

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

1055

"existing project."

1056

msgstr ""

1057

1058

#: bzrlib/builtins.py:2020

1058

#: bzrlib/builtins.py:2031

1059

msgid ""

1060

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

1061

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

1063

"in the .bzr directory."

1064

msgstr ""

1065

1066

#: bzrlib/builtins.py:2025

1066

#: bzrlib/builtins.py:2036

1067

msgid ""

1068

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

1069

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

1070

msgstr ""

1071

1072

#: bzrlib/builtins.py:2028

1072

#: bzrlib/builtins.py:2039

1073

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

1074

msgstr ""

1075

1076

#: bzrlib/builtins.py:2030

1076

#: bzrlib/builtins.py:2041

1077

msgid ""

1078

" cd ~/project\n"

1079

" bzr init\n"

1082

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

1083

msgstr ""

1084

1085

#: bzrlib/builtins.py:2041

1085

#: bzrlib/builtins.py:2052

1086

msgid ""

1087

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

1088

msgstr ""

1089

1090

#: bzrlib/builtins.py:2044

1090

#: bzrlib/builtins.py:2055

1091

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

1092

msgstr ""

1093

1094

#: bzrlib/builtins.py:2052

1094

#: bzrlib/builtins.py:2063

1095

msgid ""

1096

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

1097

msgstr ""

1098

1099

#: bzrlib/builtins.py:2055

1099

#: bzrlib/builtins.py:2066

1100

msgid "Create a branch without a working tree."

1101

msgstr ""

1102

1103

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

1103

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

1104

#, python-format

1105

msgid ""

1106

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

1107

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

1108

msgstr ""

1109

1110

#: bzrlib/builtins.py:2109

1110

#: bzrlib/builtins.py:2120

1111

msgid ""

1112

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

1113

msgstr ""

1114

1115

#: bzrlib/builtins.py:2120

1115

#: bzrlib/builtins.py:2131

1116

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

1117

msgstr ""

1118

1119

#: bzrlib/builtins.py:2129

1119

#: bzrlib/builtins.py:2140

1120

#, python-format

1121

msgid "Using shared repository: %s\n"

1122

msgstr ""

1123

1124

#: bzrlib/builtins.py:2133

1124

#: bzrlib/builtins.py:2144

1125

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

1126

msgstr ""

1127

1128

#: bzrlib/builtins.py:2135

1128

#: bzrlib/builtins.py:2146

1129

msgid ""

1130

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

1131

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

1133

"speeds up the creation of new branches."

1134

msgstr ""

1135

1136

#: bzrlib/builtins.py:2140

1136

#: bzrlib/builtins.py:2151

1137

msgid ""

1138

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

1139

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

1143

"branches, such as on a server."

1144

msgstr ""

1145

1146

#: bzrlib/builtins.py:2147

1146

#: bzrlib/builtins.py:2158

1147

msgid ""

1148

":Examples:\n"

1149

" Create a shared repository holding just branches::"

1150

msgstr ""

1151

1152

#: bzrlib/builtins.py:2150

1152

#: bzrlib/builtins.py:2161

1153

msgid ""

1154

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

1155

" bzr init repo/trunk"

1156

msgstr ""

1157

1158

#: bzrlib/builtins.py:2153

1158

#: bzrlib/builtins.py:2164

1159

msgid " Make a lightweight checkout elsewhere::"

1160

msgstr ""

1161

1162

#: bzrlib/builtins.py:2155

1162

#: bzrlib/builtins.py:2166

1163

msgid ""

1164

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

1165

" cd trunk-checkout\n"

1166

" (add files here)"

1167

msgstr ""

1168

1169

#: bzrlib/builtins.py:2163

1169

#: bzrlib/builtins.py:2174

1170

msgid ""

1171

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

1172

msgstr ""

1173

1174

#: bzrlib/builtins.py:2167

1174

#: bzrlib/builtins.py:2178

1175

msgid "Repository format"

1176

msgstr ""

1177

1178

#: bzrlib/builtins.py:2169

1178

#: bzrlib/builtins.py:2180

1179

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

1180

msgstr ""

1181

1182

#: bzrlib/builtins.py:2195

1182

#: bzrlib/builtins.py:2206

1183

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

1184

msgstr ""

1185

1186

#: bzrlib/builtins.py:2197

1186

#: bzrlib/builtins.py:2208

1187

msgid ""

1188

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

1189

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

1193

"given."

1194

msgstr ""

1195

1196

#: bzrlib/builtins.py:2204

1196

#: bzrlib/builtins.py:2215

1197

msgid ""

1198

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

1199

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

1200

msgstr ""

1201

1202

#: bzrlib/builtins.py:2207

1202

#: bzrlib/builtins.py:2218

1203

msgid ""

1204

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

1205

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

1209

"in the range."

1210

msgstr ""

1211

1212

#: bzrlib/builtins.py:2214

1212

#: bzrlib/builtins.py:2225

1213

msgid ""

1214

":Exit values:\n"

1215

" 1 - changed\n"

1218

" 0 - no change"

1219

msgstr ""

1220

1221

#: bzrlib/builtins.py:2220

1221

#: bzrlib/builtins.py:2231

1222

msgid ""

1223

":Examples:\n"

1224

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

1225

msgstr ""

1226

1227

#: bzrlib/builtins.py:2223

1227

#: bzrlib/builtins.py:2234

1228

msgid " bzr diff"

1229

msgstr ""

1230

1231

#: bzrlib/builtins.py:2225

1231

#: bzrlib/builtins.py:2236

1232

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

1233

msgstr ""

1234

1235

#: bzrlib/builtins.py:2227

1235

#: bzrlib/builtins.py:2238

1236

msgid " bzr diff -r1"

1237

msgstr ""

1238

1239

#: bzrlib/builtins.py:2229

1239

#: bzrlib/builtins.py:2240

1240

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

1241

msgstr ""

1242

1243

#: bzrlib/builtins.py:2231

1243

#: bzrlib/builtins.py:2242

1244

msgid " bzr diff -r1..3"

1245

msgstr ""

1246

1247

#: bzrlib/builtins.py:2233

1247

#: bzrlib/builtins.py:2244

1248

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

1249

msgstr ""

1250

1251

#: bzrlib/builtins.py:2235

1251

#: bzrlib/builtins.py:2246

1252

msgid " bzr diff -r1..3 xxx"

1253

msgstr ""

1254

1255

#: bzrlib/builtins.py:2237

1255

#: bzrlib/builtins.py:2248

1256

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

1257

msgstr ""

1258

1259

#: bzrlib/builtins.py:2239

1259

#: bzrlib/builtins.py:2250

1260

msgid " bzr diff -c2"

1261

msgstr ""

1262

1263

#: bzrlib/builtins.py:2241

1263

#: bzrlib/builtins.py:2252

1264

msgid ""

1265

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

1266

" \n"

1267

" bzr diff -cX"

1268

msgstr ""

1269

1270

#: bzrlib/builtins.py:2245

1270

#: bzrlib/builtins.py:2256

1271

msgid ""

1272

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

1273

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

1274

" another parent, use::"

1275

msgstr ""

1276

1277

#: bzrlib/builtins.py:2249

1277

#: bzrlib/builtins.py:2260

1278

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

1279

msgstr ""

1280

1281

#: bzrlib/builtins.py:2251

1281

#: bzrlib/builtins.py:2262

1282

msgid ""

1283

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

1284

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

1285

msgstr ""

1286

1287

#: bzrlib/builtins.py:2254

1287

#: bzrlib/builtins.py:2265

1288

msgid " bzr diff -r-2.."

1289

msgstr ""

1290

1291

#: bzrlib/builtins.py:2256

1291

#: bzrlib/builtins.py:2267

1292

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

1293

msgstr ""

1294

1295

#: bzrlib/builtins.py:2258

1295

#: bzrlib/builtins.py:2269

1296

msgid " bzr diff NEWS"

1297

msgstr ""

1298

1299

#: bzrlib/builtins.py:2260

1299

#: bzrlib/builtins.py:2271

1300

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

1301

msgstr ""

1302

1303

#: bzrlib/builtins.py:2262

1303

#: bzrlib/builtins.py:2273

1304

msgid " bzr diff xxx/NEWS"

1305

msgstr ""

1306

1307

#: bzrlib/builtins.py:2264

1307

#: bzrlib/builtins.py:2275

1308

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

1309

msgstr ""

1310

1311

#: bzrlib/builtins.py:2266

1311

#: bzrlib/builtins.py:2277

1312

msgid " bzr diff --old xxx"

1313

msgstr ""

1314

1315

#: bzrlib/builtins.py:2268

1315

#: bzrlib/builtins.py:2279

1316

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

1317

msgstr ""

1318

1319

#: bzrlib/builtins.py:2270

1319

#: bzrlib/builtins.py:2281

1320

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

1321

msgstr ""

1322

1323

#: bzrlib/builtins.py:2272

1323

#: bzrlib/builtins.py:2283

1324

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

1325

msgstr ""

1326

1327

#: bzrlib/builtins.py:2274

1327

#: bzrlib/builtins.py:2285

1328

msgid ""

1329

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

1330

" \n"

1333

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

1334

msgstr ""

1335

1336

#: bzrlib/builtins.py:2284

1336

#: bzrlib/builtins.py:2295

1337

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

1338

msgstr ""

1339

1340

#: bzrlib/builtins.py:2287

1340

#: bzrlib/builtins.py:2298

1341

msgid ""

1342

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

1343

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

1344

msgstr ""

1345

1346

#: bzrlib/builtins.py:2290

1346

#: bzrlib/builtins.py:2301

1347

msgid "Branch/tree to compare from."

1348

msgstr ""

1349

1350

#: bzrlib/builtins.py:2294

1350

#: bzrlib/builtins.py:2305

1351

msgid "Branch/tree to compare to."

1352

msgstr ""

1353

1354

#: bzrlib/builtins.py:2300

1354

#: bzrlib/builtins.py:2311

1355

msgid "Use this command to compare files."

1356

msgstr ""

1357

1358

#: bzrlib/builtins.py:2305

1358

#: bzrlib/builtins.py:2316

1359

msgid "Diff format to use."

1360

msgstr ""

1361

1362

#: bzrlib/builtins.py:2307

1362

#: bzrlib/builtins.py:2318

1363

msgid "Diff format"

1364

msgstr ""

1365

1366

#: bzrlib/builtins.py:2329

1366

#: bzrlib/builtins.py:2340

1367

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

1368

msgstr ""

1369

1370

#: bzrlib/builtins.py:2333

1370

#: bzrlib/builtins.py:2344

1371

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

1372

msgstr ""

1373

1374

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

1375

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

1374

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

1375

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

1376

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

1377

msgstr ""

1378

1379

#: bzrlib/builtins.py:2358

1379

#: bzrlib/builtins.py:2369

1380

msgid ""

1381

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

1382

" "

1383

msgstr ""

1384

1385

#: bzrlib/builtins.py:2436

1385

#: bzrlib/builtins.py:2446

1386

msgid "Show the tree root directory."

1387

msgstr ""

1388

1389

#: bzrlib/builtins.py:2438

1389

#: bzrlib/builtins.py:2448

1390

msgid ""

1391

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

1392

"directory."

1393

msgstr ""

1394

1395

#: bzrlib/builtins.py:2453

1395

#: bzrlib/builtins.py:2463

1396

msgid "The limit argument must be an integer."

1397

msgstr ""

1398

1399

#: bzrlib/builtins.py:2461

1399

#: bzrlib/builtins.py:2471

1400

msgid "The levels argument must be an integer."

1401

msgstr ""

1402

1403

#: bzrlib/builtins.py:2466

1403

#: bzrlib/builtins.py:2476

1404

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

1405

msgstr ""

1406

1407

#: bzrlib/builtins.py:2468

1407

#: bzrlib/builtins.py:2478

1408

msgid ""

1409

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

1410

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

1412

"Here are some simple examples::"

1413

msgstr ""

1414

1415

#: bzrlib/builtins.py:2473

1415

#: bzrlib/builtins.py:2483

1416

msgid ""

1417

" bzr log log the current branch\n"

1418

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

1419

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

1420

msgstr ""

1421

1422

#: bzrlib/builtins.py:2477

1422

#: bzrlib/builtins.py:2487

1423

msgid ""

1424

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

1425

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

1429

"were merged."

1430

msgstr ""

1431

1432

#: bzrlib/builtins.py:2484

1432

#: bzrlib/builtins.py:2494

1433

msgid ":Output control:"

1434

msgstr ""

1435

1436

#: bzrlib/builtins.py:2486

1436

#: bzrlib/builtins.py:2496

1437

msgid ""

1438

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

1439

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

1441

" for more details on log formats."

1442

msgstr ""

1443

1444

#: bzrlib/builtins.py:2491

1444

#: bzrlib/builtins.py:2501

1445

msgid ""

1446

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

1447

" displayed::"

1448

msgstr ""

1449

1450

#: bzrlib/builtins.py:2494

1450

#: bzrlib/builtins.py:2504

1451

msgid ""

1452

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

1453

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

1456

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

1457

msgstr ""

1458

1459

#: bzrlib/builtins.py:2500

1459

#: bzrlib/builtins.py:2510

1460

msgid ""

1461

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

1462

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

1463

" just the top level (mainline)."

1464

msgstr ""

1465

1466

#: bzrlib/builtins.py:2504

1466

#: bzrlib/builtins.py:2514

1467

msgid ""

1468

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

1469

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

1470

" instead, use the -vv option."

1471

msgstr ""

1472

1473

#: bzrlib/builtins.py:2508

1473

#: bzrlib/builtins.py:2518

1474

msgid ":Ordering control:"

1475

msgstr ""

1476

1477

#: bzrlib/builtins.py:2510

1477

#: bzrlib/builtins.py:2520

1478

msgid ""

1479

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

1480

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

1482

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

1483

msgstr ""

1484

1485

#: bzrlib/builtins.py:2515

1485

#: bzrlib/builtins.py:2525

1486

msgid ":Revision filtering:"

1487

msgstr ""

1488

1489

#: bzrlib/builtins.py:2517

1489

#: bzrlib/builtins.py:2527

1490

msgid ""

1491

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

1492

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

1493

msgstr ""

1494

1495

#: bzrlib/builtins.py:2520

1495

#: bzrlib/builtins.py:2530

1496

msgid ""

1497

" -rX display revision X\n"

1498

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

1500

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

1501

msgstr ""

1502

1503

#: bzrlib/builtins.py:2525

1503

#: bzrlib/builtins.py:2535

1504

msgid ""

1505

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

1506

" Some common examples are given below::"

1507

msgstr ""

1508

1509

#: bzrlib/builtins.py:2528

1509

#: bzrlib/builtins.py:2538

1510

msgid ""

1511

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

1512

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

1516

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

1517

msgstr ""

1518

1519

#: bzrlib/builtins.py:2535

1519

#: bzrlib/builtins.py:2545

1520

msgid ""

1521

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

1522

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

1526

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

1527

msgstr ""

1528

1529

#: bzrlib/builtins.py:2542

1529

#: bzrlib/builtins.py:2552

1530

msgid ":Path filtering:"

1531

msgstr ""

1532

1533

#: bzrlib/builtins.py:2544

1533

#: bzrlib/builtins.py:2554

1534

msgid ""

1535

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

1536

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

1537

" nominated files or directories."

1538

msgstr ""

1539

1540

#: bzrlib/builtins.py:2548

1540

#: bzrlib/builtins.py:2558

1541

msgid ""

1542

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

1543

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

1544

" the end or start of the range."

1545

msgstr ""

1546

1547

#: bzrlib/builtins.py:2552

1547

#: bzrlib/builtins.py:2562

1548

msgid ""

1549

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

1550

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

1551

msgstr ""

1552

1553

#: bzrlib/builtins.py:2555

1553

#: bzrlib/builtins.py:2565

1554

msgid ""

1555

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

1556

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

1557

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

1558

msgstr ""

1559

1560

#: bzrlib/builtins.py:2559

1560

#: bzrlib/builtins.py:2569

1561

msgid " In this case:"

1562

msgstr ""

1563

1564

#: bzrlib/builtins.py:2561

1564

#: bzrlib/builtins.py:2571

1565

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

1566

msgstr ""

1567

1568

#: bzrlib/builtins.py:2563

1568

#: bzrlib/builtins.py:2573

1569

msgid ""

1570

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

1571

msgstr ""

1572

1573

#: bzrlib/builtins.py:2565

1573

#: bzrlib/builtins.py:2575

1574

msgid ""

1575

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

1576

" the original file in revision 2."

1577

msgstr ""

1578

1579

#: bzrlib/builtins.py:2568

1579

#: bzrlib/builtins.py:2578

1580

msgid ""

1581

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

1582

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

1583

msgstr ""

1584

1585

#: bzrlib/builtins.py:2571

1585

#: bzrlib/builtins.py:2581

1586

msgid ""

1587

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

1588

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

1589

" until it was last renamed)."

1590

msgstr ""

1591

1592

#: bzrlib/builtins.py:2575

1592

#: bzrlib/builtins.py:2585

1593

msgid ":Other filtering:"

1594

msgstr ""

1595

1596

#: bzrlib/builtins.py:2577

1596

#: bzrlib/builtins.py:2587

1597

msgid ""

1598

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

1599

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

1602

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

1603

msgstr ""

1604

1605

#: bzrlib/builtins.py:2583

1605

#: bzrlib/builtins.py:2593

1606

msgid ":Tips & tricks:"

1607

msgstr ""

1608

1609

#: bzrlib/builtins.py:2585

1609

#: bzrlib/builtins.py:2595

1610

msgid ""

1611

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

1612

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

1615

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

1616

msgstr ""

1617

1618

#: bzrlib/builtins.py:2591

1618

#: bzrlib/builtins.py:2601

1619

msgid ""

1620

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

1621

msgstr ""

1622

1623

#: bzrlib/builtins.py:2593

1623

#: bzrlib/builtins.py:2603

1624

msgid ""

1625

" [ALIASES]\n"

1626

" tip = log -r-1\n"

1628

" show = log -v -p"

1629

msgstr ""

1630

1631

#: bzrlib/builtins.py:2598

1631

#: bzrlib/builtins.py:2608

1632

msgid ""

1633

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

1634

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

1635

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

1636

msgstr ""

1637

1638

#: bzrlib/builtins.py:2602

1638

#: bzrlib/builtins.py:2612

1639

msgid ""

1640

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

1641

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

1642

msgstr ""

1643

1644

#: bzrlib/builtins.py:2605

1644

#: bzrlib/builtins.py:2615

1645

msgid ""

1646

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

1647

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

1649

" be given when using the -v option."

1650

msgstr ""

1651

1652

#: bzrlib/builtins.py:2610

1652

#: bzrlib/builtins.py:2620

1653

msgid ""

1654

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

1655

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

1657

" a list of words but not others."

1658

msgstr ""

1659

1660

#: bzrlib/builtins.py:2615

1660

#: bzrlib/builtins.py:2625

1661

msgid ""

1662

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

1663

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

1665

" trading disk space for faster speed."

1666

msgstr ""

1667

1668

#: bzrlib/builtins.py:2624

1668

#: bzrlib/builtins.py:2634

1669

msgid "Show from oldest to newest."

1670

msgstr ""

1671

1672

#: bzrlib/builtins.py:2627

1672

#: bzrlib/builtins.py:2637

1673

msgid "Show files changed in each revision."

1674

msgstr ""

1675

1676

#: bzrlib/builtins.py:2633

1676

#: bzrlib/builtins.py:2643

1677

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

1678

msgstr ""

1679

1680

#: bzrlib/builtins.py:2637

1680

#: bzrlib/builtins.py:2647

1681

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

1682

msgstr ""

1683

1684

#: bzrlib/builtins.py:2638

1684

#: bzrlib/builtins.py:2648

1685

msgid "Authors"

1686

msgstr ""

1687

1688

#: bzrlib/builtins.py:2643

1688

#: bzrlib/builtins.py:2653

1689

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

1690

msgstr ""

1691

1692

#: bzrlib/builtins.py:2653

1692

#: bzrlib/builtins.py:2663

1693

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

1694

msgstr ""

1695

1696

#: bzrlib/builtins.py:2658

1696

#: bzrlib/builtins.py:2668

1697

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

1698

msgstr ""

1699

1700

#: bzrlib/builtins.py:2660

1700

#: bzrlib/builtins.py:2670

1701

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

1702

msgstr ""

1703

1704

#: bzrlib/builtins.py:2664

1704

#: bzrlib/builtins.py:2674

1705

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

1706

msgstr ""

1707

1708

#: bzrlib/builtins.py:2666

1708

#: bzrlib/builtins.py:2676

1709

msgid ""

1710

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

1711

"rX..Y)."

1712

msgstr ""

1713

1714

#: bzrlib/builtins.py:2670

1714

#: bzrlib/builtins.py:2680

1715

msgid "Show digital signature validity."

1716

msgstr ""

1717

1718

#: bzrlib/builtins.py:2673

1718

#: bzrlib/builtins.py:2683

1719

msgid "Show revisions whose properties match this expression."

1720

msgstr ""

1721

1722

#: bzrlib/builtins.py:2677

1722

#: bzrlib/builtins.py:2687

1723

msgid "Show revisions whose message matches this expression."

1724

msgstr ""

1725

1726

#: bzrlib/builtins.py:2681

1726

#: bzrlib/builtins.py:2691

1727

msgid "Show revisions whose committer matches this expression."

1728

msgstr ""

1729

1730

#: bzrlib/builtins.py:2685

1730

#: bzrlib/builtins.py:2695

1731

msgid "Show revisions whose authors match this expression."

1732

msgstr ""

1733

1734

#: bzrlib/builtins.py:2689

1734

#: bzrlib/builtins.py:2699

1735

msgid "Show revisions whose bugs match this expression."

1736

msgstr ""

1737

1738

#: bzrlib/builtins.py:2743

1738

#: bzrlib/builtins.py:2753

1739

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

1740

msgstr ""

1741

1742

#: bzrlib/builtins.py:2771

1742

#: bzrlib/builtins.py:2781

1743

#, python-format

1744

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

1745

msgstr ""

1746

1747

#: bzrlib/builtins.py:2888

1747

#: bzrlib/builtins.py:2898

1748

#, python-format

1749

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

1750

msgstr ""

1751

1752

#: bzrlib/builtins.py:2904

1752

#: bzrlib/builtins.py:2914

1753

#, python-format

1754

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

1755

msgstr ""

1756

1757

#: bzrlib/builtins.py:2949

1757

#: bzrlib/builtins.py:2959

1758

msgid ""

1759

"List files in a tree.\n"

1760

" "

1761

msgstr ""

1762

1763

#: bzrlib/builtins.py:2958

1763

#: bzrlib/builtins.py:2968

1764

msgid "Recurse into subdirectories."

1765

msgstr ""

1766

1767

#: bzrlib/builtins.py:2960

1767

#: bzrlib/builtins.py:2970

1768

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

1769

msgstr ""

1770

1771

#: bzrlib/builtins.py:2962

1771

#: bzrlib/builtins.py:2972

1772

msgid "Print unknown files."

1773

msgstr ""

1774

1775

#: bzrlib/builtins.py:2963

1775

#: bzrlib/builtins.py:2973

1776

msgid "Print versioned files."

1777

msgstr ""

1778

1779

#: bzrlib/builtins.py:2966

1779

#: bzrlib/builtins.py:2976

1780

msgid "Print ignored files."

1781

msgstr ""

1782

1783

#: bzrlib/builtins.py:2968

1783

#: bzrlib/builtins.py:2978

1784

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

1785

msgstr ""

1786

1787

#: bzrlib/builtins.py:2981

1787

#: bzrlib/builtins.py:2991

1788

msgid "invalid kind specified"

1789

msgstr ""

1790

1791

#: bzrlib/builtins.py:2984

1791

#: bzrlib/builtins.py:2994

1792

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

1793

msgstr ""

1794

1795

#: bzrlib/builtins.py:2993

1795

#: bzrlib/builtins.py:3003

1796

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

1797

msgstr ""

1798

1799

#: bzrlib/builtins.py:3080

1799

#: bzrlib/builtins.py:3090

1800

msgid "Ignore specified files or patterns."

1801

msgstr ""

1802

1803

#: bzrlib/builtins.py:3082

1803

#: bzrlib/builtins.py:3092

1804

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

1805

msgstr ""

1806

1807

#: bzrlib/builtins.py:3084

1807

#: bzrlib/builtins.py:3094

1808

msgid ""

1809

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

1810

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

1813

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

1814

msgstr ""

1815

1816

#: bzrlib/builtins.py:3090

1816

#: bzrlib/builtins.py:3100

1817

msgid ""

1818

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

1819

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

1821

"it."

1822

msgstr ""

1823

1824

#: bzrlib/builtins.py:3095

1824

#: bzrlib/builtins.py:3105

1825

msgid ""

1826

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

1827

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

1830

"can be edited directly using an editor."

1831

msgstr ""

1832

1833

#: bzrlib/builtins.py:3101

1833

#: bzrlib/builtins.py:3111

1834

msgid ""

1835

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

1836

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

1837

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

1838

msgstr ""

1839

1840

#: bzrlib/builtins.py:3105

1840

#: bzrlib/builtins.py:3115

1841

msgid ""

1842

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

1843

"precedence over the '!' exception patterns."

1844

msgstr ""

1845

1846

#: bzrlib/builtins.py:3108

1846

#: bzrlib/builtins.py:3118

1847

msgid ""

1848

":Notes: \n"

1849

" \n"

1851

" the shell on Unix."

1852

msgstr ""

1853

1854

#: bzrlib/builtins.py:3113

1854

#: bzrlib/builtins.py:3123

1855

msgid ""

1856

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

1857

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

1858

msgstr ""

1859

1860

#: bzrlib/builtins.py:3116

1860

#: bzrlib/builtins.py:3126

1861

msgid ""

1862

":Examples:\n"

1863

" Ignore the top level Makefile::"

1864

msgstr ""

1865

1866

#: bzrlib/builtins.py:3119

1866

#: bzrlib/builtins.py:3129

1867

msgid " bzr ignore ./Makefile"

1868

msgstr ""

1869

1870

#: bzrlib/builtins.py:3121

1870

#: bzrlib/builtins.py:3131

1871

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

1872

msgstr ""

1873

1874

#: bzrlib/builtins.py:3123

1874

#: bzrlib/builtins.py:3133

1875

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

1876

msgstr ""

1877

1878

#: bzrlib/builtins.py:3125

1878

#: bzrlib/builtins.py:3135

1879

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

1880

msgstr ""

1881

1882

#: bzrlib/builtins.py:3127

1882

#: bzrlib/builtins.py:3137

1883

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

1884

msgstr ""

1885

1886

#: bzrlib/builtins.py:3129

1886

#: bzrlib/builtins.py:3139

1887

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

1888

msgstr ""

1889

1890

#: bzrlib/builtins.py:3131

1890

#: bzrlib/builtins.py:3141

1891

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

1892

msgstr ""

1893

1894

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

1894

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

1895

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

1896

msgstr ""

1897

1898

#: bzrlib/builtins.py:3135

1898

#: bzrlib/builtins.py:3145

1899

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

1900

msgstr ""

1901

1902

#: bzrlib/builtins.py:3139

1902

#: bzrlib/builtins.py:3149

1903

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

1904

msgstr ""

1905

1906

#: bzrlib/builtins.py:3141

1906

#: bzrlib/builtins.py:3151

1907

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

1908

msgstr ""

1909

1910

#: bzrlib/builtins.py:3143

1910

#: bzrlib/builtins.py:3153

1911

msgid ""

1912

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

1913

" \n"

1919

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

1920

msgstr ""

1921

1922

#: bzrlib/builtins.py:3157

1922

#: bzrlib/builtins.py:3167

1923

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

1924

msgstr ""

1925

1926

#: bzrlib/builtins.py:3169

1926

#: bzrlib/builtins.py:3179

1927

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

1928

msgstr ""

1929

1930

#: bzrlib/builtins.py:3180

1930

#: bzrlib/builtins.py:3190

1931

#, python-format

1932

msgid "Invalid ignore pattern found. %s"

1933

msgid_plural "Invalid ignore patterns found. %s"

1934

msgstr[0] ""

1935

msgstr[1] ""

1936

1937

#: bzrlib/builtins.py:3189

1937

#: bzrlib/builtins.py:3199

1938

msgid "NAME_PATTERN should not be an absolute path"

1939

msgstr ""

1940

1941

#: bzrlib/builtins.py:3202

1941

#: bzrlib/builtins.py:3212

1942

#, python-format

1943

msgid ""

1944

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

1948

"them.\n"

1949

msgstr ""

1950

1951

#: bzrlib/builtins.py:3209

1951

#: bzrlib/builtins.py:3219

1952

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

1953

msgstr ""

1954

1955

#: bzrlib/builtins.py:3211

1955

#: bzrlib/builtins.py:3221

1956

msgid ""

1957

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

1958

"be ignored."

1959

msgstr ""

1960

1961

#: bzrlib/builtins.py:3214

1961

#: bzrlib/builtins.py:3224

1962

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

1963

msgstr ""

1964

1965

#: bzrlib/builtins.py:3216

1965

#: bzrlib/builtins.py:3226

1966

msgid " bzr ls --ignored"

1967

msgstr ""

1968

1969

#: bzrlib/builtins.py:3250

1969

#: bzrlib/builtins.py:3260

1970

#, python-format

1971

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

1972

msgstr ""

1973

1974

#: bzrlib/builtins.py:3257

1974

#: bzrlib/builtins.py:3267

1975

msgid ""

1976

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

1977

msgstr ""

1978

1979

#: bzrlib/builtins.py:3259

1979

#: bzrlib/builtins.py:3269

1980

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

1981

msgstr ""

1982

1983

#: bzrlib/builtins.py:3261

1983

#: bzrlib/builtins.py:3271

1984

msgid ""

1985

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

1986

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

1987

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

1988

msgstr ""

1989

1990

#: bzrlib/builtins.py:3265

1990

#: bzrlib/builtins.py:3275

1991

msgid ""

1992

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

1993

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

1994

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

1995

msgstr ""

1996

1997

#: bzrlib/builtins.py:3269

1997

#: bzrlib/builtins.py:3279

1998

msgid ""

1999

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

2000

"directory will be used."

2001

msgstr ""

2002

2003

#: bzrlib/builtins.py:3272

2003

#: bzrlib/builtins.py:3282

2004

msgid ""

2005

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

2006

msgstr ""

2007

2008

#: bzrlib/builtins.py:3274

2008

#: bzrlib/builtins.py:3284

2009

msgid ""

2010

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

2011

" Supported formats Autodetected by extension\n"

2018

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

2019

msgstr ""

2020

2021

#: bzrlib/builtins.py:3288

2021

#: bzrlib/builtins.py:3298

2022

msgid "Type of file to export to."

2023

msgstr ""

2024

2025

#: bzrlib/builtins.py:3291

2025

#: bzrlib/builtins.py:3301

2026

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

2027

msgstr ""

2028

2029

#: bzrlib/builtins.py:3295

2029

#: bzrlib/builtins.py:3305

2030

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

2031

msgstr ""

2032

2033

#: bzrlib/builtins.py:3297

2033

#: bzrlib/builtins.py:3307

2034

msgid ""

2035

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

2036

"changed."

2037

msgstr ""

2038

2039

#: bzrlib/builtins.py:3300

2039

#: bzrlib/builtins.py:3310

2040

msgid ""

2041

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

2042

msgstr ""

2043

2044

#: bzrlib/builtins.py:3319

2044

#: bzrlib/builtins.py:3329

2045

msgid "--uncommitted requires a working tree"

2046

msgstr ""

2047

2048

#: bzrlib/builtins.py:3328

2048

#: bzrlib/builtins.py:3338

2049

#, python-format

2050

msgid "Unsupported export format: %s"

2051

msgstr ""

2052

2053

#: bzrlib/builtins.py:3332

2053

#: bzrlib/builtins.py:3342

2054

msgid ""

2055

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

2056

msgstr ""

2057

2058

#: bzrlib/builtins.py:3334

2058

#: bzrlib/builtins.py:3344

2059

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

2060

msgstr ""

2061

2062

#: bzrlib/builtins.py:3336

2062

#: bzrlib/builtins.py:3346

2063

msgid ""

2064

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

2065

"binary file."

2066

msgstr ""

2067

2068

#: bzrlib/builtins.py:3342

2068

#: bzrlib/builtins.py:3352

2069

msgid "The path name in the old tree."

2070

msgstr ""

2071

2072

#: bzrlib/builtins.py:3343

2072

#: bzrlib/builtins.py:3353

2073

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

2074

msgstr ""

2075

2076

#: bzrlib/builtins.py:3354

2076

#: bzrlib/builtins.py:3364

2077

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

2078

msgstr ""

2079

2080

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

2080

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

2081

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

2082

msgstr ""

2083

2084

#: bzrlib/builtins.py:3414

2084

#: bzrlib/builtins.py:3424

2085

msgid "Commit changes into a new revision."

2086

msgstr ""

2087

2088

#: bzrlib/builtins.py:3416

2088

#: bzrlib/builtins.py:3426

2089

msgid ""

2090

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

2091

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

2095

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

2096

msgstr ""

2097

2098

#: bzrlib/builtins.py:3423

2098

#: bzrlib/builtins.py:3433

2099

msgid ""

2100

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

2101

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

2102

"as explained below."

2103

msgstr ""

2104

2105

#: bzrlib/builtins.py:3427

2105

#: bzrlib/builtins.py:3437

2106

msgid ":Selective commits:"

2107

msgstr ""

2108

2109

#: bzrlib/builtins.py:3429

2109

#: bzrlib/builtins.py:3439

2110

msgid ""

2111

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

2112

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

2113

" everything within it is committed."

2114

msgstr ""

2115

2116

#: bzrlib/builtins.py:3433

2116

#: bzrlib/builtins.py:3443

2117

msgid ""

2118

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

2119

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

2120

" within foo/bar::"

2121

msgstr ""

2122

2123

#: bzrlib/builtins.py:3437

2123

#: bzrlib/builtins.py:3447

2124

msgid " bzr commit foo -x foo/bar"

2125

msgstr ""

2126

2127

#: bzrlib/builtins.py:3439

2127

#: bzrlib/builtins.py:3449

2128

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

2129

msgstr ""

2130

2131

#: bzrlib/builtins.py:3441

2131

#: bzrlib/builtins.py:3451

2132

msgid ":Custom authors:"

2133

msgstr ""

2134

2135

#: bzrlib/builtins.py:3443

2135

#: bzrlib/builtins.py:3453

2136

msgid ""

2137

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

2138

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

2142

" author."

2143

msgstr ""

2144

2145

#: bzrlib/builtins.py:3450

2145

#: bzrlib/builtins.py:3460

2146

msgid ":Checks:"

2147

msgstr ""

2148

2149

#: bzrlib/builtins.py:3452

2149

#: bzrlib/builtins.py:3462

2150

msgid ""

2151

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

2152

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

2155

" for details."

2156

msgstr ""

2157

2158

#: bzrlib/builtins.py:3458

2158

#: bzrlib/builtins.py:3468

2159

msgid ":Things to note:"

2160

msgstr ""

2161

2162

#: bzrlib/builtins.py:3460

2162

#: bzrlib/builtins.py:3470

2163

msgid ""

2164

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

2165

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

2166

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

2167

msgstr ""

2168

2169

#: bzrlib/builtins.py:3464

2169

#: bzrlib/builtins.py:3474

2170

msgid ""

2171

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

2172

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

2174

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

2175

msgstr ""

2176

2177

#: bzrlib/builtins.py:3474

2177

#: bzrlib/builtins.py:3484

2178

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

2179

msgstr ""

2180

2181

#: bzrlib/builtins.py:3477

2181

#: bzrlib/builtins.py:3487

2182

msgid "Description of the new revision."

2183

msgstr ""

2184

2185

#: bzrlib/builtins.py:3480

2185

#: bzrlib/builtins.py:3490

2186

msgid "Commit even if nothing has changed."

2187

msgstr ""

2188

2189

#: bzrlib/builtins.py:3484

2189

#: bzrlib/builtins.py:3494

2190

msgid "Take commit message from this file."

2191

msgstr ""

2192

2193

#: bzrlib/builtins.py:3486

2193

#: bzrlib/builtins.py:3496

2194

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

2195

msgstr ""

2196

2197

#: bzrlib/builtins.py:3489

2197

#: bzrlib/builtins.py:3499

2198

msgid ""

2199

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

2200

"08:00:00 +0100'."

2201

msgstr ""

2202

2203

#: bzrlib/builtins.py:3492

2203

#: bzrlib/builtins.py:3502

2204

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

2205

msgstr ""

2206

2207

#: bzrlib/builtins.py:3495

2207

#: bzrlib/builtins.py:3505

2208

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

2209

msgstr ""

2210

2211

#: bzrlib/builtins.py:3498

2211

#: bzrlib/builtins.py:3508

2212

msgid ""

2213

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

2214

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

2215

msgstr ""

2216

2217

#: bzrlib/builtins.py:3504

2217

#: bzrlib/builtins.py:3514

2218

msgid ""

2219

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

2220

"the message editor."

2221

msgstr ""

2222

2223

#: bzrlib/builtins.py:3507

2223

#: bzrlib/builtins.py:3517

2224

msgid ""

2225

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

2226

"can not be natively represented."

2227

msgstr ""

2228

2229

#: bzrlib/builtins.py:3525

2229

#: bzrlib/builtins.py:3535

2230

#, python-format

2231

msgid ""

2232

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

2234

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

2235

msgstr ""

2236

2237

#: bzrlib/builtins.py:3534

2237

#: bzrlib/builtins.py:3544

2238

#, python-format

2239

msgid ""

2240

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

2242

"Commit refused."

2243

msgstr ""

2244

2245

#: bzrlib/builtins.py:3543

2245

#: bzrlib/builtins.py:3553

2246

#, python-format

2247

msgid "Unrecognized bug %s. Commit refused."

2248

msgstr ""

2249

2250

#: bzrlib/builtins.py:3546

2250

#: bzrlib/builtins.py:3556

2251

#, python-format

2252

msgid ""

2253

"%s\n"

2254

"Commit refused."

2255

msgstr ""

2256

2257

#: bzrlib/builtins.py:3570

2257

#: bzrlib/builtins.py:3580

2258

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

2259

msgstr ""

2260

2261

#: bzrlib/builtins.py:3610

2261

#: bzrlib/builtins.py:3620

2262

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

2263

msgstr ""

2264

2265

#: bzrlib/builtins.py:3639

2265

#: bzrlib/builtins.py:3649

2266

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

2267

msgstr ""

2268

2269

#: bzrlib/builtins.py:3642

2269

#: bzrlib/builtins.py:3652

2270

msgid ""

2271

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

2272

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

2273

msgstr ""

2274

2275

#: bzrlib/builtins.py:3662

2275

#: bzrlib/builtins.py:3672

2276

msgid ""

2277

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

2278

"-unchanged to force an empty commit."

2279

msgstr ""

2280

2281

#: bzrlib/builtins.py:3666

2281

#: bzrlib/builtins.py:3676

2282

msgid ""

2283

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

2284

"resolve FILE\" to resolve."

2285

msgstr ""

2286

2287

#: bzrlib/builtins.py:3670

2287

#: bzrlib/builtins.py:3680

2288

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

2289

msgstr ""

2290

2291

#: bzrlib/builtins.py:3673

2291

#: bzrlib/builtins.py:3683

2292

msgid ""

2293

"\n"

2294

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

2295

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

2296

msgstr ""

2297

2298

#: bzrlib/builtins.py:3681

2298

#: bzrlib/builtins.py:3691

2299

msgid ""

2300

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

2301

msgstr ""

2302

2303

#: bzrlib/builtins.py:3683

2303

#: bzrlib/builtins.py:3693

2304

msgid ""

2305

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

2306

"to detect data corruption or bzr bugs."

2307

msgstr ""

2308

2309

#: bzrlib/builtins.py:3686

2309

#: bzrlib/builtins.py:3696

2310

msgid ""

2311

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

2312

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

2313

msgstr ""

2314

2315

#: bzrlib/builtins.py:3689

2315

#: bzrlib/builtins.py:3699

2316

msgid ""

2317

"revisions\n"

2318

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

2319

" indicate a problem."

2320

msgstr ""

2321

2322

#: bzrlib/builtins.py:3693

2322

#: bzrlib/builtins.py:3703

2323

msgid ""

2324

"versionedfiles\n"

2325

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

2326

" doesn't indicate a problem."

2327

msgstr ""

2328

2329

#: bzrlib/builtins.py:3697

2329

#: bzrlib/builtins.py:3707

2330

msgid ""

2331

"unreferenced ancestors\n"

2332

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

2334

" subtle problem that Bazaar can work around."

2335

msgstr ""

2336

2337

#: bzrlib/builtins.py:3702

2337

#: bzrlib/builtins.py:3712

2338

msgid ""

2339

"unique file texts\n"

2340

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

2341

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

2342

msgstr ""

2343

2344

#: bzrlib/builtins.py:3706

2344

#: bzrlib/builtins.py:3716

2345

msgid ""

2346

"repeated file texts\n"

2347

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

2350

" indicate a problem."

2351

msgstr ""

2352

2353

#: bzrlib/builtins.py:3712

2353

#: bzrlib/builtins.py:3722

2354

msgid ""

2355

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

2356

"given\n"

2357

"location will be checked."

2358

msgstr ""

2359

2360

#: bzrlib/builtins.py:3717

2360

#: bzrlib/builtins.py:3727

2361

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

2362

msgstr ""

2363

2364

#: bzrlib/builtins.py:3719

2364

#: bzrlib/builtins.py:3729

2365

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

2366

msgstr ""

2367

2368

#: bzrlib/builtins.py:3721

2368

#: bzrlib/builtins.py:3731

2369

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

2370

msgstr ""

2371

2372

#: bzrlib/builtins.py:3723

2372

#: bzrlib/builtins.py:3733

2373

msgid " bzr check --repo bar"

2374

msgstr ""

2375

2376

#: bzrlib/builtins.py:3725

2376

#: bzrlib/builtins.py:3735

2377

msgid " Check everything at 'baz'::"

2378

msgstr ""

2379

2380

#: bzrlib/builtins.py:3727

2380

#: bzrlib/builtins.py:3737

2381

msgid " bzr check baz"

2382

msgstr ""

2383

2384

#: bzrlib/builtins.py:3733

2384

#: bzrlib/builtins.py:3743

2385

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

2386

msgstr ""

2387

2388

#: bzrlib/builtins.py:3735

2388

#: bzrlib/builtins.py:3745

2389

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

2390

msgstr ""

2391

2392

#: bzrlib/builtins.py:3737

2392

#: bzrlib/builtins.py:3747

2393

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

2394

msgstr ""

2395

2396

#: bzrlib/builtins.py:3751

2396

#: bzrlib/builtins.py:3761

2397

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

2398

msgstr ""

2399

2400

#: bzrlib/builtins.py:3753

2400

#: bzrlib/builtins.py:3763

2401

msgid ""

2402

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

2403

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

2406

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

2407

msgstr ""

2408

2409

#: bzrlib/builtins.py:3759

2409

#: bzrlib/builtins.py:3769

2410

msgid ""

2411

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

2412

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

2416

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

2417

msgstr ""

2418

2419

#: bzrlib/builtins.py:3766

2419

#: bzrlib/builtins.py:3776

2420

msgid ""

2421

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

2422

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

2427

"afterwards."

2428

msgstr ""

2429

2430

#: bzrlib/builtins.py:3774

2430

#: bzrlib/builtins.py:3784

2431

msgid ""

2432

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

2433

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

2435

"tried."

2436

msgstr ""

2437

2438

#: bzrlib/builtins.py:3779

2438

#: bzrlib/builtins.py:3789

2439

msgid ""

2440

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

2441

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

2442

msgstr ""

2443

2444

#: bzrlib/builtins.py:3787

2444

#: bzrlib/builtins.py:3797

2445

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

2446

msgstr ""

2447

2448

#: bzrlib/builtins.py:3791

2448

#: bzrlib/builtins.py:3801

2449

msgid "Branch format"

2450

msgstr ""

2451

2452

#: bzrlib/builtins.py:3793

2452

#: bzrlib/builtins.py:3803

2453

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

2454

msgstr ""

2455

2456

#: bzrlib/builtins.py:3795

2456

#: bzrlib/builtins.py:3805

2457

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

2458

msgstr ""

2459

2460

#: bzrlib/builtins.py:3810

2460

#: bzrlib/builtins.py:3820

2461

msgid "Show or set bzr user id."

2462

msgstr ""

2463

2464

#: bzrlib/builtins.py:3812

2464

#: bzrlib/builtins.py:3822

2465

msgid ""

2466

":Examples:\n"

2467

" Show the email of the current user::"

2468

msgstr ""

2469

2470

#: bzrlib/builtins.py:3815

2470

#: bzrlib/builtins.py:3825

2471

msgid " bzr whoami --email"

2472

msgstr ""

2473

2474

#: bzrlib/builtins.py:3817

2474

#: bzrlib/builtins.py:3827

2475

msgid " Set the current user::"

2476

msgstr ""

2477

2478

#: bzrlib/builtins.py:3819

2478

#: bzrlib/builtins.py:3829

2479

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

2480

msgstr ""

2481

2482

#: bzrlib/builtins.py:3823

2482

#: bzrlib/builtins.py:3833

2483

msgid "Display email address only."

2484

msgstr ""

2485

2486

#: bzrlib/builtins.py:3825

2486

#: bzrlib/builtins.py:3835

2487

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

2488

msgstr ""

2489

2490

#: bzrlib/builtins.py:3851

2490

#: bzrlib/builtins.py:3861

2491

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

2492

msgstr ""

2493

2494

#: bzrlib/builtins.py:3873

2494

#: bzrlib/builtins.py:3885

2495

msgid "Print or set the branch nickname."

2496

msgstr ""

2497

2498

#: bzrlib/builtins.py:3875

2498

#: bzrlib/builtins.py:3887

2499

msgid ""

2500

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

2501

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

2500

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

2501

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

2502

"current nickname, execute with no argument."

2502

2503

msgstr ""

2503

2504

#: bzrlib/builtins.py:3878

2505

#: bzrlib/builtins.py:3891

2505

2506

msgid ""

2506

2507

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

2507

2508

"locally."

2508

2509

msgstr ""

2509

2510

#: bzrlib/builtins.py:3898

2511

#: bzrlib/builtins.py:3911

2511

2512

msgid "Set/unset and display aliases."

2512

2513

msgstr ""

2513

2514

#: bzrlib/builtins.py:3900

2515

#: bzrlib/builtins.py:3913

2515

2516

msgid ""

2516

2517

":Examples:\n"

2517

2518

" Show the current aliases::"

2518

2519

msgstr ""

2519

2520

#: bzrlib/builtins.py:3903

2521

#: bzrlib/builtins.py:3916

2521

2522

msgid " bzr alias"

2522

2523

msgstr ""

2523

2524

#: bzrlib/builtins.py:3905

2525

#: bzrlib/builtins.py:3918

2525

2526

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

2526

2527

msgstr ""

2527

2528

#: bzrlib/builtins.py:3907

2529

#: bzrlib/builtins.py:3920

2529

2530

msgid " bzr alias ll"

2530

2531

msgstr ""

2531

2532

#: bzrlib/builtins.py:3909

2533

#: bzrlib/builtins.py:3922

2533

2534

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

2534

2535

msgstr ""

2535

2536

#: bzrlib/builtins.py:3911

2537

#: bzrlib/builtins.py:3924

2537

2538

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

2538

2539

msgstr ""

2539

2540

#: bzrlib/builtins.py:3913

2541

#: bzrlib/builtins.py:3926

2541

2542

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

2542

2543

msgstr ""

2543

2544

#: bzrlib/builtins.py:3915

2545

#: bzrlib/builtins.py:3928

2545

2546

msgid " bzr alias --remove ll"

2546

2547

msgstr ""

2547

2548

#: bzrlib/builtins.py:3920

2549

#: bzrlib/builtins.py:3933

2549

2550

msgid "Remove the alias."

2550

2551

msgstr ""

2551

2552

#: bzrlib/builtins.py:3938

2553

#: bzrlib/builtins.py:3951

2553

2554

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

2554

2555

msgstr ""

2555

2556

#: bzrlib/builtins.py:4119

2557

#: bzrlib/builtins.py:4132

2557

2558

msgid ""

2558

2559

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

2559

2560

msgstr ""

2560

2561

#: bzrlib/builtins.py:4136

2562

#: bzrlib/builtins.py:4149

2562

2563

msgid ""

2563

2564

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

2564

2565

msgstr ""

2565

2566

#: bzrlib/builtins.py:4183

2567

#: bzrlib/builtins.py:4196

2567

2568

msgid "Show version of bzr."

2568

2569

msgstr ""

2569

2570

#: bzrlib/builtins.py:4187

2571

#: bzrlib/builtins.py:4200

2571

2572

msgid "Print just the version number."

2572

2573

msgstr ""

2573

2574

#: bzrlib/builtins.py:4206

2575

#: bzrlib/builtins.py:4219

2575

2576

msgid "It sure does!\n"

2576

2577

msgstr ""

2577

2578

#: bzrlib/builtins.py:4230

2579

#: bzrlib/builtins.py:4243

2579

2580

#, python-format

2580

2581

msgid "merge base is revision %s\n"

2581

2582

msgstr ""

2582

2583

#: bzrlib/builtins.py:4234

2584

#: bzrlib/builtins.py:4247

2584

2585

msgid "Perform a three-way merge."

2585

2586

msgstr ""

2586

2587

#: bzrlib/builtins.py:4236

2588

#: bzrlib/builtins.py:4249

2588

2589

msgid ""

2589

2590

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

2590

2591

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

2595

2596

"the current working tree."

2596

2597

msgstr ""

2597

2598

#: bzrlib/builtins.py:4244

2599

#: bzrlib/builtins.py:4257

2599

2600

msgid ""

2600

2601

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

2601

2602

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

2602

2603

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

2603

2604

msgstr ""

2604

2605

#: bzrlib/builtins.py:4248

2606

#: bzrlib/builtins.py:4261

2606

2607

msgid ""

2607

2608

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

2608

2609

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

2609

2610

msgstr ""

2610

2611

#: bzrlib/builtins.py:4251

2612

#: bzrlib/builtins.py:4264

2612

2613

msgid ""

2613

2614

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

2614

2615

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

2619

2620

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

2620

2621

msgstr ""

2621

2622

#: bzrlib/builtins.py:4259

2623

#: bzrlib/builtins.py:4272

2623

2624

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

2624

2625

msgstr ""

2625

2626

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

2627

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

2627

2628

msgid ""

2628

2629

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

2629

2630

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

2631

2632

"before you can commit."

2632

2633

msgstr ""

2633

2634

#: bzrlib/builtins.py:4266

2635

#: bzrlib/builtins.py:4279

2635

2636

msgid ""

2636

2637

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

2637

2638

msgstr ""

2638

2639

#: bzrlib/builtins.py:4268

2640

#: bzrlib/builtins.py:4281

2640

2641

msgid ""

2641

2642

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

2642

2643

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

2644

2645

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

2645

2646

msgstr ""

2646

2647

#: bzrlib/builtins.py:4273

2648

#: bzrlib/builtins.py:4286

2648

2649

msgid ""

2649

2650

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

2650

2651

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

2651

2652

"committed to record the result of the merge."

2652

2653

msgstr ""

2653

2654

#: bzrlib/builtins.py:4277

2655

#: bzrlib/builtins.py:4290

2655

2656

msgid ""

2656

2657

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

2657

2658

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

2660

2661

"merge revision which has more than two parents."

2661

2662

msgstr ""

2662

2663

#: bzrlib/builtins.py:4283

2664

#: bzrlib/builtins.py:4296

2664

2665

msgid ""

2665

2666

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

2666

2667

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

2667

2668

"can be given."

2668

2669

msgstr ""

2669

2670

#: bzrlib/builtins.py:4287

2671

#: bzrlib/builtins.py:4300

2671

2672

msgid ""

2672

2673

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

2673

2674

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

2674

2675

msgstr ""

2675

2676

#: bzrlib/builtins.py:4290

2677

#: bzrlib/builtins.py:4303

2677

2678

msgid ""

2678

2679

":Examples:\n"

2679

2680

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

2680

2681

msgstr ""

2681

2682

#: bzrlib/builtins.py:4293

2683

#: bzrlib/builtins.py:4306

2683

2684

msgid " bzr merge ../bzr.dev"

2684

2685

msgstr ""

2685

2686

#: bzrlib/builtins.py:4295

2687

#: bzrlib/builtins.py:4308

2687

2688

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

2688

2689

msgstr ""

2689

2690

#: bzrlib/builtins.py:4297

2691

#: bzrlib/builtins.py:4310

2691

2692

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

2692

2693

msgstr ""

2693

2694

#: bzrlib/builtins.py:4299

2695

#: bzrlib/builtins.py:4312

2695

2696

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

2696

2697

msgstr ""

2697

2698

#: bzrlib/builtins.py:4301

2699

#: bzrlib/builtins.py:4314

2699

2700

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

2700

2701

msgstr ""

2701

2702

#: bzrlib/builtins.py:4303

2703

#: bzrlib/builtins.py:4316

2703

2704

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

2704

2705

msgstr ""

2705

2706

#: bzrlib/builtins.py:4305

2707

#: bzrlib/builtins.py:4318

2707

2708

msgid " bzr merge /tmp/merge"

2708

2709

msgstr ""

2709

2710

#: bzrlib/builtins.py:4307

2711

#: bzrlib/builtins.py:4320

2711

2712

msgid ""

2712

2713

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

2713

2714

" feature1a and feature1b:"

2714

2715

msgstr ""

2715

2716

#: bzrlib/builtins.py:4310

2717

#: bzrlib/builtins.py:4323

2717

2718

msgid ""

2718

2719

" bzr merge ../feature1a\n"

2719

2720

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

2720

2721

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

2721

2722

msgstr ""

2722

2723

#: bzrlib/builtins.py:4322

2724

#: bzrlib/builtins.py:4335

2724

2725

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

2725

2726

msgstr ""

2726

2727

#: bzrlib/builtins.py:4328

2728

#: bzrlib/builtins.py:4341

2728

2729

msgid ""

2729

2730

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

2730

2731

msgstr ""

2731

2732

#: bzrlib/builtins.py:4330

2733

#: bzrlib/builtins.py:4343

2733

2734

msgid ""

2734

2735

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

2735

2736

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

2736

2737

"commit the result."

2737

2738

msgstr ""

2738

2739

#: bzrlib/builtins.py:4335

2740

#: bzrlib/builtins.py:4348

2740

2741

msgid ""

2741

2742

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

2742

2743

msgstr ""

2743

2744

#: bzrlib/builtins.py:4337

2745

#: bzrlib/builtins.py:4350

2745

2746

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

2746

2747

msgstr ""

2747

2748

#: bzrlib/builtins.py:4339

2749

#: bzrlib/builtins.py:4352

2749

2750

msgid "Select changes interactively."

2750

2751

msgstr ""

2751

2752

#: bzrlib/builtins.py:4361

2753

#: bzrlib/builtins.py:4374

2753

2754

msgid ""

2754

2755

"Merging into empty branches not currently supported, "

2755

2756

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

2756

2757

msgstr ""

2757

2758

#: bzrlib/builtins.py:4388

2759

#: bzrlib/builtins.py:4401

2759

2760

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

2760

2761

msgstr ""

2761

2762

#: bzrlib/builtins.py:4399

2763

#: bzrlib/builtins.py:4412

2763

2764

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

2764

2765

msgstr ""

2765

2766

#: bzrlib/builtins.py:4419

2767

#: bzrlib/builtins.py:4432

2767

2768

msgid "merger: "

2768

2769

msgstr ""

2769

2770

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

2771

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

2771

2772

msgid "Nothing to do."

2772

2773

msgstr ""

2773

2774

#: bzrlib/builtins.py:4425

2775

#: bzrlib/builtins.py:4438

2775

2776

msgid "Cannot pull individual files"

2776

2777

msgstr ""

2777

2778

#: bzrlib/builtins.py:4433

2779

#: bzrlib/builtins.py:4446

2779

2780

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

2780

2781

msgstr ""

2781

2782

#: bzrlib/builtins.py:4491

2783

#: bzrlib/builtins.py:4504

2783

2784

#, python-format

2784

2785

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

2785

2786

msgstr ""

2786

2787

#: bzrlib/builtins.py:4500

2788

#: bzrlib/builtins.py:4513

2788

2789

#, python-format

2789

2790

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

2790

2791

msgstr ""

2791

2792

#: bzrlib/builtins.py:4504

2793

#: bzrlib/builtins.py:4517

2793

2794

msgid "Cannot do conflict reduction and show base."

2794

2795

msgstr ""

2795

2796

#: bzrlib/builtins.py:4615

2797

#: bzrlib/builtins.py:4628

2797

2798

msgid "No location specified or remembered"

2798

2799

msgstr ""

2799

2800

#: bzrlib/builtins.py:4617

2801

#: bzrlib/builtins.py:4630

2801

2802

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

2802

2803

msgstr ""

2803

2804

#: bzrlib/builtins.py:4623

2805

#: bzrlib/builtins.py:4636

2805

2806

msgid "Redo a merge."

2806

2807

msgstr ""

2807

2808

#: bzrlib/builtins.py:4625

2809

#: bzrlib/builtins.py:4638

2809

2810

msgid ""

2810

2811

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

2811

2812

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

2812

2813

"lets you try different ones on different files."

2813

2814

msgstr ""

2814

2815

#: bzrlib/builtins.py:4629

2816

#: bzrlib/builtins.py:4642

2816

2817

msgid ""

2817

2818

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

2818

2819

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

2819

2820

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

2820

2821

msgstr ""

2821

2822

#: bzrlib/builtins.py:4633

2823

#: bzrlib/builtins.py:4646

2823

2824

msgid ""

2824

2825

":Examples:\n"

2825

2826

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

2826

2827

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

2827

2828

msgstr ""

2828

2829

#: bzrlib/builtins.py:4637

2830

#: bzrlib/builtins.py:4650

2830

2831

msgid " bzr remerge --show-base"

2831

2832

msgstr ""

2832

2833

#: bzrlib/builtins.py:4639

2834

#: bzrlib/builtins.py:4652

2834

2835

msgid ""

2835

2836

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

2836

2837

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

2837

2838

msgstr ""

2838

2839

#: bzrlib/builtins.py:4642

2840

#: bzrlib/builtins.py:4655

2840

2841

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

2841

2842

msgstr ""

2842

2843

#: bzrlib/builtins.py:4649

2844

#: bzrlib/builtins.py:4662

2844

2845

msgid "Show base revision text in conflicts."

2845

2846

msgstr ""

2846

2847

#: bzrlib/builtins.py:4661

2848

#: bzrlib/builtins.py:4674

2848

2849

msgid ""

2849

2850

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

2850

2851

"merges."

2851

2852

msgstr ""

2852

2853

#: bzrlib/builtins.py:4717

2854

#: bzrlib/builtins.py:4731

2854

2855

msgid "Revert files to a previous revision."

2855

2856

msgstr ""

2856

2857

#: bzrlib/builtins.py:4719

2858

#: bzrlib/builtins.py:4733

2858

2859

msgid ""

2859

2860

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

2860

2861

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

2861

2862

"last committed revision is used."

2862

2863

msgstr ""

2863

2864

#: bzrlib/builtins.py:4723

2865

#: bzrlib/builtins.py:4737

2865

2866

msgid ""

2866

2867

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

2867

2868

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

2870

2871

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

2871

2872

msgstr ""

2872

2873

#: bzrlib/builtins.py:4729

2874

#: bzrlib/builtins.py:4743

2874

2875

msgid ""

2875

2876

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

2876

2877

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

2877

2878

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

2878

2879

msgstr ""

2879

2880

#: bzrlib/builtins.py:4733

2881

#: bzrlib/builtins.py:4747

2881

2882

msgid ""

2882

2883

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

2883

2884

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

2885

2886

"reverted."

2886

2887

msgstr ""

2887

2888

#: bzrlib/builtins.py:4738

2889

#: bzrlib/builtins.py:4752

2889

2890

msgid ""

2890

2891

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

2891

2892

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

2893

2894

"deleted."

2894

2895

msgstr ""

2895

2896

#: bzrlib/builtins.py:4743

2897

#: bzrlib/builtins.py:4757

2897

2898

msgid ""

2898

2899

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

2899

2900

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

2905

2906

"reverting any files."

2906

2907

msgstr ""

2907

2908

#: bzrlib/builtins.py:4752

2909

#: bzrlib/builtins.py:4766

2909

2910

msgid ""

2910

2911

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

2911

2912

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

2919

2920

"target branches."

2920

2921

msgstr ""

2921

2922

#: bzrlib/builtins.py:4766

2923

#: bzrlib/builtins.py:4780

2923

2924

msgid "Do not save backups of reverted files."

2924

2925

msgstr ""

2925

2926

#: bzrlib/builtins.py:4768

2927

#: bzrlib/builtins.py:4782

2927

2928

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

2928

2929

msgstr ""

2929

2930

#: bzrlib/builtins.py:4799

2931

#: bzrlib/builtins.py:4813

2931

2932

msgid ""

2932

2933

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

2933

2934

" "

2934

2935

msgstr ""

2935

2936

#: bzrlib/builtins.py:4804

2937

#: bzrlib/builtins.py:4818

2937

2938

msgid "Show help on all commands."

2938

2939

msgstr ""

2939

2940

#: bzrlib/builtins.py:4833

2941

#: bzrlib/builtins.py:4847

2941

2942

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

2942

2943

msgstr ""

2943

2944

#: bzrlib/builtins.py:4835

2945

#: bzrlib/builtins.py:4849

2945

2946

msgid "OTHER_BRANCH may be local or remote."

2946

2947

msgstr ""

2947

2948

#: bzrlib/builtins.py:4837

2949

#: bzrlib/builtins.py:4851

2949

2950

msgid ""

2950

2951

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

2951

2952

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

2956

2957

" 0 - no missing revisions"

2957

2958

msgstr ""

2958

2959

#: bzrlib/builtins.py:4847

2960

#: bzrlib/builtins.py:4861

2960

2961

msgid ""

2961

2962

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

2962

2963

" remembered pull location::"

2963

2964

msgstr ""

2964

2965

#: bzrlib/builtins.py:4850

2966

#: bzrlib/builtins.py:4864

2966

2967

msgid " bzr missing"

2967

2968

msgstr ""

2968

2969

#: bzrlib/builtins.py:4852

2970

#: bzrlib/builtins.py:4866

2970

2971

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

2971

2972

msgstr ""

2972

2973

#: bzrlib/builtins.py:4854

2974

#: bzrlib/builtins.py:4868

2974

2975

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

2975

2976

msgstr ""

2976

2977

#: bzrlib/builtins.py:4856

2978

#: bzrlib/builtins.py:4870

2978

2979

msgid ""

2979

2980

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

2980

2981

" branch::"

2981

2982

msgstr ""

2982

2983

#: bzrlib/builtins.py:4859

2984

#: bzrlib/builtins.py:4873

2984

2985

msgid " bzr missing -r ..-10"

2985

2986

msgstr ""

2986

2987

#: bzrlib/builtins.py:4861

2988

#: bzrlib/builtins.py:4875

2988

2989

msgid ""

2989

2990

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

2990

2991

" branch::"

2991

2992

msgstr ""

2992

2993

#: bzrlib/builtins.py:4864

2994

#: bzrlib/builtins.py:4878

2994

2995

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

2995

2996

msgstr ""

2996

2997

#: bzrlib/builtins.py:4871

2998

#: bzrlib/builtins.py:4885

2998

2999

msgid "Reverse the order of revisions."

2999

3000

msgstr ""

3000

3001

#: bzrlib/builtins.py:4873

3002

#: bzrlib/builtins.py:4887

3002

3003

msgid "Display changes in the local branch only."

3003

3004

msgstr ""

3004

3005

#: bzrlib/builtins.py:4874

3006

#: bzrlib/builtins.py:4888

3006

3007

msgid "Same as --mine-only."

3007

3008

msgstr ""

3008

3009

#: bzrlib/builtins.py:4876

3010

#: bzrlib/builtins.py:4890

3010

3011

msgid "Display changes in the remote branch only."

3011

3012

msgstr ""

3012

3013

#: bzrlib/builtins.py:4877

3014

#: bzrlib/builtins.py:4891

3014

3015

msgid "Same as --theirs-only."

3015

3016

msgstr ""

3016

3017

#: bzrlib/builtins.py:4882

3018

#: bzrlib/builtins.py:4896

3018

3019

msgid ""

3019

3020

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

3020

3021

"details."

3021

3022

msgstr ""

3022

3023

#: bzrlib/builtins.py:4886

3024

#: bzrlib/builtins.py:4900

3024

3025

msgid ""

3025

3026

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

3026

3027

"details."

3027

3028

msgstr ""

3028

3029

#: bzrlib/builtins.py:4889

3030

#: bzrlib/builtins.py:4903

3030

3031

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

3031

3032

msgstr ""

3032

3033

#: bzrlib/builtins.py:4943

3034

#: bzrlib/builtins.py:4957

3034

3035

msgid "No peer location known or specified."

3035

3036

msgstr ""

3036

3037

#: bzrlib/builtins.py:4947

3038

#: bzrlib/builtins.py:4961

3038

3039

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

3039

3040

msgstr ""

3040

3041

#: bzrlib/builtins.py:4980

3042

#: bzrlib/builtins.py:4994

3042

3043

#, python-format

3043

3044

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

3044

3045

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

3045

3046

msgstr[0] ""

3046

3047

msgstr[1] ""

3047

3048

#: bzrlib/builtins.py:4996

3049

#: bzrlib/builtins.py:5010

3049

3050

#, python-format

3050

3051

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

3051

3052

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

3052

3053

msgstr[0] ""

3053

3054

msgstr[1] ""

3054

3055

#: bzrlib/builtins.py:5008

3056

#: bzrlib/builtins.py:5022

3056

3057

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

3057

3058

msgstr ""

3058

3059

#: bzrlib/builtins.py:5011

3060

#: bzrlib/builtins.py:5025

3060

3061

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

3061

3062

msgstr ""

3062

3063

#: bzrlib/builtins.py:5016

3064

#: bzrlib/builtins.py:5030

3064

3065

msgid "Branches are up to date.\n"

3065

3066

msgstr ""

3066

3067

#: bzrlib/builtins.py:5027

3068

#: bzrlib/builtins.py:5041

3068

3069

msgid "Compress the data within a repository."

3069

3070

msgstr ""

3070

3071

#: bzrlib/builtins.py:5029

3072

#: bzrlib/builtins.py:5043

3072

3073

msgid ""

3073

3074

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

3074

3075

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

3075

3076

"normally not required to be done manually."

3076

3077

msgstr ""

3077

3078

#: bzrlib/builtins.py:5033

3079

#: bzrlib/builtins.py:5047

3079

3080

msgid ""

3080

3081

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

3081

3082

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

3084

3085

"used."

3085

3086

msgstr ""

3086

3087

#: bzrlib/builtins.py:5039

3088

#: bzrlib/builtins.py:5053

3088

3089

msgid ""

3089

3090

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

3090

3091

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

3092

3093

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

3093

3094

msgstr ""

3094

3095

#: bzrlib/builtins.py:5048

3096

#: bzrlib/builtins.py:5062

3096

3097

msgid "Delete obsolete packs to save disk space."

3097

3098

msgstr ""

3098

3099

#: bzrlib/builtins.py:5062

3100

#: bzrlib/builtins.py:5076

3100

3101

msgid "List the installed plugins."

3101

3102

msgstr ""

3102

3103

#: bzrlib/builtins.py:5064

3104

#: bzrlib/builtins.py:5078

3104

3105

msgid ""

3105

3106

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

3106

3107

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

3107

3108

msgstr ""

3108

3109

#: bzrlib/builtins.py:5067

3110

#: bzrlib/builtins.py:5081

3110

3111

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

3111

3112

msgstr ""

3112

3113

#: bzrlib/builtins.py:5069

3114

#: bzrlib/builtins.py:5083

3114

3115

msgid ""

3115

3116

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

3116

3117

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

3119

3120

"customizing log output."

3120

3121

msgstr ""

3121

3122

#: bzrlib/builtins.py:5075

3123

#: bzrlib/builtins.py:5089

3123

3124

msgid ""

3124

3125

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

3125

3126

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

3127

3128

"plugins using the Python programming language."

3128

3129

msgstr ""

3129

3130

#: bzrlib/builtins.py:5091

3131

#: bzrlib/builtins.py:5105

3131

3132

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

3132

3133

msgstr ""

3133

3134

#: bzrlib/builtins.py:5094

3135

#: bzrlib/builtins.py:5108

3135

3136

msgid "Produce long-format testament."

3136

3137

msgstr ""

3137

3138

#: bzrlib/builtins.py:5096

3139

#: bzrlib/builtins.py:5110

3139

3140

msgid "Produce a strict-format testament."

3140

3141

msgstr ""

3141

3142

#: bzrlib/builtins.py:5122

3143

#: bzrlib/builtins.py:5136

3143

3144

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

3144

3145

msgstr ""

3145

3146

#: bzrlib/builtins.py:5124

3147

#: bzrlib/builtins.py:5138

3147

3148

msgid ""

3148

3149

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

3149

3150

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

3150

3151

msgstr ""

3151

3152

#: bzrlib/builtins.py:5127

3153

#: bzrlib/builtins.py:5141

3153

3154

msgid ""

3154

3155

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

3155

3156

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

3156

3157

msgstr ""

3157

3158

#: bzrlib/builtins.py:5135

3159

#: bzrlib/builtins.py:5149

3159

3160

msgid "Show annotations on all lines."

3160

3161

msgstr ""

3161

3162

#: bzrlib/builtins.py:5136

3163

#: bzrlib/builtins.py:5150

3163

3164

msgid "Show commit date in annotations."

3164

3165

msgstr ""

3165

3166

#: bzrlib/builtins.py:5223

3167

#: bzrlib/builtins.py:5237

3167

3168

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

3168

3169

msgstr ""

3169

3170

#: bzrlib/builtins.py:5235

3171

#: bzrlib/builtins.py:5249

3171

3172

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

3172

3173

msgstr ""

3173

3174

#: bzrlib/builtins.py:5239

3175

#: bzrlib/builtins.py:5253

3175

3176

msgid ""

3176

3177

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

3177

3178

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

3178

3179

msgstr ""

3179

3180

#: bzrlib/builtins.py:5242

3181

#: bzrlib/builtins.py:5256

3181

3182

msgid ""

3182

3183

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

3183

3184

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

3184

3185

msgstr ""

3185

3186

#: bzrlib/builtins.py:5245

3187

#: bzrlib/builtins.py:5259

3187

3188

msgid ""

3188

3189

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

3189

3190

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

3190

3191

"that of the master."

3191

3192

msgstr ""

3192

3193

#: bzrlib/builtins.py:5260

3194

#: bzrlib/builtins.py:5274

3194

3195

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

3195

3196

msgstr ""

3196

3197

#: bzrlib/builtins.py:5265

3198

#: bzrlib/builtins.py:5280

3198

3199

msgid "Branch is already bound"

3199

3200

msgstr ""

3200

3201

#: bzrlib/builtins.py:5267

3202

#: bzrlib/builtins.py:5283

3202

3203

msgid "No location supplied and no previous location known"

3203

3204

msgstr ""

3204

3205

#: bzrlib/builtins.py:5273

3206

#: bzrlib/builtins.py:5289

3206

3207

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

3207

3208

msgstr ""

3208

3209

#: bzrlib/builtins.py:5280

3210

#: bzrlib/builtins.py:5296

3210

3211

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

3211

3212

msgstr ""

3212

3213

#: bzrlib/builtins.py:5282

3214

#: bzrlib/builtins.py:5298

3214

3215

msgid ""

3215

3216

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

3216

3217

"commits will be local only."

3217

3218

msgstr ""

3218

3219

#: bzrlib/builtins.py:5293

3220

#: bzrlib/builtins.py:5309

3220

3221

msgid "Local branch is not bound"

3221

3222

msgstr ""

3222

3223

#: bzrlib/builtins.py:5297

3224

#: bzrlib/builtins.py:5313

3224

3225

msgid "Remove the last committed revision."

3225

3226

msgstr ""

3226

3227

#: bzrlib/builtins.py:5299

3228

#: bzrlib/builtins.py:5315

3228

3229

msgid ""

3229

3230

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

3230

3231

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

3231

3232

"remove anything."

3232

3233

msgstr ""

3233

3234

#: bzrlib/builtins.py:5303

3235

#: bzrlib/builtins.py:5319

3235

3236

msgid ""

3236

3237

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

3237

3238

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

3238

3239

"branch at revision 15."

3239

3240

msgstr ""

3240

3241

#: bzrlib/builtins.py:5307

3242

#: bzrlib/builtins.py:5323

3242

3243

msgid ""

3243

3244

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

3244

3245

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

3245

3246

"the commit."

3246

3247

msgstr ""

3247

3248

#: bzrlib/builtins.py:5318

3249

#: bzrlib/builtins.py:5334

3249

3250

msgid "Don't actually make changes."

3250

3251

msgstr ""

3251

3252

#: bzrlib/builtins.py:5319

3253

#: bzrlib/builtins.py:5335

3253

3254

msgid "Say yes to all questions."

3254

3255

msgstr ""

3255

3256

#: bzrlib/builtins.py:5321

3257

#: bzrlib/builtins.py:5337

3257

3258

msgid "Keep tags that point to removed revisions."

3258

3259

msgstr ""

3259

3260

#: bzrlib/builtins.py:5323

3261

#: bzrlib/builtins.py:5339

3261

3262

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

3262

3263

msgstr ""

3263

3264

#: bzrlib/builtins.py:5372

3265

#: bzrlib/builtins.py:5388

3265

3266

msgid "No revisions to uncommit.\n"

3266

3267

msgstr ""

3267

3268

#: bzrlib/builtins.py:5387

3269

#: bzrlib/builtins.py:5403

3269

3270

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

3270

3271

msgstr ""

3271

3272

#: bzrlib/builtins.py:5390

3273

#: bzrlib/builtins.py:5406

3273

3274

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

3274

3275

msgstr ""

3275

3276

#: bzrlib/builtins.py:5394

3277

#: bzrlib/builtins.py:5410

3277

3278

msgid "Uncommit these revisions"

3278

3279

msgstr ""

3279

3280

#: bzrlib/builtins.py:5397

3281

#: bzrlib/builtins.py:5413

3281

3282

msgid "Canceled\n"

3282

3283

msgstr ""

3283

3284

#: bzrlib/builtins.py:5404

3285

#: bzrlib/builtins.py:5420

3285

3286

#, python-format

3286

3287

msgid ""

3287

3288

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

3288

3289

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

3289

3290

msgstr ""

3290

3291

#: bzrlib/builtins.py:5409

3292

#: bzrlib/builtins.py:5425

3292

3293

msgid "Break a dead lock."

3293

3294

msgstr ""

3294

3295

#: bzrlib/builtins.py:5411

3296

#: bzrlib/builtins.py:5427

3296

3297

msgid ""

3297

3298

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

3298

3299

"config file."

3299

3300

msgstr ""

3300

3301

#: bzrlib/builtins.py:5414

3302

#: bzrlib/builtins.py:5430

3302

3303

msgid ""

3303

3304

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

3304

3305

"holding the lock has been stopped."

3305

3306

msgstr ""

3306

3307

#: bzrlib/builtins.py:5417

3308

#: bzrlib/builtins.py:5433

3308

3309

msgid ""

3309

3310

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

3310

3311

"[location]' command."

3311

3312

msgstr ""

3312

3313

#: bzrlib/builtins.py:5420

3314

#: bzrlib/builtins.py:5436

3314

3315

msgid ""

3315

3316

":Examples:\n"

3316

3317

" bzr break-lock\n"

3318

3319

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

3319

3320

msgstr ""

3320

3321

#: bzrlib/builtins.py:5429

3322

#: bzrlib/builtins.py:5445

3322

3323

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

3323

3324

msgstr ""

3324

3325

#: bzrlib/builtins.py:5431

3326

#: bzrlib/builtins.py:5447

3326

3327

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

3327

3328

msgstr ""

3328

3329

#: bzrlib/builtins.py:5466

3330

#: bzrlib/builtins.py:5482

3330

3331

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

3331

3332

msgstr ""

3332

3333

#: bzrlib/builtins.py:5467

3334

#: bzrlib/builtins.py:5483

3334

3335

msgid "Run the bzr server."

3335

3336

msgstr ""

3336

3337

#: bzrlib/builtins.py:5473

3338

#: bzrlib/builtins.py:5489

3338

3339

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

3339

3340

msgstr ""

3340

3341

#: bzrlib/builtins.py:5474

3342

#: bzrlib/builtins.py:5490

3342

3343

msgid "protocol"

3343

3344

msgstr ""

3344

3345

#: bzrlib/builtins.py:5475

3346

#: bzrlib/builtins.py:5491

3346

3347

msgid "Protocol to serve."

3347

3348

msgstr ""

3348

3349

#: bzrlib/builtins.py:5479

3350

#: bzrlib/builtins.py:5495

3351

msgid "Listen for connections on nominated address."

3352

msgstr ""

3353

3354

#: bzrlib/builtins.py:5497

3350

3355

msgid ""

3351

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

3352

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

3353

"The default port depends on the protocol."

3356

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

3357

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

3358

"protocol."

3354

3359

msgstr ""

3355

3360

3356

#: bzrlib/builtins.py:5485

3361

#: bzrlib/builtins.py:5502

3357

3362

msgid "Serve contents of this directory."

3358

3363

msgstr ""

3359

3364

3360

#: bzrlib/builtins.py:5487

3365

#: bzrlib/builtins.py:5504

3361

3366

msgid ""

3362

3367

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

3363

3368

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

3366

3371

"uncontrolled write access to your file system."

3367

3372

msgstr ""

3368

3373

3369

#: bzrlib/builtins.py:5496

3374

#: bzrlib/builtins.py:5513

3370

3375

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

3371

3376

msgstr ""

3372

3377

3373

#: bzrlib/builtins.py:5546

3378

#: bzrlib/builtins.py:5531

3374

3379

msgid "Combine a tree into its containing tree."

3375

3380

msgstr ""

3376

3381

3377

#: bzrlib/builtins.py:5548

3382

#: bzrlib/builtins.py:5533

3378

3383

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

3379

3384

msgstr ""

3380

3385

3381

#: bzrlib/builtins.py:5550

3386

#: bzrlib/builtins.py:5535

3382

3387

msgid ""

3383

3388

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

3384

3389

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

3385

3390

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

3386

3391

msgstr ""

3387

3392

3388

#: bzrlib/builtins.py:5554

3393

#: bzrlib/builtins.py:5539

3389

3394

msgid ""

3390

3395

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

3391

3396

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

3392

3397

"and all history is preserved."

3393

3398

msgstr ""

3394

3399

3395

#: bzrlib/builtins.py:5572

3400

#: bzrlib/builtins.py:5557

3396

3401

#, python-format

3397

3402

msgid ""

3398

3403

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

3399

3404

"You can use bzr upgrade on the repository."

3400

3405

msgstr ""

3401

3406

3402

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

3407

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

3403

3408

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

3404

3409

msgstr ""

3405

3410

3406

#: bzrlib/builtins.py:5592

3411

#: bzrlib/builtins.py:5577

3407

3412

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

3408

3413

msgstr ""

3409

3414

3410

#: bzrlib/builtins.py:5594

3415

#: bzrlib/builtins.py:5579

3411

3416

msgid ""

3412

3417

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

3413

3418

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

3414

3419

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

3415

3420

msgstr ""

3416

3421

3417

#: bzrlib/builtins.py:5598

3422

#: bzrlib/builtins.py:5583

3418

3423

msgid ""

3419

3424

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

3420

3425

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

3421

3426

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

3422

3427

msgstr ""

3423

3428

3424

#: bzrlib/builtins.py:5678

3429

#: bzrlib/builtins.py:5663

3425

3430

msgid "No submit branch specified or known"

3426

3431

msgstr ""

3427

3432

3428

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

3433

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

3429

3434

msgid "No public branch specified or known"

3430

3435

msgstr ""

3431

3436

3432

#: bzrlib/builtins.py:5691

3437

#: bzrlib/builtins.py:5677

3433

3438

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

3434

3439

msgstr ""

3435

3440

3436

#: bzrlib/builtins.py:5700

3441

#: bzrlib/builtins.py:5686

3437

3442

msgid "No revisions to bundle."

3438

3443

msgstr ""

3439

3444

3440

#: bzrlib/builtins.py:5719

3445

#: bzrlib/builtins.py:5705

3441

3446

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

3442

3447

msgstr ""

3443

3448

3444

#: bzrlib/builtins.py:5721

3449

#: bzrlib/builtins.py:5707

3445

3450

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

3446

3451

msgstr ""

3447

3452

3448

#: bzrlib/builtins.py:5723

3453

#: bzrlib/builtins.py:5709

3449

3454

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

3450

3455

msgstr ""

3451

3456

3452

#: bzrlib/builtins.py:5725

3457

#: bzrlib/builtins.py:5711

3453

3458

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

3454

3459

msgstr ""

3455

3460

3456

#: bzrlib/builtins.py:5727

3461

#: bzrlib/builtins.py:5713

3457

3462

msgid ""

3458

3463

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

3459

3464

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

3460

3465

" branch."

3461

3466

msgstr ""

3462

3467

3463

#: bzrlib/builtins.py:5731

3468

#: bzrlib/builtins.py:5717

3464

3469

msgid ""

3465

3470

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

3466

3471

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

3467

3472

msgstr ""

3468

3473

3469

#: bzrlib/builtins.py:5734

3474

#: bzrlib/builtins.py:5720

3470

3475

msgid ""

3471

3476

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

3472

3477

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

3473

3478

"the source branch."

3474

3479

msgstr ""

3475

3480

3476

#: bzrlib/builtins.py:5738

3481

#: bzrlib/builtins.py:5724

3477

3482

msgid ""

3478

3483

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

3479

3484

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

3482

3487

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

3483

3488

msgstr ""

3484

3489

3485

#: bzrlib/builtins.py:5744

3490

#: bzrlib/builtins.py:5730

3486

3491

msgid ""

3487

3492

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

3488

3493

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

3491

3496

"be changed using --from."

3492

3497

msgstr ""

3493

3498

3494

#: bzrlib/builtins.py:5750

3499

#: bzrlib/builtins.py:5736

3495

3500

msgid ""

3496

3501

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

3497

3502

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

3500

3505

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

3501

3506

msgstr ""

3502

3507

3503

#: bzrlib/builtins.py:5756

3508

#: bzrlib/builtins.py:5742

3504

3509

msgid ""

3505

3510

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

3506

3511

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

3508

3513

"in the merge directive."

3509

3514

msgstr ""

3510

3515

3511

#: bzrlib/builtins.py:5761

3516

#: bzrlib/builtins.py:5747

3512

3517

msgid ""

3513

3518

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

3514

3519

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

3515

3520

msgstr ""

3516

3521

3517

#: bzrlib/builtins.py:5764

3522

#: bzrlib/builtins.py:5750

3518

3523

msgid ""

3519

3524

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

3520

3525

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

3521

3526

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

3522

3527

msgstr ""

3523

3528

3524

#: bzrlib/builtins.py:5768

3529

#: bzrlib/builtins.py:5754

3525

3530

msgid ""

3526

3531

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

3527

3532

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

3533

3538

"supported clients."

3534

3539

msgstr ""

3535

3540

3536

#: bzrlib/builtins.py:5775

3541

#: bzrlib/builtins.py:5761

3537

3542

msgid ""

3538

3543

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

3539

3544

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

3541

3546

"in the submit branch."

3542

3547

msgstr ""

3543

3548

3544

#: bzrlib/builtins.py:5780

3549

#: bzrlib/builtins.py:5766

3545

3550

msgid ""

3546

3551

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

3547

3552

"and\n"

3551

3556

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

3552

3557

msgstr ""

3553

3558

3554

#: bzrlib/builtins.py:5786

3559

#: bzrlib/builtins.py:5772

3555

3560

msgid ""

3556

3561

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

3557

3562

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

3558

3563

msgstr ""

3559

3564

3560

#: bzrlib/builtins.py:5789

3565

#: bzrlib/builtins.py:5775

3561

3566

msgid ""

3562

3567

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

3563

3568

"into\n"

3565

3570

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

3566

3571

msgstr ""

3567

3572

3568

#: bzrlib/builtins.py:5813

3573

#: bzrlib/builtins.py:5799

3569

3574

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

3570

3575

msgstr ""

3571

3576

3572

#: bzrlib/builtins.py:5817

3577

#: bzrlib/builtins.py:5803

3573

3578

msgid ""

3574

3579

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

3575

3580

"strict disables the check."

3576

3581

msgstr ""

3577

3582

3578

#: bzrlib/builtins.py:5819

3583

#: bzrlib/builtins.py:5805

3579

3584

msgid "Mail the request to this address."

3580

3585

msgstr ""

3581

3586

3582

#: bzrlib/builtins.py:5823

3587

#: bzrlib/builtins.py:5809

3583

3588

msgid "Body for the email."

3584

3589

msgstr ""

3585

3590

3586

#: bzrlib/builtins.py:5876

3591

#: bzrlib/builtins.py:5862

3587

3592

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

3588

3593

msgstr ""

3589

3594

3590

#: bzrlib/builtins.py:5877

3595

#: bzrlib/builtins.py:5863

3591

3596

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

3592

3597

msgstr ""

3593

3598

3594

#: bzrlib/builtins.py:5880

3599

#: bzrlib/builtins.py:5866

3595

3600

msgid "Remember submit and public branch."

3596

3601

msgstr ""

3597

3602

3598

#: bzrlib/builtins.py:5882

3603

#: bzrlib/builtins.py:5868

3599

3604

msgid ""

3600

3605

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

3601

3606

"working directory."

3602

3607

msgstr ""

3603

3608

3604

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

3609

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

3605

3610

msgid "format"

3606

3611

msgstr ""

3607

3612

3608

#: bzrlib/builtins.py:5893

3613

#: bzrlib/builtins.py:5879

3609

3614

msgid "Use the specified output format."

3610

3615

msgstr ""

3611

3616

3612

#: bzrlib/builtins.py:5915

3617

#: bzrlib/builtins.py:5901

3613

3618

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

3614

3619

msgstr ""

3615

3620

3616

#: bzrlib/builtins.py:5917

3621

#: bzrlib/builtins.py:5903

3617

3622

msgid ""

3618

3623

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

3619

3624

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

3620

3625

"created tag."

3621

3626

msgstr ""

3622

3627

3623

#: bzrlib/builtins.py:5921

3628

#: bzrlib/builtins.py:5907

3624

3629

msgid ""

3625

3630

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

3626

3631

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

3627

3632

msgstr ""

3628

3633

3629

#: bzrlib/builtins.py:5924

3634

#: bzrlib/builtins.py:5910

3630

3635

msgid ""

3631

3636

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

3632

3637

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

3633

3638

msgstr ""

3634

3639

3635

#: bzrlib/builtins.py:5927

3640

#: bzrlib/builtins.py:5913

3636

3641

msgid ""

3637

3642

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

3638

3643

"``bzr\n"

3639

3644

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

3640

3645

msgstr ""

3641

3646

3642

#: bzrlib/builtins.py:5930

3647

#: bzrlib/builtins.py:5916

3643

3648

msgid ""

3644

3649

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

3645

3650

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

3647

3652

"details."

3648

3653

msgstr ""

3649

3654

3650

#: bzrlib/builtins.py:5940

3655

#: bzrlib/builtins.py:5926

3651

3656

msgid "Delete this tag rather than placing it."

3652

3657

msgstr ""

3653

3658

3654

#: bzrlib/builtins.py:5943

3659

#: bzrlib/builtins.py:5929

3655

3660

msgid "Branch in which to place the tag."

3656

3661

msgstr ""

3657

3662

3658

#: bzrlib/builtins.py:5945

3663

#: bzrlib/builtins.py:5931

3659

3664

msgid "Replace existing tags."

3660

3665

msgstr ""

3661

3666

3662

#: bzrlib/builtins.py:5960

3667

#: bzrlib/builtins.py:5946

3663

3668

msgid "No tag specified to delete."

3664

3669

msgstr ""

3665

3670

3671

#: bzrlib/builtins.py:5948

3672

#, python-format

3673

msgid "Deleted tag %s."

3674

msgstr ""

3675

3666

3676

#: bzrlib/builtins.py:5962

3667

#, python-format

3668

msgid "Deleted tag %s."

3669

msgstr ""

3670

3671

#: bzrlib/builtins.py:5976

3672

3677

msgid "Please specify a tag name."

3673

3678

msgstr ""

3674

3679

3675

#: bzrlib/builtins.py:5984

3680

#: bzrlib/builtins.py:5970

3676

3681

#, python-format

3677

3682

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

3678

3683

msgstr ""

3679

3684

3680

#: bzrlib/builtins.py:5988

3685

#: bzrlib/builtins.py:5974

3681

3686

#, python-format

3682

3687

msgid "Created tag %s."

3683

3688

msgstr ""

3684

3689

3685

#: bzrlib/builtins.py:5990

3690

#: bzrlib/builtins.py:5976

3686

3691

#, python-format

3687

3692

msgid "Updated tag %s."

3688

3693

msgstr ""

3689

3694

3690

#: bzrlib/builtins.py:5994

3695

#: bzrlib/builtins.py:5980

3691

3696

msgid "List tags."

3692

3697

msgstr ""

3693

3698

3694

#: bzrlib/builtins.py:5996

3699

#: bzrlib/builtins.py:5982

3695

3700

msgid ""

3696

3701

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

3697

3702

msgstr ""

3698

3703

3699

#: bzrlib/builtins.py:6002

3704

#: bzrlib/builtins.py:5988

3700

3705

msgid "Branch whose tags should be displayed."

3701

3706

msgstr ""

3702

3707

3703

#: bzrlib/builtins.py:6004

3708

#: bzrlib/builtins.py:5990

3704

3709

msgid "Sort tags by different criteria."

3705

3710

msgstr ""

3706

3711

3707

#: bzrlib/builtins.py:6004

3712

#: bzrlib/builtins.py:5990

3708

3713

msgid "Sorting"

3709

3714

msgstr ""

3710

3715

3711

#: bzrlib/builtins.py:6073

3716

#: bzrlib/builtins.py:6059

3712

3717

msgid "Reconfigure the type of a bzr directory."

3713

3718

msgstr ""

3714

3719

3715

#: bzrlib/builtins.py:6075

3720

#: bzrlib/builtins.py:6061

3716

3721

msgid "A target configuration must be specified."

3717

3722

msgstr ""

3718

3723

3719

#: bzrlib/builtins.py:6077

3724

#: bzrlib/builtins.py:6063

3720

3725

msgid ""

3721

3726

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

3722

3727

"The order of preference is\n"

3727

3732

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

3728

3733

msgstr ""

3729

3734

3730

#: bzrlib/builtins.py:6091

3735

#: bzrlib/builtins.py:6077

3731

3736

msgid "Tree type"

3732

3737

msgstr ""

3733

3738

3734

#: bzrlib/builtins.py:6092

3739

#: bzrlib/builtins.py:6078

3735

3740

msgid "The relation between branch and tree."

3736

3741

msgstr ""

3737

3742

3738

#: bzrlib/builtins.py:6094

3743

#: bzrlib/builtins.py:6080

3739

3744

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

3740

3745

msgstr ""

3741

3746

3742

#: bzrlib/builtins.py:6095

3747

#: bzrlib/builtins.py:6081

3743

3748

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

3744

3749

msgstr ""

3745

3750

3746

#: bzrlib/builtins.py:6096

3751

#: bzrlib/builtins.py:6082

3747

3752

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

3748

3753

msgstr ""

3749

3754

3750

#: bzrlib/builtins.py:6097

3755

#: bzrlib/builtins.py:6083

3751

3756

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

3752

3757

msgstr ""

3753

3758

3754

#: bzrlib/builtins.py:6102

3759

#: bzrlib/builtins.py:6088

3755

3760

msgid "Repository type"

3756

3761

msgstr ""

3757

3762

3758

#: bzrlib/builtins.py:6103

3763

#: bzrlib/builtins.py:6089

3759

3764

msgid "Location fo the repository."

3760

3765

msgstr ""

3761

3766

3762

#: bzrlib/builtins.py:6105

3767

#: bzrlib/builtins.py:6091

3763

3768

msgid ""

3764

3769

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

3765

3770

msgstr ""

3766

3771

3767

#: bzrlib/builtins.py:6107

3772

#: bzrlib/builtins.py:6093

3768

3773

msgid "Reconfigure to use a shared repository."

3769

3774

msgstr ""

3770

3775

3771

#: bzrlib/builtins.py:6111

3776

#: bzrlib/builtins.py:6097

3772

3777

msgid "Trees in Repository"

3773

3778

msgstr ""

3774

3779

3775

#: bzrlib/builtins.py:6112

3780

#: bzrlib/builtins.py:6098

3776

3781

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

3777

3782

msgstr ""

3778

3783

3779

#: bzrlib/builtins.py:6114

3784

#: bzrlib/builtins.py:6100

3780

3785

msgid ""

3781

3786

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

3782

3787

msgstr ""

3783

3788

3784

#: bzrlib/builtins.py:6116

3789

#: bzrlib/builtins.py:6102

3785

3790

msgid ""

3786

3791

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

3787

3792

msgstr ""

3788

3793

3789

#: bzrlib/builtins.py:6119

3794

#: bzrlib/builtins.py:6105

3790

3795

msgid "Branch to bind checkout to."

3791

3796

msgstr ""

3792

3797

3793

#: bzrlib/builtins.py:6121

3798

#: bzrlib/builtins.py:6107

3794

3799

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

3795

3800

msgstr ""

3796

3801

3797

#: bzrlib/builtins.py:6124

3802

#: bzrlib/builtins.py:6110

3798

3803

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

3799

3804

msgstr ""

3800

3805

3801

#: bzrlib/builtins.py:6128

3806

#: bzrlib/builtins.py:6114

3802

3807

msgid ""

3803

3808

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

3804

3809

"data into it."

3805

3810

msgstr ""

3806

3811

3812

#: bzrlib/builtins.py:6124

3813

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

3814

msgstr ""

3815

3807

3816

#: bzrlib/builtins.py:6138

3808

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

3809

msgstr ""

3810

3811

#: bzrlib/builtins.py:6152

3812

3817

msgid "No target configuration specified"

3813

3818

msgstr ""

3814

3819

3815

#: bzrlib/builtins.py:6187

3820

#: bzrlib/builtins.py:6173

3816

3821

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

3817

3822

msgstr ""

3818

3823

3819

#: bzrlib/builtins.py:6189

3824

#: bzrlib/builtins.py:6175

3820

3825

msgid ""

3821

3826

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

3822

3827

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

3824

3829

"of the new location and binds to it."

3825

3830

msgstr ""

3826

3831

3827

#: bzrlib/builtins.py:6194

3832

#: bzrlib/builtins.py:6180

3828

3833

msgid ""

3829

3834

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

3830

3835

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

3831

3836

msgstr ""

3832

3837

3833

#: bzrlib/builtins.py:6197

3838

#: bzrlib/builtins.py:6183

3834

3839

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

3835

3840

msgstr ""

3836

3841

3837

#: bzrlib/builtins.py:6199

3842

#: bzrlib/builtins.py:6185

3838

3843

msgid ""

3839

3844

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

3840

3845

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

3842

3847

"/path/to/newbranch."

3843

3848

msgstr ""

3844

3849

3845

#: bzrlib/builtins.py:6204

3850

#: bzrlib/builtins.py:6190

3846

3851

msgid ""

3847

3852

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

3848

3853

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

3849

3854

"that of the master."

3850

3855

msgstr ""

3851

3856

3852

#: bzrlib/builtins.py:6212

3857

#: bzrlib/builtins.py:6198

3853

3858

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

3854

3859

msgstr ""

3855

3860

3861

#: bzrlib/builtins.py:6201

3862

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

3863

msgstr ""

3864

3856

3865

#: bzrlib/builtins.py:6215

3857

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

3858

msgstr ""

3859

3860

#: bzrlib/builtins.py:6229

3861

3866

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

3862

3867

msgstr ""

3863

3868

3864

#: bzrlib/builtins.py:6242

3869

#: bzrlib/builtins.py:6228

3865

3870

msgid "cannot create branch without source branch"

3866

3871

msgstr ""

3867

3872

3868

#: bzrlib/builtins.py:6262

3873

#: bzrlib/builtins.py:6253

3869

3874

msgid "Manage filtered views."

3870

3875

msgstr ""

3871

3876

3872

#: bzrlib/builtins.py:6264

3877

#: bzrlib/builtins.py:6255

3873

3878

msgid ""

3874

3879

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

3875

3880

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

3879

3884

"must be within the current view."

3880

3885

msgstr ""

3881

3886

3882

#: bzrlib/builtins.py:6271

3887

#: bzrlib/builtins.py:6262

3883

3888

msgid ""

3884

3889

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

3885

3890

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

3887

3892

"and switch between them."

3888

3893

msgstr ""

3889

3894

3890

#: bzrlib/builtins.py:6276

3895

#: bzrlib/builtins.py:6267

3891

3896

msgid ""

3892

3897

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

3893

3898

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

3895

3900

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

3896

3901

msgstr ""

3897

3902

3898

#: bzrlib/builtins.py:6281

3903

#: bzrlib/builtins.py:6272

3899

3904

msgid ""

3900

3905

":Examples:\n"

3901

3906

" To define the current view::"

3902

3907

msgstr ""

3903

3908

3904

#: bzrlib/builtins.py:6284

3909

#: bzrlib/builtins.py:6275

3905

3910

msgid " bzr view file1 dir1 ..."

3906

3911

msgstr ""

3907

3912

3908

#: bzrlib/builtins.py:6286

3913

#: bzrlib/builtins.py:6277

3909

3914

msgid " To list the current view::"

3910

3915

msgstr ""

3911

3916

3912

#: bzrlib/builtins.py:6288

3917

#: bzrlib/builtins.py:6279

3913

3918

msgid " bzr view"

3914

3919

msgstr ""

3915

3920

3916

#: bzrlib/builtins.py:6290

3921

#: bzrlib/builtins.py:6281

3917

3922

msgid " To delete the current view::"

3918

3923

msgstr ""

3919

3924

3920

#: bzrlib/builtins.py:6292

3925

#: bzrlib/builtins.py:6283

3921

3926

msgid " bzr view --delete"

3922

3927

msgstr ""

3923

3928

3924

#: bzrlib/builtins.py:6294

3929

#: bzrlib/builtins.py:6285

3925

3930

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

3926

3931

msgstr ""

3927

3932

3928

#: bzrlib/builtins.py:6296

3933

#: bzrlib/builtins.py:6287

3929

3934

msgid " bzr view --switch off"

3930

3935

msgstr ""

3931

3936

3932

#: bzrlib/builtins.py:6298

3937

#: bzrlib/builtins.py:6289

3933

3938

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

3934

3939

msgstr ""

3935

3940

3936

#: bzrlib/builtins.py:6300

3941

#: bzrlib/builtins.py:6291

3937

3942

msgid " bzr view --name view-name file1 dir1 ..."

3938

3943

msgstr ""

3939

3944

3940

#: bzrlib/builtins.py:6302

3945

#: bzrlib/builtins.py:6293

3941

3946

msgid " To list a named view::"

3942

3947

msgstr ""

3943

3948

3944

#: bzrlib/builtins.py:6304

3949

#: bzrlib/builtins.py:6295

3945

3950

msgid " bzr view --name view-name"

3946

3951

msgstr ""

3947

3952

3948

#: bzrlib/builtins.py:6306

3953

#: bzrlib/builtins.py:6297

3949

3954

msgid " To delete a named view::"

3950

3955

msgstr ""

3951

3956

3952

#: bzrlib/builtins.py:6308

3957

#: bzrlib/builtins.py:6299

3953

3958

msgid " bzr view --name view-name --delete"

3954

3959

msgstr ""

3955

3960

3956

#: bzrlib/builtins.py:6310

3961

#: bzrlib/builtins.py:6301

3957

3962

msgid " To switch to a named view::"

3958

3963

msgstr ""

3959

3964

3960

#: bzrlib/builtins.py:6312

3965

#: bzrlib/builtins.py:6303

3961

3966

msgid " bzr view --switch view-name"

3962

3967

msgstr ""

3963

3968

3964

#: bzrlib/builtins.py:6314

3969

#: bzrlib/builtins.py:6305

3965

3970

msgid " To list all views defined::"

3966

3971

msgstr ""

3967

3972

3968

#: bzrlib/builtins.py:6316

3973

#: bzrlib/builtins.py:6307

3969

3974

msgid " bzr view --all"

3970

3975

msgstr ""

3971

3976

3972

#: bzrlib/builtins.py:6318

3977

#: bzrlib/builtins.py:6309

3973

3978

msgid " To delete all views::"

3974

3979

msgstr ""

3975

3980

3976

#: bzrlib/builtins.py:6320

3981

#: bzrlib/builtins.py:6311

3977

3982

msgid " bzr view --delete --all"

3978

3983

msgstr ""

3979

3984

3980

#: bzrlib/builtins.py:6327

3985

#: bzrlib/builtins.py:6318

3981

3986

msgid "Apply list or delete action to all views."

3982

3987

msgstr ""

3983

3988

3984

#: bzrlib/builtins.py:6330

3989

#: bzrlib/builtins.py:6321

3985

3990

msgid "Delete the view."

3986

3991

msgstr ""

3987

3992

3988

#: bzrlib/builtins.py:6333

3993

#: bzrlib/builtins.py:6324

3989

3994

msgid "Name of the view to define, list or delete."

3990

3995

msgstr ""

3991

3996

3992

#: bzrlib/builtins.py:6337

3997

#: bzrlib/builtins.py:6328

3993

3998

msgid "Name of the view to switch to."

3994

3999

msgstr ""

3995

4000

3996

#: bzrlib/builtins.py:6356

4001

#: bzrlib/builtins.py:6347

3997

4002

msgid "Both --delete and a file list specified"

3998

4003

msgstr ""

3999

4004

4000

#: bzrlib/builtins.py:6359

4005

#: bzrlib/builtins.py:6350

4001

4006

msgid "Both --delete and --switch specified"

4002

4007

msgstr ""

4003

4008

4004

#: bzrlib/builtins.py:6362

4009

#: bzrlib/builtins.py:6353

4005

4010

msgid "Deleted all views.\n"

4006

4011

msgstr ""

4007

4012

4008

#: bzrlib/builtins.py:6364

4013

#: bzrlib/builtins.py:6355

4009

4014

msgid "No current view to delete"

4010

4015

msgstr ""

4011

4016

4012

#: bzrlib/builtins.py:6367

4017

#: bzrlib/builtins.py:6358

4013

4018

#, python-format

4014

4019

msgid "Deleted '%s' view.\n"

4015

4020

msgstr ""

4016

4021

4017

#: bzrlib/builtins.py:6371

4022

#: bzrlib/builtins.py:6362

4018

4023

msgid "Both --switch and a file list specified"

4019

4024

msgstr ""

4020

4025

4021

#: bzrlib/builtins.py:6374

4026

#: bzrlib/builtins.py:6365

4022

4027

msgid "Both --switch and --all specified"

4023

4028

msgstr ""

4024

4029

4025

#: bzrlib/builtins.py:6377

4030

#: bzrlib/builtins.py:6368

4026

4031

msgid "No current view to disable"

4027

4032

msgstr ""

4028

4033

4029

#: bzrlib/builtins.py:6379

4034

#: bzrlib/builtins.py:6370

4030

4035

#, python-format

4031

4036

msgid "Disabled '%s' view.\n"

4032

4037

msgstr ""

4033

4038

4034

#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405

4039

#: bzrlib/builtins.py:6374 bzrlib/builtins.py:6396

4035

4040

msgid "Using '{0}' view: {1}\n"

4036

4041

msgstr ""

4037

4042

4043

#: bzrlib/builtins.py:6377

4044

msgid "Views defined:\n"

4045

msgstr ""

4046

4038

4047

#: bzrlib/builtins.py:6386

4039

msgid "Views defined:\n"

4040

msgstr ""

4041

4042

#: bzrlib/builtins.py:6395

4043

4048

msgid "No views defined.\n"

4044

4049

msgstr ""

4045

4050

4046

#: bzrlib/builtins.py:6402

4051

#: bzrlib/builtins.py:6393

4047

4052

msgid "Cannot change the 'off' pseudo view"

4048

4053

msgstr ""

4049

4054

4050

#: bzrlib/builtins.py:6410

4055

#: bzrlib/builtins.py:6401

4051

4056

msgid "No current view.\n"

4052

4057

msgstr ""

4053

4058

4054

#: bzrlib/builtins.py:6413

4059

#: bzrlib/builtins.py:6404

4055

4060

msgid "'{0}' view is: {1}\n"

4056

4061

msgstr ""

4057

4062

4058

#: bzrlib/builtins.py:6433

4063

#: bzrlib/builtins.py:6424

4059

4064

msgid " <no hooks installed>\n"

4060

4065

msgstr ""

4061

4066

4062

#: bzrlib/builtins.py:6437

4067

#: bzrlib/builtins.py:6428

4063

4068

msgid "Remove a branch."

4064

4069

msgstr ""

4065

4070

4066

#: bzrlib/builtins.py:6439

4071

#: bzrlib/builtins.py:6430

4067

4072

msgid ""

4068

4073

"This will remove the branch from the specified location but \n"

4069

4074

"will keep any working tree or repository in place."

4070

4075

msgstr ""

4071

4076

4072

#: bzrlib/builtins.py:6444

4077

#: bzrlib/builtins.py:6435

4073

4078

msgid " Remove the branch at repo/trunk::"

4074

4079

msgstr ""

4075

4080

4076

#: bzrlib/builtins.py:6446

4081

#: bzrlib/builtins.py:6437

4077

4082

msgid " bzr remove-branch repo/trunk"

4078

4083

msgstr ""

4079

4084

4080

#: bzrlib/builtins.py:6461

4085

#: bzrlib/builtins.py:6444

4086

msgid "Remove branch even if it is the active branch."

4087

msgstr ""

4088

4089

#: bzrlib/builtins.py:6458

4090

msgid "Branch is active. Use --force to remove it."

4091

msgstr ""

4092

4093

#: bzrlib/builtins.py:6462

4081

4094

msgid "Plaintext diff output."

4082

4095

msgstr ""

4083

4096

4084

#: bzrlib/builtins.py:6462

4097

#: bzrlib/builtins.py:6463

4085

4098

msgid "Temporarily set aside some changes from the current tree."

4086

4099

msgstr ""

4087

4100

4088

#: bzrlib/builtins.py:6464

4101

#: bzrlib/builtins.py:6465

4089

4102

msgid ""

4090

4103

"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"

4091

4104

"ie. out of the way, until a later time when you can bring them back from\n"

4094

4107

"will they survive its deletion."

4095

4108

msgstr ""

4096

4109

4097

#: bzrlib/builtins.py:6470

4110

#: bzrlib/builtins.py:6471

4098

4111

msgid "If shelve --list is specified, previously-shelved changes are listed."

4099

4112

msgstr ""

4100

4113

4101

#: bzrlib/builtins.py:6472

4114

#: bzrlib/builtins.py:6473

4102

4115

msgid ""

4103

4116

"Shelve is intended to help separate several sets of changes that have\n"

4104

4117

"been inappropriately mingled. If you just want to get rid of all changes\n"

4106

4119

"shelve all text changes at once, use shelve --all."

4107

4120

msgstr ""

4108

4121

4109

#: bzrlib/builtins.py:6477

4122

#: bzrlib/builtins.py:6478

4110

4123

msgid ""

4111

4124

"If filenames are specified, only the changes to those files will be\n"

4112

4125

"shelved. Other files will be left untouched."

4113

4126

msgstr ""

4114

4127

4115

#: bzrlib/builtins.py:6480

4128

#: bzrlib/builtins.py:6481

4116

4129

msgid ""

4117

4130

"If a revision is specified, changes since that revision will be shelved."

4118

4131

msgstr ""

4119

4132

4120

#: bzrlib/builtins.py:6482

4133

#: bzrlib/builtins.py:6483

4121

4134

msgid ""

4122

4135

"You can put multiple items on the shelf, and by default, 'unshelve' will\n"

4123

4136

"restore the most recently shelved changes."

4124

4137

msgstr ""

4125

4138

4126

#: bzrlib/builtins.py:6485

4139

#: bzrlib/builtins.py:6486

4127

4140

msgid ""

4128

4141

"For complicated changes, it is possible to edit the changes in a separate\n"

4129

4142

"editor program to decide what the file remaining in the working copy\n"

4130

4143

"should look like. To do this, add the configuration option"

4131

4144

msgstr ""

4132

4145

4133

#: bzrlib/builtins.py:6489

4146

#: bzrlib/builtins.py:6490

4134

4147

msgid " change_editor = PROGRAM @new_path @old_path"

4135

4148

msgstr ""

4136

4149

4137

#: bzrlib/builtins.py:6491

4150

#: bzrlib/builtins.py:6492

4138

4151

msgid ""

4139

4152

"where @new_path is replaced with the path of the new version of the \n"

4140

4153

"file and @old_path is replaced with the path of the old version of \n"

4143

4156

" "

4144

4157

msgstr ""

4145

4158

4146

#: bzrlib/builtins.py:6503

4159

#: bzrlib/builtins.py:6504

4147

4160

msgid "Shelve all changes."

4148

4161

msgstr ""

4149

4162

4150

#: bzrlib/builtins.py:6505

4163

#: bzrlib/builtins.py:6506

4151

4164

msgid "Method to use for writing diffs."

4152

4165

msgstr ""

4153

4166

4154

#: bzrlib/builtins.py:6505

4167

#: bzrlib/builtins.py:6506

4155

4168

msgid "writer"

4156

4169

msgstr ""

4157

4170

4158

#: bzrlib/builtins.py:6509

4171

#: bzrlib/builtins.py:6510

4159

4172

msgid "List shelved changes."

4160

4173

msgstr ""

4161

4174

4162

#: bzrlib/builtins.py:6511

4175

#: bzrlib/builtins.py:6512

4163

4176

msgid "Destroy removed changes instead of shelving them."

4164

4177

msgstr ""

4165

4178

4166

#: bzrlib/builtins.py:6540

4179

#: bzrlib/builtins.py:6541

4167

4180

msgid "No shelved changes."

4168

4181

msgstr ""

4169

4182

4170

#: bzrlib/builtins.py:6551

4183

#: bzrlib/builtins.py:6552

4171

4184

msgid "Restore shelved changes."

4172

4185

msgstr ""

4173

4186

4174

#: bzrlib/builtins.py:6553

4187

#: bzrlib/builtins.py:6554

4175

4188

msgid ""

4176

4189

"By default, the most recently shelved changes are restored. However if you\n"

4177

4190

"specify a shelf by id those changes will be restored instead. This works\n"

4178

4191

"best when the changes don't depend on each other."

4179

4192

msgstr ""

4180

4193

4181

#: bzrlib/builtins.py:6562

4194

#: bzrlib/builtins.py:6563

4182

4195

msgid "The action to perform."

4183

4196

msgstr ""

4184

4197

4185

#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694

4198

#: bzrlib/builtins.py:6563 bzrlib/conflicts.py:694

4186

4199

msgid "action"

4187

4200

msgstr ""

4188

4201

4189

#: bzrlib/builtins.py:6564

4202

#: bzrlib/builtins.py:6565

4190

4203

msgid "Apply changes and remove from the shelf."

4191

4204

msgstr ""

4192

4205

4193

#: bzrlib/builtins.py:6565

4206

#: bzrlib/builtins.py:6566

4194

4207

msgid "Show changes, but do not apply or remove them."

4195

4208

msgstr ""

4196

4209

4197

#: bzrlib/builtins.py:6566

4210

#: bzrlib/builtins.py:6567

4198

4211

msgid ""

4199

4212

"Instead of unshelving the changes, show the diff that would result from "

4200

4213

"unshelving."

4201

4214

msgstr ""

4202

4215

4203

#: bzrlib/builtins.py:6568

4216

#: bzrlib/builtins.py:6569

4204

4217

msgid "Delete changes without applying them."

4205

4218

msgstr ""

4206

4219

4207

#: bzrlib/builtins.py:6569

4220

#: bzrlib/builtins.py:6570

4208

4221

msgid "Apply changes but don't delete them."

4209

4222

msgstr ""

4210

4223

4211

#: bzrlib/builtins.py:6584

4224

#: bzrlib/builtins.py:6585

4212

4225

msgid "Remove unwanted files from working tree."

4213

4226

msgstr ""

4214

4227

4215

#: bzrlib/builtins.py:6586

4228

#: bzrlib/builtins.py:6587

4216

4229

msgid ""

4217

4230

"By default, only unknown files, not ignored files, are deleted. Versioned\n"

4218

4231

"files are never deleted."

4219

4232

msgstr ""

4220

4233

4221

#: bzrlib/builtins.py:6589

4234

#: bzrlib/builtins.py:6590

4222

4235

msgid ""

4223

4236

"Another class is 'detritus', which includes files emitted by bzr during\n"

4224

4237

"normal operations and selftests. (The value of these files decreases with\n"

4225

4238

"time.)"

4226

4239

msgstr ""

4227

4240

4228

#: bzrlib/builtins.py:6593

4241

#: bzrlib/builtins.py:6594

4229

4242

msgid ""

4230

4243

"If no options are specified, unknown files are deleted. Otherwise, option\n"

4231

4244

"flags are respected, and may be combined."

4232

4245

msgstr ""

4233

4246

4234

#: bzrlib/builtins.py:6596

4247

#: bzrlib/builtins.py:6597

4235

4248

msgid "To check what clean-tree will do, use --dry-run."

4236

4249

msgstr ""

4237

4250

4238

#: bzrlib/builtins.py:6599

4251

#: bzrlib/builtins.py:6600

4239

4252

msgid "Delete all ignored files."

4240

4253

msgstr ""

4241

4254

4242

#: bzrlib/builtins.py:6600

4255

#: bzrlib/builtins.py:6601

4243

4256

msgid ""

4244

4257

"Delete conflict files, merge and revert backups, and failed selftest dirs."

4245

4258

msgstr ""

4246

4259

4247

#: bzrlib/builtins.py:6603

4260

#: bzrlib/builtins.py:6604

4248

4261

msgid "Delete files unknown to bzr (default)."

4249

4262

msgstr ""

4250

4263

4251

#: bzrlib/builtins.py:6604

4264

#: bzrlib/builtins.py:6605

4252

4265

msgid "Show files to delete instead of deleting them."

4253

4266

msgstr ""

4254

4267

4255

#: bzrlib/builtins.py:6606

4268

#: bzrlib/builtins.py:6607

4256

4269

msgid "Do not prompt before deleting."

4257

4270

msgstr ""

4258

4271

4312

4325

msgstr[0] ""

4313

4326

msgstr[1] ""

4314

4327

4315

#: bzrlib/bzrdir.py:490

4328

#: bzrlib/bzrdir.py:486

4316

4329

msgid ""

4317

4330

"making backup of {0}\n"

4318

4331

" to {1}"

4319

4332

msgstr ""

4320

4333

4321

#: bzrlib/bzrdir.py:513

4334

#: bzrlib/bzrdir.py:509

4322

4335

msgid "renamed {0} to {1}"

4323

4336

msgstr ""

4324

4337

4325

#: bzrlib/bzrdir.py:1652

4338

#: bzrlib/bzrdir.py:1638

4326

4339

#, python-format

4327

4340

msgid ""

4328

4341

"Source repository format does not support stacking, using format:\n"

4329

4342

" %s"

4330

4343

msgstr ""

4331

4344

4332

#: bzrlib/bzrdir.py:1672

4345

#: bzrlib/bzrdir.py:1658

4333

4346

#, python-format

4334

4347

msgid ""

4335

4348

"Source branch format does not support stacking, using format:\n"

4336

4349

" %s"

4337

4350

msgstr ""

4338

4351

4339

#: bzrlib/bzrdir.py:1818

4352

#: bzrlib/bzrdir.py:1804

4340

4353

msgid "starting repository conversion"

4341

4354

msgstr ""

4342

4355

4343

#: bzrlib/bzrdir.py:2039

4356

#: bzrlib/bzrdir.py:2025

4344

4357

msgid "Using default stacking branch {0} at {1}"

4345

4358

msgstr ""

4346

4359

4643

4656

msgid ":See also: %s"

4644

4657

msgstr ""

4645

4658

4646

#: bzrlib/commands.py:816 bzrlib/gpg.py:324

4659

#: bzrlib/commands.py:826 bzrlib/gpg.py:347

4647

4660

msgid "Only ASCII permitted in option names"

4648

4661

msgstr ""

4649

4662

4650

#: bzrlib/commands.py:841 bzrlib/commands.py:849

4663

#: bzrlib/commands.py:851 bzrlib/commands.py:859

4651

4664

msgid "command {0!r} needs one or more {1}"

4652

4665

msgstr ""

4653

4666

4654

#: bzrlib/commands.py:858

4667

#: bzrlib/commands.py:868

4655

4668

msgid "command {0!r} requires argument {1}"

4656

4669

msgstr ""

4657

4670

4658

#: bzrlib/commands.py:865

4671

#: bzrlib/commands.py:875

4659

4672

msgid "extra argument to command {0}: {1}"

4660

4673

msgstr ""

4661

4674

4662

#: bzrlib/commands.py:962

4675

#: bzrlib/commands.py:972

4663

4676

#, python-format

4664

4677

msgid "Profile data written to \"%s\"."

4665

4678

msgstr ""

4702

4715

msgid "renamed"

4703

4716

msgstr ""

4704

4717

4705

#: bzrlib/commit.py:977

4718

#: bzrlib/commit.py:976

4706

4719

msgid "unchanged"

4707

4720

msgstr ""

4708

4721

4709

#: bzrlib/commit.py:999

4722

#: bzrlib/commit.py:998

4710

4723

msgid "{0} [{1}] - Stage"

4711

4724

msgstr ""

4712

4725

4713

#: bzrlib/commit.py:1002

4726

#: bzrlib/commit.py:1001

4714

4727

#, python-format

4715

4728

msgid "%s - Stage"

4716

4729

msgstr ""

4717

4730

4731

#: bzrlib/commit_signature_commands.py:34

4732

msgid "Sign all commits by a given committer."

4733

msgstr ""

4734

4718

4735

#: bzrlib/commit_signature_commands.py:36

4719

msgid "Sign all commits by a given committer."

4720

msgstr ""

4721

4722

#: bzrlib/commit_signature_commands.py:38

4723

4736

msgid ""

4724

4737

"If location is not specified the local tree is used.\n"

4725

4738

"If committer is not specified the default committer is used."

4726

4739

msgstr ""

4727

4740

4728

#: bzrlib/commit_signature_commands.py:41

4741

#: bzrlib/commit_signature_commands.py:39

4729

4742

msgid "This does not sign commits that already have signatures."

4730

4743

msgstr ""

4731

4744

4732

#: bzrlib/commit_signature_commands.py:49

4745

#: bzrlib/commit_signature_commands.py:47

4733

4746

msgid ""

4734

4747

"Don't actually sign anything, just print the revisions that would be signed."

4735

4748

msgstr ""

4736

4749

4750

#: bzrlib/commit_signature_commands.py:98

4751

#, python-format

4752

msgid "Signed %d revision.\n"

4753

msgid_plural "Signed %d revisions.\n"

4754

msgstr[0] ""

4755

msgstr[1] ""

4756

4737

4757

#: bzrlib/commit_signature_commands.py:103

4738

4758

msgid "Verify all commit signatures."

4739

4759

msgstr ""

4749

4769

"verification."

4750

4770

msgstr ""

4751

4771

4752

#: bzrlib/commit_signature_commands.py:147

4772

#: bzrlib/commit_signature_commands.py:148

4753

4773

msgid "Cannot verify a range of non-revision-history revisions"

4754

4774

msgstr ""

4755

4775

4756

#: bzrlib/commit_signature_commands.py:168

4776

#: bzrlib/commit_signature_commands.py:166

4757

4777

msgid "All commits signed with verifiable keys"

4758

4778

msgstr ""

4759

4779

4760

#: bzrlib/config.py:475

4780

#: bzrlib/config.py:436

4761

4781

msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."

4762

4782

msgstr ""

4763

4783

4764

#: bzrlib/config.py:2485

4784

#: bzrlib/config.py:2451

4765

4785

msgid "{0} is not an SI unit."

4766

4786

msgstr ""

4767

4787

4768

#: bzrlib/config.py:2949

4788

#: bzrlib/config.py:2970

4769

4789

msgid ""

4770

4790

"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "

4771

4791

"will be saved."

4772

4792

msgstr ""

4773

4793

4774

#: bzrlib/config.py:3093

4794

#: bzrlib/config.py:3114

4775

4795

#, python-format

4776

4796

msgid "Invalid '%s', should be of the form 'name=value'"

4777

4797

msgstr ""

4778

4798

4779

#: bzrlib/config.py:3962

4799

#: bzrlib/config.py:4004

4780

4800

msgid "Display, set or remove a configuration option."

4781

4801

msgstr ""

4782

4802

4783

#: bzrlib/config.py:3964

4803

#: bzrlib/config.py:4006

4784

4804

msgid "Display the active value for a given option."

4785

4805

msgstr ""

4786

4806

4787

#: bzrlib/config.py:3966

4807

#: bzrlib/config.py:4008

4788

4808

msgid ""

4789

4809

"If --all is specified, NAME is interpreted as a regular expression and all\n"

4790

4810

"matching options are displayed mentioning their scope. The active value\n"

4791

4811

"that bzr will take into account is the first one displayed for each option."

4792

4812

msgstr ""

4793

4813

4794

#: bzrlib/config.py:3970

4814

#: bzrlib/config.py:4012

4795

4815

msgid "If no NAME is given, --all .* is implied."

4796

4816

msgstr ""

4797

4817

4798

#: bzrlib/config.py:3972

4818

#: bzrlib/config.py:4014

4799

4819

msgid ""

4800

4820

"Setting a value is achieved by using name=value without spaces. The value\n"

4801

4821

"is set in the most relevant scope and can be checked by displaying the\n"

4802

4822

"option again."

4803

4823

msgstr ""

4804

4824

4805

#: bzrlib/config.py:3984

4825

#: bzrlib/config.py:4026

4806

4826

msgid "Reduce the scope to the specified configuration file."

4807

4827

msgstr ""

4808

4828

4809

#: bzrlib/config.py:3988

4829

#: bzrlib/config.py:4030

4810

4830

msgid "Display all the defined values for the matching options."

4811

4831

msgstr ""

4812

4832

4813

#: bzrlib/config.py:3990

4833

#: bzrlib/config.py:4032

4814

4834

msgid "Remove the option from the configuration file."

4815

4835

msgstr ""

4816

4836

4890

4910

msgstr[0] ""

4891

4911

msgstr[1] ""

4892

4912

4893

#: bzrlib/controldir.py:710

4913

#: bzrlib/controldir.py:712

4894

4914

msgid "{0} is{1} redirected to {2}"

4895

4915

msgstr ""

4896

4916

5107

5127

msgstr ""

5108

5128

5109

5129

#: bzrlib/errors.py:715

5130

msgid "Invalid branch name: %(name)s"

5131

msgstr ""

5132

5133

#: bzrlib/errors.py:724

5110

5134

msgid "Parent branch already exists: \"%(path)s\"."

5111

5135

msgstr ""

5112

5136

5113

#: bzrlib/errors.py:721

5137

#: bzrlib/errors.py:730

5114

5138

msgid ""

5115

5139

"Directory contains a branch, but no working tree (use bzr checkout if you "

5116

5140

"wish to build a working tree): \"%(path)s\""

5117

5141

msgstr ""

5118

5142

5119

#: bzrlib/errors.py:726

5143

#: bzrlib/errors.py:735

5120

5144

msgid ""

5121

5145

"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""

5122

5146

msgstr ""

5123

5147

5124

#: bzrlib/errors.py:736

5148

#: bzrlib/errors.py:745

5125

5149

msgid ""

5126

5150

"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""

5127

5151

msgstr ""

5128

5152

5129

#: bzrlib/errors.py:746

5153

#: bzrlib/errors.py:755

5130

5154

msgid "No repository present: \"%(path)s\""

5131

5155

msgstr ""

5132

5156

5133

#: bzrlib/errors.py:753

5157

#: bzrlib/errors.py:762

5134

5158

msgid ""

5135

5159

"Unsupported branch format: %(format)s\n"

5136

5160

"Please run 'bzr upgrade'"

5137

5161

msgstr ""

5138

5162

5139

#: bzrlib/errors.py:759

5163

#: bzrlib/errors.py:768

5140

5164

msgid "Unknown %(kind)s format: %(format)r"

5141

5165

msgstr ""

5142

5166

5143

#: bzrlib/errors.py:768

5167

#: bzrlib/errors.py:777

5144

5168

msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."

5145

5169

msgstr ""

5146

5170

5147

#: bzrlib/errors.py:778

5171

#: bzrlib/errors.py:787

5148

5172

msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"

5149

5173

msgstr ""

5150

5174

5151

#: bzrlib/errors.py:793

5175

#: bzrlib/errors.py:802

5152

5176

msgid ""

5153

5177

"%(target)s\n"

5154

5178

"is not compatible with\n"

5156

5180

"%(details)s"

5157

5181

msgstr ""

5158

5182

5159

#: bzrlib/errors.py:809

5183

#: bzrlib/errors.py:818

5160

5184

msgid "Revision is not compatible with %(repo_format)s"

5161

5185

msgstr ""

5162

5186

5163

#: bzrlib/errors.py:819

5187

#: bzrlib/errors.py:828

5164

5188

msgid "%(context_info)s%(path)s is already versioned."

5165

5189

msgstr ""

5166

5190

5167

#: bzrlib/errors.py:840

5191

#: bzrlib/errors.py:849

5168

5192

msgid "%(context_info)s%(path)s is not versioned."

5169

5193

msgstr ""

5170

5194

5171

#: bzrlib/errors.py:861

5195

#: bzrlib/errors.py:870

5172

5196

msgid "Path(s) are not versioned: %(paths_as_string)s"

5173

5197

msgstr ""

5174

5198

5175

#: bzrlib/errors.py:872

5199

#: bzrlib/errors.py:881

5176

5200

msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"

5177

5201

msgstr ""

5178

5202

5179

#: bzrlib/errors.py:891

5203

#: bzrlib/errors.py:900

5180

5204

msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""

5181

5205

msgstr ""

5182

5206

5183

#: bzrlib/errors.py:899

5207

#: bzrlib/errors.py:908

5184

5208

msgid ""

5185

5209

"Filename %(filename)r is not valid in your current filesystem encoding "

5186

5210

"%(fs_encoding)s"

5187

5211

msgstr ""

5188

5212

5189

#: bzrlib/errors.py:910

5213

#: bzrlib/errors.py:919

5190

5214

msgid "Cannot operate on \"%(filename)s\" because it is a control file"

5191

5215

msgstr ""

5192

5216

5193

#: bzrlib/errors.py:928

5217

#: bzrlib/errors.py:937

5194

5218

msgid "The lock for '%(lock_description)s' is in use and cannot be broken."

5195

5219

msgstr ""

5196

5220

5197

#: bzrlib/errors.py:967

5221

#: bzrlib/errors.py:976

5198

5222

msgid "Cannot lock %(lock)s: %(why)s"

5199

5223

msgstr ""

5200

5224

5201

#: bzrlib/errors.py:977

5225

#: bzrlib/errors.py:986

5202

5226

msgid ""

5203

5227

"A transaction related operation was attempted after the transaction finished."

5204

5228

msgstr ""

5205

5229

5206

#: bzrlib/errors.py:1004

5230

#: bzrlib/errors.py:1013

5207

5231

msgid "Cannot lock: transport is read only: %(transport)s"

5208

5232

msgstr ""

5209

5233

5210

#: bzrlib/errors.py:1012

5234

#: bzrlib/errors.py:1021

5211

5235

msgid "Could not acquire lock \"%(lock)s\": %(msg)s"

5212

5236

msgstr ""

5213

5237

5214

#: bzrlib/errors.py:1023

5238

#: bzrlib/errors.py:1032

5215

5239

msgid ""

5216

5240

"Lock was broken while still open: %(lock)s - check storage consistency!"

5217

5241

msgstr ""

5218

5242

5219

#: bzrlib/errors.py:1034

5243

#: bzrlib/errors.py:1043

5220

5244

msgid ""

5221

5245

"Lock was released and re-acquired before being broken: %(lock)s: held by "

5222

5246

"%(holder)r, wanted to break %(target)r"

5223

5247

msgstr ""

5224

5248

5225

#: bzrlib/errors.py:1046

5249

#: bzrlib/errors.py:1055

5226

5250

msgid ""

5227

5251

"Lock is apparently held, but corrupted: %(corruption_info)s\n"

5228

5252

"Use 'bzr break-lock' to clear it"

5229

5253

msgstr ""

5230

5254

5231

#: bzrlib/errors.py:1059

5255

#: bzrlib/errors.py:1068

5232

5256

msgid "Lock not held: %(lock)s"

5233

5257

msgstr ""

5234

5258

5235

#: bzrlib/errors.py:1088

5259

#: bzrlib/errors.py:1097

5236

5260

msgid "No changes to commit"

5237

5261

msgstr ""

5238

5262

5239

#: bzrlib/errors.py:1093

5263

#: bzrlib/errors.py:1102

5240

5264

msgid ""

5241

5265

"Selected-file commit of merges is not supported yet: files %(files_str)s"

5242

5266

msgstr ""

5243

5267

5244

#: bzrlib/errors.py:1103

5268

#: bzrlib/errors.py:1112

5245

5269

msgid ""

5246

5270

"Excluding paths during commit is not supported by repository at "

5247

5271

"%(repository)r."

5248

5272

msgstr ""

5249

5273

5250

#: bzrlib/errors.py:1112

5274

#: bzrlib/errors.py:1121

5251

5275

msgid ""

5252

5276

"The specified commit message contains characters unsupported by the current "

5253

5277

"encoding."

5254

5278

msgstr ""

5255

5279

5256

#: bzrlib/errors.py:1118

5280

#: bzrlib/errors.py:1127

5257

5281

msgid "Upgrade URL cannot work with readonly URLs."

5258

5282

msgstr ""

5259

5283

5260

#: bzrlib/errors.py:1123

5284

#: bzrlib/errors.py:1132

5261

5285

msgid "The branch format %(format)s is already at the most recent format."

5262

5286

msgstr ""

5263

5287

5264

#: bzrlib/errors.py:1146

5288

#: bzrlib/errors.py:1155

5265

5289

msgid "Option --change does not accept revision ranges"

5266

5290

msgstr ""

5267

5291

5268

#: bzrlib/errors.py:1151

5292

#: bzrlib/errors.py:1160

5269

5293

msgid "No namespace registered for string: %(spec)r"

5270

5294

msgstr ""

5271

5295

5272

#: bzrlib/errors.py:1170

5296

#: bzrlib/errors.py:1179

5273

5297

msgid ""

5274

5298

"Requested revision: '%(spec)s' does not exist in branch: "

5275

5299

"%(branch_url)s%(extra)s"

5276

5300

msgstr ""

5277

5301

5278

#: bzrlib/errors.py:1184

5302

#: bzrlib/errors.py:1193

5279

5303

msgid ""

5280

5304

"Operation denied because it would change the main history, which is not "

5281

5305

"permitted by the append_revisions_only setting on branch \"%(location)s\"."

5282

5306

msgstr ""

5283

5307

5284

#: bzrlib/errors.py:1195

5308

#: bzrlib/errors.py:1204

5285

5309

msgid ""

5286

5310

"These branches have diverged. Use the missing command to see how.\n"

5287

5311

"Use the merge command to reconcile them."

5288

5312

msgstr ""

5289

5313

5290

#: bzrlib/errors.py:1215

5314

#: bzrlib/errors.py:1224

5291

5315

msgid ""

5292

5316

"Branches have no common ancestor, and no merge base revision was specified."

5293

5317

msgstr ""

5294

5318

5295

#: bzrlib/errors.py:1221

5319

#: bzrlib/errors.py:1230

5296

5320

msgid ""

5297

5321

"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."

5298

5322

msgstr ""

5299

5323

5300

#: bzrlib/errors.py:1227

5324

#: bzrlib/errors.py:1236

5301

5325

msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"

5302

5326

msgstr ""

5303

5327

5304

#: bzrlib/errors.py:1236

5328

#: bzrlib/errors.py:1245

5305

5329

msgid ""

5306

5330

"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."

5307

5331

msgstr ""

5308

5332

5309

#: bzrlib/errors.py:1245

5333

#: bzrlib/errors.py:1254

5310

5334

msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"

5311

5335

msgstr ""

5312

5336

5313

#: bzrlib/errors.py:1254

5337

#: bzrlib/errors.py:1263

5314

5338

msgid "Branch %(branch)s has no commits."

5315

5339

msgstr ""

5316

5340

5317

#: bzrlib/errors.py:1272

5341

#: bzrlib/errors.py:1281

5318

5342

msgid ""

5319

5343

"Bound branch %(branch)s is out of date with master branch "

5320

5344

"%(master)s.%(extra_help)s"

5321

5345

msgstr ""

5322

5346

5323

#: bzrlib/errors.py:1284

5347

#: bzrlib/errors.py:1293

5324

5348

msgid ""

5325

5349

"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "

5326

5350

"bound to %(remote)s."

5327

5351

msgstr ""

5328

5352

5329

#: bzrlib/errors.py:1296

5353

#: bzrlib/errors.py:1305

5330

5354

msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"

5331

5355

msgstr ""

5332

5356

5333

#: bzrlib/errors.py:1305

5357

#: bzrlib/errors.py:1314

5334

5358

msgid ""

5335

5359

"Unable to connect to target of bound branch %(branch)s => %(target)s: "

5336

5360

"%(error)s"

5337

5361

msgstr ""

5338

5362

5339

#: bzrlib/errors.py:1317

5363

#: bzrlib/errors.py:1326

5340

5364

msgid "Error in processing weave: %(msg)s"

5341

5365

msgstr ""

5342

5366

5343

#: bzrlib/errors.py:1326

5367

#: bzrlib/errors.py:1335

5344

5368

msgid "Revision {%(revision_id)s} already present in %(weave)s"

5345

5369

msgstr ""

5346

5370

5347

#: bzrlib/errors.py:1337

5371

#: bzrlib/errors.py:1346

5348

5372

msgid "Revision {%(revision_id)s} not present in %(weave)s"

5349

5373

msgstr ""

5350

5374

5351

#: bzrlib/errors.py:1347

5375

#: bzrlib/errors.py:1356

5352

5376

msgid "Weave invariant violated: %(what)s"

5353

5377

msgstr ""

5354

5378

5355

#: bzrlib/errors.py:1356

5379

#: bzrlib/errors.py:1365

5356

5380

msgid "Parents are mismatched between two revisions. %(msg)s"

5357

5381

msgstr ""

5358

5382

5359

#: bzrlib/errors.py:1378

5383

#: bzrlib/errors.py:1387

5360

5384

msgid ""

5361

5385

"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "

5362

5386

"%(weave_b)s"

5363

5387

msgstr ""

5364

5388

5365

#: bzrlib/errors.py:1390

5389

#: bzrlib/errors.py:1399

5366

5390

msgid "Versioned file error"

5367

5391

msgstr ""

5368

5392

5369

#: bzrlib/errors.py:1395

5393

#: bzrlib/errors.py:1404

5370

5394

msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."

5371

5395

msgstr ""

5372

5396

5373

#: bzrlib/errors.py:1405

5397

#: bzrlib/errors.py:1414

5374

5398

msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."

5375

5399

msgstr ""

5376

5400

5377

#: bzrlib/errors.py:1415

5401

#: bzrlib/errors.py:1424

5378

5402

msgid "Text did not match its checksum: %(msg)s"

5379

5403

msgstr ""

5380

5404

5381

#: bzrlib/errors.py:1541

5405

#: bzrlib/errors.py:1550

5382

5406

msgid "Export format %(format)r not supported"

5383

5407

msgstr ""

5384

5408

5385

#: bzrlib/errors.py:1550

5409

#: bzrlib/errors.py:1559

5386

5410

msgid "Transport error: %(msg)s %(orig_error)s"

5387

5411

msgstr ""

5388

5412

5389

#: bzrlib/errors.py:1576

5413

#: bzrlib/errors.py:1585

5390

5414

msgid "Generic bzr smart protocol error: %(details)s"

5391

5415

msgstr ""

5392

5416

5393

#: bzrlib/errors.py:1584

5417

#: bzrlib/errors.py:1593

5394

5418

msgid "Received bad protocol version marker: %(marker)r"

5395

5419

msgstr ""

5396

5420

5397

#: bzrlib/errors.py:1616

5421

#: bzrlib/errors.py:1625

5398

5422

msgid "Transport operation not possible: %(msg)s %(orig_error)s"

5399

5423

msgstr ""

5400

5424

5401

#: bzrlib/errors.py:1621

5425

#: bzrlib/errors.py:1630

5402

5426

msgid "Connection error: %(msg)s %(orig_error)s"

5403

5427

msgstr ""

5404

5428

5405

#: bzrlib/errors.py:1626

5429

#: bzrlib/errors.py:1635

5406

5430

msgid "%(msg)s %(host)s%(port)s%(orig_error)s"

5407

5431

msgstr ""

5408

5432

5409

#: bzrlib/errors.py:1647

5433

#: bzrlib/errors.py:1656

5410

5434

msgid "Connection closed: %(msg)s %(orig_error)s"

5411

5435

msgstr ""

5412

5436

5413

#: bzrlib/errors.py:1652

5437

#: bzrlib/errors.py:1661

5414

5438

msgid "Connection Timeout: %(msg)s%(orig_error)s"

5415

5439

msgstr ""

5416

5440

5417

#: bzrlib/errors.py:1657

5441

#: bzrlib/errors.py:1666

5418

5442

msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"

5419

5443

msgstr ""

5420

5444

5421

#: bzrlib/errors.py:1667

5445

#: bzrlib/errors.py:1676

5422

5446

msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"

5423

5447

msgstr ""

5424

5448

5425

#: bzrlib/errors.py:1682

5449

#: bzrlib/errors.py:1691

5426

5450

msgid "Certificate error: %(error)s"

5427

5451

msgstr ""

5428

5452

5429

#: bzrlib/errors.py:1690

5453

#: bzrlib/errors.py:1699

5430

5454

msgid "Invalid http range %(range)r for %(path)s: %(msg)s"

5431

5455

msgstr ""

5432

5456

5433

#: bzrlib/errors.py:1704

5457

#: bzrlib/errors.py:1713

5434

5458

msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"

5435

5459

msgstr ""

5436

5460

5437

#: bzrlib/errors.py:1712

5461

#: bzrlib/errors.py:1721

5438

5462

msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"

5439

5463

msgstr ""

5440

5464

5441

#: bzrlib/errors.py:1721

5465

#: bzrlib/errors.py:1730

5442

5466

msgid "%(source)s is%(permanently)s redirected to %(target)s"

5443

5467

msgstr ""

5444

5468

5445

#: bzrlib/errors.py:1735

5469

#: bzrlib/errors.py:1744

5446

5470

msgid "Too many redirections"

5447

5471

msgstr ""

5448

5472

5449

#: bzrlib/errors.py:1740

5473

#: bzrlib/errors.py:1749

5450

5474

msgid "Working tree has conflicts."

5451

5475

msgstr ""

5452

5476

5453

#: bzrlib/errors.py:1744

5477

#: bzrlib/errors.py:1753

5454

5478

msgid "Config file %(filename)s is not UTF-8 encoded\n"

5455

5479

msgstr ""

5456

5480

5457

#: bzrlib/errors.py:1753

5481

#: bzrlib/errors.py:1762

5458

5482

msgid ""

5459

5483

"Error(s) parsing config file %(filename)s:\n"

5460

5484

"%(errors)s"

5461

5485

msgstr ""

5462

5486

5463

#: bzrlib/errors.py:1763

5487

#: bzrlib/errors.py:1772

5464

5488

msgid ""

5465

5489

"Bad value \"%(value)s\" for option \"%(name)s\".\n"

5466

5490

"See ``bzr help %(name)s``"

5467

5491

msgstr ""

5468

5492

5469

#: bzrlib/errors.py:1773

5493

#: bzrlib/errors.py:1782

5470

5494

msgid "%(username)r does not seem to contain a reasonable email address"

5471

5495

msgstr ""

5472

5496

5473

#: bzrlib/errors.py:1782

5497

#: bzrlib/errors.py:1791

5474

5498

msgid "Failed to GPG sign data with command \"%(command_line)s\""

5475

5499

msgstr ""

5476

5500

5477

#: bzrlib/errors.py:1790

5501

#: bzrlib/errors.py:1799

5478

5502

msgid "Failed to verify GPG signature data with error \"%(error)s\""

5479

5503

msgstr ""

5480

5504

5481

#: bzrlib/errors.py:1798

5505

#: bzrlib/errors.py:1807

5482

5506

msgid "Unable to import library \"%(library)s\": %(error)s"

5483

5507

msgstr ""

5484

5508

5485

#: bzrlib/errors.py:1806

5509

#: bzrlib/errors.py:1815

5486

5510

msgid "python-gpgme is not installed, it is needed to verify signatures"

5487

5511

msgstr ""

5488

5512

5489

#: bzrlib/errors.py:1814

5513

#: bzrlib/errors.py:1823

5490

5514

msgid ""

5491

5515

"The working tree for %(basedir)s has changed since the last commit, but "

5492

5516

"weave merge requires that it be unchanged"

5493

5517

msgstr ""

5494

5518

5495

#: bzrlib/errors.py:1824

5519

#: bzrlib/errors.py:1833

5496

5520

msgid ""

5497

5521

"Can't reprocess and show base, because reprocessing obscures the "

5498

5522

"relationship of conflicting lines to the base"

5499

5523

msgstr ""

5500

5524

5501

#: bzrlib/errors.py:1830

5525

#: bzrlib/errors.py:1839

5502

5526

msgid "Cycle in graph %(graph)r"

5503

5527

msgstr ""

5504

5528

5505

#: bzrlib/errors.py:1858

5529

#: bzrlib/errors.py:1867

5506

5530

msgid "File %(filename)s is not conflicted."

5507

5531

msgstr ""

5508

5532

5509

#: bzrlib/errors.py:1880

5533

#: bzrlib/errors.py:1889

5510

5534

msgid "No bundle was found in \"%(filename)s\"."

5511

5535

msgstr ""

5512

5536

5513

#: bzrlib/errors.py:1889

5537

#: bzrlib/errors.py:1898

5514

5538

msgid "Unable to handle bundle version %(version)s: %(msg)s"

5515

5539

msgstr ""

5516

5540

5517

#: bzrlib/errors.py:1899

5541

#: bzrlib/errors.py:1908

5518

5542

msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"

5519

5543

msgstr ""

5520

5544

5521

#: bzrlib/errors.py:1912

5545

#: bzrlib/errors.py:1921

5522

5546

msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"

5523

5547

msgstr ""

5524

5548

5525

#: bzrlib/errors.py:1922

5549

#: bzrlib/errors.py:1931

5526

5550

msgid "Key %(key)s is already present in map"

5527

5551

msgstr ""

5528

5552

5529

#: bzrlib/errors.py:1927

5553

#: bzrlib/errors.py:1936

5530

5554

msgid "The prefix %(prefix)s is in the help search path twice."

5531

5555

msgstr ""

5532

5556

5533

#: bzrlib/errors.py:1937

5557

#: bzrlib/errors.py:1946

5534

5558

msgid ""

5535

5559

"No final name for trans_id %(trans_id)r\n"

5536

5560

"file-id: %(file_id)r\n"

5537

5561

"root trans-id: %(root_trans_id)r\n"

5538

5562

msgstr ""

5539

5563

5540

#: bzrlib/errors.py:1969

5564

#: bzrlib/errors.py:1978

5541

5565

msgid "Attempt to reuse a transform that has already been applied."

5542

5566

msgstr ""

5543

5567

5544

#: bzrlib/errors.py:1974

5568

#: bzrlib/errors.py:1983

5545

5569

msgid "Moving the root directory is not supported at this time"

5546

5570

msgstr ""

5547

5571

5548

#: bzrlib/errors.py:1979

5572

#: bzrlib/errors.py:1988

5549

5573

msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"

5550

5574

msgstr ""

5551

5575

5552

#: bzrlib/errors.py:1990

5576

#: bzrlib/errors.py:1999

5553

5577

msgid ""

5554

5578

"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5555

5579

msgstr ""

5556

5580

5557

#: bzrlib/errors.py:2026

5581

#: bzrlib/errors.py:2035

5558

5582

msgid ""

5559

5583

"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5560

5584

msgstr ""

5561

5585

5562

#: bzrlib/errors.py:2056

5586

#: bzrlib/errors.py:2065

5563

5587

msgid "Unable to import paramiko (required for sftp support): %(error)s"

5564

5588

msgstr ""

5565

5589

5566

#: bzrlib/errors.py:2064

5590

#: bzrlib/errors.py:2073

5567

5591

msgid "Nothing to merge."

5568

5592

msgstr ""

5569

5593

5570

#: bzrlib/errors.py:2069

5594

#: bzrlib/errors.py:2078

5571

5595

msgid "Format %(format)s cannot be initialised by this version of bzr."

5572

5596

msgstr ""

5573

5597

5574

#: bzrlib/errors.py:2078

5598

#: bzrlib/errors.py:2087

5575

5599

msgid ""

5576

5600

"Cannot convert from format %(from_format)s to format %(format)s. "

5577

5601

"%(problem)s"

5578

5602

msgstr ""

5579

5603

5580

#: bzrlib/errors.py:2090

5604

#: bzrlib/errors.py:2099

5581

5605

msgid "Could not find an appropriate Differ for file \"%(path)s\""

5582

5606

msgstr ""

5583

5607

5584

#: bzrlib/errors.py:2098

5608

#: bzrlib/errors.py:2107

5585

5609

msgid "%(exe_name)s could not be found on this machine"

5586

5610

msgstr ""

5587

5611

5588

#: bzrlib/errors.py:2106

5612

#: bzrlib/errors.py:2115

5589

5613

msgid "Diff is not installed on this machine: %(msg)s"

5590

5614

msgstr ""

5591

5615

5592

#: bzrlib/errors.py:2114

5616

#: bzrlib/errors.py:2123

5593

5617

msgid "Diff3 is not installed on this machine."

5594

5618

msgstr ""

5595

5619

5596

#: bzrlib/errors.py:2120

5620

#: bzrlib/errors.py:2129

5597

5621

msgid "The content being inserted is already present."

5598

5622

msgstr ""

5599

5623

5600

#: bzrlib/errors.py:2125

5624

#: bzrlib/errors.py:2134

5601

5625

msgid ""

5602

5626

"This tree contains left-over files from a failed operation.\n"

5603

5627

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5605

5629

" keep, and delete it when you are done."

5606

5630

msgstr ""

5607

5631

5608

#: bzrlib/errors.py:2136

5632

#: bzrlib/errors.py:2145

5609

5633

msgid ""

5610

5634

"This tree contains left-over files from a failed operation.\n"

5611

5635

" Please examine %(pending_deletion)s to see if it contains any files you\n"

5612

5636

" wish to keep, and delete it when you are done."

5613

5637

msgstr ""

5614

5638

5615

#: bzrlib/errors.py:2146

5639

#: bzrlib/errors.py:2155

5616

5640

msgid ""

5617

5641

"Unable to delete transform temporary directory %(limbo_dir)s.\n"

5618

5642

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5620

5644

" keep, and delete it when you are done."

5621

5645

msgstr ""

5622

5646

5623

#: bzrlib/errors.py:2157

5647

#: bzrlib/errors.py:2166

5624

5648

msgid ""

5625

5649

"Unable to delete transform temporary directory %(pending_deletion)s. Please "

5626

5650

"examine %(pending_deletion)s to see if it contains any files you wish to "

5627

5651

"keep, and delete it when you are done."

5628

5652

msgstr ""

5629

5653

5630

#: bzrlib/errors.py:2167

5654

#: bzrlib/errors.py:2176

5631

5655

msgid "Working tree is out of date, please run 'bzr update'.%(more)s"

5632

5656

msgstr ""

5633

5657

5634

#: bzrlib/errors.py:2181

5658

#: bzrlib/errors.py:2190

5635

5659

msgid ""

5636

5660

"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."

5637

5661

msgstr ""

5638

5662

5639

#: bzrlib/errors.py:2194

5663

#: bzrlib/errors.py:2203

5640

5664

msgid "Error in merge modified format"

5641

5665

msgstr ""

5642

5666

5643

#: bzrlib/errors.py:2199

5667

#: bzrlib/errors.py:2208

5644

5668

msgid "Format error in conflict listings"

5645

5669

msgstr ""

5646

5670

5647

#: bzrlib/errors.py:2203

5671

#: bzrlib/errors.py:2212

5648

5672

msgid ""

5649

5673

"Inconsistency in dirstate file %(dirstate_path)s.\n"

5650

5674

"Error: %(description)s"

5651

5675

msgstr ""

5652

5676

5653

#: bzrlib/errors.py:2214

5677

#: bzrlib/errors.py:2223

5654

5678

msgid ""

5655

5679

"An error has been detected in the repository %(repo_path)s.\n"

5656

5680

"Please run bzr reconcile on this repository."

5657

5681

msgstr ""

5658

5682

5659

#: bzrlib/errors.py:2225

5683

#: bzrlib/errors.py:2234

5660

5684

msgid ""

5661

5685

"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"

5662

5686

"reason: %(reason)s"

5663

5687

msgstr ""

5664

5688

5665

#: bzrlib/errors.py:2238

5689

#: bzrlib/errors.py:2247

5666

5690

msgid ""

5667

5691

"An inconsistent delta was supplied: %(delta)r\n"

5668

5692

"reason: %(reason)s"

5669

5693

msgstr ""

5670

5694

5671

#: bzrlib/errors.py:2250

5695

#: bzrlib/errors.py:2259

5672

5696

msgid "To use this feature you must upgrade your branch at %(path)s."

5673

5697

msgstr ""

5674

5698

5675

#: bzrlib/errors.py:2259

5699

#: bzrlib/errors.py:2268

5676

5700

msgid "To use this feature you must upgrade your repository at %(path)s."

5677

5701

msgstr ""

5678

5702

5679

#: bzrlib/errors.py:2264

5703

#: bzrlib/errors.py:2273

5680

5704

msgid ""

5681

5705

"To use this feature you must upgrade your branch at %(path)s to a format "

5682

5706

"which supports rich roots."

5683

5707

msgstr ""

5684

5708

5685

#: bzrlib/errors.py:2270

5709

#: bzrlib/errors.py:2279

5686

5710

msgid "Cannot perform local-only commits on unbound branches."

5687

5711

msgstr ""

5688

5712

5689

#: bzrlib/errors.py:2275

5713

#: bzrlib/errors.py:2284

5690

5714

msgid "The method %(mname)s is not supported on objects of type %(tname)s."

5691

5715

msgstr ""

5692

5716

5693

#: bzrlib/errors.py:2296

5717

#: bzrlib/errors.py:2305

5694

5718

msgid "Ghost tags not supported by format %(format)r."

5695

5719

msgstr ""

5696

5720

5697

#: bzrlib/errors.py:2304

5721

#: bzrlib/errors.py:2313

5698

5722

msgid "File is binary but should be text."

5699

5723

msgstr ""

5700

5724

5701

#: bzrlib/errors.py:2309

5725

#: bzrlib/errors.py:2318

5702

5726

msgid "The path %(path)s is not permitted on this platform"

5703

5727

msgstr ""

5704

5728

5705

#: bzrlib/errors.py:2318

5729

#: bzrlib/errors.py:2327

5706

5730

msgid ""

5707

5731

"Testament did not match expected value.\n"

5708

5732

" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"

5709

5733

" {%(measured)s}"

5710

5734

msgstr ""

5711

5735

5712

#: bzrlib/errors.py:2330

5736

#: bzrlib/errors.py:2339

5713

5737

msgid "Not a bzr revision-bundle: %(text)r"

5714

5738

msgstr ""

5715

5739

5716

#: bzrlib/errors.py:2339

5740

#: bzrlib/errors.py:2348

5717

5741

msgid "Bad bzr revision-bundle: %(text)r"

5718

5742

msgstr ""

5719

5743

5720

#: bzrlib/errors.py:2348

5744

#: bzrlib/errors.py:2357

5721

5745

msgid "Malformed bzr revision-bundle header: %(text)r"

5722

5746

msgstr ""

5723

5747

5724

#: bzrlib/errors.py:2353

5748

#: bzrlib/errors.py:2362

5725

5749

msgid "Malformed patches in bzr revision-bundle: %(text)r"

5726

5750

msgstr ""

5727

5751

5728

#: bzrlib/errors.py:2358

5752

#: bzrlib/errors.py:2367

5729

5753

msgid "Malformed footer in bzr revision-bundle: %(text)r"

5730

5754

msgstr ""

5731

5755

5732

#: bzrlib/errors.py:2363

5756

#: bzrlib/errors.py:2372

5733

5757

msgid "End of line marker was not \\n in bzr revision-bundle"

5734

5758

msgstr ""

5735

5759

5736

#: bzrlib/errors.py:2373

5760

#: bzrlib/errors.py:2382

5737

5761

msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"

5738

5762

msgstr ""

5739

5763

5740

#: bzrlib/errors.py:2383

5764

#: bzrlib/errors.py:2392

5741

5765

msgid "Root class for inventory serialization errors"

5742

5766

msgstr ""

5743

5767

5744

#: bzrlib/errors.py:2387

5768

#: bzrlib/errors.py:2396

5745

5769

msgid ""

5746

5770

"The inventory was not in the expected format:\n"

5747

5771

" %(msg)s"

5748

5772

msgstr ""

5749

5773

5750

#: bzrlib/errors.py:2396

5774

#: bzrlib/errors.py:2405

5751

5775

msgid "This operation requires rich root data storage"

5752

5776

msgstr ""

5753

5777

5754

#: bzrlib/errors.py:2409

5778

#: bzrlib/errors.py:2418

5755

5779

msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"

5756

5780

msgstr ""

5757

5781

5758

#: bzrlib/errors.py:2418

5782

#: bzrlib/errors.py:2427

5759

5783

msgid ""

5760

5784

"Don't know how to handle SSH connections. Please set BZR_SSH environment "

5761

5785

"variable."

5762

5786

msgstr ""

5763

5787

5764

#: bzrlib/errors.py:2425

5788

#: bzrlib/errors.py:2434

5765

5789

msgid ""

5766

5790

"Could not determine revno for {%(revision_id)s} because its ancestry shows a "

5767

5791

"ghost at {%(ghost_revision_id)s}"

5768

5792

msgstr ""

5769

5793

5770

#: bzrlib/errors.py:2435

5794

#: bzrlib/errors.py:2444

5771

5795

msgid "Ghost revision {%(revision_id)s} cannot be used here."

5772

5796

msgstr ""

5773

5797

5774

#: bzrlib/errors.py:2486

5798

#: bzrlib/errors.py:2495

5775

5799

msgid ""

5776

5800

"A merge directive must provide either a bundle or a public branch location."

5777

5801

msgstr ""

5778

5802

5779

#: bzrlib/errors.py:2493

5803

#: bzrlib/errors.py:2502

5780

5804

msgid "Bad merge directive payload %(start)r"

5781

5805

msgstr ""

5782

5806

5783

#: bzrlib/errors.py:2503

5807

#: bzrlib/errors.py:2512

5784

5808

msgid "Preview patch does not match requested changes."

5785

5809

msgstr ""

5786

5810

5787

#: bzrlib/errors.py:2509

5811

#: bzrlib/errors.py:2518

5788

5812

msgid "Patch_type was %(patch_type)s, but no patch was supplied."

5789

5813

msgstr ""

5790

5814

5791

#: bzrlib/errors.py:2519

5815

#: bzrlib/errors.py:2528

5792

5816

msgid ""

5793

5817

"Your branch does not have all of the revisions required in order to merge "

5794

5818

"this merge directive and the target location specified in the merge "

5795

5819

"directive is not a branch: %(location)s."

5796

5820

msgstr ""

5797

5821

5798

#: bzrlib/errors.py:2531

5822

#: bzrlib/errors.py:2540

5799

5823

msgid "Unsupported entry kind %(kind)s"

5800

5824

msgstr ""

5801

5825

5802

#: bzrlib/errors.py:2539

5826

#: bzrlib/errors.py:2548

5803

5827

msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"

5804

5828

msgstr ""

5805

5829

5806

#: bzrlib/errors.py:2549

5830

#: bzrlib/errors.py:2558

5807

5831

msgid "Subsume target %(other_tree)s needs to be upgraded."

5808

5832

msgstr ""

5809

5833

5810

#: bzrlib/errors.py:2568

5834

#: bzrlib/errors.py:2577

5811

5835

msgid "No such tag: %(tag_name)s"

5812

5836

msgstr ""

5813

5837

5814

#: bzrlib/errors.py:2576

5838

#: bzrlib/errors.py:2585

5815

5839

msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."

5816

5840

msgstr ""

5817

5841

5818

#: bzrlib/errors.py:2585

5842

#: bzrlib/errors.py:2594

5819

5843

msgid "Tag %(tag_name)s already exists."

5820

5844

msgstr ""

5821

5845

5822

#: bzrlib/errors.py:2593

5846

#: bzrlib/errors.py:2602

5823

5847

msgid ""

5824

5848

"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "

5825

5849

"bugs\" for more information on this feature."

5826

5850

msgstr ""

5827

5851

5828

#: bzrlib/errors.py:2603

5852

#: bzrlib/errors.py:2612

5829

5853

msgid ""

5830

5854

"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"

5831

5855

msgstr ""

5832

5856

5833

#: bzrlib/errors.py:2613

5857

#: bzrlib/errors.py:2622

5834

5858

msgid ""

5835

5859

"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"

5836

5860

msgstr ""

5837

5861

5838

#: bzrlib/errors.py:2623

5862

#: bzrlib/errors.py:2632

5839

5863

msgid "Invalid line in bugs property: '%(line)s'"

5840

5864

msgstr ""

5841

5865

5842

#: bzrlib/errors.py:2631

5866

#: bzrlib/errors.py:2640

5843

5867

msgid "Invalid bug status: '%(status)s'"

5844

5868

msgstr ""

5845

5869

5846

#: bzrlib/errors.py:2639

5870

#: bzrlib/errors.py:2648

5847

5871

msgid "Could not understand response from smart server: %(response_tuple)r"

5848

5872

msgstr ""

5849

5873

5850

#: bzrlib/errors.py:2678

5874

#: bzrlib/errors.py:2687

5851

5875

msgid "Server sent an unexpected error: %(error_tuple)r"

5852

5876

msgstr ""

5853

5877

5854

#: bzrlib/errors.py:2697

5878

#: bzrlib/errors.py:2706

5855

5879

msgid "Unrecognised container format: %(container_format)r"

5856

5880

msgstr ""

5857

5881

5858

#: bzrlib/errors.py:2705

5882

#: bzrlib/errors.py:2714

5859

5883

msgid "Unexpected end of container stream"

5860

5884

msgstr ""

5861

5885

5862

#: bzrlib/errors.py:2710

5886

#: bzrlib/errors.py:2719

5863

5887

msgid "Unknown record type: %(record_type)r"

5864

5888

msgstr ""

5865

5889

5866

#: bzrlib/errors.py:2718

5890

#: bzrlib/errors.py:2727

5867

5891

msgid "Invalid record: %(reason)s"

5868

5892

msgstr ""

5869

5893

5870

#: bzrlib/errors.py:2726

5894

#: bzrlib/errors.py:2735

5871

5895

msgid "Container has data after end marker: %(excess)r"

5872

5896

msgstr ""

5873

5897

5874

#: bzrlib/errors.py:2734

5898

#: bzrlib/errors.py:2743

5875

5899

msgid "Container has multiple records with the same name: %(name)s"

5876

5900

msgstr ""

5877

5901

5878

#: bzrlib/errors.py:2747

5902

#: bzrlib/errors.py:2756

5879

5903

msgid "Corrupt or incompatible data stream: %(reason)s"

5880

5904

msgstr ""

5881

5905

5882

#: bzrlib/errors.py:2755

5906

#: bzrlib/errors.py:2764

5883

5907

msgid "SMTP error: %(error)s"

5884

5908

msgstr ""

5885

5909

5886

#: bzrlib/errors.py:2763

5910

#: bzrlib/errors.py:2772

5887

5911

msgid "No message supplied."

5888

5912

msgstr ""

5889

5913

5890

#: bzrlib/errors.py:2768

5914

#: bzrlib/errors.py:2777

5891

5915

msgid "No mail-to address (--mail-to) or output (-o) specified."

5892

5916

msgstr ""

5893

5917

5894

#: bzrlib/errors.py:2773

5895

msgid "Unknown mail client: %(mail_client)s"

5896

msgstr ""

5897

5898

#: bzrlib/errors.py:2781

5918

#: bzrlib/errors.py:2782

5899

5919

msgid ""

5900

5920

"Unable to find mail client with the following names: "

5901

5921

"%(mail_command_list_string)s"

5902

5922

msgstr ""

5903

5923

5904

#: bzrlib/errors.py:2791

5924

#: bzrlib/errors.py:2792

5905

5925

msgid "SMTP connection to %(host)s refused"

5906

5926

msgstr ""

5907

5927

5908

#: bzrlib/errors.py:2800

5928

#: bzrlib/errors.py:2801

5909

5929

msgid "Please specify smtp_server. No server at default %(host)s."

5910

5930

msgstr ""

5911

5931

5912

#: bzrlib/errors.py:2814

5932

#: bzrlib/errors.py:2815

5913

5933

msgid ""

5914

5934

"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"

5915

5935

"reconfigure."

5916

5936

msgstr ""

5917

5937

5918

#: bzrlib/errors.py:2826

5938

#: bzrlib/errors.py:2827

5919

5939

msgid "'%(display_url)s' is already a branch."

5920

5940

msgstr ""

5921

5941

5922

#: bzrlib/errors.py:2831

5942

#: bzrlib/errors.py:2832

5923

5943

msgid "'%(display_url)s' is already a tree."

5924

5944

msgstr ""

5925

5945

5926

#: bzrlib/errors.py:2836

5946

#: bzrlib/errors.py:2837

5927

5947

msgid "'%(display_url)s' is already a checkout."

5928

5948

msgstr ""

5929

5949

5930

#: bzrlib/errors.py:2841

5950

#: bzrlib/errors.py:2842

5931

5951

msgid "'%(display_url)s' is already a lightweight checkout."

5932

5952

msgstr ""

5933

5953

5934

#: bzrlib/errors.py:2846

5954

#: bzrlib/errors.py:2847

5935

5955

msgid "'%(display_url)s' is already using a shared repository."

5936

5956

msgstr ""

5937

5957

5938

#: bzrlib/errors.py:2851

5958

#: bzrlib/errors.py:2852

5939

5959

msgid "'%(display_url)s' is already standalone."

5940

5960

msgstr ""

5941

5961

5942

#: bzrlib/errors.py:2856

5962

#: bzrlib/errors.py:2857

5943

5963

msgid "Shared repository '%(display_url)s' already creates working trees."

5944

5964

msgstr ""

5945

5965

5946

#: bzrlib/errors.py:2862

5966

#: bzrlib/errors.py:2863

5947

5967

msgid ""

5948

5968

"Shared repository '%(display_url)s' already doesn't create working trees."

5949

5969

msgstr ""

5950

5970

5951

#: bzrlib/errors.py:2868

5971

#: bzrlib/errors.py:2869

5952

5972

msgid "Requested reconfiguration of '%(display_url)s' is not supported."

5953

5973

msgstr ""

5954

5974

5955

#: bzrlib/errors.py:2873

5975

#: bzrlib/errors.py:2874

5956

5976

msgid "No location could be found to bind to at %(display_url)s."

5957

5977

msgstr ""

5958

5978

5959

#: bzrlib/errors.py:2878

5979

#: bzrlib/errors.py:2879

5960

5980

msgid ""

5961

5981

"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "

5962

5982

"status).%(more)s"

5963

5983

msgstr ""

5964

5984

5965

#: bzrlib/errors.py:2897

5985

#: bzrlib/errors.py:2898

5966

5986

msgid ""

5967

5987

"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"

5968

5988

"list).%(more)s"

5969

5989

msgstr ""

5970

5990

5971

#: bzrlib/errors.py:2903

5991

#: bzrlib/errors.py:2904

5972

5992

msgid "Variable {%(name)s} is not available."

5973

5993

msgstr ""

5974

5994

5975

#: bzrlib/errors.py:2911

5995

#: bzrlib/errors.py:2912

5976

5996

msgid "No template specified."

5977

5997

msgstr ""

5978

5998

5979

#: bzrlib/errors.py:2916

5999

#: bzrlib/errors.py:2917

5980

6000

msgid "Unable to create symlink %(path_str)son this platform"

5981

6001

msgstr ""

5982

6002

5983

#: bzrlib/errors.py:2931

6003

#: bzrlib/errors.py:2932

5984

6004

msgid ""

5985

6005

"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "

5986

6006

"\"original\", \"local\"."

5987

6007

msgstr ""

5988

6008

5989

#: bzrlib/errors.py:2965

6009

#: bzrlib/errors.py:2966

5990

6010

msgid ""

5991

6011

"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"

5992

6012

msgstr ""

5993

6013

5994

#: bzrlib/errors.py:2977

6014

#: bzrlib/errors.py:2978

5995

6015

msgid "The \"%(config_id)s\" configuration does not exist."

5996

6016

msgstr ""

5997

6017

5998

#: bzrlib/errors.py:2985

6018

#: bzrlib/errors.py:2986

5999

6019

msgid "The \"%(option_name)s\" configuration option does not exist."

6000

6020

msgstr ""

6001

6021

6002

#: bzrlib/errors.py:2993

6022

#: bzrlib/errors.py:2994

6003

6023

msgid "The alias \"%(alias_name)s\" does not exist."

6004

6024

msgstr ""

6005

6025

6006

#: bzrlib/errors.py:3007

6026

#: bzrlib/errors.py:3008

6007

6027

msgid "\"%(alias_name)s\" is not a valid location alias."

6008

6028

msgstr ""

6009

6029

6010

#: bzrlib/errors.py:3015

6030

#: bzrlib/errors.py:3016

6011

6031

msgid "No %(alias_name)s location assigned."

6012

6032

msgstr ""

6013

6033

6014

#: bzrlib/errors.py:3023

6034

#: bzrlib/errors.py:3024

6015

6035

msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."

6016

6036

msgstr ""

6017

6037

6018

#: bzrlib/errors.py:3033

6038

#: bzrlib/errors.py:3034

6019

6039

msgid "Unknown rules detected: %(unknowns_str)s."

6020

6040

msgstr ""

6021

6041

6022

#: bzrlib/errors.py:3044

6042

#: bzrlib/errors.py:3045

6023

6043

msgid "Tip change rejected: %(msg)s"

6024

6044

msgstr ""

6025

6045

6026

#: bzrlib/errors.py:3052

6046

#: bzrlib/errors.py:3053

6027

6047

msgid "Shelf corrupt."

6028

6048

msgstr ""

6029

6049

6030

#: bzrlib/errors.py:3057

6050

#: bzrlib/errors.py:3058

6031

6051

msgid "Corruption while decompressing repository file%(orig_error)s"

6032

6052

msgstr ""

6033

6053

6034

#: bzrlib/errors.py:3069

6054

#: bzrlib/errors.py:3070

6035

6055

msgid "No changes are shelved with id \"%(shelf_id)d\"."

6036

6056

msgstr ""

6037

6057

6038

#: bzrlib/errors.py:3077

6058

#: bzrlib/errors.py:3078

6039

6059

msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."

6040

6060

msgstr ""

6041

6061

6042

#: bzrlib/errors.py:3085

6062

#: bzrlib/errors.py:3086

6043

6063

msgid ""

6044

6064

"An attempt to access a url outside the server jail was made: '%(url)s'."

6045

6065

msgstr ""

6046

6066

6047

#: bzrlib/errors.py:3093

6067

#: bzrlib/errors.py:3094

6048

6068

msgid "The user aborted the operation."

6049

6069

msgstr ""

6050

6070

6051

#: bzrlib/errors.py:3098

6071

#: bzrlib/errors.py:3099

6052

6072

msgid "Branching '%(url)s'(%(format)s) must create a working tree."

6053

6073

msgstr ""

6054

6074

6055

#: bzrlib/errors.py:3108

6075

#: bzrlib/errors.py:3109

6056

6076

msgid "No such view: %(view_name)s."

6057

6077

msgstr ""

6058

6078

6059

#: bzrlib/errors.py:3118

6079

#: bzrlib/errors.py:3119

6060

6080

msgid ""

6061

6081

"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "

6062

6082

"to a later format."

6063

6083

msgstr ""

6064

6084

6065

#: bzrlib/errors.py:3127

6085

#: bzrlib/errors.py:3128

6066

6086

msgid ""

6067

6087

"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"

6068

6088

msgstr ""

6069

6089

6070

#: bzrlib/errors.py:3194

6090

#: bzrlib/errors.py:3195

6071

6091

msgid "%(bzrdir)r does not support co-located branches."

6072

6092

msgstr ""

6073

6093

6074

#: bzrlib/errors.py:3200

6094

#: bzrlib/errors.py:3201

6075

6095

msgid ""

6076

6096

"Unable to determine your name.\n"

6077

6097

"Please, set your name with the 'whoami' command.\n"

6078

6098

"E.g. bzr whoami \"Your Name <name@example.com>\""

6079

6099

msgstr ""

6080

6100

6081

#: bzrlib/errors.py:3209

6101

#: bzrlib/errors.py:3210

6082

6102

msgid "Invalid pattern(s) found. %(msg)s"

6083

6103

msgstr ""

6084

6104

6085

#: bzrlib/errors.py:3217

6105

#: bzrlib/errors.py:3218

6086

6106

msgid ""

6087

6107

"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "

6088

6108

"unbind` to fix."

6089

6109

msgstr ""

6090

6110

6091

#: bzrlib/errors.py:3228

6111

#: bzrlib/errors.py:3229

6092

6112

msgid "Loop involving %(refs)r while expanding \"%(string)s\"."

6093

6113

msgstr ""

6094

6114

6095

#: bzrlib/errors.py:3237

6115

#: bzrlib/errors.py:3238

6096

6116

msgid "Option %(name)s is not defined while expanding \"%(string)s\"."

6097

6117

msgstr ""

6098

6118

6099

#: bzrlib/errors.py:3246

6119

#: bzrlib/errors.py:3247

6100

6120

msgid ""

6101

6121

"No compatible object available for operations from %(source)r to %(target)r."

6102

6122

msgstr ""

6103

6123

6104

#: bzrlib/errors.py:3256

6124

#: bzrlib/errors.py:3257

6105

6125

msgid ""

6106

6126

"VFS requests over the smart server are not allowed. Encountered: %(method)s, "

6107

6127

"%(arguments)s."

6108

6128

msgstr ""

6109

6129

6110

#: bzrlib/errors.py:3266

6130

#: bzrlib/errors.py:3267

6111

6131

msgid ""

6112

6132

"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "

6113

6133

"format %(format)r"

6114

6134

msgstr ""

6115

6135

6116

#: bzrlib/errors.py:3278

6136

#: bzrlib/errors.py:3279

6117

6137

msgid ""

6118

6138

"Missing feature %(feature)s not provided by this version of Bazaar or any "

6119

6139

"plugin."

6120

6140

msgstr ""

6121

6141

6122

#: bzrlib/errors.py:3291

6142

#: bzrlib/errors.py:3292

6123

6143

msgid "Binary files section encountered."

6124

6144

msgstr ""

6125

6145

6126

#: bzrlib/errors.py:3299

6146

#: bzrlib/errors.py:3300

6127

6147

msgid ""

6128

6148

"Malformed patch header. %(desc)s\n"

6129

6149

"%(line)r"

6130

6150

msgstr ""

6131

6151

6132

#: bzrlib/errors.py:3308

6152

#: bzrlib/errors.py:3309

6133

6153

msgid ""

6134

6154

"Malformed hunk header. %(desc)s\n"

6135

6155

"%(line)r"

6136

6156

msgstr ""

6137

6157

6138

#: bzrlib/errors.py:3317

6158

#: bzrlib/errors.py:3318

6139

6159

msgid ""

6140

6160

"Malformed line. %(desc)s\n"

6141

6161

"%(line)r"

6142

6162

msgstr ""

6143

6163

6144

#: bzrlib/errors.py:3327

6164

#: bzrlib/errors.py:3328

6145

6165

msgid ""

6146

6166

"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "

6147

6167

"but patch says it should be \"%(patch_line)s\""

6148

6168

msgstr ""

6149

6169

6150

#: bzrlib/errors.py:3338

6170

#: bzrlib/errors.py:3339

6151

6171

msgid "The feature %(feature)s has already been registered."

6152

6172

msgstr ""

6153

6173

6199

6219

"regular push."

6200

6220

msgstr ""

6201

6221

6202

#: bzrlib/gpg.py:119 bzrlib/gpg.py:460

6222

#: bzrlib/gpg.py:366

6223

msgid "No GnuPG key results for pattern: {0}"

6224

msgstr ""

6225

6226

#: bzrlib/gpg.py:439

6203

6227

msgid "{0} commits with valid signatures"

6204

6228

msgstr ""

6205

6229

6206

#: bzrlib/gpg.py:123 bzrlib/gpg.py:465

6230

#: bzrlib/gpg.py:445

6207

6231

msgid "{0} commit with unknown key"

6208

6232

msgid_plural "{0} commits with unknown keys"

6209

6233

msgstr[0] ""

6210

6234

msgstr[1] ""

6211

6235

6212

#: bzrlib/gpg.py:129 bzrlib/gpg.py:472

6236

#: bzrlib/gpg.py:453

6213

6237

msgid "{0} commit not valid"

6214

6238

msgid_plural "{0} commits not valid"

6215

6239

msgstr[0] ""

6216

6240

msgstr[1] ""

6217

6241

6218

#: bzrlib/gpg.py:135 bzrlib/gpg.py:479

6242

#: bzrlib/gpg.py:461

6219

6243

msgid "{0} commit not signed"

6220

6244

msgid_plural "{0} commits not signed"

6221

6245

msgstr[0] ""

6222

6246

msgstr[1] ""

6223

6247

6224

#: bzrlib/gpg.py:141 bzrlib/gpg.py:486

6248

#: bzrlib/gpg.py:469

6225

6249

msgid "{0} commit with key now expired"

6226

6250

msgid_plural "{0} commits with key now expired"

6227

6251

msgstr[0] ""

6228

6252

msgstr[1] ""

6229

6253

6230

#: bzrlib/gpg.py:343

6231

msgid "No GnuPG key results for pattern: {0}"

6232

msgstr ""

6254

#: bzrlib/gpg.py:489

6255

msgid "{0} commit by author {1} with key {2} now expired"

6256

msgid_plural "{0} commits by author {1} with key {2} now expired"

6257

msgstr[0] ""

6258

msgstr[1] ""

6233

6259

6234

#: bzrlib/gpg.py:386

6260

#: bzrlib/gpg.py:505

6235

6261

msgid "{0} signed {1} commit"

6236

6262

msgid_plural "{0} signed {1} commits"

6237

6263

msgstr[0] ""

6238

6264

msgstr[1] ""

6239

6265

6240

#: bzrlib/gpg.py:403 bzrlib/gpg.py:419

6266

#: bzrlib/gpg.py:522 bzrlib/gpg.py:539

6241

6267

msgid "{0} commit by author {1}"

6242

6268

msgid_plural "{0} commits by author {1}"

6243

6269

msgstr[0] ""

6244

6270

msgstr[1] ""

6245

6271

6246

#: bzrlib/gpg.py:433

6272

#: bzrlib/gpg.py:554

6247

6273

msgid "Unknown key {0} signed {1} commit"

6248

6274

msgid_plural "Unknown key {0} signed {1} commits"

6249

6275

msgstr[0] ""

6250

6276

msgstr[1] ""

6251

6277

6252

#: bzrlib/gpg.py:452

6253

msgid "{0} commit by author {1} with key {2} now expired"

6254

msgid_plural "{0} commits by author {1} with key {2} now expired"

6255

msgstr[0] ""

6256

msgstr[1] ""

6257

6258

6278

#: bzrlib/groupcompress.py:1739

6259

6279

#, python-format

6260

6280

msgid "Insert claimed random_id=True, but then inserted %r two times"

6261

6281

msgstr ""

6262

6282

6263

#: bzrlib/hooks.py:331

6283

#: bzrlib/hooks.py:313

6264

6284

#, python-format

6265

6285

msgid "Introduced in: %s"

6266

6286

msgstr ""

6267

6287

6268

#: bzrlib/hooks.py:334

6288

#: bzrlib/hooks.py:316

6269

6289

#, python-format

6270

6290

msgid "Deprecated in: %s"

6271

6291

msgstr ""

6314

6334

"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"

6315

6335

msgstr ""

6316

6336

6317

#: bzrlib/log.py:572

6337

#: bzrlib/log.py:563

6318

6338

msgid "--exclude-common-ancestry requires two different revisions"

6319

6339

msgstr ""

6320

6340

6321

#: bzrlib/log.py:574

6341

#: bzrlib/log.py:565

6322

6342

#, python-format

6323

6343

msgid "invalid direction %r"

6324

6344

msgstr ""

6325

6345

6326

#: bzrlib/log.py:662

6346

#: bzrlib/log.py:653

6327

6347

msgid "Start revision not found in history of end revision."

6328

6348

msgstr ""

6329

6349

6330

#: bzrlib/log.py:1080 bzrlib/log.py:1138

6350

#: bzrlib/log.py:1071 bzrlib/log.py:1129

6331

6351

msgid "Logging revision 0 is invalid."

6332

6352

msgstr ""

6333

6353

6334

#: bzrlib/log.py:1082 bzrlib/log.py:1140

6354

#: bzrlib/log.py:1073 bzrlib/log.py:1131

6335

6355

msgid "Start revision must be older than the end revision."

6336

6356

msgstr ""

6337

6357

6338

#: bzrlib/log.py:1827

6358

#: bzrlib/log.py:1818

6339

6359

#, python-format

6340

6360

msgid "unknown log formatter: %r"

6341

6361

msgstr ""

6342

6362

6343

#: bzrlib/log.py:2123

6363

#: bzrlib/log.py:2114

6344

6364

msgid "fixes bug"

6345

6365

msgid_plural "fixes bugs"

6346

6366

msgstr[0] ""

6355

6375

msgid "%d conflicts encountered."

6356

6376

msgstr ""

6357

6377

6358

#: bzrlib/merge.py:845 bzrlib/merge.py:1933

6378

#: bzrlib/merge.py:845 bzrlib/merge.py:1868

6359

6379

msgid "Preparing file merge"

6360

6380

msgstr ""

6361

6381

6477

6497

msgid "lstat/stat of ({0!r}): {1!r}"

6478

6498

msgstr ""

6479

6499

6480

#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019

6500

#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041

6481

6501

#, python-format

6482

6502

msgid "sorry, %r not allowed in path"

6483

6503

msgstr ""

6484

6504

6485

#: bzrlib/osutils.py:1237

6505

#: bzrlib/osutils.py:1259

6486

6506

#, python-format

6487

6507

msgid "%r is too short to calculate a relative path"

6488

6508

msgstr ""

6521

6541

msgid "Generate only the shell function, don't enable it"

6522

6542

msgstr ""

6523

6543

6524

#: bzrlib/plugins/launchpad/__init__.py:81

6544

#: bzrlib/plugins/launchpad/account.py:66

6545

msgid "Setting ssh/sftp usernames for launchpad.net."

6546

msgstr ""

6547

6548

#: bzrlib/plugins/launchpad/cmds.py:44

6525

6549

msgid "Register a branch with launchpad.net."

6526

6550

msgstr ""

6527

6551

6528

#: bzrlib/plugins/launchpad/__init__.py:83

6552

#: bzrlib/plugins/launchpad/cmds.py:46

6529

6553

msgid ""

6530

6554

"This command lists a bzr branch in the directory of branches on\n"

6531

6555

"launchpad.net. Registration allows the branch to be associated with\n"

6532

6556

"bugs or specifications."

6533

6557

msgstr ""

6534

6558

6535

#: bzrlib/plugins/launchpad/__init__.py:87

6559

#: bzrlib/plugins/launchpad/cmds.py:50

6536

6560

msgid ""

6537

6561

"Before using this command you must register the project to which the\n"

6538

6562

"branch belongs, and create an account for yourself on launchpad.net."

6539

6563

msgstr ""

6540

6564

6541

#: bzrlib/plugins/launchpad/__init__.py:90

6565

#: bzrlib/plugins/launchpad/cmds.py:53

6542

6566

msgid ""

6543

6567

"arguments:\n"

6544

6568

" public_url: The publicly visible url for the branch to register.\n"

6550

6574

" otherwise error."

6551

6575

msgstr ""

6552

6576

6553

#: bzrlib/plugins/launchpad/__init__.py:99

6577

#: bzrlib/plugins/launchpad/cmds.py:62

6554

6578

msgid ""

6555

6579

"example:\n"

6556

6580

" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"

6557

6581

" --project fooproject"

6558

6582

msgstr ""

6559

6583

6560

#: bzrlib/plugins/launchpad/__init__.py:106

6584

#: bzrlib/plugins/launchpad/cmds.py:69

6561

6585

msgid "Launchpad project short name to associate with the branch."

6562

6586

msgstr ""

6563

6587

6564

#: bzrlib/plugins/launchpad/__init__.py:113

6588

#: bzrlib/plugins/launchpad/cmds.py:76

6565

6589

msgid ""

6566

6590

"Short name for the branch; by default taken from the last component of the "

6567

6591

"url."

6568

6592

msgstr ""

6569

6593

6570

#: bzrlib/plugins/launchpad/__init__.py:117

6594

#: bzrlib/plugins/launchpad/cmds.py:80

6571

6595

msgid "One-sentence description of the branch."

6572

6596

msgstr ""

6573

6597

6574

#: bzrlib/plugins/launchpad/__init__.py:120

6598

#: bzrlib/plugins/launchpad/cmds.py:83

6575

6599

msgid "Longer description of the purpose or contents of the branch."

6576

6600

msgstr ""

6577

6601

6578

#: bzrlib/plugins/launchpad/__init__.py:123

6602

#: bzrlib/plugins/launchpad/cmds.py:86

6579

6603

msgid "Branch author's email address, if not yourself."

6580

6604

msgstr ""

6581

6605

6582

#: bzrlib/plugins/launchpad/__init__.py:126

6606

#: bzrlib/plugins/launchpad/cmds.py:89

6583

6607

msgid "The bug this branch fixes."

6584

6608

msgstr ""

6585

6609

6586

#: bzrlib/plugins/launchpad/__init__.py:129

6610

#: bzrlib/plugins/launchpad/cmds.py:92

6587

6611

msgid "Prepare the request but don't actually send it."

6588

6612

msgstr ""

6589

6613

6590

#: bzrlib/plugins/launchpad/__init__.py:151

6614

#: bzrlib/plugins/launchpad/cmds.py:114

6591

6615

msgid ""

6592

6616

"register-branch requires a public branch url - see bzr help register-branch."

6593

6617

msgstr ""

6594

6618

6595

#: bzrlib/plugins/launchpad/__init__.py:159

6619

#: bzrlib/plugins/launchpad/cmds.py:122

6596

6620

msgid "--product is deprecated; please use --project."

6597

6621

msgstr ""

6598

6622

6599

#: bzrlib/plugins/launchpad/__init__.py:191

6623

#: bzrlib/plugins/launchpad/cmds.py:152

6600

6624

msgid "Open a Launchpad branch page in your web browser."

6601

6625

msgstr ""

6602

6626

6603

#: bzrlib/plugins/launchpad/__init__.py:196

6627

#: bzrlib/plugins/launchpad/cmds.py:157

6604

6628

msgid "Do not actually open the browser. Just say the URL we would use."

6605

6629

msgstr ""

6606

6630

6607

#: bzrlib/plugins/launchpad/__init__.py:231

6631

#: bzrlib/plugins/launchpad/cmds.py:192

6608

6632

#, python-format

6609

6633

msgid "Opening %s in web browser"

6610

6634

msgstr ""

6611

6635

6612

#: bzrlib/plugins/launchpad/__init__.py:241

6636

#: bzrlib/plugins/launchpad/cmds.py:200

6613

6637

msgid "Show or set the Launchpad user ID."

6614

6638

msgstr ""

6615

6639

6616

#: bzrlib/plugins/launchpad/__init__.py:243

6640

#: bzrlib/plugins/launchpad/cmds.py:202

6617

6641

msgid ""

6618

6642

"When communicating with Launchpad, some commands need to know your\n"

6619

6643

"Launchpad user ID. This command can be used to set or show the\n"

6620

6644

"user ID that Bazaar will use for such communication."

6621

6645

msgstr ""

6622

6646

6623

#: bzrlib/plugins/launchpad/__init__.py:247

6647

#: bzrlib/plugins/launchpad/cmds.py:206

6624

6648

msgid ""

6625

6649

":Examples:\n"

6626

6650

" Show the Launchpad ID of the current user::"

6627

6651

msgstr ""

6628

6652

6629

#: bzrlib/plugins/launchpad/__init__.py:250

6653

#: bzrlib/plugins/launchpad/cmds.py:209

6630

6654

msgid " bzr launchpad-login"

6631

6655

msgstr ""

6632

6656

6633

#: bzrlib/plugins/launchpad/__init__.py:252

6657

#: bzrlib/plugins/launchpad/cmds.py:211

6634

6658

msgid " Set the Launchpad ID of the current user to 'bob'::"

6635

6659

msgstr ""

6636

6660

6637

#: bzrlib/plugins/launchpad/__init__.py:254

6661

#: bzrlib/plugins/launchpad/cmds.py:213

6638

6662

msgid " bzr launchpad-login bob"

6639

6663

msgstr ""

6640

6664

6641

#: bzrlib/plugins/launchpad/__init__.py:261

6665

#: bzrlib/plugins/launchpad/cmds.py:220

6642

6666

msgid "Don't check that the user name is valid."

6643

6667

msgstr ""

6644

6668

6645

#: bzrlib/plugins/launchpad/__init__.py:276

6646

#: bzrlib/plugins/launchpad/__init__.py:287

6669

#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246

6647

6670

msgid "Launchpad user ID exists and has SSH keys.\n"

6648

6671

msgstr ""

6649

6672

6650

#: bzrlib/plugins/launchpad/__init__.py:279

6673

#: bzrlib/plugins/launchpad/cmds.py:238

6651

6674

msgid "No Launchpad user ID configured.\n"

6652

6675

msgstr ""

6653

6676

6654

#: bzrlib/plugins/launchpad/__init__.py:290

6677

#: bzrlib/plugins/launchpad/cmds.py:249

6655

6678

#, python-format

6656

6679

msgid "Launchpad user ID set to '%s'.\n"

6657

6680

msgstr ""

6658

6681

6659

#: bzrlib/plugins/launchpad/__init__.py:298

6682

#: bzrlib/plugins/launchpad/cmds.py:255

6660

6683

msgid "Ask Launchpad to mirror a branch now."

6661

6684

msgstr ""

6662

6685

6663

#: bzrlib/plugins/launchpad/__init__.py:318

6686

#: bzrlib/plugins/launchpad/cmds.py:272

6664

6687

msgid "Propose merging a branch on Launchpad."

6665

6688

msgstr ""

6666

6689

6667

#: bzrlib/plugins/launchpad/__init__.py:320

6690

#: bzrlib/plugins/launchpad/cmds.py:274

6668

6691

msgid ""

6669

6692

"This will open your usual editor to provide the initial comment. When it\n"

6670

6693

"has created the proposal, it will open it in your default web browser."

6671

6694

msgstr ""

6672

6695

6673

#: bzrlib/plugins/launchpad/__init__.py:323

6696

#: bzrlib/plugins/launchpad/cmds.py:277

6674

6697

msgid ""

6675

6698

"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"

6676

6699

"is not supplied, the remembered submit branch will be used. If no submit\n"

6677

6700

"branch is remembered, the development focus will be used."

6678

6701

msgstr ""

6679

6702

6680

#: bzrlib/plugins/launchpad/__init__.py:327

6703

#: bzrlib/plugins/launchpad/cmds.py:281

6681

6704

msgid ""

6682

6705

"By default, the SUBMIT_BRANCH's review team will be requested to review\n"

6683

6706

"the merge proposal. This can be overriden by specifying --review (-R).\n"

6685

6708

"may optionally be followed by '=' and the review type. For example:"

6686

6709

msgstr ""

6687

6710

6688

#: bzrlib/plugins/launchpad/__init__.py:332

6711

#: bzrlib/plugins/launchpad/cmds.py:286

6689

6712

msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"

6690

6713

msgstr ""

6691

6714

6692

#: bzrlib/plugins/launchpad/__init__.py:334

6715

#: bzrlib/plugins/launchpad/cmds.py:288

6693

6716

msgid ""

6694

6717

"This will propose a merge, request \"jrandom\" to perform a review of\n"

6695

6718

"unspecified type, and request \"review-team\" to perform a \"qa\" review."

6696

6719

msgstr ""

6697

6720

6698

#: bzrlib/plugins/launchpad/__init__.py:339

6721

#: bzrlib/plugins/launchpad/cmds.py:293

6699

6722

msgid "Propose the merge on staging."

6700

6723

msgstr ""

6701

6724

6702

#: bzrlib/plugins/launchpad/__init__.py:341

6725

#: bzrlib/plugins/launchpad/cmds.py:295

6703

6726

msgid "Commit message."

6704

6727

msgstr ""

6705

6728

6706

#: bzrlib/plugins/launchpad/__init__.py:343

6729

#: bzrlib/plugins/launchpad/cmds.py:297

6707

6730

msgid "Mark the proposal as approved immediately."

6708

6731

msgstr ""

6709

6732

6710

#: bzrlib/plugins/launchpad/__init__.py:345

6733

#: bzrlib/plugins/launchpad/cmds.py:298

6734

msgid "The bug this proposal fixes."

6735

msgstr ""

6736

6737

#: bzrlib/plugins/launchpad/cmds.py:300

6711

6738

msgid "Requested reviewer and optional type."

6712

6739

msgstr ""

6713

6740

6714

#: bzrlib/plugins/launchpad/__init__.py:382

6741

#: bzrlib/plugins/launchpad/cmds.py:335

6715

6742

msgid "Find the proposal to merge this revision."

6716

6743

msgstr ""

6717

6744

6718

#: bzrlib/plugins/launchpad/__init__.py:384

6745

#: bzrlib/plugins/launchpad/cmds.py:337

6719

6746

msgid ""

6720

6747

"Finds the merge proposal(s) that discussed landing the specified revision.\n"

6721

6748

"This works only if the selected branch was the merge proposal target, and\n"

6723

6750

"are opened in a web browser."

6724

6751

msgstr ""

6725

6752

6726

#: bzrlib/plugins/launchpad/__init__.py:389

6753

#: bzrlib/plugins/launchpad/cmds.py:342

6727

6754

msgid ""

6728

6755

"Any revision involved in the merge may be specified-- the revision in\n"

6729

6756

"which the merge was performed, or one of the revisions that was merged."

6730

6757

msgstr ""

6731

6758

6732

#: bzrlib/plugins/launchpad/__init__.py:392

6759

#: bzrlib/plugins/launchpad/cmds.py:345

6733

6760

msgid "So, to find the merge proposal that reviewed line 1 of README::"

6734

6761

msgstr ""

6735

6762

6736

#: bzrlib/plugins/launchpad/__init__.py:394

6763

#: bzrlib/plugins/launchpad/cmds.py:347

6737

6764

msgid " bzr lp-find-proposal -r annotate:README:1"

6738

6765

msgstr ""

6739

6766

6740

#: bzrlib/plugins/launchpad/__init__.py:409

6767

#: bzrlib/plugins/launchpad/cmds.py:363

6741

6768

msgid "No review found."

6742

6769

msgstr ""

6743

6770

6744

#: bzrlib/plugins/launchpad/__init__.py:410

6771

#: bzrlib/plugins/launchpad/cmds.py:364

6745

6772

#, python-format

6746

6773

msgid "%d proposals(s) found."

6747

6774

msgstr ""

6748

6775

6749

#: bzrlib/plugins/launchpad/__init__.py:420

6776

#: bzrlib/plugins/launchpad/cmds.py:374

6750

6777

msgid "Finding revision-id"

6751

6778

msgstr ""

6752

6779

6753

#: bzrlib/plugins/launchpad/__init__.py:427

6780

#: bzrlib/plugins/launchpad/cmds.py:381

6754

6781

msgid "Finding merge"

6755

6782

msgstr ""

6756

6783

6757

#: bzrlib/plugins/launchpad/__init__.py:432

6784

#: bzrlib/plugins/launchpad/cmds.py:386

6758

6785

msgid "Finding revno"

6759

6786

msgstr ""

6760

6787

6761

#: bzrlib/plugins/launchpad/__init__.py:437

6788

#: bzrlib/plugins/launchpad/cmds.py:392

6762

6789

msgid "Finding Launchpad branch"

6763

6790

msgstr ""

6764

6791

6765

#: bzrlib/plugins/launchpad/__init__.py:440

6792

#: bzrlib/plugins/launchpad/cmds.py:395

6766

6793

msgid "Finding proposals"

6767

6794

msgstr ""

6768

6795

6769

#: bzrlib/plugins/launchpad/account.py:66

6770

msgid "Setting ssh/sftp usernames for launchpad.net."

6771

msgstr ""

6772

6773

6796

#: bzrlib/plugins/launchpad/lp_api.py:241

6774

6797

#: bzrlib/plugins/launchpad/lp_api.py:246

6775

6798

#, python-format

6813

6836

" remote: {2}"

6814

6837

msgstr ""

6815

6838

6816

#: bzrlib/plugins/launchpad/lp_propose.py:149

6839

#: bzrlib/plugins/launchpad/lp_propose.py:150

6817

6840

#, python-format

6818

6841

msgid "There is already a branch merge proposal: %s"

6819

6842

msgstr ""

6820

6843

6821

#: bzrlib/plugins/weave_fmt/bzrdir.py:236

6844

#: bzrlib/plugins/weave_fmt/bzrdir.py:237

6822

6845

msgid "pb parameter to convert() is deprecated"

6823

6846

msgstr ""

6824

6847

6825

#: bzrlib/plugins/weave_fmt/bzrdir.py:239

6848

#: bzrlib/plugins/weave_fmt/bzrdir.py:240

6826

6849

msgid "starting upgrade from format 4 to 5"

6827

6850

msgstr ""

6828

6851

6829

#: bzrlib/plugins/weave_fmt/bzrdir.py:249

6852

#: bzrlib/plugins/weave_fmt/bzrdir.py:250

6830

6853

msgid "note: upgrade may be faster if all store files are ungzipped first"

6831

6854

msgstr ""

6832

6855

6833

#: bzrlib/plugins/weave_fmt/bzrdir.py:278

6856

#: bzrlib/plugins/weave_fmt/bzrdir.py:279

6834

6857

msgid "converting revision"

6835

6858

msgstr ""

6836

6859

6837

#: bzrlib/plugins/weave_fmt/bzrdir.py:283

6860

#: bzrlib/plugins/weave_fmt/bzrdir.py:284

6838

6861

msgid "upgraded to weaves:"

6839

6862

msgstr ""

6840

6863

6841

#: bzrlib/plugins/weave_fmt/bzrdir.py:284

6864

#: bzrlib/plugins/weave_fmt/bzrdir.py:285

6842

6865

#, python-format

6843

6866

msgid "%6d revisions and inventories"

6844

6867

msgstr ""

6845

6868

6846

#: bzrlib/plugins/weave_fmt/bzrdir.py:286

6869

#: bzrlib/plugins/weave_fmt/bzrdir.py:287

6847

6870

#, python-format

6848

6871

msgid "%6d revisions not present"

6849

6872

msgstr ""

6850

6873

6851

#: bzrlib/plugins/weave_fmt/bzrdir.py:288

6874

#: bzrlib/plugins/weave_fmt/bzrdir.py:289

6852

6875

#, python-format

6853

6876

msgid "%6d texts"

6854

6877

msgstr ""

6855

6878

6856

#: bzrlib/plugins/weave_fmt/bzrdir.py:324

6879

#: bzrlib/plugins/weave_fmt/bzrdir.py:325

6857

6880

msgid "writing weave"

6858

6881

msgstr ""

6859

6882

6860

#: bzrlib/plugins/weave_fmt/bzrdir.py:328

6861

#: bzrlib/plugins/weave_fmt/bzrdir.py:330

6883

#: bzrlib/plugins/weave_fmt/bzrdir.py:329

6884

#: bzrlib/plugins/weave_fmt/bzrdir.py:331

6862

6885

msgid "inventory"

6863

6886

msgstr ""

6864

6887

6865

#: bzrlib/plugins/weave_fmt/bzrdir.py:347

6888

#: bzrlib/plugins/weave_fmt/bzrdir.py:348

6866

6889

msgid "write revision"

6867

6890

msgstr ""

6868

6891

6869

#: bzrlib/plugins/weave_fmt/bzrdir.py:361

6892

#: bzrlib/plugins/weave_fmt/bzrdir.py:362

6870

6893

msgid "loading revision"

6871

6894

msgstr ""

6872

6895

6873

#: bzrlib/plugins/weave_fmt/bzrdir.py:366

6896

#: bzrlib/plugins/weave_fmt/bzrdir.py:367

6874

6897

#, python-format

6875

6898

msgid "revision {%s} not present in branch; will be converted as a ghost"

6876

6899

msgstr ""

6877

6900

6878

#: bzrlib/plugins/weave_fmt/bzrdir.py:506

6901

#: bzrlib/plugins/weave_fmt/bzrdir.py:507

6879

6902

msgid "starting upgrade from format 5 to 6"

6880

6903

msgstr ""

6881

6904

6882

#: bzrlib/plugins/weave_fmt/bzrdir.py:516

6905

#: bzrlib/plugins/weave_fmt/bzrdir.py:517

6883

6906

#, python-format

6884

6907

msgid "adding prefixes to %s"

6885

6908

msgstr ""

6886

6909

6887

#: bzrlib/plugins/weave_fmt/bzrdir.py:556

6910

#: bzrlib/plugins/weave_fmt/bzrdir.py:557

6888

6911

msgid "starting upgrade from format 6 to metadir"

6889

6912

msgstr ""

6890

6913

6891

#: bzrlib/plugins/weave_fmt/bzrdir.py:564

6914

#: bzrlib/plugins/weave_fmt/bzrdir.py:565

6892

6915

msgid "Removing ancestry.weave"

6893

6916

msgstr ""

6894

6917

6895

#: bzrlib/plugins/weave_fmt/bzrdir.py:569

6918

#: bzrlib/plugins/weave_fmt/bzrdir.py:570

6896

6919

msgid "Finding branch files"

6897

6920

msgstr ""

6898

6921

6899

#: bzrlib/plugins/weave_fmt/bzrdir.py:579

6922

#: bzrlib/plugins/weave_fmt/bzrdir.py:580

6900

6923

msgid "Upgrading repository"

6901

6924

msgstr ""

6902

6925

6903

#: bzrlib/plugins/weave_fmt/bzrdir.py:589

6926

#: bzrlib/plugins/weave_fmt/bzrdir.py:590

6904

6927

msgid "Upgrading branch"

6905

6928

msgstr ""

6906

6929

6907

#: bzrlib/plugins/weave_fmt/bzrdir.py:612

6930

#: bzrlib/plugins/weave_fmt/bzrdir.py:613

6908

6931

msgid "No working tree."

6909

6932

msgstr ""

6910

6933

6911

#: bzrlib/plugins/weave_fmt/bzrdir.py:619

6934

#: bzrlib/plugins/weave_fmt/bzrdir.py:620

6912

6935

msgid "Upgrading working tree"

6913

6936

msgstr ""

6914

6937

6915

#: bzrlib/plugins/weave_fmt/bzrdir.py:640

6938

#: bzrlib/plugins/weave_fmt/bzrdir.py:641

6916

6939

#, python-format

6917

6940

msgid "Make %s lock"

6918

6941

msgstr ""

6919

6942

6920

#: bzrlib/plugins/weave_fmt/bzrdir.py:651

6943

#: bzrlib/plugins/weave_fmt/bzrdir.py:652

6921

6944

#, python-format

6922

6945

msgid "Moving %s"

6923

6946

msgstr ""

6944

6967

msgid "Too many redirections trying to make %s."

6945

6968

msgstr ""

6946

6969

6947

#: bzrlib/push.py:147

6970

#: bzrlib/push.py:148

6948

6971

msgid ""

6949

6972

"These branches have diverged. See \"bzr help diverged-branches\" for more "

6950

6973

"information."

6951

6974

msgstr ""

6952

6975

6953

#: bzrlib/push.py:151

6976

#: bzrlib/push.py:152

6954

6977

#, python-format

6955

6978

msgid ""

6956

6979

"It is not possible to losslessly push to %s. You may want to use dpush "

6957

6980

"instead."

6958

6981

msgstr ""

6959

6982

6960

#: bzrlib/push.py:157

6983

#: bzrlib/push.py:158

6961

6984

#, python-format

6962

6985

msgid ""

6963

6986

"At %s you have a valid .bzr control directory, but not a branch or "

7074

7097

msgid "{0} => {1}"

7075

7098

msgstr ""

7076

7099

7077

#: bzrlib/repository.py:1787

7100

#: bzrlib/repository.py:1799

7078

7101

msgid "Moving repository to repository.backup"

7079

7102

msgstr ""

7080

7103

7081

#: bzrlib/repository.py:1794

7104

#: bzrlib/repository.py:1806

7082

7105

msgid "Creating new repository"

7083

7106

msgstr ""

7084

7107

7085

#: bzrlib/repository.py:1799

7108

#: bzrlib/repository.py:1811

7086

7109

msgid "Copying content"

7087

7110

msgstr ""

7088

7111

7089

#: bzrlib/repository.py:1803

7112

#: bzrlib/repository.py:1815

7090

7113

msgid "Deleting old repository content"

7091

7114

msgstr ""

7092

7115

7093

#: bzrlib/repository.py:1805

7116

#: bzrlib/repository.py:1817

7094

7117

msgid "repository converted"

7095

7118

msgstr ""

7096

7119

7098

7121

msgid "Using {0} {1}"

7099

7122

msgstr ""

7100

7123

7101

#: bzrlib/send.py:58

7124

#: bzrlib/send.py:59

7102

7125

#, python-format

7103

7126

msgid "Mail client \"%s\" does not support specifying body"

7104

7127

msgstr ""

7105

7128

7106

#: bzrlib/send.py:62

7129

#: bzrlib/send.py:63

7107

7130

msgid "--remember requires a branch to be specified."

7108

7131

msgstr ""

7109

7132

7110

#: bzrlib/send.py:77

7133

#: bzrlib/send.py:78

7111

7134

msgid "No submit branch known or specified"

7112

7135

msgstr ""

7113

7136

7114

#: bzrlib/send.py:80

7137

#: bzrlib/send.py:81

7115

7138

msgid "Using saved {0} location \"{1}\" to determine what changes to submit."

7116

7139

msgstr ""

7117

7140

7118

#: bzrlib/send.py:98

7141

#: bzrlib/send.py:99

7119

7142

#, python-format

7120

7143

msgid "No such send format '%s'."

7121

7144

msgstr ""

7122

7145

7123

#: bzrlib/send.py:114

7146

#: bzrlib/send.py:115

7124

7147

msgid "bzr send takes at most two one revision identifiers"

7125

7148

msgstr ""

7126

7149

7127

#: bzrlib/send.py:127

7150

#: bzrlib/send.py:128

7128

7151

msgid "No revisions to submit."

7129

7152

msgstr ""

7130

7153

7131

#: bzrlib/send.py:139

7154

#: bzrlib/send.py:140

7132

7155

msgid ""

7133

7156

"- not supported for merge directives that use more than one output file."

7134

7157

msgstr ""

7135

7158

7136

#: bzrlib/send.py:185

7159

#: bzrlib/send.py:186

7137

7160

msgid "Format 0.9 does not permit bundle with no patch"

7138

7161

msgstr ""

7139

7162

7290

7313

"anyway, use --force."

7291

7314

msgstr ""

7292

7315

7293

#: bzrlib/switch.py:125

7316

#: bzrlib/switch.py:129

7294

7317

msgid "Cannot switch a branch, only a checkout."

7295

7318

msgstr ""

7296

7319

7297

#: bzrlib/switch.py:163

7320

#: bzrlib/switch.py:167

7298

7321

#, python-format

7299

7322

msgid "Tree is up to date at revision %d."

7300

7323

msgstr ""

7301

7324

7302

#: bzrlib/switch.py:169

7325

#: bzrlib/switch.py:173

7303

7326

#, python-format

7304

7327

msgid "Updated to revision %d."

7305

7328

msgstr ""

7306

7329

7307

#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747

7330

#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736

7308

7331

msgid "Apply phase"

7309

7332

msgstr ""

7310

7333

7311

#: bzrlib/transform.py:1773 bzrlib/transform.py:1841

7334

#: bzrlib/transform.py:1762 bzrlib/transform.py:1830

7312

7335

msgid "removing file"

7313

7336

msgstr ""

7314

7337

7315

#: bzrlib/transform.py:1791 bzrlib/transform.py:1876

7338

#: bzrlib/transform.py:1780 bzrlib/transform.py:1865

7316

7339

msgid "adding file"

7317

7340

msgstr ""

7318

7341

7319

#: bzrlib/transform.py:2591

7342

#: bzrlib/transform.py:2590

7320

7343

msgid "Building tree"

7321

7344

msgstr ""

7322

7345

7323

#: bzrlib/transform.py:2681 bzrlib/transform.py:2708

7346

#: bzrlib/transform.py:2680 bzrlib/transform.py:2707

7324

7347

msgid "Adding file contents"

7325

7348

msgstr ""

7326

7349

7327

#: bzrlib/transform.py:3028

7350

#: bzrlib/transform.py:3009

7328

7351

msgid "Resolution pass"

7329

7352

msgstr ""

7330

7353

7333

7356

msgid "Authenticated as %s"

7334

7357

msgstr ""

7335

7358

7336

#: bzrlib/tree.py:634

7359

#: bzrlib/tree.py:637

7337

7360

msgid "*** {0} content-filter: {1} => {2!r}"

7338

7361

msgstr ""

7339

7362

7392

7415

msgid "failed to clean-up {0}: {1}"

7393

7416

msgstr ""

7394

7417

7395

#: bzrlib/vf_repository.py:1090

7418

#: bzrlib/vf_repository.py:1091

7396

7419

msgid "inventories"

7397

7420

msgstr ""

7398

7421

7399

#: bzrlib/vf_repository.py:1116

7422

#: bzrlib/vf_repository.py:1117

7400

7423

msgid "texts"

7401

7424

msgstr ""

7402

7425

7403

#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630

7426

#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631

7404

7427

msgid "Calculating text parents"

7405

7428

msgstr ""

7406

7429

7407

#: bzrlib/vf_repository.py:1706

7430

#: bzrlib/vf_repository.py:1707

7408

7431

msgid "Fetch texts"

7409

7432

msgstr ""

7410

7433

7411

#: bzrlib/vf_repository.py:2535

7434

#: bzrlib/vf_repository.py:2536

7412

7435

msgid "loading text store"

7413

7436

msgstr ""

7414

7437

7415

#: bzrlib/vf_repository.py:2541

7438

#: bzrlib/vf_repository.py:2542

7416

7439

msgid "checking text graph"

7417

7440

msgstr ""

7418

7441

7419

#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009

7420

#: bzrlib/vf_repository.py:3124

7442

#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012

7443

#: bzrlib/vf_repository.py:3127

7421

7444

msgid "Transferring revisions"

7422

7445

msgstr ""

7423

7446

7463

7486

msgid "PageFaultCount %8d"

7464

7487

msgstr ""

7465

7488

7466

#: bzrlib/workingtree.py:1478

7489

#: bzrlib/workingtree.py:1482

7467

7490

msgid "Rerun update after fixing the conflicts."

7468

7491

msgstr ""

7469

7492

7473

7496

7474

7497

#: dummy/help_topics/basic/detail.txt:1

7475

7498

msgid ""

7476

"Bazaar 2.5b6 -- a free distributed version-control tool\n"

7499

"Bazaar 2.6.0dev1 -- a free distributed version-control tool\n"

7477

7500

"http://bazaar.canonical.com/"

7478

7501

msgstr ""

7479

7502

11690

11713

msgstr ""

11691

11714

11692

11715

#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56

11693

#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259

11716

#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262

11694

11717

msgid "Introduced in: 2.2"

11695

11718

msgstr ""

11696

11719

11708

11731

"~~~~"

11709

11732

msgstr ""

11710

11733

11711

#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290

11712

#: en/help_topics/hooks.txt:304

11734

#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293

11735

#: en/help_topics/hooks.txt:307

11713

11736

msgid "Introduced in: 1.8"

11714

11737

msgstr ""

11715

11738

11739

11762

"~~~~~~~~~~~~~~~~~~~~~~"

11740

11763

msgstr ""

11741

11764

11742

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418

11765

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421

11743

11766

msgid "Introduced in: 1.4"

11744

11767

msgstr ""

11745

11768

11751

11774

"uncommit will all trigger this hook."

11752

11775

msgstr ""

11753

11776

11754

#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389

11777

#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392

11755

11778

msgid ""

11756

11779

"post_commit\n"

11757

11780

"~~~~~~~~~~~"

11759

11782

11760

11783

#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86

11761

11784

#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110

11762

#: en/help_topics/hooks.txt:145

11763

11785

msgid "Introduced in: 0.15"

11764

11786

msgstr ""

11765

11787

11864

11886

11865

11887

#: en/help_topics/hooks.txt:142

11866

11888

msgid ""

11867

"set_rh\n"

11868

"~~~~~~"

11869

msgstr ""

11870

11871

#: en/help_topics/hooks.txt:147

11872

msgid ""

11873

"Invoked whenever the revision history has been set via\n"

11874

"set_revision_history. The api signature is (branch, revision_history),\n"

11875

"and the branch will be write-locked. The set_rh hook can be expensive\n"

11876

"for bzr to trigger, a better hook to use is\n"

11877

"Branch.post_change_branch_tip."

11878

msgstr ""

11879

11880

#: en/help_topics/hooks.txt:153

11881

msgid ""

11882

11889

"transform_fallback_location\n"

11883

11890

"~~~~~~~~~~~~~~~~~~~~~~~~~~~"

11884

11891

msgstr ""

11885

11892

11886

#: en/help_topics/hooks.txt:156

11893

#: en/help_topics/hooks.txt:145

11887

11894

msgid "Introduced in: 1.9"

11888

11895

msgstr ""

11889

11896

11890

#: en/help_topics/hooks.txt:158

11897

#: en/help_topics/hooks.txt:147

11891

11898

msgid ""

11892

11899

"Called when a stacked branch is activating its fallback locations.\n"

11893

11900

"transform_fallback_location is called with (branch, url), and should\n"

11901

11908

"however undefined."

11902

11909

msgstr ""

11903

11910

11904

#: en/help_topics/hooks.txt:169

11911

#: en/help_topics/hooks.txt:158

11905

11912

msgid ""

11906

11913

"CommandHooks\n"

11907

11914

"------------"

11908

11915

msgstr ""

11909

11916

11910

#: en/help_topics/hooks.txt:172

11917

#: en/help_topics/hooks.txt:161

11911

11918

msgid ""

11912

11919

"extend_command\n"

11913

11920

"~~~~~~~~~~~~~~"

11914

11921

msgstr ""

11915

11922

11916

#: en/help_topics/hooks.txt:175

11923

#: en/help_topics/hooks.txt:164

11917

11924

msgid "Introduced in: 1.13"

11918

11925

msgstr ""

11919

11926

11920

#: en/help_topics/hooks.txt:177

11927

#: en/help_topics/hooks.txt:166

11921

11928

msgid ""

11922

11929

"Called after creating a command object to allow modifications such as\n"

11923

11930

"adding or removing options, docs etc. Called with the new\n"

11924

11931

"bzrlib.commands.Command object."

11925

11932

msgstr ""

11926

11933

11927

#: en/help_topics/hooks.txt:181

11934

#: en/help_topics/hooks.txt:170

11928

11935

msgid ""

11929

11936

"get_command\n"

11930

11937

"~~~~~~~~~~~"

11931

11938

msgstr ""

11932

11939

11933

#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196

11934

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464

11940

#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185

11941

#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467

11935

11942

msgid "Introduced in: 1.17"

11936

11943

msgstr ""

11937

11944

11938

#: en/help_topics/hooks.txt:186

11945

#: en/help_topics/hooks.txt:175

11939

11946

msgid ""

11940

11947

"Called when creating a single command. Called with (cmd_or_None,\n"

11941

11948

"command_name). get_command should either return the cmd_or_None\n"

11945

11952

"plugin_cmds.register_lazy."

11946

11953

msgstr ""

11947

11954

11948

#: en/help_topics/hooks.txt:193

11955

#: en/help_topics/hooks.txt:182

11949

11956

msgid ""

11950

11957

"get_missing_command\n"

11951

11958

"~~~~~~~~~~~~~~~~~~~"

11952

11959

msgstr ""

11953

11960

11954

#: en/help_topics/hooks.txt:198

11961

#: en/help_topics/hooks.txt:187

11955

11962

msgid ""

11956

11963

"Called when creating a single command if no command could be found.\n"

11957

11964

"Called with (command_name). get_missing_command should either return\n"

11958

11965

"None, or a Command object to be used for the command."

11959

11966

msgstr ""

11960

11967

11961

#: en/help_topics/hooks.txt:202

11968

#: en/help_topics/hooks.txt:191

11962

11969

msgid ""

11963

11970

"list_commands\n"

11964

11971

"~~~~~~~~~~~~~"

11965

11972

msgstr ""

11966

11973

11967

#: en/help_topics/hooks.txt:207

11974

#: en/help_topics/hooks.txt:196

11968

11975

msgid ""

11969

11976

"Called when enumerating commands. Called with a set of cmd_name\n"

11970

11977

"strings for all the commands found so far. This set is safe to mutate\n"

11972

11979

"set of command names."

11973

11980

msgstr ""

11974

11981

11975

#: en/help_topics/hooks.txt:212

11982

#: en/help_topics/hooks.txt:201

11983

msgid ""

11984

"post_command\n"

11985

"~~~~~~~~~~~~"

11986

msgstr ""

11987

11988

#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211

11989

msgid "Introduced in: 2.6"

11990

msgstr ""

11991

11992

#: en/help_topics/hooks.txt:206

11993

msgid "Called after executing a command. Called with the command object."

11994

msgstr ""

11995

11996

#: en/help_topics/hooks.txt:208

11997

msgid ""

11998

"pre_command\n"

11999

"~~~~~~~~~~~"

12000

msgstr ""

12001

12002

#: en/help_topics/hooks.txt:213

12003

msgid "Called prior to executing a command. Called with the command object."

12004

msgstr ""

12005

12006

#: en/help_topics/hooks.txt:215

11976

12007

msgid ""

11977

12008

"_ConfigHooks\n"

11978

12009

"------------"

11979

12010

msgstr ""

11980

12011

11981

#: en/help_topics/hooks.txt:215

12012

#: en/help_topics/hooks.txt:218

11982

12013

msgid ""

11983

12014

"get\n"

11984

12015

"~~~"

11985

12016

msgstr ""

11986

12017

11987

#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226

11988

#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241

11989

#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370

11990

#: en/help_topics/hooks.txt:443

12018

#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229

12019

#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244

12020

#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373

12021

#: en/help_topics/hooks.txt:446

11991

12022

msgid "Introduced in: 2.4"

11992

12023

msgstr ""

11993

12024

11994

#: en/help_topics/hooks.txt:220

12025

#: en/help_topics/hooks.txt:223

11995

12026

msgid ""

11996

12027

"Invoked when a config option is read. The signature is (stack, name,\n"

11997

12028

"value)."

11998

12029

msgstr ""

11999

12030

12000

#: en/help_topics/hooks.txt:223

12031

#: en/help_topics/hooks.txt:226

12001

12032

msgid ""

12002

12033

"load\n"

12003

12034

"~~~~"

12004

12035

msgstr ""

12005

12036

12006

#: en/help_topics/hooks.txt:228

12037

#: en/help_topics/hooks.txt:231

12007

12038

msgid "Invoked when a config store is loaded. The signature is (store)."

12008

12039

msgstr ""

12009

12040

12010

#: en/help_topics/hooks.txt:230

12041

#: en/help_topics/hooks.txt:233

12011

12042

msgid ""

12012

12043

"remove\n"

12013

12044

"~~~~~~"

12014

12045

msgstr ""

12015

12046

12016

#: en/help_topics/hooks.txt:235

12047

#: en/help_topics/hooks.txt:238

12017

12048

msgid ""

12018

12049

"Invoked when a config option is removed. The signature is (stack,\n"

12019

12050

"name)."

12020

12051

msgstr ""

12021

12052

12022

#: en/help_topics/hooks.txt:238

12053

#: en/help_topics/hooks.txt:241

12023

12054

msgid ""

12024

12055

"save\n"

12025

12056

"~~~~"

12026

12057

msgstr ""

12027

12058

12028

#: en/help_topics/hooks.txt:243

12059

#: en/help_topics/hooks.txt:246

12029

12060

msgid "Invoked when a config store is saved. The signature is (store)."

12030

12061

msgstr ""

12031

12062

12032

#: en/help_topics/hooks.txt:245

12063

#: en/help_topics/hooks.txt:248

12033

12064

msgid ""

12034

12065

"set\n"

12035

12066

"~~~"

12036

12067

msgstr ""

12037

12068

12038

#: en/help_topics/hooks.txt:250

12069

#: en/help_topics/hooks.txt:253

12039

12070

msgid ""

12040

12071

"Invoked when a config option is set. The signature is (stack, name,\n"

12041

12072

"value)."

12042

12073

msgstr ""

12043

12074

12044

#: en/help_topics/hooks.txt:253

12075

#: en/help_topics/hooks.txt:256

12045

12076

msgid ""

12046

12077

"ControlDirHooks\n"

12047

12078

"---------------"

12048

12079

msgstr ""

12049

12080

12050

#: en/help_topics/hooks.txt:256

12081

#: en/help_topics/hooks.txt:259

12051

12082

msgid ""

12052

12083

"post_repo_init\n"

12053

12084

"~~~~~~~~~~~~~~"

12054

12085

msgstr ""

12055

12086

12056

#: en/help_topics/hooks.txt:261

12087

#: en/help_topics/hooks.txt:264

12057

12088

msgid ""

12058

12089

"Invoked after a repository has been initialized. post_repo_init is\n"

12059

12090

"called with a bzrlib.controldir.RepoInitHookParams."

12060

12091

msgstr ""

12061

12092

12062

#: en/help_topics/hooks.txt:264

12093

#: en/help_topics/hooks.txt:267

12063

12094

msgid ""

12064

12095

"pre_open\n"

12065

12096

"~~~~~~~~"

12066

12097

msgstr ""

12067

12098

12068

#: en/help_topics/hooks.txt:267

12099

#: en/help_topics/hooks.txt:270

12069

12100

msgid "Introduced in: 1.14"

12070

12101

msgstr ""

12071

12102

12072

#: en/help_topics/hooks.txt:269

12103

#: en/help_topics/hooks.txt:272

12073

12104

msgid ""

12074

12105

"Invoked before attempting to open a ControlDir with the transport that\n"

12075

12106

"the open will use."

12076

12107

msgstr ""

12077

12108

12078

#: en/help_topics/hooks.txt:272

12109

#: en/help_topics/hooks.txt:275

12079

12110

msgid ""

12080

12111

"InfoHooks\n"

12081

12112

"---------"

12082

12113

msgstr ""

12083

12114

12084

#: en/help_topics/hooks.txt:275

12115

#: en/help_topics/hooks.txt:278

12085

12116

msgid ""

12086

12117

"repository\n"

12087

12118

"~~~~~~~~~~"

12088

12119

msgstr ""

12089

12120

12090

#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297

12091

#: en/help_topics/hooks.txt:521

12121

#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300

12122

#: en/help_topics/hooks.txt:524

12092

12123

msgid "Introduced in: 1.15"

12093

12124

msgstr ""

12094

12125

12095

#: en/help_topics/hooks.txt:280

12126

#: en/help_topics/hooks.txt:283

12096

12127

msgid ""

12097

12128

"Invoked when displaying the statistics for a repository. repository is\n"

12098

12129

"called with a statistics dictionary as returned by the repository and\n"

12099

12130

"a file-like object to write to."

12100

12131

msgstr ""

12101

12132

12102

#: en/help_topics/hooks.txt:284

12133

#: en/help_topics/hooks.txt:287

12103

12134

msgid ""

12104

12135

"LockHooks\n"

12105

12136

"---------"

12106

12137

msgstr ""

12107

12138

12108

#: en/help_topics/hooks.txt:287

12139

#: en/help_topics/hooks.txt:290

12109

12140

msgid ""

12110

12141

"lock_acquired\n"

12111

12142

"~~~~~~~~~~~~~"

12112

12143

msgstr ""

12113

12144

12114

#: en/help_topics/hooks.txt:292

12145

#: en/help_topics/hooks.txt:295

12115

12146

msgid ""

12116

12147

"Called with a bzrlib.lock.LockResult when a physical lock is acquired."

12117

12148

msgstr ""

12118

12149

12119

#: en/help_topics/hooks.txt:294

12150

#: en/help_topics/hooks.txt:297

12120

12151

msgid ""

12121

12152

"lock_broken\n"

12122

12153

"~~~~~~~~~~~"

12123

12154

msgstr ""

12124

12155

12125

#: en/help_topics/hooks.txt:299

12156

#: en/help_topics/hooks.txt:302

12126

12157

msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."

12127

12158

msgstr ""

12128

12159

12129

#: en/help_topics/hooks.txt:301

12160

#: en/help_topics/hooks.txt:304

12130

12161

msgid ""

12131

12162

"lock_released\n"

12132

12163

"~~~~~~~~~~~~~"

12133

12164

msgstr ""

12134

12165

12135

#: en/help_topics/hooks.txt:306

12166

#: en/help_topics/hooks.txt:309

12136

12167

msgid ""

12137

12168

"Called with a bzrlib.lock.LockResult when a physical lock is released."

12138

12169

msgstr ""

12139

12170

12140

#: en/help_topics/hooks.txt:308

12171

#: en/help_topics/hooks.txt:311

12141

12172

msgid ""

12142

12173

"MergeHooks\n"

12143

12174

"----------"

12144

12175

msgstr ""

12145

12176

12146

#: en/help_topics/hooks.txt:311

12177

#: en/help_topics/hooks.txt:314

12147

12178

msgid ""

12148

12179

"merge_file_content\n"

12149

12180

"~~~~~~~~~~~~~~~~~~"

12150

12181

msgstr ""

12151

12182

12152

#: en/help_topics/hooks.txt:314

12183

#: en/help_topics/hooks.txt:317

12153

12184

msgid "Introduced in: 2.1"

12154

12185

msgstr ""

12155

12186

12156

#: en/help_topics/hooks.txt:316

12187

#: en/help_topics/hooks.txt:319

12157

12188

msgid ""

12158

12189

"Called with a bzrlib.merge.Merger object to create a per file merge\n"

12159

12190

"object when starting a merge. Should return either None or a subclass\n"

12163

12194

"AbstractPerFileMerger API docs for details on how it is used by merge."

12164

12195

msgstr ""

12165

12196

12166

#: en/help_topics/hooks.txt:323

12197

#: en/help_topics/hooks.txt:326

12167

12198

msgid ""

12168

12199

"post_merge\n"

12169

12200

"~~~~~~~~~~"

12170

12201

msgstr ""

12171

12202

12172

#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334

12173

#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402

12174

#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509

12203

#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337

12204

#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405

12205

#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512

12175

12206

msgid "Introduced in: 2.5"

12176

12207

msgstr ""

12177

12208

12178

#: en/help_topics/hooks.txt:328

12209

#: en/help_topics/hooks.txt:331

12179

12210

msgid ""

12180

12211

"Called after a merge. Receives a Merger object as the single argument.\n"

12181

12212

"The return value is ignored."

12182

12213

msgstr ""

12183

12214

12184

#: en/help_topics/hooks.txt:331

12215

#: en/help_topics/hooks.txt:334

12185

12216

msgid ""

12186

12217

"pre_merge\n"

12187

12218

"~~~~~~~~~"

12188

12219

msgstr ""

12189

12220

12190

#: en/help_topics/hooks.txt:336

12221

#: en/help_topics/hooks.txt:339

12191

12222

msgid ""

12192

12223

"Called before a merge. Receives a Merger object as the single\n"

12193

12224

"argument."

12194

12225

msgstr ""

12195

12226

12196

#: en/help_topics/hooks.txt:339

12227

#: en/help_topics/hooks.txt:342

12197

12228

msgid ""

12198

12229

"MergeDirectiveHooks\n"

12199

12230

"-------------------"

12200

12231

msgstr ""

12201

12232

12202

#: en/help_topics/hooks.txt:342

12233

#: en/help_topics/hooks.txt:345

12203

12234

msgid ""

12204

12235

"merge_request_body\n"

12205

12236

"~~~~~~~~~~~~~~~~~~"

12206

12237

msgstr ""

12207

12238

12208

#: en/help_topics/hooks.txt:345

12239

#: en/help_topics/hooks.txt:348

12209

12240

msgid "Introduced in: 1.15.0"

12210

12241

msgstr ""

12211

12242

12212

#: en/help_topics/hooks.txt:347

12243

#: en/help_topics/hooks.txt:350

12213

12244

msgid ""

12214

12245

"Called with a MergeRequestBodyParams when a body is needed for a merge\n"

12215

12246

"request. Callbacks must return a body. If more than one callback is\n"

12216

12247

"registered, the output of one callback is provided to the next."

12217

12248

msgstr ""

12218

12249

12219

#: en/help_topics/hooks.txt:351

12250

#: en/help_topics/hooks.txt:354

12220

12251

msgid ""

12221

12252

"MessageEditorHooks\n"

12222

12253

"------------------"

12223

12254

msgstr ""

12224

12255

12225

#: en/help_topics/hooks.txt:354

12256

#: en/help_topics/hooks.txt:357

12226

12257

msgid ""

12227

12258

"commit_message_template\n"

12228

12259

"~~~~~~~~~~~~~~~~~~~~~~~"

12229

12260

msgstr ""

12230

12261

12231

#: en/help_topics/hooks.txt:357

12262

#: en/help_topics/hooks.txt:360

12232

12263

msgid "Introduced in: 1.10"

12233

12264

msgstr ""

12234

12265

12235

#: en/help_topics/hooks.txt:359

12266

#: en/help_topics/hooks.txt:362

12236

12267

msgid ""

12237

12268

"Called when a commit message is being generated.\n"

12238

12269

"commit_message_template is called with the bzrlib.commit.Commit object\n"

12243

12274

"second, and so on."

12244

12275

msgstr ""

12245

12276

12246

#: en/help_topics/hooks.txt:367

12277

#: en/help_topics/hooks.txt:370

12247

12278

msgid ""

12248

12279

"set_commit_message\n"

12249

12280

"~~~~~~~~~~~~~~~~~~"

12250

12281

msgstr ""

12251

12282

12252

#: en/help_topics/hooks.txt:372

12283

#: en/help_topics/hooks.txt:375

12253

12284

msgid ""

12254

12285

"Set a fixed commit message. set_commit_message is called with the\n"

12255

12286

"bzrlib.commit.Commit object (so you can also change e.g. revision\n"

12258

12289

"should use the message editor as normal."

12259

12290

msgstr ""

12260

12291

12261

#: en/help_topics/hooks.txt:378

12292

#: en/help_topics/hooks.txt:381

12262

12293

msgid ""

12263

12294

"MutableTreeHooks\n"

12264

12295

"----------------"

12265

12296

msgstr ""

12266

12297

12267

#: en/help_topics/hooks.txt:381

12298

#: en/help_topics/hooks.txt:384

12268

12299

msgid ""

12269

12300

"post_build_tree\n"

12270

12301

"~~~~~~~~~~~~~~~"

12271

12302

msgstr ""

12272

12303

12273

#: en/help_topics/hooks.txt:386

12304

#: en/help_topics/hooks.txt:389

12274

12305

msgid ""

12275

12306

"Called after a completely new tree is built. The hook is called with\n"

12276

12307

"the tree as its only argument."

12277

12308

msgstr ""

12278

12309

12279

#: en/help_topics/hooks.txt:392

12310

#: en/help_topics/hooks.txt:395

12280

12311

msgid "Introduced in: 2.0"

12281

12312

msgstr ""

12282

12313

12283

#: en/help_topics/hooks.txt:394

12314

#: en/help_topics/hooks.txt:397

12284

12315

msgid ""

12285

12316

"Called after a commit is performed on a tree. The hook is called with\n"

12286

12317

"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"

12288

12319

"that object."

12289

12320

msgstr ""

12290

12321

12291

#: en/help_topics/hooks.txt:399

12322

#: en/help_topics/hooks.txt:402

12292

12323

msgid ""

12293

12324

"post_transform\n"

12294

12325

"~~~~~~~~~~~~~~"

12295

12326

msgstr ""

12296

12327

12297

#: en/help_topics/hooks.txt:404

12328

#: en/help_topics/hooks.txt:407

12298

12329

msgid ""

12299

12330

"Called after a tree transform has been performed on a tree. The hook\n"

12300

12331

"is called with the tree that is being transformed and the transform."

12301

12332

msgstr ""

12302

12333

12303

#: en/help_topics/hooks.txt:407

12334

#: en/help_topics/hooks.txt:410

12304

12335

msgid ""

12305

12336

"pre_transform\n"

12306

12337

"~~~~~~~~~~~~~"

12307

12338

msgstr ""

12308

12339

12309

#: en/help_topics/hooks.txt:412

12340

#: en/help_topics/hooks.txt:415

12310

12341

msgid ""

12311

12342

"Called before a tree transform on this tree. The hook is called with\n"

12312

12343

"the tree that is being transformed and the transform."

12313

12344

msgstr ""

12314

12345

12315

#: en/help_topics/hooks.txt:415

12346

#: en/help_topics/hooks.txt:418

12316

12347

msgid ""

12317

12348

"start_commit\n"

12318

12349

"~~~~~~~~~~~~"

12319

12350

msgstr ""

12320

12351

12321

#: en/help_topics/hooks.txt:420

12352

#: en/help_topics/hooks.txt:423

12322

12353

msgid ""

12323

12354

"Called before a commit is performed on a tree. The start commit hook\n"

12324

12355

"is able to change the tree before the commit takes place. start_commit\n"

12326

12357

"being performed on."

12327

12358

msgstr ""

12328

12359

12329

#: en/help_topics/hooks.txt:425

12360

#: en/help_topics/hooks.txt:428

12330

12361

msgid ""

12331

12362

"SmartClientHooks\n"

12332

12363

"----------------"

12333

12364

msgstr ""

12334

12365

12335

#: en/help_topics/hooks.txt:428

12366

#: en/help_topics/hooks.txt:431

12336

12367

msgid ""

12337

12368

"call\n"

12338

12369

"~~~~"

12339

12370

msgstr ""

12340

12371

12341

#: en/help_topics/hooks.txt:431

12372

#: en/help_topics/hooks.txt:434

12342

12373

msgid "Introduced in: unknown"

12343

12374

msgstr ""

12344

12375

12345

#: en/help_topics/hooks.txt:433

12376

#: en/help_topics/hooks.txt:436

12346

12377

msgid ""

12347

12378

"Called when the smart client is submitting a request to the smart\n"

12348

12379

"server. Called with a bzrlib.smart.client.CallHookParams object.\n"

12349

12380

"Streaming request bodies, and responses, are not accessible."

12350

12381

msgstr ""

12351

12382

12352

#: en/help_topics/hooks.txt:437

12383

#: en/help_topics/hooks.txt:440

12353

12384

msgid ""

12354

12385

"SmartServerHooks\n"

12355

12386

"----------------"

12356

12387

msgstr ""

12357

12388

12358

#: en/help_topics/hooks.txt:440

12389

#: en/help_topics/hooks.txt:443

12359

12390

msgid ""

12360

12391

"server_exception\n"

12361

12392

"~~~~~~~~~~~~~~~~"

12362

12393

msgstr ""

12363

12394

12364

#: en/help_topics/hooks.txt:445

12395

#: en/help_topics/hooks.txt:448

12365

12396

msgid ""

12366

12397

"Called by the bzr server when an exception occurs. server_exception is\n"

12367

12398

"called with the sys.exc_info() tuple return true for the hook if the\n"

12369

12400

"normally."

12370

12401

msgstr ""

12371

12402

12372

#: en/help_topics/hooks.txt:450

12403

#: en/help_topics/hooks.txt:453

12373

12404

msgid ""

12374

12405

"server_started\n"

12375

12406

"~~~~~~~~~~~~~~"

12376

12407

msgstr ""

12377

12408

12378

#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472

12409

#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475

12379

12410

msgid "Introduced in: 0.16"

12380

12411

msgstr ""

12381

12412

12382

#: en/help_topics/hooks.txt:455

12413

#: en/help_topics/hooks.txt:458

12383

12414

msgid ""

12384

12415

"Called by the bzr server when it starts serving a directory.\n"

12385

12416

"server_started is called with (backing urls, public url), where\n"

12388

12419

"served."

12389

12420

msgstr ""

12390

12421

12391

#: en/help_topics/hooks.txt:461

12422

#: en/help_topics/hooks.txt:464

12392

12423

msgid ""

12393

12424

"server_started_ex\n"

12394

12425

"~~~~~~~~~~~~~~~~~"

12395

12426

msgstr ""

12396

12427

12397

#: en/help_topics/hooks.txt:466

12428

#: en/help_topics/hooks.txt:469

12398

12429

msgid ""

12399

12430

"Called by the bzr server when it starts serving a directory.\n"

12400

12431

"server_started is called with (backing_urls, server_obj)."

12401

12432

msgstr ""

12402

12433

12403

#: en/help_topics/hooks.txt:469

12434

#: en/help_topics/hooks.txt:472

12404

12435

msgid ""

12405

12436

"server_stopped\n"

12406

12437

"~~~~~~~~~~~~~~"

12407

12438

msgstr ""

12408

12439

12409

#: en/help_topics/hooks.txt:474

12440

#: en/help_topics/hooks.txt:477

12410

12441

msgid ""

12411

12442

"Called by the bzr server when it stops serving a directory.\n"

12412

12443

"server_stopped is called with the same parameters as the\n"

12413

12444

"server_started hook: (backing_urls, public_url)."

12414

12445

msgstr ""

12415

12446

12416

#: en/help_topics/hooks.txt:478

12447

#: en/help_topics/hooks.txt:481

12417

12448

msgid ""

12418

12449

"StatusHooks\n"

12419

12450

"-----------"

12420

12451

msgstr ""

12421

12452

12422

#: en/help_topics/hooks.txt:481

12453

#: en/help_topics/hooks.txt:484

12423

12454

msgid ""

12424

12455

"post_status\n"

12425

12456

"~~~~~~~~~~~"

12426

12457

msgstr ""

12427

12458

12428

#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495

12459

#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498

12429

12460

msgid "Introduced in: 2.3"

12430

12461

msgstr ""

12431

12462

12432

#: en/help_topics/hooks.txt:486

12463

#: en/help_topics/hooks.txt:489

12433

12464

msgid ""

12434

12465

"Called with argument StatusHookParams after Bazaar has displayed the\n"

12435

12466

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12438

12469

"status command. to_file is the output stream for writing."

12439

12470

msgstr ""

12440

12471

12441

#: en/help_topics/hooks.txt:492

12472

#: en/help_topics/hooks.txt:495

12442

12473

msgid ""

12443

12474

"pre_status\n"

12444

12475

"~~~~~~~~~~"

12445

12476

msgstr ""

12446

12477

12447

#: en/help_topics/hooks.txt:497

12478

#: en/help_topics/hooks.txt:500

12448

12479

msgid ""

12449

12480

"Called with argument StatusHookParams before Bazaar displays the\n"

12450

12481

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12453

12484

"status command. to_file is the output stream for writing."

12454

12485

msgstr ""

12455

12486

12456

#: en/help_topics/hooks.txt:503

12487

#: en/help_topics/hooks.txt:506

12457

12488

msgid ""

12458

12489

"TransportHooks\n"

12459

12490

"--------------"

12460

12491

msgstr ""

12461

12492

12462

#: en/help_topics/hooks.txt:506

12493

#: en/help_topics/hooks.txt:509

12463

12494

msgid ""

12464

12495

"post_connect\n"

12465

12496

"~~~~~~~~~~~~"

12466

12497

msgstr ""

12467

12498

12468

#: en/help_topics/hooks.txt:511

12499

#: en/help_topics/hooks.txt:514

12469

12500

msgid ""

12470

12501

"Called after a new connection is established or a reconnect occurs.\n"

12471

12502

"The sole argument passed is either the connected transport or smart\n"

12472

12503

"medium instance."

12473

12504

msgstr ""

12474

12505

12475

#: en/help_topics/hooks.txt:515

12506

#: en/help_topics/hooks.txt:518

12476

12507

msgid ""

12477

12508

"RioVersionInfoBuilderHooks\n"

12478

12509

"--------------------------"

12479

12510

msgstr ""

12480

12511

12481

#: en/help_topics/hooks.txt:518

12512

#: en/help_topics/hooks.txt:521

12482

12513

msgid ""

12483

12514

"revision\n"

12484

12515

"~~~~~~~~"

12485

12516

msgstr ""

12486

12517

12487

#: en/help_topics/hooks.txt:523

12518

#: en/help_topics/hooks.txt:526

12488

12519

msgid ""

12489

12520

"Invoked when adding information about a revision to the RIO stanza\n"

12490

12521

"that is printed. revision is called with a revision object and a RIO\n"