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

1

# Russian 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: 2012-01-21 16:45+0000\n"

12

"Last-Translator: Sergey Basalaev <SBasalaev@gmail.com>\n"

13

"Language-Team: Russian <ru@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=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18

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

19

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

20

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

19

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

20

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

21

22

#: bzrlib/add.py:95

22

#: bzrlib/add.py:93

23

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

24

msgstr "пропуск {0} (более, чем {1} из {2} байт)"

25

26

#: bzrlib/branch.py:872

26

#: bzrlib/branch.py:854

27

msgid "Unstacking"

28

msgstr "Извлечение из стека"

29

30

#: bzrlib/branch.py:3205

30

#: bzrlib/branch.py:3121

31

#, python-format

32

msgid "Pushed up to revision %d."

33

msgstr "Отправлено до ревизии %d включительно."

34

35

#: bzrlib/branch.py:3207

35

#: bzrlib/branch.py:3123

36

#, python-format

37

msgid "%d tag updated."

38

msgid_plural "%d tags updated."

40

msgstr[1] "%d тега обновлено."

41

msgstr[2] "%d тегов обновлено."

42

43

#: bzrlib/branch.py:3210

43

#: bzrlib/branch.py:3126

44

msgid "No new revisions or tags to push."

45

msgstr "Нет новых ревизий или тегов для отправки."

46

47

#: bzrlib/branch.py:3212

47

#: bzrlib/branch.py:3128

48

msgid "No new revisions to push."

49

msgstr "Нет новых ревизий для отправки."

50

51

#: bzrlib/branch.py:3232

51

#: bzrlib/branch.py:3148

52

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

53

msgstr "проверена ветвь {0} формата {1}"

54

55

#: bzrlib/branch.py:3235

55

#: bzrlib/branch.py:3151

56

#, python-format

57

msgid "found error:%s"

58

msgstr "обнаружена ошибка:%s"

59

60

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

60

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

61

#, python-format

62

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

63

msgstr "Игнорируются файлы вне окна просмотра. Окно просмотра: %s"

64

65

#: bzrlib/builtins.py:218

65

#: bzrlib/builtins.py:260

66

#, python-format

67

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

68

msgstr "bzr %s --revision принимает ровно один идентификатор ревизии"

69

70

#: bzrlib/builtins.py:303

70

#: bzrlib/builtins.py:315

71

msgid "Display status summary."

72

msgstr "Отобразить краткое описание состояния."

73

74

#: bzrlib/builtins.py:305

74

#: bzrlib/builtins.py:317

75

msgid ""

76

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

77

"grouped by state. Possible states are:"

79

"Эта команда сообщает о файлах с версиями и неизвестных файлах,\n"

80

"группируя их по состоянию. Возможные состояния:"

81

82

#: bzrlib/builtins.py:308

82

#: bzrlib/builtins.py:320

83

msgid ""

84

"added\n"

85

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

88

" Имеют версию в рабочей копии, но отсутствуют в предыдущей\n"

89

" ревизии."

90

91

#: bzrlib/builtins.py:311

91

#: bzrlib/builtins.py:323

92

msgid ""

93

"removed\n"

94

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

98

" Имеют версию в предыдущей ревизии но исключены или удалены\n"

99

" в рабочей копии."

100

101

#: bzrlib/builtins.py:315

101

#: bzrlib/builtins.py:327

102

msgid ""

103

"renamed\n"

104

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

110

" текст также мог измениться. Это состояние включает\n"

111

" файлы, родительская директория которых была переименована."

112

113

#: bzrlib/builtins.py:320

113

#: bzrlib/builtins.py:332

114

msgid ""

115

"modified\n"

116

" Text has changed since the previous revision."

118

"изменены\n"

119

" Текст изменился с предыдущей ревизии."

120

121

#: bzrlib/builtins.py:323

121

#: bzrlib/builtins.py:335

122

msgid ""

123

"kind changed\n"

124

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

126

"изменили вид\n"

127

" Вид файла изменился (например, файл стал директорией)."

128

129

#: bzrlib/builtins.py:326

129

#: bzrlib/builtins.py:338

130

msgid ""

131

"unknown\n"

132

" Not versioned and not matching an ignore pattern."

134

"неизвестны\n"

135

" Не имеют версии и не подходят под шаблон игнориируемых файлов."

136

137

#: bzrlib/builtins.py:329

137

#: bzrlib/builtins.py:341

138

msgid ""

139

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

140

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

146

"в конец имени символы: '/', '@' или '*' соответственно. Эти\n"

147

"декорации можно убрать, используя опцию '--no-classify'."

148

149

#: bzrlib/builtins.py:334

149

#: bzrlib/builtins.py:346

150

msgid ""

151

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

152

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

154

"Чтобы просмотреть игнорируемые файлы, используйте 'bzr ignored'.\n"

155

"Изменения текста файлов можно увидеть, используя 'bzr diff'."

156

157

#: bzrlib/builtins.py:337

157

#: bzrlib/builtins.py:349

158

msgid ""

159

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

160

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

164

"подобный команде Subversion status. Чтобы получить вывод, похожий\n"

165

"на svn -q, используйте bzr status -SV."

166

167

#: bzrlib/builtins.py:341

167

#: bzrlib/builtins.py:353

168

msgid ""

169

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

170

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

176

"Если указана директория, то выводится состояние всех файлов внутри\n"

177

"этой директории."

178

179

#: bzrlib/builtins.py:346

179

#: bzrlib/builtins.py:358

180

msgid ""

181

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

182

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

188

"Чтобы полностью пропустить отображение информации о слиянии,\n"

189

"используйте опцию no-pending либо укажите файл или директорию."

190

191

#: bzrlib/builtins.py:351

191

#: bzrlib/builtins.py:363

192

msgid ""

193

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

194

"single revision to the revision argument."

196

"Чтобы сравнить рабочую копию с определённой ревизией, укажите\n"

197

"ревизию в соответствующем аргументе."

198

199

#: bzrlib/builtins.py:354

199

#: bzrlib/builtins.py:366

200

msgid ""

201

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

202

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

206

"между двумя ревизиями, укажите в аргументе ревизии интервал.\n"

207

"Это даёт такой же результат, как вызов 'bzr diff --summarize'."

208

209

#: bzrlib/builtins.py:363

209

#: bzrlib/builtins.py:375

210

msgid "Use short status indicators."

211

msgstr "Использовать короткие статусные пометки."

212

213

#: bzrlib/builtins.py:365

213

#: bzrlib/builtins.py:377

214

msgid "Only show versioned files."

215

msgstr "Показывать только файлы, имеющие версию."

216

217

#: bzrlib/builtins.py:367

217

#: bzrlib/builtins.py:379

218

msgid "Don't show pending merges."

219

msgstr "Не показывать необработанные слияния."

220

221

#: bzrlib/builtins.py:370

221

#: bzrlib/builtins.py:382

222

msgid "Do not mark object type using indicator."

223

msgstr "Не помечать типы объектов суффиксами."

224

225

#: bzrlib/builtins.py:385

225

#: bzrlib/builtins.py:397

226

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

227

msgstr ""

228

"bzr status --revision принимает ровно один или два идентификатора ревизии"

229

230

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

230

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

231

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

232

msgstr "Вы можете указать только одно из revision_id или --revision"

233

234

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

234

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

235

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

236

msgstr "Вы должны предоставить --revision или revision_id"

237

238

#: bzrlib/builtins.py:439

238

#: bzrlib/builtins.py:451

239

#, python-format

240

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

241

msgstr "Репозиторий %r не поддерживает прямой доступ к текстам ревизий"

242

243

#: bzrlib/builtins.py:450

243

#: bzrlib/builtins.py:462

244

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

245

msgstr "Репозиторий {0} не содержит ревизии {1}."

246

247

#: bzrlib/builtins.py:457

247

#: bzrlib/builtins.py:469

248

msgid "You cannot specify a NULL revision."

249

msgstr "Вы не можете указать ревизию NULL."

250

251

#: bzrlib/builtins.py:549

251

#: bzrlib/builtins.py:561

252

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

253

msgstr "Удалить рабочее дерево из данной ветви или рабочей копии."

254

255

#: bzrlib/builtins.py:551

255

#: bzrlib/builtins.py:563

256

msgid ""

257

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

258

"this will refuse to run against one."

260

"Поскольку легковесная рабочая копия, это нечто большее, чем рабочее\n"

261

"дерево, эту команду нельзя выполнить внутри неё."

262

263

#: bzrlib/builtins.py:554

263

#: bzrlib/builtins.py:566

264

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

265

msgstr "Чтобы воссоздать рабочее дерево, используйте «bzr checkout»."

266

267

#: bzrlib/builtins.py:560

267

#: bzrlib/builtins.py:572

268

msgid ""

269

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

270

msgstr ""

271

"Удалить рабочее дерево даже, если оно содержит незакреплённые или отложенные "

272

"изменения."

273

274

#: bzrlib/builtins.py:574

274

#: bzrlib/builtins.py:586

275

msgid "No working tree to remove"

276

msgstr "Нет рабочего дерева для удаления"

277

278

#: bzrlib/builtins.py:576

278

#: bzrlib/builtins.py:588

279

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

280

msgstr "Вы не можете удалить внешнее рабочее дерево"

281

282

#: bzrlib/builtins.py:585

282

#: bzrlib/builtins.py:597

283

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

284

msgstr "Вы не можете удалить рабочее дерево из легковесной рабочей копии"

285

286

#: bzrlib/builtins.py:625

286

#: bzrlib/builtins.py:637

287

msgid ""

288

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

289

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

291

"Дерево не повреждено. Возможно, вы хотели выполнить «bzr revert». "

292

"Используйте «--force», если вы уверены, что хотите использовать reset."

293

294

#: bzrlib/builtins.py:636

294

#: bzrlib/builtins.py:648

295

msgid ""

296

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

297

"commit"

299

", заголовок повреждён, попробуйте использовать аргумент -r -1, чтобы "

300

"сбросить состояние до предыдущего закрепления"

301

302

#: bzrlib/builtins.py:640

302

#: bzrlib/builtins.py:652

303

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

304

msgstr "не удалось сбросить состояние дерева {0}"

305

306

#: bzrlib/builtins.py:644

306

#: bzrlib/builtins.py:656

307

msgid "Show current revision number."

308

msgstr "Показать номер текущей ревизии."

309

310

#: bzrlib/builtins.py:646

310

#: bzrlib/builtins.py:658

311

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

312

msgstr "Это эквивалентно числу ревизий в этой ветви."

313

314

#: bzrlib/builtins.py:659

314

#: bzrlib/builtins.py:671

315

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

316

msgstr "--tree и --revision не могут использоваться вместе"

317

318

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

318

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

319

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

320

msgstr "Тегом можно пометить только отдельную ревизию, не интервал"

321

322

#: bzrlib/builtins.py:700

322

#: bzrlib/builtins.py:712

323

msgid "Show revno of working tree."

324

msgstr "Показать номер ревизии рабочего дерева."

325

326

#: bzrlib/builtins.py:748

326

#: bzrlib/builtins.py:760

327

msgid "Add specified files or directories."

328

msgstr "Добавить указанные файлы или директории."

329

330

#: bzrlib/builtins.py:750

330

#: bzrlib/builtins.py:762

331

msgid ""

332

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

333

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

338

"предупреждение, если какие-либо из указанных элементов уже были\n"

339

"под контролем Bazaar."

340

341

#: bzrlib/builtins.py:754

341

#: bzrlib/builtins.py:766

342

msgid ""

343

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

344

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

357

"Этот поиск входит рекурсивно в директории, имеющие версию.\n"

358

"Если не указано ни одного имени, предполагается '.'."

359

360

#: bzrlib/builtins.py:762

360

#: bzrlib/builtins.py:774

361

msgid ""

362

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

363

"unless they are explicitly ignored."

365

"Предупреждение будет напечатано для каждого встреченного вложенного\n"

366

"дерева, если только оно не игнорируется явно."

367

368

#: bzrlib/builtins.py:765

368

#: bzrlib/builtins.py:777

369

msgid ""

370

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

371

"are currently unknown."

373

"Следовательно, просто вызов 'bzr add' добавит к системе контроля\n"

374

"версий все файлы, которые ей неизвестны."

375

376

#: bzrlib/builtins.py:768

376

#: bzrlib/builtins.py:780

377

msgid ""

378

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

379

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

385

"вам никогда не нужно явно добавлять директорию, они добавляются\n"

386

"автоматически, когда вы добавляете файлы."

387

388

#: bzrlib/builtins.py:773

388

#: bzrlib/builtins.py:785

389

msgid ""

390

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

391

"add them."

393

"--dry-run покажет, какие файлы будут добавлены, но не будет их\n"

394

"добавлять."

395

396

#: bzrlib/builtins.py:776

396

#: bzrlib/builtins.py:788

397

msgid ""

398

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

399

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

413

"Это также полезно при помещении другого проекта, как поддиректории\n"

414

"данного."

415

416

#: bzrlib/builtins.py:784

416

#: bzrlib/builtins.py:796

417

msgid ""

418

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

419

"unless they are explicitly mentioned."

421

"Любые файлы, удовлетворяющие шаблонам в списке ignore не будут\n"

422

"добавлены, если их не указать явно."

423

424

#: bzrlib/builtins.py:787

424

#: bzrlib/builtins.py:799

425

msgid ""

426

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

427

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

431

"add.maximum_file_size, будут пропущены. Явно названные элементы\n"

432

"никогда не будут пропущены по этому критерию."

433

434

#: bzrlib/builtins.py:794

434

#: bzrlib/builtins.py:806

435

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

436

msgstr "Не добавлять содержимое директорий рекурсивно."

437

438

#: bzrlib/builtins.py:800

438

#: bzrlib/builtins.py:813

439

msgid "Lookup file ids from this tree."

440

msgstr "Искать идентификаторы в этом дереве."

441

442

#: bzrlib/builtins.py:836

442

#: bzrlib/builtins.py:849

443

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

444

msgstr "пропуск {0} из-за условия «{1}»\n"

445

446

#: bzrlib/builtins.py:841

446

#: bzrlib/builtins.py:854

447

msgid "Create a new versioned directory."

448

msgstr "Создать новую директорию в системе версий."

449

450

#: bzrlib/builtins.py:843

450

#: bzrlib/builtins.py:856

451

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

452

msgstr "Это эквивалентно созданию директории и её добавлению."

453

454

#: bzrlib/builtins.py:850

454

#: bzrlib/builtins.py:863

455

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

456

msgstr ""

457

"Не выводить ошибку, если существует, создавать родительские директории при "

458

"необходимости."

459

460

#: bzrlib/builtins.py:884

460

#: bzrlib/builtins.py:897

461

#, python-format

462

msgid "added %s\n"

463

msgstr "добавлен %s\n"

464

465

#: bzrlib/builtins.py:926

465

#: bzrlib/builtins.py:939

466

#, python-format

467

msgid "invalid kind %r specified"

468

msgstr "указан неизвестный вид %r"

469

470

#: bzrlib/builtins.py:963

470

#: bzrlib/builtins.py:976

471

msgid "Move or rename a file."

472

msgstr "Переместить или переименовать файл."

473

474

#: bzrlib/builtins.py:965

474

#: bzrlib/builtins.py:978

475

msgid " bzr mv SOURCE... DESTINATION"

476

msgstr " bzr mv ИСТОЧНИК... НАЗНАЧЕНИЕ"

477

478

#: bzrlib/builtins.py:967

478

#: bzrlib/builtins.py:980

479

msgid ""

480

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

481

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

485

"все остальные имена перемещаются в неё. Иначе, должно быть указано\n"

486

"ровно два аргумента, и файл переименовывается."

487

488

#: bzrlib/builtins.py:971

488

#: bzrlib/builtins.py:984

489

msgid ""

490

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

491

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

499

"свои внутренние структуры, чтобы отразить это изменение.\n"

500

"Тоже верно и при перемещении многих ИСТОЧНИКов в НАЗНАЧЕНИЕ."

501

502

#: bzrlib/builtins.py:977

502

#: bzrlib/builtins.py:990

503

msgid "Files cannot be moved between branches."

504

msgstr "Файлы нельзя перемещать между ветвями."

505

506

#: bzrlib/builtins.py:984

506

#: bzrlib/builtins.py:997

507

msgid ""

508

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

509

"moved."

511

"Переместить только bzr-идентификатор файла, поскольку сам файл уже был "

512

"перемещён."

513

514

#: bzrlib/builtins.py:986

514

#: bzrlib/builtins.py:999

515

msgid "Automatically guess renames."

516

msgstr "Автоматически предполагать переименования."

517

518

#: bzrlib/builtins.py:987

518

#: bzrlib/builtins.py:1000

519

msgid "Avoid making changes when guessing renames."

520

msgstr "Избегать изменений при угадывании переименований."

521

522

#: bzrlib/builtins.py:996

522

#: bzrlib/builtins.py:1009

523

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

524

msgstr "--dry-run требует --auto."

525

526

#: bzrlib/builtins.py:1000

526

#: bzrlib/builtins.py:1013

527

msgid "missing file argument"

528

msgstr "отсутствует аргумент файл"

529

530

#: bzrlib/builtins.py:1004

530

#: bzrlib/builtins.py:1017

531

msgid "can not move root of branch"

532

msgstr "нельзя переместить корень ветви"

533

534

#: bzrlib/builtins.py:1010

534

#: bzrlib/builtins.py:1023

535

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

536

msgstr "Только один путь может быть указан, как аргумент --auto."

537

538

#: bzrlib/builtins.py:1013

538

#: bzrlib/builtins.py:1026

539

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

540

msgstr "--after не может использоваться вместе с --auto."

541

542

#: bzrlib/builtins.py:1050

542

#: bzrlib/builtins.py:1062

543

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

544

msgstr ""

545

"чтобы переместить несколько файлов, назначение должно быть директорией под "

546

"контролем системы версий"

547

548

#: bzrlib/builtins.py:1102

548

#: bzrlib/builtins.py:1114

549

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

550

msgstr "Преобразовать эту ветвь в зеркало другой ветви."

551

552

#: bzrlib/builtins.py:1104

552

#: bzrlib/builtins.py:1116

553

msgid ""

554

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

555

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

560

"отклонениями. Ветвь считается отклонением, если последнее закрепление в\n"

561

"ветви назначения не было совмещено (явно или неявно) с родителем."

562

563

#: bzrlib/builtins.py:1109

563

#: bzrlib/builtins.py:1121

564

msgid ""

565

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

566

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

570

"возвращения изменений. После совмещения ветвей, можно снова принимать\n"

571

"изменения из одной в другую."

572

573

#: bzrlib/builtins.py:1113

573

#: bzrlib/builtins.py:1125

574

msgid ""

575

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

576

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

580

"с удалённой, используйте pull --overwrite. Это будет работать, даже если\n"

581

"ветвь является отклонением."

582

583

#: bzrlib/builtins.py:1117

583

#: bzrlib/builtins.py:1129

584

msgid ""

585

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

586

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

594

"--remember. Значение будет сохранено, только если доступ к удалённому\n"

595

"местоположению будет успешен."

596

597

#: bzrlib/builtins.py:1122

597

#: bzrlib/builtins.py:1134

598

msgid ""

599

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

600

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

604

"конфигурации log_format. Вы можете использовать другой формат, перегрузив\n"

605

"её опцией -Olog_format=<другой_формат>."

606

607

#: bzrlib/builtins.py:1126

607

#: bzrlib/builtins.py:1138

608

msgid ""

609

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

610

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

613

"Замечание: Местоположение можно указывать как в форме ветви, так и в\n"

614

"форме пути к файлу, содержащему директиву слияния, созданному bzr send."

615

616

#: bzrlib/builtins.py:1134

616

#: bzrlib/builtins.py:1146

617

msgid "Show logs of pulled revisions."

618

msgstr "Показать журналы принятых ревизий."

619

620

#: bzrlib/builtins.py:1136

620

#: bzrlib/builtins.py:1148

621

msgid ""

622

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

623

msgstr ""

624

"Принимать изменения в эту ветвь, а не в содержащую рабочую директорию."

625

626

#: bzrlib/builtins.py:1139

626

#: bzrlib/builtins.py:1151

627

msgid ""

628

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

629

"master branch."

631

"Сделать локальный приём в связанную ветвь. Локальный приём не накладывается "

632

"на основную ветвь."

633

634

#: bzrlib/builtins.py:1168

634

#: bzrlib/builtins.py:1180

635

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

636

msgstr "Для --show-base необходимо рабочее дерево."

637

638

#: bzrlib/builtins.py:1184

638

#: bzrlib/builtins.py:1196

639

msgid "No pull location known or specified."

640

msgstr "Местоположение для приёма неизвестно и не указано."

641

642

#: bzrlib/builtins.py:1190

642

#: bzrlib/builtins.py:1202

643

#, python-format

644

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

645

msgstr "Используется сохранённое местоположение родителя: %s\n"

646

647

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

647

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

648

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

649

msgstr "Нельзя использовать -r с директивами слияния или пакетами"

650

651

#: bzrlib/builtins.py:1238

651

#: bzrlib/builtins.py:1252

652

msgid "Update a mirror of this branch."

653

msgstr "Обновить зеркало этой ветви."

654

655

#: bzrlib/builtins.py:1240

655

#: bzrlib/builtins.py:1254

656

msgid ""

657

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

658

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

660

"Целевая ветвь не будет иметь рабочего дерева, поскольку это накладно\n"

661

"и не поддерживается удалёнными файловыми системами."

662

663

#: bzrlib/builtins.py:1243

663

#: bzrlib/builtins.py:1257

664

msgid ""

665

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

666

"the future."

668

"Некоторые умные серверы или протоколы *может быть* будут размещать\n"

669

"рабочее дерево в месте назначения в будущем."

670

671

#: bzrlib/builtins.py:1246

671

#: bzrlib/builtins.py:1260

672

msgid ""

673

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

674

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

679

"закрепление в ветви назначения не было совмещено (явно или\n"

680

"неявно) с родителем."

681

682

#: bzrlib/builtins.py:1250

682

#: bzrlib/builtins.py:1264

683

msgid ""

684

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

685

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

688

"чтобы полностью заменить другую ветвь, убирая все её несовмещённые\n"

689

"изменения."

690

691

#: bzrlib/builtins.py:1253

691

#: bzrlib/builtins.py:1267

692

msgid ""

693

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

694

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

699

"изменения. После этого вы сможете делать push без необходимости указывать\n"

700

"опцию '--overwrite'."

701

702

#: bzrlib/builtins.py:1257

702

#: bzrlib/builtins.py:1271

703

msgid ""

704

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

705

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

713

"используйте опцию --remember. Значение будет сохранено, только если\n"

714

"доступ к удалённой локации будет успешен."

715

716

#: bzrlib/builtins.py:1262

716

#: bzrlib/builtins.py:1276

717

msgid ""

718

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

719

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

723

"конфигурации log_format. Вы можете использовать другой формат, перегрузив\n"

724

"её опцией -Olog_format=<другой_формат>."

725

726

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

726

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

727

msgid ""

728

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

729

msgstr "Отправлять из этой ветви, а не из содержащей рабочую директорию."

730

731

#: bzrlib/builtins.py:1276

731

#: bzrlib/builtins.py:1290

732

msgid ""

733

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

734

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

737

"существует, но не содержит управляющих метаданных. Этот флаг позволит "

738

"отправке изменений продолжаться."

739

740

#: bzrlib/builtins.py:1281

740

#: bzrlib/builtins.py:1295

741

msgid ""

742

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

743

"branch."

745

"Создать стековую ветвь, которая ссылается на публичное местоположение "

746

"родительской ветви."

747

748

#: bzrlib/builtins.py:1284

748

#: bzrlib/builtins.py:1298

749

msgid ""

750

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

751

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

755

"истории фиксаций. В созданную ветвь помещается только работа, не "

756

"существующая в исходной ветви."

757

758

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

758

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

759

msgid ""

760

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

761

"strict disables the check."

763

"Отказывать в отсылке изменений, если в рабочем дереве есть незакреплённые "

764

"изменения, --no-strict запрещает проверку."

765

766

#: bzrlib/builtins.py:1292

766

#: bzrlib/builtins.py:1306

767

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

768

msgstr ""

769

"Не создавать рабочее дерево, даже для протоколов, которые поддерживают это."

770

771

#: bzrlib/builtins.py:1336

771

#: bzrlib/builtins.py:1350

772

msgid "Could not determine branch to refer to."

773

msgstr "Не удалось определить ветвь, на которую нужно ссылаться."

774

775

#: bzrlib/builtins.py:1345

775

#: bzrlib/builtins.py:1359

776

#, python-format

777

msgid ""

778

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

779

"use 'bzr push :parent'."

780

msgstr ""

781

782

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

782

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

783

msgid "No push location known or specified."

784

msgstr "Местоположение для отсылки изменений неизвестно и не указано."

785

786

#: bzrlib/builtins.py:1355

786

#: bzrlib/builtins.py:1369

787

#, python-format

788

msgid "Using saved push location: %s"

789

msgstr "Используется сохранённое местоположение отсылки: %s"

790

791

#: bzrlib/builtins.py:1365

791

#: bzrlib/builtins.py:1379

792

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

793

msgstr "Создать новую ветвь, являющуюся копией существующей ветви."

794

795

#: bzrlib/builtins.py:1367

795

#: bzrlib/builtins.py:1381

796

msgid ""

797

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

798

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

808

"из FROM_LOCATION удалением префикса. Например «branch lp:foo-bar»\n"

809

"попытается создать ./foo-bar."

810

811

#: bzrlib/builtins.py:1374

811

#: bzrlib/builtins.py:1388

812

msgid ""

813

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

814

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

816

"Чтобы получить определённую ревизию ветви, передайте её в параметре\n"

817

"--revision, напр. «branch foo/bar -r 5»."

818

819

#: bzrlib/builtins.py:1377

819

#: bzrlib/builtins.py:1391

820

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

821

msgstr "Синонимы 'clone' и 'get' для этой команды устарели."

822

823

#: bzrlib/builtins.py:1387

823

#: bzrlib/builtins.py:1401

824

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

825

msgstr "Создать ветвь без рабочего дерева."

826

827

#: bzrlib/builtins.py:1389

827

#: bzrlib/builtins.py:1403

828

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

829

msgstr "Заменить рабочую копию в текущей директории новой ветвью."

830

831

#: bzrlib/builtins.py:1392

831

#: bzrlib/builtins.py:1406

832

msgid ""

833

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

834

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

836

"Создать стековую ветвь, ссылающуюся на исходную ветвь. Все операции над "

837

"новой ветвью будут зависеть от доступности старой ветви."

838

839

#: bzrlib/builtins.py:1396

839

#: bzrlib/builtins.py:1410

840

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

841

msgstr "Не использовать общий репозиторий, даже если доступен."

842

843

#: bzrlib/builtins.py:1398

843

#: bzrlib/builtins.py:1412

844

msgid ""

845

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

846

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

849

"существует, но не содержит управляющих метаданных. Этот флаг позволит branch "

850

"продолжаться."

851

852

#: bzrlib/builtins.py:1403

852

#: bzrlib/builtins.py:1417

853

msgid "Bind new branch to from location."

854

msgstr "Связать новую ветвь с FROM_LOCATION"

855

856

#: bzrlib/builtins.py:1450

856

#: bzrlib/builtins.py:1464

857

#, python-format

858

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

859

msgstr "Целевая директория «%s» уже существует."

860

861

#: bzrlib/builtins.py:1462

861

#: bzrlib/builtins.py:1476

862

#, python-format

863

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

864

msgstr "Родитель «%s» не существует."

865

866

#: bzrlib/builtins.py:1481

866

#: bzrlib/builtins.py:1495

867

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

868

msgstr "В ветви {0} отсутствует ревизия {1}."

869

870

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

870

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

871

#, python-format

872

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

873

msgstr "Создана новая стековая ветвь, ссылающаяся на %s."

874

875

#: bzrlib/builtins.py:1500

875

#: bzrlib/builtins.py:1514

876

#, python-format

877

msgid "Branched %d revision."

878

msgid_plural "Branched %d revisions."

880

msgstr[1] "Ответвлены %d ревизии."

881

msgstr[2] "Ответвлены %d ревизий."

882

883

#: bzrlib/builtins.py:1505

883

#: bzrlib/builtins.py:1519

884

#, python-format

885

msgid "New branch bound to %s"

886

msgstr "Новая ветвь, связанная с %s"

887

888

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

888

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

889

#, python-format

890

msgid "Switched to branch: %s"

891

msgstr "Переключение на ветвь: %s"

892

893

#: bzrlib/builtins.py:1515

893

#: bzrlib/builtins.py:1529

894

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

895

msgstr "Вывести список ветвей, доступных в текущем местоположении."

896

897

#: bzrlib/builtins.py:1517

897

#: bzrlib/builtins.py:1531

898

msgid ""

899

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

900

"location."

901

msgstr "Эта команда выведет имена всех ветвей в текущем местоположении."

902

903

#: bzrlib/builtins.py:1524

903

#: bzrlib/builtins.py:1538

904

msgid ""

905

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

906

"location."

907

msgstr ""

908

"Рекурсивно сканировать ветви, а не смотреть в указанном местоположении."

909

910

#: bzrlib/builtins.py:1554

910

#: bzrlib/builtins.py:1567

911

msgid "(default)"

912

msgstr "(по умолчанию)"

913

914

#: bzrlib/builtins.py:1566

914

#: bzrlib/builtins.py:1579

915

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

916

msgstr "Создать новую рабочую копию текущей ветви."

917

918

#: bzrlib/builtins.py:1568

918

#: bzrlib/builtins.py:1581

919

msgid ""

920

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

921

"for\n"

928

"для ветви, найденной в '.'. Это полезно, если вы удалили рабочее дерево,\n"

929

"или если вы никогда не создавали его."

930

931

#: bzrlib/builtins.py:1573

931

#: bzrlib/builtins.py:1586

932

msgid ""

933

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

934

"will\n"

945

"то TO_LOCATION определется из BRANCH_LOCATION удалением префикса.\n"

946

"Например «checkout lp:foo-bar» попытается создать ./foo-bar."

947

948

#: bzrlib/builtins.py:1580

948

#: bzrlib/builtins.py:1593

949

msgid ""

950

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

951

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

959

"просрочено [так что в не сможете закрепить изменения], но это может быть\n"

960

"полезно, к примеру, для просмотра старого кода."

961

962

#: bzrlib/builtins.py:1590

962

#: bzrlib/builtins.py:1603

963

msgid ""

964

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

965

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

971

"производить стандартные операции, как diff и status, без такого доступа, а "

972

"также поддерживают локальные закрепления."

973

974

#: bzrlib/builtins.py:1597

974

#: bzrlib/builtins.py:1610

975

msgid "Get file contents from this tree."

976

msgstr "Получить содержимое файла из этого дерева."

977

978

#: bzrlib/builtins.py:1599

978

#: bzrlib/builtins.py:1612

979

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

980

msgstr "Использовать жёсткие ссылки в рабочем дереве, когда это возможно."

981

982

#: bzrlib/builtins.py:1640

982

#: bzrlib/builtins.py:1653

983

msgid ""

984

"Show list of renamed files.\n"

985

" "

987

"Показать список переименованных файлов.\n"

988

" "

989

990

#: bzrlib/builtins.py:1670

990

#: bzrlib/builtins.py:1681

991

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

992

msgstr "Обновить рабочее дерево до новой ревизии."

993

994

#: bzrlib/builtins.py:1672

994

#: bzrlib/builtins.py:1683

995

msgid ""

996

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

997

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

998

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

999

msgstr ""

1000

1001

#: bzrlib/builtins.py:1676

1001

#: bzrlib/builtins.py:1687

1002

msgid ""

1003

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

1004

"that is out of date from its branch."

1005

msgstr ""

1006

1007

#: bzrlib/builtins.py:1679

1007

#: bzrlib/builtins.py:1690

1008

msgid ""

1009

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

1010

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

1012

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

1013

msgstr ""

1014

1015

#: bzrlib/builtins.py:1684

1015

#: bzrlib/builtins.py:1695

1016

msgid ""

1017

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

1018

"the branch from the master."

1019

msgstr ""

1020

1021

#: bzrlib/builtins.py:1687

1021

#: bzrlib/builtins.py:1698

1022

msgid ""

1023

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

1024

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

1035

"или используйте 'bzr cat', чтобы записать старое содержимое этого файла\n"

1036

"в новое местоположение."

1037

1038

#: bzrlib/builtins.py:1694

1038

#: bzrlib/builtins.py:1705

1039

msgid ""

1040

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

1041

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

1042

"current working directory is used."

1043

msgstr ""

1044

1045

#: bzrlib/builtins.py:1710

1045

#: bzrlib/builtins.py:1721

1046

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

1047

msgstr "bzr update --revision принимает ровно одну ревизию"

1048

1049

#: bzrlib/builtins.py:1718

1049

#: bzrlib/builtins.py:1729

1050

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

1051

msgstr ""

1052

"bzr update может обновить только всё дерево, не файл или поддиректорию"

1053

1054

#: bzrlib/builtins.py:1749

1054

#: bzrlib/builtins.py:1760

1055

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

1056

msgstr "Дерево в актуальной ревизии {0} ветви {1}"

1057

1058

#: bzrlib/builtins.py:1765

1058

#: bzrlib/builtins.py:1776

1059

#, python-format

1060

msgid ""

1061

"branch has no revision %s\n"

1064

"в ветви нет ревизии %s\n"

1065

"bzr update --revision работает только для ревизий в истории ветви"

1066

1067

#: bzrlib/builtins.py:1771

1067

#: bzrlib/builtins.py:1782

1068

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

1069

msgstr "Обновлено до ревизии {0} ветви {1}"

1070

1071

#: bzrlib/builtins.py:1775

1071

#: bzrlib/builtins.py:1786

1072

msgid ""

1073

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

1074

"can be committed with 'bzr commit'."

1076

"Ваши локальные закрепления теперь будут отображаться в 'bzr status' как "

1077

"незавершённые слияния, и их можно закрепить с помощью 'bzr commit'."

1078

1079

#: bzrlib/builtins.py:1784

1079

#: bzrlib/builtins.py:1795

1080

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

1081

msgstr "Показать информацию о рабочем дереве, ветви или репозитории."

1082

1083

#: bzrlib/builtins.py:1786

1083

#: bzrlib/builtins.py:1797

1084

msgid ""

1085

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

1086

"tree, branch or repository."

1088

"Эта команда выведет все известные местоположения и форматы, связанные\n"

1089

"с деревом, ветвью или репозиторием."

1090

1091

#: bzrlib/builtins.py:1789

1091

#: bzrlib/builtins.py:1800

1092

msgid ""

1093

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

1094

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

1098

"Чтобы увидеть расширенную статистическую информацию, используйте уровень\n"

1099

"подробностей 2 или выше, указывая опцию -v несколько раз, например -vv."

1100

1101

#: bzrlib/builtins.py:1793

1101

#: bzrlib/builtins.py:1804

1102

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

1103

msgstr ""

1104

"Ветви и рабочие деревья также включают в отчёт отсутствующие ревизии."

1105

1106

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

1107

#: bzrlib/builtins.py:6442

1106

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

1107

#: bzrlib/builtins.py:6433

1108

msgid ":Examples:"

1109

msgstr ":Примеры:"

1110

1111

#: bzrlib/builtins.py:1797

1111

#: bzrlib/builtins.py:1808

1112

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

1113

msgstr " Вывести информацию о формате и связанных местоположениях:"

1114

1115

#: bzrlib/builtins.py:1799

1115

#: bzrlib/builtins.py:1810

1116

msgid " bzr info"

1117

msgstr " bzr info"

1118

1119

#: bzrlib/builtins.py:1801

1119

#: bzrlib/builtins.py:1812

1120

msgid ""

1121

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

1122

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

1126

" и базовую статистику (как число файлов в рабочем дереве и число\n"

1127

" ревизий в ветви и репозитории):"

1128

1129

#: bzrlib/builtins.py:1805

1129

#: bzrlib/builtins.py:1816

1130

msgid " bzr info -v"

1131

msgstr " bzr info -v"

1132

1133

#: bzrlib/builtins.py:1807

1133

#: bzrlib/builtins.py:1818

1134

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

1135

msgstr " Вывести то же, что и выше, а также число участников ветви:"

1136

1137

#: bzrlib/builtins.py:1809

1137

#: bzrlib/builtins.py:1820

1138

msgid " bzr info -vv"

1139

msgstr " bzr info -vv"

1140

1141

#: bzrlib/builtins.py:1828

1141

#: bzrlib/builtins.py:1839

1142

msgid "Remove files or directories."

1143

msgstr "Исключить файлы или директории."

1144

1145

#: bzrlib/builtins.py:1830

1145

#: bzrlib/builtins.py:1841

1146

msgid ""

1147

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

1148

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

1156

"ни параметров, Bazaar найдёт файлы, которые отслеживаются, но отсутствуют\n"

1157

"в рабочем дереве и прекратит их отслеживать."

1158

1159

#: bzrlib/builtins.py:1838

1159

#: bzrlib/builtins.py:1849

1160

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

1161

msgstr "Исключать только файлы, которые никогда не были закреплены."

1162

1163

#: bzrlib/builtins.py:1840

1163

#: bzrlib/builtins.py:1851

1164

msgid "The file deletion mode to be used."

1165

msgstr "Используемый способ удаления файлов."

1166

1167

#: bzrlib/builtins.py:1841

1167

#: bzrlib/builtins.py:1852

1168

msgid "Deletion Strategy"

1169

msgstr "Стратегия удаления"

1170

1171

#: bzrlib/builtins.py:1842

1171

#: bzrlib/builtins.py:1853

1172

msgid "Backup changed files (default)."

1173

msgstr ""

1174

1175

#: bzrlib/builtins.py:1843

1175

#: bzrlib/builtins.py:1854

1176

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

1177

msgstr "Удалить из bzr, но оставить рабочую копию."

1178

1179

#: bzrlib/builtins.py:1844

1179

#: bzrlib/builtins.py:1855

1180

msgid "Don't backup changed files."

1181

msgstr "Не создавать резервные копии изменённых файлов."

1182

1183

#: bzrlib/builtins.py:1845

1183

#: bzrlib/builtins.py:1856

1184

msgid ""

1185

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

1186

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

1188

"Удалить все указанные файлы, даже если их нельзя восстановить или они "

1189

"являются непустыми директориями. (устарело, используйте no-backup)"

1190

1191

#: bzrlib/builtins.py:1854

1191

#: bzrlib/builtins.py:1865

1192

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

1193

msgstr ""

1194

"(Опция --force устарела, в будущем следует использовать --no-backup.)"

1195

1196

#: bzrlib/builtins.py:1871

1196

#: bzrlib/builtins.py:1882

1197

msgid "No matching files."

1198

msgstr "Нет файлов, удовлетворяющих критерию."

1199

1200

#: bzrlib/builtins.py:1932

1200

#: bzrlib/builtins.py:1943

1201

msgid "Reconcile bzr metadata in a branch."

1202

msgstr "Согласовать метаданные bzr в ветви."

1203

1204

#: bzrlib/builtins.py:1934

1204

#: bzrlib/builtins.py:1945

1205

msgid ""

1206

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

1207

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

1212

"Эту команду стоит запускать только, если 'bzr check' или разработчик\n"

1213

"bzr предложат вам сделать это."

1214

1215

#: bzrlib/builtins.py:1939

1215

#: bzrlib/builtins.py:1950

1216

msgid ""

1217

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

1218

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

1224

"присутствовавшие в ранних версиях bzr, корректно представлены\n"

1225

"в обоих ветвях."

1226

1227

#: bzrlib/builtins.py:1944

1227

#: bzrlib/builtins.py:1955

1228

msgid ""

1229

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

1230

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

1233

"уменьшающее размер занимаемого пространства и повышающее\n"

1234

"производительность."

1235

1236

#: bzrlib/builtins.py:1947

1236

#: bzrlib/builtins.py:1958

1237

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

1238

msgstr ""

1239

"Ветвь *ДОЛЖНА* быть на системе, поддерживающей список файлов, такой как\r\n"

1240

"локальный диск или SFTP."

1241

1242

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

1242

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

1243

msgid ""

1244

"Format for the bzr 2.0 series.\n"

1245

"Uses group-compress storage.\n"

1246

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

1247

msgstr ""

1248

1249

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

1249

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

1250

msgid ""

1251

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

1252

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

1253

msgstr ""

1254

1255

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

1255

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

1256

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

1257

msgstr ""

1258

1259

#: bzrlib/builtins.py:2015

1259

#: bzrlib/builtins.py:2026

1260

msgid "Make a directory into a versioned branch."

1261

msgstr "Преобразовать директорию в ветвь системы контроля версий."

1262

1263

#: bzrlib/builtins.py:2017

1263

#: bzrlib/builtins.py:2028

1264

msgid ""

1265

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

1266

"existing project."

1268

"Используйте эту команду для создания пустой ветви или\n"

1269

"перед импортом существующего проекта."

1270

1271

#: bzrlib/builtins.py:2020

1271

#: bzrlib/builtins.py:2031

1272

msgid ""

1273

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

1274

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

1279

"будет сохранена в репозитории. Иначе, init создаёт одиночную ветвь,\n"

1280

"которая несёт историю с собой в директории .bzr."

1281

1282

#: bzrlib/builtins.py:2025

1282

#: bzrlib/builtins.py:2036

1283

msgid ""

1284

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

1285

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

1287

"Если ветвь уже существует, но рабочее дерево отсутствует, то оно\n"

1288

"создаётся с помощью 'bzr checkout'."

1289

1290

#: bzrlib/builtins.py:2028

1290

#: bzrlib/builtins.py:2039

1291

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

1292

msgstr "Рецепт для импорта дерева файлов::"

1293

1294

#: bzrlib/builtins.py:2030

1294

#: bzrlib/builtins.py:2041

1295

msgid ""

1296

" cd ~/project\n"

1297

" bzr init\n"

1305

" bzr status\n"

1306

" bzr commit -m \"проект импортирован\""

1307

1308

#: bzrlib/builtins.py:2041

1308

#: bzrlib/builtins.py:2052

1309

msgid ""

1310

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

1311

msgstr "Создать путь, ведущий к ветви, если он ещё не существует."

1312

1313

#: bzrlib/builtins.py:2044

1313

#: bzrlib/builtins.py:2055

1314

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

1315

msgstr "Указать формат данной ветви. См. «help formats»."

1316

1317

#: bzrlib/builtins.py:2052

1317

#: bzrlib/builtins.py:2063

1318

msgid ""

1319

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

1320

msgstr ""

1321

"Никогда не изменять номера ревизий в существующем журнале. Только добавлять "

1322

"к нему ревизии."

1323

1324

#: bzrlib/builtins.py:2055

1324

#: bzrlib/builtins.py:2066

1325

msgid "Create a branch without a working tree."

1326

msgstr "Создать ветвь без рабочего дерева."

1327

1328

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

1328

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

1329

#, python-format

1330

msgid ""

1331

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

1335

"Вы может предоставить --create-prefix, чтобы создать все родительские "

1336

"директории."

1337

1338

#: bzrlib/builtins.py:2109

1338

#: bzrlib/builtins.py:2120

1339

msgid ""

1340

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

1341

msgstr ""

1342

"Формат этой ветви не может быть установлен в append-revisions-only. "

1343

"Попробуйте --default."

1344

1345

#: bzrlib/builtins.py:2120

1345

#: bzrlib/builtins.py:2131

1346

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

1347

msgstr "Создана {0} в формате {1}\n"

1348

1349

#: bzrlib/builtins.py:2129

1349

#: bzrlib/builtins.py:2140

1350

#, python-format

1351

msgid "Using shared repository: %s\n"

1352

msgstr "Используется общий репозиторий: %s\n"

1353

1354

#: bzrlib/builtins.py:2133

1354

#: bzrlib/builtins.py:2144

1355

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

1356

msgstr ""

1357

"Создать общий репозиторий для ветвей, которые разделяют общее пространство."

1358

1359

#: bzrlib/builtins.py:2135

1359

#: bzrlib/builtins.py:2146

1360

msgid ""

1361

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

1362

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

1368

"Для ветвей с общей историей это уменьшает размер необходимого\n"

1369

"пространства и ускоряет создание новых ветвей."

1370

1371

#: bzrlib/builtins.py:2140

1371

#: bzrlib/builtins.py:2151

1372

msgid ""

1373

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

1374

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

1384

"хранящих ветви, работа с которыми производится через рабочие копии\n"

1385

"или через удалённые ветви, например на сервере."

1386

1387

#: bzrlib/builtins.py:2147

1387

#: bzrlib/builtins.py:2158

1388

msgid ""

1389

":Examples:\n"

1390

" Create a shared repository holding just branches::"

1392

":Примеры:\n"

1393

" Создать общий репозиторий, хранящий только ветви::"

1394

1395

#: bzrlib/builtins.py:2150

1395

#: bzrlib/builtins.py:2161

1396

msgid ""

1397

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

1398

" bzr init repo/trunk"

1400

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

1401

" bzr init repo/trunk"

1402

1403

#: bzrlib/builtins.py:2153

1403

#: bzrlib/builtins.py:2164

1404

msgid " Make a lightweight checkout elsewhere::"

1405

msgstr " Создать легковесную рабочую копию где-нибудь ещё::"

1406

1407

#: bzrlib/builtins.py:2155

1407

#: bzrlib/builtins.py:2166

1408

msgid ""

1409

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

1410

" cd trunk-checkout\n"

1414

" cd trunk-checkout\n"

1415

" (здесь добавляйте файлы)"

1416

1417

#: bzrlib/builtins.py:2163

1417

#: bzrlib/builtins.py:2174

1418

msgid ""

1419

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

1420

msgstr ""

1421

"Указать формат для этого репозитория. Описание форматов см. в «bzr help "

1422

"formats»."

1423

1424

#: bzrlib/builtins.py:2167

1424

#: bzrlib/builtins.py:2178

1425

msgid "Repository format"

1426

msgstr "Формат репозитория"

1427

1428

#: bzrlib/builtins.py:2169

1428

#: bzrlib/builtins.py:2180

1429

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

1430

msgstr "Ветви в репозитории по умолчанию не будут иметь рабочего дерева."

1431

1432

#: bzrlib/builtins.py:2195

1432

#: bzrlib/builtins.py:2206

1433

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

1434

msgstr "Показать изменения в рабочем дереве, между ревизиями или ветвями."

1435

1436

#: bzrlib/builtins.py:2197

1436

#: bzrlib/builtins.py:2208

1437

msgid ""

1438

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

1439

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

1448

"Если не указаны, значение по умолчанию для обоих извлекается из первого\n"

1449

"аргумента или из текущего дерева, если не дано аргументов."

1450

1451

#: bzrlib/builtins.py:2204

1451

#: bzrlib/builtins.py:2215

1452

msgid ""

1453

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

1454

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

1456

"«bzr diff -p1» эквивалентно «bzr diff -prefix old/:new/», и\n"

1457

"создаёт патчи, подходящие для «patch -p1»."

1458

1459

#: bzrlib/builtins.py:2207

1459

#: bzrlib/builtins.py:2218

1460

msgid ""

1461

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

1462

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

1471

"Это отличается от интерпретации интервалов ревизий командой «bzr log»,\n"

1472

"которая включает первую ревизию интервала."

1473

1474

#: bzrlib/builtins.py:2214

1474

#: bzrlib/builtins.py:2225

1475

msgid ""

1476

":Exit values:\n"

1477

" 1 - changed\n"

1485

" 3 - ошибка\n"

1486

" 0 - нет изменений"

1487

1488

#: bzrlib/builtins.py:2220

1488

#: bzrlib/builtins.py:2231

1489

msgid ""

1490

":Examples:\n"

1491

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

1493

":Примеры:\n"

1494

" Показывает отличия рабочего дерева от последнего закрепления::"

1495

1496

#: bzrlib/builtins.py:2223

1496

#: bzrlib/builtins.py:2234

1497

msgid " bzr diff"

1498

msgstr " bzr diff"

1499

1500

#: bzrlib/builtins.py:2225

1500

#: bzrlib/builtins.py:2236

1501

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

1502

msgstr " Различия между рабочим деревом и ревизией 1::"

1503

1504

#: bzrlib/builtins.py:2227

1504

#: bzrlib/builtins.py:2238

1505

msgid " bzr diff -r1"

1506

msgstr " bzr diff -r1"

1507

1508

#: bzrlib/builtins.py:2229

1508

#: bzrlib/builtins.py:2240

1509

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

1510

msgstr " Различия между ревизией 3 и ревизией 1::"

1511

1512

#: bzrlib/builtins.py:2231

1512

#: bzrlib/builtins.py:2242

1513

msgid " bzr diff -r1..3"

1514

msgstr " bzr diff -r1..3"

1515

1516

#: bzrlib/builtins.py:2233

1516

#: bzrlib/builtins.py:2244

1517

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

1518

msgstr " Различия между ревизией 3 и ревизией 1 для ветви xxx::"

1519

1520

#: bzrlib/builtins.py:2235

1520

#: bzrlib/builtins.py:2246

1521

msgid " bzr diff -r1..3 xxx"

1522

msgstr " bzr diff -r1..3 xxx"

1523

1524

#: bzrlib/builtins.py:2237

1524

#: bzrlib/builtins.py:2248

1525

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

1526

msgstr " Изменения, представленные в ревизии 2 (эквивалентно -r1..2)::"

1527

1528

#: bzrlib/builtins.py:2239

1528

#: bzrlib/builtins.py:2250

1529

msgid " bzr diff -c2"

1530

msgstr " bzr diff -c2"

1531

1532

#: bzrlib/builtins.py:2241

1532

#: bzrlib/builtins.py:2252

1533

msgid ""

1534

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

1535

" \n"

1539

" \n"

1540

" bzr diff -cX"

1541

1542

#: bzrlib/builtins.py:2245

1542

#: bzrlib/builtins.py:2256

1543

msgid ""

1544

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

1545

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

1549

" относительно левого родителя. Чтобы увидеть изменения относительно\n"

1550

" правого родителя, используйте::"

1551

1552

#: bzrlib/builtins.py:2249

1552

#: bzrlib/builtins.py:2260

1553

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

1554

msgstr " bzr diff -r<выбранный_родитель>..X"

1555

1556

#: bzrlib/builtins.py:2251

1556

#: bzrlib/builtins.py:2262

1557

msgid ""

1558

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

1559

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

1561

" Изменения между текущей ревизией и предыдущей\n"

1562

" (эквивалент -c-1 и -r-2..-1)"

1563

1564

#: bzrlib/builtins.py:2254

1564

#: bzrlib/builtins.py:2265

1565

msgid " bzr diff -r-2.."

1566

msgstr " bzr diff -r-2.."

1567

1568

#: bzrlib/builtins.py:2256

1568

#: bzrlib/builtins.py:2267

1569

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

1570

msgstr " Показать изменения только для файла NEWS::"

1571

1572

#: bzrlib/builtins.py:2258

1572

#: bzrlib/builtins.py:2269

1573

msgid " bzr diff NEWS"

1574

msgstr " bzr diff NEWS"

1575

1576

#: bzrlib/builtins.py:2260

1576

#: bzrlib/builtins.py:2271

1577

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

1578

msgstr " Показать изменения в рабочем дереве xxx для файла NEWS::"

1579

1580

#: bzrlib/builtins.py:2262

1580

#: bzrlib/builtins.py:2273

1581

msgid " bzr diff xxx/NEWS"

1582

msgstr " bzr diff xxx/NEWS"

1583

1584

#: bzrlib/builtins.py:2264

1584

#: bzrlib/builtins.py:2275

1585

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

1586

msgstr " Показать изменения рабочего дерева относительно ветви xxx:"

1587

1588

#: bzrlib/builtins.py:2266

1588

#: bzrlib/builtins.py:2277

1589

msgid " bzr diff --old xxx"

1590

msgstr " bzr diff --old xxx"

1591

1592

#: bzrlib/builtins.py:2268

1592

#: bzrlib/builtins.py:2279

1593

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

1594

msgstr " Показать различия в файле NEWS между двумя ветвями::"

1595

1596

#: bzrlib/builtins.py:2270

1596

#: bzrlib/builtins.py:2281

1597

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

1598

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

1599

1600

#: bzrlib/builtins.py:2272

1600

#: bzrlib/builtins.py:2283

1601

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

1602

msgstr " Тоже, что и 'bzr diff', но начать пути с old/ и new/::"

1603

1604

#: bzrlib/builtins.py:2274

1604

#: bzrlib/builtins.py:2285

1605

msgid ""

1606

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

1607

" \n"

1616

" \n"

1617

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

1618

1619

#: bzrlib/builtins.py:2284

1619

#: bzrlib/builtins.py:2295

1620

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

1621

msgstr "Передать эти опции внешней программе diff."

1622

1623

#: bzrlib/builtins.py:2287

1623

#: bzrlib/builtins.py:2298

1624

msgid ""

1625

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

1626

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

1628

"Установить префиксы, добавляемые к старым и новым именам файлов, как "

1629

"значения, разделённые двоеточием (напр. «old/:new/»)."

1630

1631

#: bzrlib/builtins.py:2290

1631

#: bzrlib/builtins.py:2301

1632

msgid "Branch/tree to compare from."

1633

msgstr "Ветвь или дерево, которое сравнивать."

1634

1635

#: bzrlib/builtins.py:2294

1635

#: bzrlib/builtins.py:2305

1636

msgid "Branch/tree to compare to."

1637

msgstr "Ветвь или дерево, с которым сравнивать."

1638

1639

#: bzrlib/builtins.py:2300

1639

#: bzrlib/builtins.py:2311

1640

msgid "Use this command to compare files."

1641

msgstr "Использовать эту команду для сравнения."

1642

1643

#: bzrlib/builtins.py:2305

1643

#: bzrlib/builtins.py:2316

1644

msgid "Diff format to use."

1645

msgstr "Используемый формат diff."

1646

1647

#: bzrlib/builtins.py:2307

1647

#: bzrlib/builtins.py:2318

1648

msgid "Diff format"

1649

msgstr "Формат diff"

1650

1651

#: bzrlib/builtins.py:2329

1651

#: bzrlib/builtins.py:2340

1652

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

1653

msgstr ""

1654

"--prefix ожидает два значения, разделённые двоеточием (напр. «old/:new/»)"

1655

1656

#: bzrlib/builtins.py:2333

1656

#: bzrlib/builtins.py:2344

1657

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

1658

msgstr "bzr diff --revision принимает ровно ожин или два аргумента"

1659

1660

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

1661

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

1660

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

1661

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

1662

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

1663

msgstr "{0} и {1} взаимоисключающи"

1664

1665

#: bzrlib/builtins.py:2358

1665

#: bzrlib/builtins.py:2369

1666

msgid ""

1667

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

1668

" "

1670

"Вывести список файлов, удалённых в рабочем дереве.\n"

1671

" "

1672

1673

#: bzrlib/builtins.py:2436

1673

#: bzrlib/builtins.py:2446

1674

msgid "Show the tree root directory."

1675

msgstr "Показать корневую директорию дерева."

1676

1677

#: bzrlib/builtins.py:2438

1677

#: bzrlib/builtins.py:2448

1678

msgid ""

1679

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

1680

"directory."

1682

"Корень это ближайшая родительская директория с управляющей\n"

1683

"директорией .bzr."

1684

1685

#: bzrlib/builtins.py:2453

1685

#: bzrlib/builtins.py:2463

1686

msgid "The limit argument must be an integer."

1687

msgstr "Аргумент предела должен быть целым числом."

1688

1689

#: bzrlib/builtins.py:2461

1689

#: bzrlib/builtins.py:2471

1690

msgid "The levels argument must be an integer."

1691

msgstr "Аргументы пределов должны быть целыми числами."

1692

1693

#: bzrlib/builtins.py:2466

1693

#: bzrlib/builtins.py:2476

1694

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

1695

msgstr "Показать журнал истории ветви или подмножества ветви."

1696

1697

#: bzrlib/builtins.py:2468

1697

#: bzrlib/builtins.py:2478

1698

msgid ""

1699

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

1700

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

1706

"параметров, выводится журнал ветви, содержащей рабочюю директорию.\n"

1707

"Вот несколько простых примеров::"

1708

1709

#: bzrlib/builtins.py:2473

1709

#: bzrlib/builtins.py:2483

1710

msgid ""

1711

" bzr log log the current branch\n"

1712

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

1716

" bzr log foo.py журнал файла в его ветви\n"

1717

" bzr log http://server/branch журнал ветви на сервере"

1718

1719

#: bzrlib/builtins.py:2477

1719

#: bzrlib/builtins.py:2487

1720

msgid ""

1721

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

1722

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

1732

"отображаются, то они отображаются с отступом, относительно ревизии,\n"

1733

"в которой происходило слияние."

1734

1735

#: bzrlib/builtins.py:2484

1735

#: bzrlib/builtins.py:2494

1736

msgid ":Output control:"

1737

msgstr ":Управление выводом:"

1738

1739

#: bzrlib/builtins.py:2486

1739

#: bzrlib/builtins.py:2496

1740

msgid ""

1741

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

1742

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

1748

" и «line». По умолчание используется long. Подробности о форматах\n"

1749

" смотрите в «bzr help log-formats»."

1750

1751

#: bzrlib/builtins.py:2491

1751

#: bzrlib/builtins.py:2501

1752

msgid ""

1753

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

1754

" displayed::"

1756

" Следующие опции могут использоваться для управления отображением\n"

1757

" информации::"

1758

1759

#: bzrlib/builtins.py:2494

1759

#: bzrlib/builtins.py:2504

1760

msgid ""

1761

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

1762

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

1770

" -p выводить различия diff для каждой ревизии\n"

1771

" --show-ids выводить id ревизий (и id файлов), не только номера ревизий"

1772

1773

#: bzrlib/builtins.py:2500

1773

#: bzrlib/builtins.py:2510

1774

msgid ""

1775

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

1776

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

1780

" Если используется не опция -n, стандартные форматы журнала показывают\n"

1781

" верхний уровень (основную линию)."

1782

1783

#: bzrlib/builtins.py:2504

1783

#: bzrlib/builtins.py:2514

1784

msgid ""

1785

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

1786

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

1790

" увидеть изменения, описанные словами вроде «добавлены» и «изменены»,\n"

1791

" используйте опцию -vv."

1792

1793

#: bzrlib/builtins.py:2508

1793

#: bzrlib/builtins.py:2518

1794

msgid ":Ordering control:"

1795

msgstr ":Управление порядком:"

1796

1797

#: bzrlib/builtins.py:2510

1797

#: bzrlib/builtins.py:2520

1798

msgid ""

1799

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

1800

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

1806

" расходуется мало времени, хотя --forward не выводит ревизии по порядку,\n"

1807

" как это делает --reverse."

1808

1809

#: bzrlib/builtins.py:2515

1809

#: bzrlib/builtins.py:2525

1810

msgid ":Revision filtering:"

1811

msgstr ":Фильтрация ревизий:"

1812

1813

#: bzrlib/builtins.py:2517

1813

#: bzrlib/builtins.py:2527

1814

msgid ""

1815

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

1816

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

1818

" Опцию -r можно использовать для указания ревизии или интервала ревизий\n"

1819

" для фильтрации. Различные формы показаны ниже::"

1820

1821

#: bzrlib/builtins.py:2520

1821

#: bzrlib/builtins.py:2530

1822

msgid ""

1823

" -rX display revision X\n"

1824

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

1830

" -r..Y вывести до и включая ревизию Y\n"

1831

" -rX..Y вывести от X до Y включительно"

1832

1833

#: bzrlib/builtins.py:2525

1833

#: bzrlib/builtins.py:2535

1834

msgid ""

1835

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

1836

" Some common examples are given below::"

1838

" Чтобы узнать, как указывать X и Y, смотрите «bzr help revisionspec».\n"

1839

" Ниже приведеные некоторые распространённые примеры::"

1840

1841

#: bzrlib/builtins.py:2528

1841

#: bzrlib/builtins.py:2538

1842

msgid ""

1843

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

1844

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

1854

" этой ветви и указанной в пути\n"

1855

" -rdate:yesterday.. показать изменения со вчерашнего дня"

1856

1857

#: bzrlib/builtins.py:2535

1857

#: bzrlib/builtins.py:2545

1858

msgid ""

1859

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

1860

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

1864

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

1865

msgstr ""

1866

1867

#: bzrlib/builtins.py:2542

1867

#: bzrlib/builtins.py:2552

1868

msgid ":Path filtering:"

1869

msgstr ":Фильтрация пути:"

1870

1871

#: bzrlib/builtins.py:2544

1871

#: bzrlib/builtins.py:2554

1872

msgid ""

1873

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

1874

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

1877

" Если заданы параметры и первый не является ветвью, будут отображаться\n"

1878

" только те ревизии, которые изменяли указанные файлы или директории."

1879

1880

#: bzrlib/builtins.py:2548

1880

#: bzrlib/builtins.py:2558

1881

msgid ""

1882

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

1883

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

1887

" журнал для удалённого файла, укажите такой интервал ревизий, что файл\n"

1888

" существует от начала до конца интервала."

1889

1890

#: bzrlib/builtins.py:2552

1890

#: bzrlib/builtins.py:2562

1891

msgid ""

1892

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

1893

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

1895

" Исторический контекст также важен при интерпретации путей\n"

1896

" переименованных файлов и директорий. Рассмотрим следующий пример:"

1897

1898

#: bzrlib/builtins.py:2555

1898

#: bzrlib/builtins.py:2565

1899

msgid ""

1900

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

1901

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

1905

" * ревизия 2: изменён tutorial.txt\n"

1906

" * ревизия 3: переименован tutorial.txt в guide.txt; добавлен tutorial.txt"

1907

1908

#: bzrlib/builtins.py:2559

1908

#: bzrlib/builtins.py:2569

1909

msgid " In this case:"

1910

msgstr " В этом случае:"

1911

1912

#: bzrlib/builtins.py:2561

1912

#: bzrlib/builtins.py:2571

1913

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

1914

msgstr ""

1915

" * «bzr log guide.txt» выведет журнал файла, добавленного в ревизии 1"

1916

1917

#: bzrlib/builtins.py:2563

1917

#: bzrlib/builtins.py:2573

1918

msgid ""

1919

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

1920

msgstr ""

1921

" * «bzr log tutorial.txt» выведет журнал нового файла, добавленного\r\n"

1922

" в ревизии 3"

1923

1924

#: bzrlib/builtins.py:2565

1924

#: bzrlib/builtins.py:2575

1925

msgid ""

1926

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

1927

" the original file in revision 2."

1929

" * «bzr log -r2 -p tutorial.txt» выведет изменения оригинального\n"

1930

" файла в ревизии 2."

1931

1932

#: bzrlib/builtins.py:2568

1932

#: bzrlib/builtins.py:2578

1933

msgid ""

1934

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

1935

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

1937

" * «bzr log -r2 -p guide.txt» выведет сообщение об ошибке, так как\n"

1938

" в ревизии 2 нет файла guide.txt."

1939

1940

#: bzrlib/builtins.py:2571

1940

#: bzrlib/builtins.py:2581

1941

msgid ""

1942

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

1943

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

1944

" until it was last renamed)."

1945

msgstr ""

1946

1947

#: bzrlib/builtins.py:2575

1947

#: bzrlib/builtins.py:2585

1948

msgid ":Other filtering:"

1949

msgstr ":Другая фильтрация:"

1950

1951

#: bzrlib/builtins.py:2577

1951

#: bzrlib/builtins.py:2587

1952

msgid ""

1953

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

1954

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

1963

" полям можно использовать опции --match-author, --match-bugs,\n"

1964

" --match-committer и --match-message."

1965

1966

#: bzrlib/builtins.py:2583

1966

#: bzrlib/builtins.py:2593

1967

msgid ":Tips & tricks:"

1968

msgstr ":Советы и трюки:"

1969

1970

#: bzrlib/builtins.py:2585

1970

#: bzrlib/builtins.py:2595

1971

msgid ""

1972

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

1973

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

1981

" <http://doc.bazaar.canonical.com/plugins/en/> и\n"

1982

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

1983

1984

#: bzrlib/builtins.py:2591

1984

#: bzrlib/builtins.py:2601

1985

msgid ""

1986

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

1987

msgstr ""

1988

" Возможно, вы захотите добавить следующие псевдонимы в «bazaar.conf»::"

1989

1990

#: bzrlib/builtins.py:2593

1990

#: bzrlib/builtins.py:2603

1991

msgid ""

1992

" [ALIASES]\n"

1993

" tip = log -r-1\n"

1999

" top = log -l10 --line\n"

2000

" show = log -v -p"

2001

2002

#: bzrlib/builtins.py:2598

2002

#: bzrlib/builtins.py:2608

2003

msgid ""

2004

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

2005

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

2009

" 10 ревизий основной линии. Чтобы просмотреть журнал определённой\n"

2010

" ревизии X, используйте «bzr show -rX»."

2011

2012

#: bzrlib/builtins.py:2602

2012

#: bzrlib/builtins.py:2612

2013

msgid ""

2014

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

2015

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

2017

" Если вы хотите подробно рассмотреть определённое слияние X,\n"

2018

" используйте «bzr log -n0 -rX»."

2019

2020

#: bzrlib/builtins.py:2605

2020

#: bzrlib/builtins.py:2615

2021

msgid ""

2022

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

2023

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

2029

" недостатка. Независимо от того, будет это исправлено или нет,\n"

2030

" рекомендуется задавать интервал ревизий с помощью опции -v."

2031

2032

#: bzrlib/builtins.py:2610

2032

#: bzrlib/builtins.py:2620

2033

msgid ""

2034

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

2035

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

2037

" a list of words but not others."

2038

msgstr ""

2039

2040

#: bzrlib/builtins.py:2615

2040

#: bzrlib/builtins.py:2625

2041

msgid ""

2042

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

2043

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

2045

" trading disk space for faster speed."

2046

msgstr ""

2047

2048

#: bzrlib/builtins.py:2624

2048

#: bzrlib/builtins.py:2634

2049

msgid "Show from oldest to newest."

2050

msgstr "Выводить от старых к новым."

2051

2052

#: bzrlib/builtins.py:2627

2052

#: bzrlib/builtins.py:2637

2053

msgid "Show files changed in each revision."

2054

msgstr "Показывать файлы, изменённые в каждой ревизии."

2055

2056

#: bzrlib/builtins.py:2633

2056

#: bzrlib/builtins.py:2643

2057

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

2058

msgstr "Показать только указанную ревизию. См. также «help revisionspec»."

2059

2060

#: bzrlib/builtins.py:2637

2060

#: bzrlib/builtins.py:2647

2061

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

2062

msgstr "Какие имена выводить, как авторов — first, all или committer."

2063

2064

#: bzrlib/builtins.py:2638

2064

#: bzrlib/builtins.py:2648

2065

msgid "Authors"

2066

msgstr "Авторы"

2067

2068

#: bzrlib/builtins.py:2643

2068

#: bzrlib/builtins.py:2653

2069

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

2070

msgstr "Число уровней для вывода — 0 для всех, 1 для плоского вывода."

2071

2072

#: bzrlib/builtins.py:2653

2072

#: bzrlib/builtins.py:2663

2073

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

2074

msgstr "Ограничить вывод лишь первыми N ревизиями."

2075

2076

#: bzrlib/builtins.py:2658

2076

#: bzrlib/builtins.py:2668

2077

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

2078

msgstr "Показать изменения, сделанные в каждой ревизии, в виде патча."

2079

2080

#: bzrlib/builtins.py:2660

2080

#: bzrlib/builtins.py:2670

2081

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

2082

msgstr "Показывать слияния, как это делает --levels 0."

2083

2084

#: bzrlib/builtins.py:2664

2084

#: bzrlib/builtins.py:2674

2085

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

2086

msgstr "Не сообщать о закреплениях с более, чем одним родителем."

2087

2088

#: bzrlib/builtins.py:2666

2088

#: bzrlib/builtins.py:2676

2089

msgid ""

2090

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

2091

"rX..Y)."

2093

"Показать только ревизии, которые не являются частью обоих предков (требует -"

2094

"rX..Y)."

2095

2096

#: bzrlib/builtins.py:2670

2096

#: bzrlib/builtins.py:2680

2097

msgid "Show digital signature validity."

2098

msgstr ""

2099

2100

#: bzrlib/builtins.py:2673

2100

#: bzrlib/builtins.py:2683

2101

msgid "Show revisions whose properties match this expression."

2102

msgstr "Показывать ревизии, свойства которых удовлетворяют этому выражению."

2103

2104

#: bzrlib/builtins.py:2677

2104

#: bzrlib/builtins.py:2687

2105

msgid "Show revisions whose message matches this expression."

2106

msgstr ""

2107

"Показывать ревизии, комментарий которых удовлетворяет этому выражению."

2108

2109

#: bzrlib/builtins.py:2681

2109

#: bzrlib/builtins.py:2691

2110

msgid "Show revisions whose committer matches this expression."

2111

msgstr ""

2112

"Показывать ревизии, закрепитель которых удовлетворяет этому выражению."

2113

2114

#: bzrlib/builtins.py:2685

2114

#: bzrlib/builtins.py:2695

2115

msgid "Show revisions whose authors match this expression."

2116

msgstr "Показывать ревизии, авторы которых удовлетворяют этому выражению."

2117

2118

#: bzrlib/builtins.py:2689

2118

#: bzrlib/builtins.py:2699

2119

msgid "Show revisions whose bugs match this expression."

2120

msgstr "Показывать ревизии, ошибки которых удовлетворяют этому выражению."

2121

2122

#: bzrlib/builtins.py:2743

2122

#: bzrlib/builtins.py:2753

2123

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

2124

msgstr "--exclude-common-ancestry требует -r с двумя ревизиями"

2125

2126

#: bzrlib/builtins.py:2771

2126

#: bzrlib/builtins.py:2781

2127

#, python-format

2128

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

2129

msgstr "Неизвестный путь в начале или конце интервала ревизий: %s"

2130

2131

#: bzrlib/builtins.py:2888

2131

#: bzrlib/builtins.py:2898

2132

#, python-format

2133

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

2134

msgstr "bzr %s не принимает две ревизии в различных ветвях."

2135

2136

#: bzrlib/builtins.py:2904

2136

#: bzrlib/builtins.py:2914

2137

#, python-format

2138

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

2139

msgstr "bzr %s --revision принимает одно или два значения."

2140

2141

#: bzrlib/builtins.py:2949

2141

#: bzrlib/builtins.py:2959

2142

msgid ""

2143

"List files in a tree.\n"

2144

" "

2146

"Вывести список файлов в дереве.\n"

2147

" "

2148

2149

#: bzrlib/builtins.py:2958

2149

#: bzrlib/builtins.py:2968

2150

msgid "Recurse into subdirectories."

2151

msgstr "Рекурсивно входить в поддиректории."

2152

2153

#: bzrlib/builtins.py:2960

2153

#: bzrlib/builtins.py:2970

2154

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

2155

msgstr "Выводить пути относительно корня ветви."

2156

2157

#: bzrlib/builtins.py:2962

2157

#: bzrlib/builtins.py:2972

2158

msgid "Print unknown files."

2159

msgstr "Выводить неизвестные файлы."

2160

2161

#: bzrlib/builtins.py:2963

2161

#: bzrlib/builtins.py:2973

2162

msgid "Print versioned files."

2163

msgstr "Выводить файлы под контролем системы версий."

2164

2165

#: bzrlib/builtins.py:2966

2165

#: bzrlib/builtins.py:2976

2166

msgid "Print ignored files."

2167

msgstr "Выводить игнорируемые файлы."

2168

2169

#: bzrlib/builtins.py:2968

2169

#: bzrlib/builtins.py:2978

2170

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

2171

msgstr "Выводить файлы определённого типа: file, directory, symlink."

2172

2173

#: bzrlib/builtins.py:2981

2173

#: bzrlib/builtins.py:2991

2174

msgid "invalid kind specified"

2175

msgstr "указан неверный вид файла"

2176

2177

#: bzrlib/builtins.py:2984

2177

#: bzrlib/builtins.py:2994

2178

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

2179

msgstr "Нельзя установить оба --verbose и --null"

2180

2181

#: bzrlib/builtins.py:2993

2181

#: bzrlib/builtins.py:3003

2182

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

2183

msgstr "нельзя указать оба --from-root и PATH"

2184

2185

#: bzrlib/builtins.py:3080

2185

#: bzrlib/builtins.py:3090

2186

msgid "Ignore specified files or patterns."

2187

msgstr "Игнорировать указанные файлы или шаблоны."

2188

2189

#: bzrlib/builtins.py:3082

2189

#: bzrlib/builtins.py:3092

2190

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

2191

msgstr "Смотрите подробности о синтаксисе шаблонов в «bzr help patterns»."

2192

2193

#: bzrlib/builtins.py:3084

2193

#: bzrlib/builtins.py:3094

2194

msgid ""

2195

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

2196

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

2204

"к системе версий. Создание файла .bzrignore без использования\n"

2205

"команды ignore потребует явного добавления командой add."

2206

2207

#: bzrlib/builtins.py:3090

2207

#: bzrlib/builtins.py:3100

2208

msgid ""

2209

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

2210

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

2216

"файла, как неявно с помощью этой команды, так и явно при помощи\n"

2217

"редактора, не забывайте закреплять его."

2218

2219

#: bzrlib/builtins.py:3095

2219

#: bzrlib/builtins.py:3105

2220

msgid ""

2221

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

2222

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

2232

"Эта команда не изменяет глобальный файл игнорирования. Он может быть\n"

2233

"отредактирован вручную с помощью текстового редактора."

2234

2235

#: bzrlib/builtins.py:3101

2235

#: bzrlib/builtins.py:3111

2236

msgid ""

2237

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

2238

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

2243

"указания файлов, которые должны попасть под контроль системы версий, но\n"

2244

"по умолчанию игнорируются."

2245

2246

#: bzrlib/builtins.py:3105

2246

#: bzrlib/builtins.py:3115

2247

msgid ""

2248

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

2249

"precedence over the '!' exception patterns."

2251

"Шаблоны, начинающиеся с '!!' ведут себя как обычные шаблоны, но имеют\n"

2252

"приоритет над шаблонами исключений '!'."

2253

2254

#: bzrlib/builtins.py:3108

2254

#: bzrlib/builtins.py:3118

2255

msgid ""

2256

":Notes: \n"

2257

" \n"

2263

"* Шаблоны игнорирования, содержащие специальные символы оболочки,\n"

2264

" должны быть заключены в кавычки при указании в командной строке."

2265

2266

#: bzrlib/builtins.py:3113

2266

#: bzrlib/builtins.py:3123

2267

msgid ""

2268

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

2269

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

2272

" Чтобы добавить шаблон, начинающийся с этого символа, используйте\n"

2273

" префикс \"RE:\"."

2274

2275

#: bzrlib/builtins.py:3116

2275

#: bzrlib/builtins.py:3126

2276

msgid ""

2277

":Examples:\n"

2278

" Ignore the top level Makefile::"

2280

":Примеры:\n"

2281

" Игнорировать файл Makefile на верхнем уровне::"

2282

2283

#: bzrlib/builtins.py:3119

2283

#: bzrlib/builtins.py:3129

2284

msgid " bzr ignore ./Makefile"

2285

msgstr " bzr ignore ./Makefile"

2286

2287

#: bzrlib/builtins.py:3121

2287

#: bzrlib/builtins.py:3131

2288

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

2289

msgstr " Игнорировать файлы .class во всех директориях...::"

2290

2291

#: bzrlib/builtins.py:3123

2291

#: bzrlib/builtins.py:3133

2292

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

2293

msgstr " bzr ignore \"*.class\""

2294

2295

#: bzrlib/builtins.py:3125

2295

#: bzrlib/builtins.py:3135

2296

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

2297

msgstr " ...но не игнорировать \"special.class\"::"

2298

2299

#: bzrlib/builtins.py:3127

2299

#: bzrlib/builtins.py:3137

2300

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

2301

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

2302

2303

#: bzrlib/builtins.py:3129

2303

#: bzrlib/builtins.py:3139

2304

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

2305

msgstr " Игнорировать файлы, начинающиеся с символа \"#\"::"

2306

2307

#: bzrlib/builtins.py:3131

2307

#: bzrlib/builtins.py:3141

2308

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

2309

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

2310

2311

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

2311

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

2312

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

2313

msgstr " Игнорировать файлы .o в директории lib::"

2314

2315

#: bzrlib/builtins.py:3135

2315

#: bzrlib/builtins.py:3145

2316

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

2317

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

2318

2319

#: bzrlib/builtins.py:3139

2319

#: bzrlib/builtins.py:3149

2320

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

2321

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

2322

2323

#: bzrlib/builtins.py:3141

2323

#: bzrlib/builtins.py:3151

2324

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

2325

msgstr " Игнорировать всё, кроме верхней директории \"debian\"::"

2326

2327

#: bzrlib/builtins.py:3143

2327

#: bzrlib/builtins.py:3153

2328

msgid ""

2329

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

2330

" \n"

2344

" bzr ignore \"!./local\"\n"

2345

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

2346

2347

#: bzrlib/builtins.py:3157

2347

#: bzrlib/builtins.py:3167

2348

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

2349

msgstr "Вывести правила игнорирования, которые bzr использует по умолчанию."

2350

2351

#: bzrlib/builtins.py:3169

2351

#: bzrlib/builtins.py:3179

2352

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

2353

msgstr ""

2354

"Для ignore требуется как минимум одно из NAME_PATTERN или --default-rules."

2355

2356

#: bzrlib/builtins.py:3180

2356

#: bzrlib/builtins.py:3190

2357

#, python-format

2358

msgid "Invalid ignore pattern found. %s"

2359

msgid_plural "Invalid ignore patterns found. %s"

2361

msgstr[1] "Найдены некорректные шаблоны игнорирования. %s"

2362

msgstr[2] "Найдены некорректные шаблоны игнорирования. %s"

2363

2364

#: bzrlib/builtins.py:3189

2364

#: bzrlib/builtins.py:3199

2365

msgid "NAME_PATTERN should not be an absolute path"

2366

msgstr "NAME_PATTERN не должен быть абсолютным путём"

2367

2368

#: bzrlib/builtins.py:3202

2368

#: bzrlib/builtins.py:3212

2369

#, python-format

2370

msgid ""

2371

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

2380

"Эти файлы будут продолжать под контролем системы версий, пока вы не "

2381

"выполните 'bzr remove'.\n"

2382

2383

#: bzrlib/builtins.py:3209

2383

#: bzrlib/builtins.py:3219

2384

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

2385

msgstr "Вывести игнорируемые файлы и шаблоны, которым они удовлетворяют."

2386

2387

#: bzrlib/builtins.py:3211

2387

#: bzrlib/builtins.py:3221

2388

msgid ""

2389

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

2390

"be ignored."

2392

"Вывести все игнорируемые файлы и шаблоны игнорирования, из-за которых эти\n"

2393

"файлы игнорируются."

2394

2395

#: bzrlib/builtins.py:3214

2395

#: bzrlib/builtins.py:3224

2396

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

2397

msgstr "Альтернативно, чтобы вывести только файлы::"

2398

2399

#: bzrlib/builtins.py:3216

2399

#: bzrlib/builtins.py:3226

2400

msgid " bzr ls --ignored"

2401

msgstr " bzr ls --ignored"

2402

2403

#: bzrlib/builtins.py:3250

2403

#: bzrlib/builtins.py:3260

2404

#, python-format

2405

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

2406

msgstr "некорректный номер ревизии: %r"

2407

2408

#: bzrlib/builtins.py:3257

2408

#: bzrlib/builtins.py:3267

2409

msgid ""

2410

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

2411

msgstr ""

2412

"Экспортировать текущую или прошлую ревизию в директорию назначения\r\n"

2413

"или архив."

2414

2415

#: bzrlib/builtins.py:3259

2415

#: bzrlib/builtins.py:3269

2416

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

2417

msgstr "Если ревизия не указана, экспортирует последнюю ревизию."

2418

2419

#: bzrlib/builtins.py:3261

2419

#: bzrlib/builtins.py:3271

2420

msgid ""

2421

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

2422

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

2426

"Если не указан, формат определяется по расширению. Если расширение\n"

2427

"отсутствует, экспортирует в директорию (эквивалентно --format=dir)."

2428

2429

#: bzrlib/builtins.py:3265

2429

#: bzrlib/builtins.py:3275

2430

msgid ""

2431

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

2432

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

2437

"умолчанию используется имя файла для эскпорта. Опция root не имеет\n"

2438

"эффекта для формата 'dir'."

2439

2440

#: bzrlib/builtins.py:3269

2440

#: bzrlib/builtins.py:3279

2441

msgid ""

2442

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

2443

"directory will be used."

2445

"Если ветвь опущена, используется ветвь, содержащая текущую рабочую\n"

2446

"директорию."

2447

2448

#: bzrlib/builtins.py:3272

2448

#: bzrlib/builtins.py:3282

2449

msgid ""

2450

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

2451

msgstr ""

2452

"Замечание: Экспорт в zip деревьев с именами файлов, содержащими не-ASCII\r\n"

2453

"символы, не поддерживается."

2454

2455

#: bzrlib/builtins.py:3274

2455

#: bzrlib/builtins.py:3284

2456

msgid ""

2457

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

2458

" Supported formats Autodetected by extension\n"

2474

" zip .zip\n"

2475

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

2476

2477

#: bzrlib/builtins.py:3288

2477

#: bzrlib/builtins.py:3298

2478

msgid "Type of file to export to."

2479

msgstr "Тип файла для экспорта."

2480

2481

#: bzrlib/builtins.py:3291

2481

#: bzrlib/builtins.py:3301

2482

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

2483

msgstr ""

2484

2485

#: bzrlib/builtins.py:3295

2485

#: bzrlib/builtins.py:3305

2486

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

2487

msgstr "Имя корневой директории внутри экспортируемого файла."

2488

2489

#: bzrlib/builtins.py:3297

2489

#: bzrlib/builtins.py:3307

2490

msgid ""

2491

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

2492

"changed."

2494

"Установить время изменения файлов на время последней ревизии, в которой они "

2495

"были изменены."

2496

2497

#: bzrlib/builtins.py:3300

2497

#: bzrlib/builtins.py:3310

2498

msgid ""

2499

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

2500

msgstr ""

2501

2502

#: bzrlib/builtins.py:3319

2502

#: bzrlib/builtins.py:3329

2503

msgid "--uncommitted requires a working tree"

2504

msgstr "--uncommitted требует рабочее дерево"

2505

2506

#: bzrlib/builtins.py:3328

2506

#: bzrlib/builtins.py:3338

2507

#, python-format

2508

msgid "Unsupported export format: %s"

2509

msgstr "Неподдерживаемый формат экспорта: %s"

2510

2511

#: bzrlib/builtins.py:3332

2511

#: bzrlib/builtins.py:3342

2512

msgid ""

2513

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

2514

msgstr ""

2515

"Вывести содержимое файла из определённой ревизии на стандартный вывод."

2516

2517

#: bzrlib/builtins.py:3334

2517

#: bzrlib/builtins.py:3344

2518

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

2519

msgstr "Если ревизия не указана, используется последняя."

2520

2521

#: bzrlib/builtins.py:3336

2521

#: bzrlib/builtins.py:3346

2522

msgid ""

2523

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

2524

"binary file."

2526

"Замечание: Не забывайте перенаправлять стандартный вывод при использовании\n"

2527

"этой команды на двоичном файле."

2528

2529

#: bzrlib/builtins.py:3342

2529

#: bzrlib/builtins.py:3352

2530

msgid "The path name in the old tree."

2531

msgstr "Имя пути в старом дереве."

2532

2533

#: bzrlib/builtins.py:3343

2533

#: bzrlib/builtins.py:3353

2534

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

2535

msgstr "Применить фильтры содержимого для отображения в удобной форме."

2536

2537

#: bzrlib/builtins.py:3354

2537

#: bzrlib/builtins.py:3364

2538

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

2539

msgstr "bzr cat --revision принимает ровно один спецификатор ревизии"

2540

2541

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

2541

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

2542

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

2543

msgstr "{0!r} не представлен в ревизии {1}"

2544

2545

#: bzrlib/builtins.py:3414

2545

#: bzrlib/builtins.py:3424

2546

msgid "Commit changes into a new revision."

2547

msgstr "Закрепить изменения в новой ревизии."

2548

2549

#: bzrlib/builtins.py:3416

2549

#: bzrlib/builtins.py:3426

2550

msgid ""

2551

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

2552

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

2556

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

2557

msgstr ""

2558

2559

#: bzrlib/builtins.py:3423

2559

#: bzrlib/builtins.py:3433

2560

msgid ""

2561

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

2562

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

2565

"По умолчанию, закрепляется всё дерево и закрепляющий считается автором.\n"

2566

"Эти умолчания могут быть перезаписаны, как объяснено ниже."

2567

2568

#: bzrlib/builtins.py:3427

2568

#: bzrlib/builtins.py:3437

2569

msgid ":Selective commits:"

2570

msgstr ":Выборочные закрепления:"

2571

2572

#: bzrlib/builtins.py:3429

2572

#: bzrlib/builtins.py:3439

2573

msgid ""

2574

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

2575

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

2579

" Если указана директория, то закрепляется директория и всё её\n"

2580

" содержимое."

2581

2582

#: bzrlib/builtins.py:3433

2582

#: bzrlib/builtins.py:3443

2583

msgid ""

2584

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

2585

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

2589

" Например, чтобы закрепить изменения внутри foo, но не изменения\n"

2590

" в foo/bar::"

2591

2592

#: bzrlib/builtins.py:3437

2592

#: bzrlib/builtins.py:3447

2593

msgid " bzr commit foo -x foo/bar"

2594

msgstr " bzr commit foo -x foo/bar"

2595

2596

#: bzrlib/builtins.py:3439

2596

#: bzrlib/builtins.py:3449

2597

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

2598

msgstr " Выборочные закрепления после слияния пока не поддерживаются."

2599

2600

#: bzrlib/builtins.py:3441

2600

#: bzrlib/builtins.py:3451

2601

msgid ":Custom authors:"

2602

msgstr ":Выбор автора:"

2603

2604

#: bzrlib/builtins.py:3443

2604

#: bzrlib/builtins.py:3453

2605

msgid ""

2606

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

2607

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

2616

" \"John Doe <jdoe@example.com>\". Если в изменении участвовал более,\n"

2617

" чем один автор, вы можете указать эту опцию несколько раз."

2618

2619

#: bzrlib/builtins.py:3450

2619

#: bzrlib/builtins.py:3460

2620

msgid ":Checks:"

2621

msgstr ":Проверки:"

2622

2623

#: bzrlib/builtins.py:3452

2623

#: bzrlib/builtins.py:3462

2624

msgid ""

2625

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

2626

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

2634

" быть реализованы определением обработчиков. Подробности можно найти,\n"

2635

" выполнив команду ``bzr help hooks''."

2636

2637

#: bzrlib/builtins.py:3458

2637

#: bzrlib/builtins.py:3468

2638

msgid ":Things to note:"

2639

msgstr ":На заметку:"

2640

2641

#: bzrlib/builtins.py:3460

2641

#: bzrlib/builtins.py:3470

2642

msgid ""

2643

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

2644

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

2649

" uncommit, чтобы отменить последнее закрепление. Подробности смотрите\n"

2650

" в «bzr help uncommit»."

2651

2652

#: bzrlib/builtins.py:3464

2652

#: bzrlib/builtins.py:3474

2653

msgid ""

2654

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

2655

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

2657

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

2658

msgstr ""

2659

2660

#: bzrlib/builtins.py:3474

2660

#: bzrlib/builtins.py:3484

2661

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

2662

msgstr "Не рассматривать изменения, сделанные в заданном пути."

2663

2664

#: bzrlib/builtins.py:3477

2664

#: bzrlib/builtins.py:3487

2665

msgid "Description of the new revision."

2666

msgstr "Описание новой ревизии."

2667

2668

#: bzrlib/builtins.py:3480

2668

#: bzrlib/builtins.py:3490

2669

msgid "Commit even if nothing has changed."

2670

msgstr "Закрепить, даже если ничего не изменилось."

2671

2672

#: bzrlib/builtins.py:3484

2672

#: bzrlib/builtins.py:3494

2673

msgid "Take commit message from this file."

2674

msgstr "Взять сообщение о закреплении из этого файла."

2675

2676

#: bzrlib/builtins.py:3486

2676

#: bzrlib/builtins.py:3496

2677

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

2678

msgstr ""

2679

"Отказываться закреплять, если в рабочем дереве есть неизвестные файлы."

2680

2681

#: bzrlib/builtins.py:3489

2681

#: bzrlib/builtins.py:3499

2682

msgid ""

2683

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

2684

"08:00:00 +0100'."

2686

"Вручную установить время закрепления, используя формат даты закрепления, "

2687

"напр. '2009-10-10 08:00:00 +0100'."

2688

2689

#: bzrlib/builtins.py:3492

2689

#: bzrlib/builtins.py:3502

2690

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

2691

msgstr ""

2692

"Отметить ошибку, как исправленную в этой ревизии (см. «bzr help bugs»)."

2693

2694

#: bzrlib/builtins.py:3495

2694

#: bzrlib/builtins.py:3505

2695

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

2696

msgstr "Установить имя автора, если оно отличается от имени закрепляющего."

2697

2698

#: bzrlib/builtins.py:3498

2698

#: bzrlib/builtins.py:3508

2699

msgid ""

2700

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

2701

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

2704

"выгружаются в основную ветвь до тех пор, пока не совершено нормальное "

2705

"закрепление."

2706

2707

#: bzrlib/builtins.py:3504

2707

#: bzrlib/builtins.py:3514

2708

msgid ""

2709

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

2710

"the message editor."

2712

"Если не указано сообщение, показывать изменения формате diff вместе с "

2713

"обзором состояния в редакторе сообщения."

2714

2715

#: bzrlib/builtins.py:3507

2715

#: bzrlib/builtins.py:3517

2716

msgid ""

2717

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

2718

"can not be natively represented."

2720

"При закреплении в иной системе контроля версий, не выгружать данные, которые "

2721

"нельзя в ней представить."

2722

2723

#: bzrlib/builtins.py:3525

2723

#: bzrlib/builtins.py:3535

2724

#, python-format

2725

msgid ""

2726

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

2732

"Больше информации об этом можно узнать, выполнив «bzr help bugs». "

2733

"Закрепление отклонено."

2734

2735

#: bzrlib/builtins.py:3534

2735

#: bzrlib/builtins.py:3544

2736

#, python-format

2737

msgid ""

2738

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

2743

"информации об этом можно узнать, выполнив «bzr help bugs».\n"

2744

"Закрепление отклонено."

2745

2746

#: bzrlib/builtins.py:3543

2746

#: bzrlib/builtins.py:3553

2747

#, python-format

2748

msgid "Unrecognized bug %s. Commit refused."

2749

msgstr "Ошибка %s не распознана. Закрепление отклонено."

2750

2751

#: bzrlib/builtins.py:3546

2751

#: bzrlib/builtins.py:3556

2752

#, python-format

2753

msgid ""

2754

"%s\n"

2757

"%s\n"

2758

"Закрепление отклонено."

2759

2760

#: bzrlib/builtins.py:3570

2760

#: bzrlib/builtins.py:3580

2761

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

2762

msgstr "Не удалось разобрать --commit-time: "

2763

2764

#: bzrlib/builtins.py:3610

2764

#: bzrlib/builtins.py:3620

2765

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

2766

msgstr "укажите либо --message, либо --file"

2767

2768

#: bzrlib/builtins.py:3639

2768

#: bzrlib/builtins.py:3649

2769

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

2770

msgstr "укажите сообщение о закреплении, используя --message либо --file"

2771

2772

#: bzrlib/builtins.py:3642

2772

#: bzrlib/builtins.py:3652

2773

msgid ""

2774

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

2775

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

2777

"Указано пустое сообщение о закреплении. Пожалуйста, укажите сообщение опцией "

2778

"--message либо --file или оставьте пустым, указав --message \"\"."

2779

2780

#: bzrlib/builtins.py:3662

2780

#: bzrlib/builtins.py:3672

2781

msgid ""

2782

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

2783

"-unchanged to force an empty commit."

2786

"командой 'bzr add', или используйте --unchanged, чтобы принудительно сделать "

2787

"пустое закрепление."

2788

2789

#: bzrlib/builtins.py:3666

2789

#: bzrlib/builtins.py:3676

2790

msgid ""

2791

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

2792

"resolve FILE\" to resolve."

2794

"В рабочем дереве обнаружены конфликты. Выполните «bzr conflicts», чтобы "

2795

"вывести список конфликтов и «bzr resolve ФАЙЛ» для исправления."

2796

2797

#: bzrlib/builtins.py:3670

2797

#: bzrlib/builtins.py:3680

2798

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

2799

msgstr "Закрепление отклонено, поскольку в рабочем дереве неизвестные файлы."

2800

2801

#: bzrlib/builtins.py:3673

2801

#: bzrlib/builtins.py:3683

2802

msgid ""

2803

"\n"

2804

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

2805

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

2806

msgstr ""

2807

2808

#: bzrlib/builtins.py:3681

2808

#: bzrlib/builtins.py:3691

2809

msgid ""

2810

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

2811

msgstr ""

2812

2813

#: bzrlib/builtins.py:3683

2813

#: bzrlib/builtins.py:3693

2814

msgid ""

2815

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

2816

"to detect data corruption or bzr bugs."

2817

msgstr ""

2818

2819

#: bzrlib/builtins.py:3686

2819

#: bzrlib/builtins.py:3696

2820

msgid ""

2821

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

2822

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

2824

"Проверки рабочего дерева и ветви выведут что-либо только в случае\n"

2825

"обнаружения проблемы. Поля вывода проверки репозитория следующие:"

2826

2827

#: bzrlib/builtins.py:3689

2827

#: bzrlib/builtins.py:3699

2828

msgid ""

2829

"revisions\n"

2830

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

2834

" Это просто число проверенных ревизий. Оно не указывает\n"

2835

" на проблему."

2836

2837

#: bzrlib/builtins.py:3693

2837

#: bzrlib/builtins.py:3703

2838

msgid ""

2839

"versionedfiles\n"

2840

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

2844

" Это просто число проверенных файлов под контролем системы\n"

2845

" версий. Оно не указывает на проблему."

2846

2847

#: bzrlib/builtins.py:3697

2847

#: bzrlib/builtins.py:3707

2848

msgid ""

2849

"unreferenced ancestors\n"

2850

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

2856

" корректных ссылок в истории ревизии. Это небольшая\n"

2857

" проблема, с которой Bazaar может разобраться."

2858

2859

#: bzrlib/builtins.py:3702

2859

#: bzrlib/builtins.py:3712

2860

msgid ""

2861

"unique file texts\n"

2862

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

2866

" Это общее число уникального содержимого файлов, встреченного\n"

2867

" в проверенных ревизиях. Оно не указывает на проблему."

2868

2869

#: bzrlib/builtins.py:3706

2869

#: bzrlib/builtins.py:3716

2870

msgid ""

2871

"repeated file texts\n"

2872

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

2880

" файлов изменились, но их содержимое осталось прежним. Оно не\n"

2881

" указывает на проблему."

2882

2883

#: bzrlib/builtins.py:3712

2883

#: bzrlib/builtins.py:3722

2884

msgid ""

2885

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

2886

"given\n"

2887

"location will be checked."

2888

msgstr ""

2889

2890

#: bzrlib/builtins.py:3717

2890

#: bzrlib/builtins.py:3727

2891

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

2892

msgstr " Проверить рабочее дерево и ветвь в 'foo'::"

2893

2894

#: bzrlib/builtins.py:3719

2894

#: bzrlib/builtins.py:3729

2895

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

2896

msgstr " bzr check --tree --branch foo"

2897

2898

#: bzrlib/builtins.py:3721

2898

#: bzrlib/builtins.py:3731

2899

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

2900

msgstr " Проверить только репозиторий в 'bar'::"

2901

2902

#: bzrlib/builtins.py:3723

2902

#: bzrlib/builtins.py:3733

2903

msgid " bzr check --repo bar"

2904

msgstr " bzr check --repo bar"

2905

2906

#: bzrlib/builtins.py:3725

2906

#: bzrlib/builtins.py:3735

2907

msgid " Check everything at 'baz'::"

2908

msgstr " Проверить всё в 'baz'::"

2909

2910

#: bzrlib/builtins.py:3727

2910

#: bzrlib/builtins.py:3737

2911

msgid " bzr check baz"

2912

msgstr " bzr check baz"

2913

2914

#: bzrlib/builtins.py:3733

2914

#: bzrlib/builtins.py:3743

2915

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

2916

msgstr "Проверить ветвь, относящуюся к текущей директории."

2917

2918

#: bzrlib/builtins.py:3735

2918

#: bzrlib/builtins.py:3745

2919

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

2920

msgstr "Проверить репозиторий, относящийся к текущей директории."

2921

2922

#: bzrlib/builtins.py:3737

2922

#: bzrlib/builtins.py:3747

2923

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

2924

msgstr "Проверить рабочее дерево, относящееся к текущей директории."

2925

2926

#: bzrlib/builtins.py:3751

2926

#: bzrlib/builtins.py:3761

2927

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

2928

msgstr "Обновить репозиторий, ветвь или рабочее дерево до нового формата."

2929

2930

#: bzrlib/builtins.py:3753

2930

#: bzrlib/builtins.py:3763

2931

msgid ""

2932

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

2933

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

2936

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

2937

msgstr ""

2938

2939

#: bzrlib/builtins.py:3759

2939

#: bzrlib/builtins.py:3769

2940

msgid ""

2941

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

2942

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

2946

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

2947

msgstr ""

2948

2949

#: bzrlib/builtins.py:3766

2949

#: bzrlib/builtins.py:3776

2950

msgid ""

2951

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

2952

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

2957

"afterwards."

2958

msgstr ""

2959

2960

#: bzrlib/builtins.py:3774

2960

#: bzrlib/builtins.py:3784

2961

msgid ""

2962

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

2963

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

2965

"tried."

2966

msgstr ""

2967

2968

#: bzrlib/builtins.py:3779

2968

#: bzrlib/builtins.py:3789

2969

msgid ""

2970

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

2971

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

2972

msgstr ""

2973

2974

#: bzrlib/builtins.py:3787

2974

#: bzrlib/builtins.py:3797

2975

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

2976

msgstr ""

2977

"Обновить до определённого формата. Подробности см. в «bzr help formats»."

2978

2979

#: bzrlib/builtins.py:3791

2979

#: bzrlib/builtins.py:3801

2980

msgid "Branch format"

2981

msgstr "Формат ветви"

2982

2983

#: bzrlib/builtins.py:3793

2983

#: bzrlib/builtins.py:3803

2984

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

2985

msgstr "Удалить директорию backup.bzr при успешном завершении."

2986

2987

#: bzrlib/builtins.py:3795

2987

#: bzrlib/builtins.py:3805

2988

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

2989

msgstr ""

2990

2991

#: bzrlib/builtins.py:3810

2991

#: bzrlib/builtins.py:3820

2992

msgid "Show or set bzr user id."

2993

msgstr ""

2994

2995

#: bzrlib/builtins.py:3812

2995

#: bzrlib/builtins.py:3822

2996

msgid ""

2997

":Examples:\n"

2998

" Show the email of the current user::"

3000

":Примеры:\n"

3001

" Показать email текущего пользователя::"

3002

3003

#: bzrlib/builtins.py:3815

3003

#: bzrlib/builtins.py:3825

3004

msgid " bzr whoami --email"

3005

msgstr " bzr whoami --email"

3006

3007

#: bzrlib/builtins.py:3817

3007

#: bzrlib/builtins.py:3827

3008

msgid " Set the current user::"

3009

msgstr " Установить текущего пользователя::"

3010

3011

#: bzrlib/builtins.py:3819

3011

#: bzrlib/builtins.py:3829

3012

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

3013

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

3014

3015

#: bzrlib/builtins.py:3823

3015

#: bzrlib/builtins.py:3833

3016

msgid "Display email address only."

3017

msgstr "Показать только адрес email."

3018

3019

#: bzrlib/builtins.py:3825

3019

#: bzrlib/builtins.py:3835

3020

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

3021

msgstr ""

3022

3023

#: bzrlib/builtins.py:3851

3023

#: bzrlib/builtins.py:3861

3024

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

3025

msgstr ""

3026

3027

#: bzrlib/builtins.py:3873

3027

#: bzrlib/builtins.py:3885

3028

msgid "Print or set the branch nickname."

3029

msgstr "Вывести или установить имя ветви."

3030

3031

#: bzrlib/builtins.py:3875

3031

#: bzrlib/builtins.py:3887

3032

msgid ""

3033

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

3034

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

3033

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

3034

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

3035

"current nickname, execute with no argument."

3035

3036

msgstr ""

3036

3037

#: bzrlib/builtins.py:3878

3038

#: bzrlib/builtins.py:3891

3038

3039

msgid ""

3039

3040

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

3040

3041

"locally."

3041

3042

msgstr ""

3042

3043

#: bzrlib/builtins.py:3898

3044

#: bzrlib/builtins.py:3911

3044

3045

msgid "Set/unset and display aliases."

3045

3046

msgstr "Установить, удалить или отобразить псевдонимы."

3046

3047

#: bzrlib/builtins.py:3900

3048

#: bzrlib/builtins.py:3913

3048

3049

msgid ""

3049

3050

":Examples:\n"

3050

3051

" Show the current aliases::"

3052

3053

":Примеры:\n"

3053

3054

" Показать текущие псевдонимы::"

3054

3055

#: bzrlib/builtins.py:3903

3056

#: bzrlib/builtins.py:3916

3056

3057

msgid " bzr alias"

3057

3058

msgstr " bzr alias"

3058

3059

#: bzrlib/builtins.py:3905

3060

#: bzrlib/builtins.py:3918

3060

3061

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

3061

3062

msgstr " Показать псевдоним для 'll'::"

3062

3063

#: bzrlib/builtins.py:3907

3064

#: bzrlib/builtins.py:3920

3064

3065

msgid " bzr alias ll"

3065

3066

msgstr " bzr alias ll"

3066

3067

#: bzrlib/builtins.py:3909

3068

#: bzrlib/builtins.py:3922

3068

3069

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

3069

3070

msgstr " Установить псевдоним для 'll'::"

3070

3071

#: bzrlib/builtins.py:3911

3072

#: bzrlib/builtins.py:3924

3072

3073

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

3073

3074

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

3074

3075

#: bzrlib/builtins.py:3913

3076

#: bzrlib/builtins.py:3926

3076

3077

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

3077

3078

msgstr " Удалить псевдоним для 'll'::"

3078

3079

#: bzrlib/builtins.py:3915

3080

#: bzrlib/builtins.py:3928

3080

3081

msgid " bzr alias --remove ll"

3081

3082

msgstr " bzr alias --remove ll"

3082

3083

#: bzrlib/builtins.py:3920

3084

#: bzrlib/builtins.py:3933

3084

3085

msgid "Remove the alias."

3085

3086

msgstr "Удалить псевдоним."

3086

3087

#: bzrlib/builtins.py:3938

3088

#: bzrlib/builtins.py:3951

3088

3089

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

3089

3090

msgstr "bzr alias --remove требуется псевдоним для удаления."

3090

3091

#: bzrlib/builtins.py:4119

3092

#: bzrlib/builtins.py:4132

3092

3093

msgid ""

3093

3094

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

3094

3095

msgstr ""

3095

3096

"subunit не доступен. Нужно установить subunit, чтобы использовать --subunit."

3096

3097

#: bzrlib/builtins.py:4136

3098

#: bzrlib/builtins.py:4149

3098

3099

msgid ""

3099

3100

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

3100

3101

msgstr ""

3101

3102

"--benchmark не поддерживается начиная с версии bzr 2.2; вместо этого "

3102

3103

"используйте bzr-usertest"

3103

3104

#: bzrlib/builtins.py:4183

3105

#: bzrlib/builtins.py:4196

3105

3106

msgid "Show version of bzr."

3106

3107

msgstr "Вывести версию bzr."

3107

3108

#: bzrlib/builtins.py:4187

3109

#: bzrlib/builtins.py:4200

3109

3110

msgid "Print just the version number."

3110

3111

msgstr "Вывести только номер версии."

3111

3112

#: bzrlib/builtins.py:4206

3113

#: bzrlib/builtins.py:4219

3113

3114

msgid "It sure does!\n"

3114

3115

msgstr "Да, он крут!\n"

3115

3116

#: bzrlib/builtins.py:4230

3117

#: bzrlib/builtins.py:4243

3117

3118

#, python-format

3118

3119

msgid "merge base is revision %s\n"

3119

3120

msgstr ""

3120

3121

#: bzrlib/builtins.py:4234

3122

#: bzrlib/builtins.py:4247

3122

3123

msgid "Perform a three-way merge."

3123

3124

msgstr ""

3124

3125

#: bzrlib/builtins.py:4236

3126

#: bzrlib/builtins.py:4249

3126

3127

msgid ""

3127

3128

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

3128

3129

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

3133

3134

"the current working tree."

3134

3135

msgstr ""

3135

3136

#: bzrlib/builtins.py:4244

3137

#: bzrlib/builtins.py:4257

3137

3138

msgid ""

3138

3139

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

3139

3140

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

3140

3141

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

3141

3142

msgstr ""

3142

3143

#: bzrlib/builtins.py:4248

3144

#: bzrlib/builtins.py:4261

3144

3145

msgid ""

3145

3146

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

3146

3147

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

3147

3148

msgstr ""

3148

3149

#: bzrlib/builtins.py:4251

3150

#: bzrlib/builtins.py:4264

3150

3151

msgid ""

3151

3152

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

3152

3153

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

3157

3158

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

3158

3159

msgstr ""

3159

3160

#: bzrlib/builtins.py:4259

3161

#: bzrlib/builtins.py:4272

3161

3162

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

3162

3163

msgstr ""

3163

3164

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

3165

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

3165

3166

msgid ""

3166

3167

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

3167

3168

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

3169

3170

"before you can commit."

3170

3171

msgstr ""

3171

3172

#: bzrlib/builtins.py:4266

3173

#: bzrlib/builtins.py:4279

3173

3174

msgid ""

3174

3175

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

3175

3176

msgstr ""

3176

3177

#: bzrlib/builtins.py:4268

3178

#: bzrlib/builtins.py:4281

3178

3179

msgid ""

3179

3180

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

3180

3181

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

3182

3183

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

3183

3184

msgstr ""

3184

3185

#: bzrlib/builtins.py:4273

3186

#: bzrlib/builtins.py:4286

3186

3187

msgid ""

3187

3188

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

3188

3189

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

3189

3190

"committed to record the result of the merge."

3190

3191

msgstr ""

3191

3192

#: bzrlib/builtins.py:4277

3193

#: bzrlib/builtins.py:4290

3193

3194

msgid ""

3194

3195

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

3195

3196

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

3198

3199

"merge revision which has more than two parents."

3199

3200

msgstr ""

3200

3201

#: bzrlib/builtins.py:4283

3202

#: bzrlib/builtins.py:4296

3202

3203

msgid ""

3203

3204

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

3204

3205

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

3205

3206

"can be given."

3206

3207

msgstr ""

3207

3208

#: bzrlib/builtins.py:4287

3209

#: bzrlib/builtins.py:4300

3209

3210

msgid ""

3210

3211

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

3211

3212

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

3212

3213

msgstr ""

3213

3214

#: bzrlib/builtins.py:4290

3215

#: bzrlib/builtins.py:4303

3215

3216

msgid ""

3216

3217

":Examples:\n"

3217

3218

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

3218

3219

msgstr ""

3219

3220

#: bzrlib/builtins.py:4293

3221

#: bzrlib/builtins.py:4306

3221

3222

msgid " bzr merge ../bzr.dev"

3222

3223

msgstr ""

3223

3224

#: bzrlib/builtins.py:4295

3225

#: bzrlib/builtins.py:4308

3225

3226

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

3226

3227

msgstr ""

3227

3228

#: bzrlib/builtins.py:4297

3229

#: bzrlib/builtins.py:4310

3229

3230

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

3230

3231

msgstr ""

3231

3232

#: bzrlib/builtins.py:4299

3233

#: bzrlib/builtins.py:4312

3233

3234

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

3234

3235

msgstr ""

3235

3236

#: bzrlib/builtins.py:4301

3237

#: bzrlib/builtins.py:4314

3237

3238

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

3238

3239

msgstr ""

3239

3240

#: bzrlib/builtins.py:4303

3241

#: bzrlib/builtins.py:4316

3241

3242

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

3242

3243

msgstr ""

3243

3244

#: bzrlib/builtins.py:4305

3245

#: bzrlib/builtins.py:4318

3245

3246

msgid " bzr merge /tmp/merge"

3246

3247

msgstr ""

3247

3248

#: bzrlib/builtins.py:4307

3249

#: bzrlib/builtins.py:4320

3249

3250

msgid ""

3250

3251

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

3251

3252

" feature1a and feature1b:"

3252

3253

msgstr ""

3253

3254

#: bzrlib/builtins.py:4310

3255

#: bzrlib/builtins.py:4323

3255

3256

msgid ""

3256

3257

" bzr merge ../feature1a\n"

3257

3258

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

3258

3259

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

3259

3260

msgstr ""

3260

3261

#: bzrlib/builtins.py:4322

3262

#: bzrlib/builtins.py:4335

3262

3263

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

3263

3264

msgstr ""

3264

3265

#: bzrlib/builtins.py:4328

3266

#: bzrlib/builtins.py:4341

3266

3267

msgid ""

3267

3268

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

3268

3269

msgstr ""

3269

3270

#: bzrlib/builtins.py:4330

3271

#: bzrlib/builtins.py:4343

3271

3272

msgid ""

3272

3273

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

3273

3274

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

3274

3275

"commit the result."

3275

3276

msgstr ""

3276

3277

#: bzrlib/builtins.py:4335

3278

#: bzrlib/builtins.py:4348

3278

3279

msgid ""

3279

3280

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

3280

3281

msgstr ""

3281

3282

#: bzrlib/builtins.py:4337

3283

#: bzrlib/builtins.py:4350

3283

3284

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

3284

3285

msgstr ""

3285

3286

#: bzrlib/builtins.py:4339

3287

#: bzrlib/builtins.py:4352

3287

3288

msgid "Select changes interactively."

3288

3289

msgstr ""

3289

3290

#: bzrlib/builtins.py:4361

3291

#: bzrlib/builtins.py:4374

3291

3292

msgid ""

3292

3293

"Merging into empty branches not currently supported, "

3293

3294

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

3294

3295

msgstr ""

3295

3296

#: bzrlib/builtins.py:4388

3297

#: bzrlib/builtins.py:4401

3297

3298

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

3298

3299

msgstr ""

3299

3300

#: bzrlib/builtins.py:4399

3301

#: bzrlib/builtins.py:4412

3301

3302

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

3302

3303

msgstr ""

3303

3304

#: bzrlib/builtins.py:4419

3305

#: bzrlib/builtins.py:4432

3305

3306

msgid "merger: "

3306

3307

msgstr ""

3307

3308

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

3309

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

3309

3310

msgid "Nothing to do."

3310

3311

msgstr ""

3311

3312

#: bzrlib/builtins.py:4425

3313

#: bzrlib/builtins.py:4438

3313

3314

msgid "Cannot pull individual files"

3314

3315

msgstr ""

3315

3316

#: bzrlib/builtins.py:4433

3317

#: bzrlib/builtins.py:4446

3317

3318

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

3318

3319

msgstr ""

3319

3320

#: bzrlib/builtins.py:4491

3321

#: bzrlib/builtins.py:4504

3321

3322

#, python-format

3322

3323

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

3323

3324

msgstr ""

3324

3325

#: bzrlib/builtins.py:4500

3326

#: bzrlib/builtins.py:4513

3326

3327

#, python-format

3327

3328

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

3328

3329

msgstr ""

3329

3330

#: bzrlib/builtins.py:4504

3331

#: bzrlib/builtins.py:4517

3331

3332

msgid "Cannot do conflict reduction and show base."

3332

3333

msgstr ""

3333

3334

#: bzrlib/builtins.py:4615

3335

#: bzrlib/builtins.py:4628

3335

3336

msgid "No location specified or remembered"

3336

3337

msgstr ""

3337

3338

#: bzrlib/builtins.py:4617

3339

#: bzrlib/builtins.py:4630

3339

3340

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

3340

3341

msgstr ""

3341

3342

#: bzrlib/builtins.py:4623

3343

#: bzrlib/builtins.py:4636

3343

3344

msgid "Redo a merge."

3344

3345

msgstr ""

3345

3346

#: bzrlib/builtins.py:4625

3347

#: bzrlib/builtins.py:4638

3347

3348

msgid ""

3348

3349

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

3349

3350

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

3350

3351

"lets you try different ones on different files."

3351

3352

msgstr ""

3352

3353

#: bzrlib/builtins.py:4629

3354

#: bzrlib/builtins.py:4642

3354

3355

msgid ""

3355

3356

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

3356

3357

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

3357

3358

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

3358

3359

msgstr ""

3359

3360

#: bzrlib/builtins.py:4633

3361

#: bzrlib/builtins.py:4646

3361

3362

msgid ""

3362

3363

":Examples:\n"

3363

3364

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

3364

3365

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

3365

3366

msgstr ""

3366

3367

#: bzrlib/builtins.py:4637

3368

#: bzrlib/builtins.py:4650

3368

3369

msgid " bzr remerge --show-base"

3369

3370

msgstr ""

3370

3371

#: bzrlib/builtins.py:4639

3372

#: bzrlib/builtins.py:4652

3372

3373

msgid ""

3373

3374

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

3374

3375

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

3375

3376

msgstr ""

3376

3377

#: bzrlib/builtins.py:4642

3378

#: bzrlib/builtins.py:4655

3378

3379

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

3379

3380

msgstr ""

3380

3381

#: bzrlib/builtins.py:4649

3382

#: bzrlib/builtins.py:4662

3382

3383

msgid "Show base revision text in conflicts."

3383

3384

msgstr ""

3384

3385

#: bzrlib/builtins.py:4661

3386

#: bzrlib/builtins.py:4674

3386

3387

msgid ""

3387

3388

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

3388

3389

"merges."

3389

3390

msgstr ""

3390

3391

#: bzrlib/builtins.py:4717

3392

#: bzrlib/builtins.py:4731

3392

3393

msgid "Revert files to a previous revision."

3393

3394

msgstr ""

3394

3395

#: bzrlib/builtins.py:4719

3396

#: bzrlib/builtins.py:4733

3396

3397

msgid ""

3397

3398

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

3398

3399

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

3399

3400

"last committed revision is used."

3400

3401

msgstr ""

3401

3402

#: bzrlib/builtins.py:4723

3403

#: bzrlib/builtins.py:4737

3403

3404

msgid ""

3404

3405

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

3405

3406

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

3408

3409

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

3409

3410

msgstr ""

3410

3411

#: bzrlib/builtins.py:4729

3412

#: bzrlib/builtins.py:4743

3412

3413

msgid ""

3413

3414

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

3414

3415

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

3415

3416

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

3416

3417

msgstr ""

3417

3418

#: bzrlib/builtins.py:4733

3419

#: bzrlib/builtins.py:4747

3419

3420

msgid ""

3420

3421

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

3421

3422

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

3423

3424

"reverted."

3424

3425

msgstr ""

3425

3426

#: bzrlib/builtins.py:4738

3427

#: bzrlib/builtins.py:4752

3427

3428

msgid ""

3428

3429

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

3429

3430

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

3431

3432

"deleted."

3432

3433

msgstr ""

3433

3434

#: bzrlib/builtins.py:4743

3435

#: bzrlib/builtins.py:4757

3435

3436

msgid ""

3436

3437

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

3437

3438

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

3443

3444

"reverting any files."

3444

3445

msgstr ""

3445

3446

#: bzrlib/builtins.py:4752

3447

#: bzrlib/builtins.py:4766

3447

3448

msgid ""

3448

3449

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

3449

3450

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

3457

3458

"target branches."

3458

3459

msgstr ""

3459

3460

#: bzrlib/builtins.py:4766

3461

#: bzrlib/builtins.py:4780

3461

3462

msgid "Do not save backups of reverted files."

3462

3463

msgstr ""

3463

3464

#: bzrlib/builtins.py:4768

3465

#: bzrlib/builtins.py:4782

3465

3466

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

3466

3467

msgstr ""

3467

3468

#: bzrlib/builtins.py:4799

3469

#: bzrlib/builtins.py:4813

3469

3470

msgid ""

3470

3471

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

3471

3472

" "

3472

3473

msgstr ""

3473

3474

#: bzrlib/builtins.py:4804

3475

#: bzrlib/builtins.py:4818

3475

3476

msgid "Show help on all commands."

3476

3477

msgstr ""

3477

3478

#: bzrlib/builtins.py:4833

3479

#: bzrlib/builtins.py:4847

3479

3480

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

3480

3481

msgstr ""

3481

3482

#: bzrlib/builtins.py:4835

3483

#: bzrlib/builtins.py:4849

3483

3484

msgid "OTHER_BRANCH may be local or remote."

3484

3485

msgstr ""

3485

3486

#: bzrlib/builtins.py:4837

3487

#: bzrlib/builtins.py:4851

3487

3488

msgid ""

3488

3489

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

3489

3490

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

3494

3495

" 0 - no missing revisions"

3495

3496

msgstr ""

3496

3497

#: bzrlib/builtins.py:4847

3498

#: bzrlib/builtins.py:4861

3498

3499

msgid ""

3499

3500

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

3500

3501

" remembered pull location::"

3501

3502

msgstr ""

3502

3503

#: bzrlib/builtins.py:4850

3504

#: bzrlib/builtins.py:4864

3504

3505

msgid " bzr missing"

3505

3506

msgstr ""

3506

3507

#: bzrlib/builtins.py:4852

3508

#: bzrlib/builtins.py:4866

3508

3509

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

3509

3510

msgstr ""

3510

3511

#: bzrlib/builtins.py:4854

3512

#: bzrlib/builtins.py:4868

3512

3513

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

3513

3514

msgstr ""

3514

3515

#: bzrlib/builtins.py:4856

3516

#: bzrlib/builtins.py:4870

3516

3517

msgid ""

3517

3518

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

3518

3519

" branch::"

3519

3520

msgstr ""

3520

3521

#: bzrlib/builtins.py:4859

3522

#: bzrlib/builtins.py:4873

3522

3523

msgid " bzr missing -r ..-10"

3523

3524

msgstr ""

3524

3525

#: bzrlib/builtins.py:4861

3526

#: bzrlib/builtins.py:4875

3526

3527

msgid ""

3527

3528

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

3528

3529

" branch::"

3529

3530

msgstr ""

3530

3531

#: bzrlib/builtins.py:4864

3532

#: bzrlib/builtins.py:4878

3532

3533

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

3533

3534

msgstr ""

3534

3535

#: bzrlib/builtins.py:4871

3536

#: bzrlib/builtins.py:4885

3536

3537

msgid "Reverse the order of revisions."

3537

3538

msgstr ""

3538

3539

#: bzrlib/builtins.py:4873

3540

#: bzrlib/builtins.py:4887

3540

3541

msgid "Display changes in the local branch only."

3541

3542

msgstr ""

3542

3543

#: bzrlib/builtins.py:4874

3544

#: bzrlib/builtins.py:4888

3544

3545

msgid "Same as --mine-only."

3545

3546

msgstr ""

3546

3547

#: bzrlib/builtins.py:4876

3548

#: bzrlib/builtins.py:4890

3548

3549

msgid "Display changes in the remote branch only."

3549

3550

msgstr ""

3550

3551

#: bzrlib/builtins.py:4877

3552

#: bzrlib/builtins.py:4891

3552

3553

msgid "Same as --theirs-only."

3553

3554

msgstr ""

3554

3555

#: bzrlib/builtins.py:4882

3556

#: bzrlib/builtins.py:4896

3556

3557

msgid ""

3557

3558

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

3558

3559

"details."

3559

3560

msgstr ""

3560

3561

#: bzrlib/builtins.py:4886

3562

#: bzrlib/builtins.py:4900

3562

3563

msgid ""

3563

3564

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

3564

3565

"details."

3565

3566

msgstr ""

3566

3567

#: bzrlib/builtins.py:4889

3568

#: bzrlib/builtins.py:4903

3568

3569

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

3569

3570

msgstr ""

3570

3571

#: bzrlib/builtins.py:4943

3572

#: bzrlib/builtins.py:4957

3572

3573

msgid "No peer location known or specified."

3573

3574

msgstr ""

3574

3575

#: bzrlib/builtins.py:4947

3576

#: bzrlib/builtins.py:4961

3576

3577

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

3577

3578

msgstr ""

3578

3579

#: bzrlib/builtins.py:4980

3580

#: bzrlib/builtins.py:4994

3580

3581

#, python-format

3581

3582

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

3582

3583

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

3583

3584

msgstr[0] ""

3584

3585

msgstr[1] ""

3585

3586

#: bzrlib/builtins.py:4996

3587

#: bzrlib/builtins.py:5010

3587

3588

#, python-format

3588

3589

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

3589

3590

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

3590

3591

msgstr[0] ""

3591

3592

msgstr[1] ""

3592

3593

#: bzrlib/builtins.py:5008

3594

#: bzrlib/builtins.py:5022

3594

3595

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

3595

3596

msgstr ""

3596

3597

#: bzrlib/builtins.py:5011

3598

#: bzrlib/builtins.py:5025

3598

3599

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

3599

3600

msgstr ""

3600

3601

#: bzrlib/builtins.py:5016

3602

#: bzrlib/builtins.py:5030

3602

3603

msgid "Branches are up to date.\n"

3603

3604

msgstr ""

3604

3605

#: bzrlib/builtins.py:5027

3606

#: bzrlib/builtins.py:5041

3606

3607

msgid "Compress the data within a repository."

3607

3608

msgstr ""

3608

3609

#: bzrlib/builtins.py:5029

3610

#: bzrlib/builtins.py:5043

3610

3611

msgid ""

3611

3612

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

3612

3613

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

3613

3614

"normally not required to be done manually."

3614

3615

msgstr ""

3615

3616

#: bzrlib/builtins.py:5033

3617

#: bzrlib/builtins.py:5047

3617

3618

msgid ""

3618

3619

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

3619

3620

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

3622

3623

"used."

3623

3624

msgstr ""

3624

3625

#: bzrlib/builtins.py:5039

3626

#: bzrlib/builtins.py:5053

3626

3627

msgid ""

3627

3628

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

3628

3629

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

3630

3631

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

3631

3632

msgstr ""

3632

3633

#: bzrlib/builtins.py:5048

3634

#: bzrlib/builtins.py:5062

3634

3635

msgid "Delete obsolete packs to save disk space."

3635

3636

msgstr ""

3636

3637

#: bzrlib/builtins.py:5062

3638

#: bzrlib/builtins.py:5076

3638

3639

msgid "List the installed plugins."

3639

3640

msgstr ""

3640

3641

#: bzrlib/builtins.py:5064

3642

#: bzrlib/builtins.py:5078

3642

3643

msgid ""

3643

3644

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

3644

3645

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

3645

3646

msgstr ""

3646

3647

#: bzrlib/builtins.py:5067

3648

#: bzrlib/builtins.py:5081

3648

3649

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

3649

3650

msgstr ""

3650

3651

#: bzrlib/builtins.py:5069

3652

#: bzrlib/builtins.py:5083

3652

3653

msgid ""

3653

3654

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

3654

3655

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

3657

3658

"customizing log output."

3658

3659

msgstr ""

3659

3660

#: bzrlib/builtins.py:5075

3661

#: bzrlib/builtins.py:5089

3661

3662

msgid ""

3662

3663

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

3663

3664

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

3665

3666

"plugins using the Python programming language."

3666

3667

msgstr ""

3667

3668

#: bzrlib/builtins.py:5091

3669

#: bzrlib/builtins.py:5105

3669

3670

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

3670

3671

msgstr ""

3671

3672

#: bzrlib/builtins.py:5094

3673

#: bzrlib/builtins.py:5108

3673

3674

msgid "Produce long-format testament."

3674

3675

msgstr ""

3675

3676

#: bzrlib/builtins.py:5096

3677

#: bzrlib/builtins.py:5110

3677

3678

msgid "Produce a strict-format testament."

3678

3679

msgstr ""

3679

3680

#: bzrlib/builtins.py:5122

3681

#: bzrlib/builtins.py:5136

3681

3682

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

3682

3683

msgstr ""

3683

3684

#: bzrlib/builtins.py:5124

3685

#: bzrlib/builtins.py:5138

3685

3686

msgid ""

3686

3687

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

3687

3688

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

3688

3689

msgstr ""

3689

3690

#: bzrlib/builtins.py:5127

3691

#: bzrlib/builtins.py:5141

3691

3692

msgid ""

3692

3693

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

3693

3694

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

3694

3695

msgstr ""

3695

3696

#: bzrlib/builtins.py:5135

3697

#: bzrlib/builtins.py:5149

3697

3698

msgid "Show annotations on all lines."

3698

3699

msgstr ""

3699

3700

#: bzrlib/builtins.py:5136

3701

#: bzrlib/builtins.py:5150

3701

3702

msgid "Show commit date in annotations."

3702

3703

msgstr ""

3703

3704

#: bzrlib/builtins.py:5223

3705

#: bzrlib/builtins.py:5237

3705

3706

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

3706

3707

msgstr ""

3707

3708

#: bzrlib/builtins.py:5235

3709

#: bzrlib/builtins.py:5249

3709

3710

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

3710

3711

msgstr ""

3711

3712

#: bzrlib/builtins.py:5239

3713

#: bzrlib/builtins.py:5253

3713

3714

msgid ""

3714

3715

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

3715

3716

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

3717

3718

"Преобразовать текущую ветвь в рабочую копию указанной ветви.\n"

3718

3719

"Если ветвь не указаны, перепривязать последнее расположение привязки."

3719

3720

#: bzrlib/builtins.py:5242

3721

#: bzrlib/builtins.py:5256

3721

3722

msgid ""

3722

3723

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

3723

3724

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

3725

3726

"После преобразования в рабочую копию, закрепления должны производиться\n"

3726

3727

"над основной ветвью, прежде чем они могут быть применены к локальной."

3727

3728

#: bzrlib/builtins.py:5245

3729

#: bzrlib/builtins.py:5259

3729

3730

msgid ""

3730

3731

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

3731

3732

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

3732

3733

"that of the master."

3733

3734

msgstr ""

3734

3735

#: bzrlib/builtins.py:5260

3736

#: bzrlib/builtins.py:5274

3736

3737

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

3737

3738

msgstr ""

3738

3739

#: bzrlib/builtins.py:5265

3740

#: bzrlib/builtins.py:5280

3740

3741

msgid "Branch is already bound"

3741

3742

msgstr ""

3742

3743

#: bzrlib/builtins.py:5267

3744

#: bzrlib/builtins.py:5283

3744

3745

msgid "No location supplied and no previous location known"

3745

3746

msgstr ""

3746

3747

#: bzrlib/builtins.py:5273

3748

#: bzrlib/builtins.py:5289

3748

3749

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

3749

3750

msgstr ""

3750

3751

#: bzrlib/builtins.py:5280

3752

#: bzrlib/builtins.py:5296

3752

3753

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

3753

3754

msgstr "Преобразовать текущую рабочую копию в обычную ветвь."

3754

3755

#: bzrlib/builtins.py:5282

3756

#: bzrlib/builtins.py:5298

3756

3757

msgid ""

3757

3758

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

3758

3759

"commits will be local only."

3759

3760

msgstr ""

3760

3761

#: bzrlib/builtins.py:5293

3762

#: bzrlib/builtins.py:5309

3762

3763

msgid "Local branch is not bound"

3763

3764

msgstr ""

3764

3765

#: bzrlib/builtins.py:5297

3766

#: bzrlib/builtins.py:5313

3766

3767

msgid "Remove the last committed revision."

3767

3768

msgstr ""

3768

3769

#: bzrlib/builtins.py:5299

3770

#: bzrlib/builtins.py:5315

3770

3771

msgid ""

3771

3772

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

3772

3773

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

3773

3774

"remove anything."

3774

3775

msgstr ""

3775

3776

#: bzrlib/builtins.py:5303

3777

#: bzrlib/builtins.py:5319

3777

3778

msgid ""

3778

3779

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

3779

3780

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

3780

3781

"branch at revision 15."

3781

3782

msgstr ""

3782

3783

#: bzrlib/builtins.py:5307

3784

#: bzrlib/builtins.py:5323

3784

3785

msgid ""

3785

3786

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

3786

3787

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

3787

3788

"the commit."

3788

3789

msgstr ""

3789

3790

#: bzrlib/builtins.py:5318

3791

#: bzrlib/builtins.py:5334

3791

3792

msgid "Don't actually make changes."

3792

3793

msgstr ""

3793

3794

#: bzrlib/builtins.py:5319

3795

#: bzrlib/builtins.py:5335

3795

3796

msgid "Say yes to all questions."

3796

3797

msgstr ""

3797

3798

#: bzrlib/builtins.py:5321

3799

#: bzrlib/builtins.py:5337

3799

3800

msgid "Keep tags that point to removed revisions."

3800

3801

msgstr ""

3801

3802

#: bzrlib/builtins.py:5323

3803

#: bzrlib/builtins.py:5339

3803

3804

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

3804

3805

msgstr "Удалить закрепления из локальной ветви только в рабочей копии."

3805

3806

#: bzrlib/builtins.py:5372

3807

#: bzrlib/builtins.py:5388

3807

3808

msgid "No revisions to uncommit.\n"

3808

3809

msgstr ""

3809

3810

#: bzrlib/builtins.py:5387

3811

#: bzrlib/builtins.py:5403

3811

3812

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

3812

3813

msgstr ""

3813

3814

#: bzrlib/builtins.py:5390

3815

#: bzrlib/builtins.py:5406

3815

3816

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

3816

3817

msgstr ""

3817

3818

#: bzrlib/builtins.py:5394

3819

#: bzrlib/builtins.py:5410

3819

3820

msgid "Uncommit these revisions"

3820

3821

msgstr ""

3821

3822

#: bzrlib/builtins.py:5397

3823

#: bzrlib/builtins.py:5413

3823

3824

msgid "Canceled\n"

3824

3825

msgstr ""

3825

3826

#: bzrlib/builtins.py:5404

3827

#: bzrlib/builtins.py:5420

3827

3828

#, python-format

3828

3829

msgid ""

3829

3830

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

3830

3831

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

3831

3832

msgstr ""

3832

3833

#: bzrlib/builtins.py:5409

3834

#: bzrlib/builtins.py:5425

3834

3835

msgid "Break a dead lock."

3835

3836

msgstr ""

3836

3837

#: bzrlib/builtins.py:5411

3838

#: bzrlib/builtins.py:5427

3838

3839

msgid ""

3839

3840

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

3840

3841

"config file."

3841

3842

msgstr ""

3842

3843

#: bzrlib/builtins.py:5414

3844

#: bzrlib/builtins.py:5430

3844

3845

msgid ""

3845

3846

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

3846

3847

"holding the lock has been stopped."

3847

3848

msgstr ""

3848

3849

#: bzrlib/builtins.py:5417

3850

#: bzrlib/builtins.py:5433

3850

3851

msgid ""

3851

3852

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

3852

3853

"[location]' command."

3853

3854

msgstr ""

3854

3855

#: bzrlib/builtins.py:5420

3856

#: bzrlib/builtins.py:5436

3856

3857

msgid ""

3857

3858

":Examples:\n"

3858

3859

" bzr break-lock\n"

3860

3861

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

3861

3862

msgstr ""

3862

3863

#: bzrlib/builtins.py:5429

3864

#: bzrlib/builtins.py:5445

3864

3865

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

3865

3866

msgstr ""

3866

3867

#: bzrlib/builtins.py:5431

3868

#: bzrlib/builtins.py:5447

3868

3869

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

3869

3870

msgstr ""

3870

3871

#: bzrlib/builtins.py:5466

3872

#: bzrlib/builtins.py:5482

3872

3873

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

3873

3874

msgstr ""

3874

3875

#: bzrlib/builtins.py:5467

3876

#: bzrlib/builtins.py:5483

3876

3877

msgid "Run the bzr server."

3877

3878

msgstr ""

3878

3879

#: bzrlib/builtins.py:5473

3880

#: bzrlib/builtins.py:5489

3880

3881

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

3881

3882

msgstr ""

3882

3883

#: bzrlib/builtins.py:5474

3884

#: bzrlib/builtins.py:5490

3884

3885

msgid "protocol"

3885

3886

msgstr ""

3886

3887

#: bzrlib/builtins.py:5475

3888

#: bzrlib/builtins.py:5491

3888

3889

msgid "Protocol to serve."

3889

3890

msgstr ""

3890

3891

#: bzrlib/builtins.py:5479

3892

#: bzrlib/builtins.py:5495

3893

msgid "Listen for connections on nominated address."

3894

msgstr ""

3895

3896

#: bzrlib/builtins.py:5497

3892

3897

msgid ""

3893

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

3894

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

3895

"The default port depends on the protocol."

3898

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

3899

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

3900

"protocol."

3896

3901

msgstr ""

3897

3902

3898

#: bzrlib/builtins.py:5485

3903

#: bzrlib/builtins.py:5502

3899

3904

msgid "Serve contents of this directory."

3900

3905

msgstr ""

3901

3906

3902

#: bzrlib/builtins.py:5487

3907

#: bzrlib/builtins.py:5504

3903

3908

msgid ""

3904

3909

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

3905

3910

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

3908

3913

"uncontrolled write access to your file system."

3909

3914

msgstr ""

3910

3915

3911

#: bzrlib/builtins.py:5496

3916

#: bzrlib/builtins.py:5513

3912

3917

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

3913

3918

msgstr ""

3914

3919

3915

#: bzrlib/builtins.py:5546

3920

#: bzrlib/builtins.py:5531

3916

3921

msgid "Combine a tree into its containing tree."

3917

3922

msgstr ""

3918

3923

3919

#: bzrlib/builtins.py:5548

3924

#: bzrlib/builtins.py:5533

3920

3925

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

3921

3926

msgstr ""

3922

3927

3923

#: bzrlib/builtins.py:5550

3928

#: bzrlib/builtins.py:5535

3924

3929

msgid ""

3925

3930

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

3926

3931

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

3927

3932

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

3928

3933

msgstr ""

3929

3934

3930

#: bzrlib/builtins.py:5554

3935

#: bzrlib/builtins.py:5539

3931

3936

msgid ""

3932

3937

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

3933

3938

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

3934

3939

"and all history is preserved."

3935

3940

msgstr ""

3936

3941

3937

#: bzrlib/builtins.py:5572

3942

#: bzrlib/builtins.py:5557

3938

3943

#, python-format

3939

3944

msgid ""

3940

3945

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

3941

3946

"You can use bzr upgrade on the repository."

3942

3947

msgstr ""

3943

3948

3944

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

3949

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

3945

3950

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

3946

3951

msgstr ""

3947

3952

3948

#: bzrlib/builtins.py:5592

3953

#: bzrlib/builtins.py:5577

3949

3954

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

3950

3955

msgstr ""

3951

3956

3952

#: bzrlib/builtins.py:5594

3957

#: bzrlib/builtins.py:5579

3953

3958

msgid ""

3954

3959

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

3955

3960

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

3956

3961

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

3957

3962

msgstr ""

3958

3963

3959

#: bzrlib/builtins.py:5598

3964

#: bzrlib/builtins.py:5583

3960

3965

msgid ""

3961

3966

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

3962

3967

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

3963

3968

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

3964

3969

msgstr ""

3965

3970

3966

#: bzrlib/builtins.py:5678

3971

#: bzrlib/builtins.py:5663

3967

3972

msgid "No submit branch specified or known"

3968

3973

msgstr ""

3969

3974

3970

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

3975

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

3971

3976

msgid "No public branch specified or known"

3972

3977

msgstr ""

3973

3978

3974

#: bzrlib/builtins.py:5691

3979

#: bzrlib/builtins.py:5677

3975

3980

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

3976

3981

msgstr ""

3977

3982

3978

#: bzrlib/builtins.py:5700

3983

#: bzrlib/builtins.py:5686

3979

3984

msgid "No revisions to bundle."

3980

3985

msgstr ""

3981

3986

3982

#: bzrlib/builtins.py:5719

3987

#: bzrlib/builtins.py:5705

3983

3988

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

3984

3989

msgstr ""

3985

3990

3986

#: bzrlib/builtins.py:5721

3991

#: bzrlib/builtins.py:5707

3987

3992

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

3988

3993

msgstr ""

3989

3994

3990

#: bzrlib/builtins.py:5723

3995

#: bzrlib/builtins.py:5709

3991

3996

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

3992

3997

msgstr ""

3993

3998

3994

#: bzrlib/builtins.py:5725

3999

#: bzrlib/builtins.py:5711

3995

4000

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

3996

4001

msgstr ""

3997

4002

3998

#: bzrlib/builtins.py:5727

4003

#: bzrlib/builtins.py:5713

3999

4004

msgid ""

4000

4005

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

4001

4006

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

4002

4007

" branch."

4003

4008

msgstr ""

4004

4009

4005

#: bzrlib/builtins.py:5731

4010

#: bzrlib/builtins.py:5717

4006

4011

msgid ""

4007

4012

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

4008

4013

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

4009

4014

msgstr ""

4010

4015

4011

#: bzrlib/builtins.py:5734

4016

#: bzrlib/builtins.py:5720

4012

4017

msgid ""

4013

4018

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

4014

4019

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

4015

4020

"the source branch."

4016

4021

msgstr ""

4017

4022

4018

#: bzrlib/builtins.py:5738

4023

#: bzrlib/builtins.py:5724

4019

4024

msgid ""

4020

4025

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

4021

4026

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

4024

4029

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

4025

4030

msgstr ""

4026

4031

4027

#: bzrlib/builtins.py:5744

4032

#: bzrlib/builtins.py:5730

4028

4033

msgid ""

4029

4034

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

4030

4035

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

4033

4038

"be changed using --from."

4034

4039

msgstr ""

4035

4040

4036

#: bzrlib/builtins.py:5750

4041

#: bzrlib/builtins.py:5736

4037

4042

msgid ""

4038

4043

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

4039

4044

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

4042

4047

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

4043

4048

msgstr ""

4044

4049

4045

#: bzrlib/builtins.py:5756

4050

#: bzrlib/builtins.py:5742

4046

4051

msgid ""

4047

4052

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

4048

4053

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

4050

4055

"in the merge directive."

4051

4056

msgstr ""

4052

4057

4053

#: bzrlib/builtins.py:5761

4058

#: bzrlib/builtins.py:5747

4054

4059

msgid ""

4055

4060

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

4056

4061

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

4057

4062

msgstr ""

4058

4063

4059

#: bzrlib/builtins.py:5764

4064

#: bzrlib/builtins.py:5750

4060

4065

msgid ""

4061

4066

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

4062

4067

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

4063

4068

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

4064

4069

msgstr ""

4065

4070

4066

#: bzrlib/builtins.py:5768

4071

#: bzrlib/builtins.py:5754

4067

4072

msgid ""

4068

4073

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

4069

4074

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

4075

4080

"supported clients."

4076

4081

msgstr ""

4077

4082

4078

#: bzrlib/builtins.py:5775

4083

#: bzrlib/builtins.py:5761

4079

4084

msgid ""

4080

4085

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

4081

4086

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

4083

4088

"in the submit branch."

4084

4089

msgstr ""

4085

4090

4086

#: bzrlib/builtins.py:5780

4091

#: bzrlib/builtins.py:5766

4087

4092

msgid ""

4088

4093

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

4089

4094

"and\n"

4093

4098

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

4094

4099

msgstr ""

4095

4100

4096

#: bzrlib/builtins.py:5786

4101

#: bzrlib/builtins.py:5772

4097

4102

msgid ""

4098

4103

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

4099

4104

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

4100

4105

msgstr ""

4101

4106

4102

#: bzrlib/builtins.py:5789

4107

#: bzrlib/builtins.py:5775

4103

4108

msgid ""

4104

4109

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

4105

4110

"into\n"

4107

4112

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

4108

4113

msgstr ""

4109

4114

4110

#: bzrlib/builtins.py:5813

4115

#: bzrlib/builtins.py:5799

4111

4116

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

4112

4117

msgstr ""

4113

4118

4114

#: bzrlib/builtins.py:5817

4119

#: bzrlib/builtins.py:5803

4115

4120

msgid ""

4116

4121

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

4117

4122

"strict disables the check."

4118

4123

msgstr ""

4119

4124

4120

#: bzrlib/builtins.py:5819

4125

#: bzrlib/builtins.py:5805

4121

4126

msgid "Mail the request to this address."

4122

4127

msgstr ""

4123

4128

4124

#: bzrlib/builtins.py:5823

4129

#: bzrlib/builtins.py:5809

4125

4130

msgid "Body for the email."

4126

4131

msgstr ""

4127

4132

4128

#: bzrlib/builtins.py:5876

4133

#: bzrlib/builtins.py:5862

4129

4134

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

4130

4135

msgstr ""

4131

4136

4132

#: bzrlib/builtins.py:5877

4137

#: bzrlib/builtins.py:5863

4133

4138

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

4134

4139

msgstr ""

4135

4140

4136

#: bzrlib/builtins.py:5880

4141

#: bzrlib/builtins.py:5866

4137

4142

msgid "Remember submit and public branch."

4138

4143

msgstr ""

4139

4144

4140

#: bzrlib/builtins.py:5882

4145

#: bzrlib/builtins.py:5868

4141

4146

msgid ""

4142

4147

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

4143

4148

"working directory."

4144

4149

msgstr ""

4145

4150

4146

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

4151

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

4147

4152

msgid "format"

4148

4153

msgstr ""

4149

4154

4150

#: bzrlib/builtins.py:5893

4155

#: bzrlib/builtins.py:5879

4151

4156

msgid "Use the specified output format."

4152

4157

msgstr ""

4153

4158

4154

#: bzrlib/builtins.py:5915

4159

#: bzrlib/builtins.py:5901

4155

4160

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

4156

4161

msgstr ""

4157

4162

4158

#: bzrlib/builtins.py:5917

4163

#: bzrlib/builtins.py:5903

4159

4164

msgid ""

4160

4165

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

4161

4166

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

4162

4167

"created tag."

4163

4168

msgstr ""

4164

4169

4165

#: bzrlib/builtins.py:5921

4170

#: bzrlib/builtins.py:5907

4166

4171

msgid ""

4167

4172

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

4168

4173

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

4169

4174

msgstr ""

4170

4175

4171

#: bzrlib/builtins.py:5924

4176

#: bzrlib/builtins.py:5910

4172

4177

msgid ""

4173

4178

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

4174

4179

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

4175

4180

msgstr ""

4176

4181

4177

#: bzrlib/builtins.py:5927

4182

#: bzrlib/builtins.py:5913

4178

4183

msgid ""

4179

4184

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

4180

4185

"``bzr\n"

4181

4186

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

4182

4187

msgstr ""

4183

4188

4184

#: bzrlib/builtins.py:5930

4189

#: bzrlib/builtins.py:5916

4185

4190

msgid ""

4186

4191

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

4187

4192

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

4189

4194

"details."

4190

4195

msgstr ""

4191

4196

4192

#: bzrlib/builtins.py:5940

4197

#: bzrlib/builtins.py:5926

4193

4198

msgid "Delete this tag rather than placing it."

4194

4199

msgstr ""

4195

4200

4196

#: bzrlib/builtins.py:5943

4201

#: bzrlib/builtins.py:5929

4197

4202

msgid "Branch in which to place the tag."

4198

4203

msgstr ""

4199

4204

4200

#: bzrlib/builtins.py:5945

4205

#: bzrlib/builtins.py:5931

4201

4206

msgid "Replace existing tags."

4202

4207

msgstr ""

4203

4208

4204

#: bzrlib/builtins.py:5960

4209

#: bzrlib/builtins.py:5946

4205

4210

msgid "No tag specified to delete."

4206

4211

msgstr ""

4207

4212

4213

#: bzrlib/builtins.py:5948

4214

#, python-format

4215

msgid "Deleted tag %s."

4216

msgstr ""

4217

4208

4218

#: bzrlib/builtins.py:5962

4209

#, python-format

4210

msgid "Deleted tag %s."

4211

msgstr ""

4212

4213

#: bzrlib/builtins.py:5976

4214

4219

msgid "Please specify a tag name."

4215

4220

msgstr ""

4216

4221

4217

#: bzrlib/builtins.py:5984

4222

#: bzrlib/builtins.py:5970

4218

4223

#, python-format

4219

4224

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

4220

4225

msgstr ""

4221

4226

4222

#: bzrlib/builtins.py:5988

4227

#: bzrlib/builtins.py:5974

4223

4228

#, python-format

4224

4229

msgid "Created tag %s."

4225

4230

msgstr ""

4226

4231

4227

#: bzrlib/builtins.py:5990

4232

#: bzrlib/builtins.py:5976

4228

4233

#, python-format

4229

4234

msgid "Updated tag %s."

4230

4235

msgstr ""

4231

4236

4232

#: bzrlib/builtins.py:5994

4237

#: bzrlib/builtins.py:5980

4233

4238

msgid "List tags."

4234

4239

msgstr ""

4235

4240

4236

#: bzrlib/builtins.py:5996

4241

#: bzrlib/builtins.py:5982

4237

4242

msgid ""

4238

4243

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

4239

4244

msgstr ""

4240

4245

4241

#: bzrlib/builtins.py:6002

4246

#: bzrlib/builtins.py:5988

4242

4247

msgid "Branch whose tags should be displayed."

4243

4248

msgstr ""

4244

4249

4245

#: bzrlib/builtins.py:6004

4250

#: bzrlib/builtins.py:5990

4246

4251

msgid "Sort tags by different criteria."

4247

4252

msgstr ""

4248

4253

4249

#: bzrlib/builtins.py:6004

4254

#: bzrlib/builtins.py:5990

4250

4255

msgid "Sorting"

4251

4256

msgstr ""

4252

4257

4253

#: bzrlib/builtins.py:6073

4258

#: bzrlib/builtins.py:6059

4254

4259

msgid "Reconfigure the type of a bzr directory."

4255

4260

msgstr ""

4256

4261

4257

#: bzrlib/builtins.py:6075

4262

#: bzrlib/builtins.py:6061

4258

4263

msgid "A target configuration must be specified."

4259

4264

msgstr ""

4260

4265

4261

#: bzrlib/builtins.py:6077

4266

#: bzrlib/builtins.py:6063

4262

4267

msgid ""

4263

4268

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

4264

4269

"The order of preference is\n"

4269

4274

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

4270

4275

msgstr ""

4271

4276

4272

#: bzrlib/builtins.py:6091

4277

#: bzrlib/builtins.py:6077

4273

4278

msgid "Tree type"

4274

4279

msgstr ""

4275

4280

4276

#: bzrlib/builtins.py:6092

4281

#: bzrlib/builtins.py:6078

4277

4282

msgid "The relation between branch and tree."

4278

4283

msgstr ""

4279

4284

4280

#: bzrlib/builtins.py:6094

4285

#: bzrlib/builtins.py:6080

4281

4286

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

4282

4287

msgstr ""

4283

4288

4284

#: bzrlib/builtins.py:6095

4289

#: bzrlib/builtins.py:6081

4285

4290

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

4286

4291

msgstr ""

4287

4292

4288

#: bzrlib/builtins.py:6096

4293

#: bzrlib/builtins.py:6082

4289

4294

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

4290

4295

msgstr ""

4291

4296

4292

#: bzrlib/builtins.py:6097

4297

#: bzrlib/builtins.py:6083

4293

4298

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

4294

4299

msgstr ""

4295

4300

4296

#: bzrlib/builtins.py:6102

4301

#: bzrlib/builtins.py:6088

4297

4302

msgid "Repository type"

4298

4303

msgstr ""

4299

4304

4300

#: bzrlib/builtins.py:6103

4305

#: bzrlib/builtins.py:6089

4301

4306

msgid "Location fo the repository."

4302

4307

msgstr ""

4303

4308

4304

#: bzrlib/builtins.py:6105

4309

#: bzrlib/builtins.py:6091

4305

4310

msgid ""

4306

4311

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

4307

4312

msgstr ""

4308

4313

4309

#: bzrlib/builtins.py:6107

4314

#: bzrlib/builtins.py:6093

4310

4315

msgid "Reconfigure to use a shared repository."

4311

4316

msgstr ""

4312

4317

4313

#: bzrlib/builtins.py:6111

4318

#: bzrlib/builtins.py:6097

4314

4319

msgid "Trees in Repository"

4315

4320

msgstr ""

4316

4321

4317

#: bzrlib/builtins.py:6112

4322

#: bzrlib/builtins.py:6098

4318

4323

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

4319

4324

msgstr ""

4320

4325

4321

#: bzrlib/builtins.py:6114

4326

#: bzrlib/builtins.py:6100

4322

4327

msgid ""

4323

4328

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

4324

4329

msgstr ""

4325

4330

4326

#: bzrlib/builtins.py:6116

4331

#: bzrlib/builtins.py:6102

4327

4332

msgid ""

4328

4333

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

4329

4334

msgstr ""

4330

4335

4331

#: bzrlib/builtins.py:6119

4336

#: bzrlib/builtins.py:6105

4332

4337

msgid "Branch to bind checkout to."

4333

4338

msgstr "Ветвь, с которой связать рабочую копию."

4334

4339

4335

#: bzrlib/builtins.py:6121

4340

#: bzrlib/builtins.py:6107

4336

4341

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

4337

4342

msgstr ""

4338

4343

4339

#: bzrlib/builtins.py:6124

4344

#: bzrlib/builtins.py:6110

4340

4345

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

4341

4346

msgstr ""

4342

4347

4343

#: bzrlib/builtins.py:6128

4348

#: bzrlib/builtins.py:6114

4344

4349

msgid ""

4345

4350

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

4346

4351

"data into it."

4347

4352

msgstr ""

4348

4353

4354

#: bzrlib/builtins.py:6124

4355

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

4356

msgstr ""

4357

4349

4358

#: bzrlib/builtins.py:6138

4350

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

4351

msgstr ""

4352

4353

#: bzrlib/builtins.py:6152

4354

4359

msgid "No target configuration specified"

4355

4360

msgstr ""

4356

4361

4357

#: bzrlib/builtins.py:6187

4362

#: bzrlib/builtins.py:6173

4358

4363

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

4359

4364

msgstr "Выбрать ветвь рабочей копии и обновить."

4360

4365

4361

#: bzrlib/builtins.py:6189

4366

#: bzrlib/builtins.py:6175

4362

4367

msgid ""

4363

4368

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

4364

4369

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

4366

4371

"of the new location and binds to it."

4367

4372

msgstr ""

4368

4373

4369

#: bzrlib/builtins.py:6194

4374

#: bzrlib/builtins.py:6180

4370

4375

msgid ""

4371

4376

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

4372

4377

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

4373

4378

msgstr ""

4374

4379

4375

#: bzrlib/builtins.py:6197

4380

#: bzrlib/builtins.py:6183

4376

4381

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

4377

4382

msgstr ""

4378

4383

4379

#: bzrlib/builtins.py:6199

4384

#: bzrlib/builtins.py:6185

4380

4385

msgid ""

4381

4386

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

4382

4387

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

4384

4389

"/path/to/newbranch."

4385

4390

msgstr ""

4386

4391

4387

#: bzrlib/builtins.py:6204

4392

#: bzrlib/builtins.py:6190

4388

4393

msgid ""

4389

4394

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

4390

4395

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

4391

4396

"that of the master."

4392

4397

msgstr ""

4393

4398

4394

#: bzrlib/builtins.py:6212

4399

#: bzrlib/builtins.py:6198

4395

4400

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

4396

4401

msgstr ""

4397

4402

4403

#: bzrlib/builtins.py:6201

4404

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

4405

msgstr ""

4406

4398

4407

#: bzrlib/builtins.py:6215

4399

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

4400

msgstr ""

4401

4402

#: bzrlib/builtins.py:6229

4403

4408

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

4404

4409

msgstr ""

4405

4410

4406

#: bzrlib/builtins.py:6242

4411

#: bzrlib/builtins.py:6228

4407

4412

msgid "cannot create branch without source branch"

4408

4413

msgstr ""

4409

4414

4410

#: bzrlib/builtins.py:6262

4415

#: bzrlib/builtins.py:6253

4411

4416

msgid "Manage filtered views."

4412

4417

msgstr ""

4413

4418

4414

#: bzrlib/builtins.py:6264

4419

#: bzrlib/builtins.py:6255

4415

4420

msgid ""

4416

4421

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

4417

4422

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

4421

4426

"must be within the current view."

4422

4427

msgstr ""

4423

4428

4424

#: bzrlib/builtins.py:6271

4429

#: bzrlib/builtins.py:6262

4425

4430

msgid ""

4426

4431

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

4427

4432

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

4429

4434

"and switch between them."

4430

4435

msgstr ""

4431

4436

4432

#: bzrlib/builtins.py:6276

4437

#: bzrlib/builtins.py:6267

4433

4438

msgid ""

4434

4439

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

4435

4440

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

4437

4442

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

4438

4443

msgstr ""

4439

4444

4440

#: bzrlib/builtins.py:6281

4445

#: bzrlib/builtins.py:6272

4441

4446

msgid ""

4442

4447

":Examples:\n"

4443

4448

" To define the current view::"

4444

4449

msgstr ""

4445

4450

4446

#: bzrlib/builtins.py:6284

4451

#: bzrlib/builtins.py:6275

4447

4452

msgid " bzr view file1 dir1 ..."

4448

4453

msgstr ""

4449

4454

4450

#: bzrlib/builtins.py:6286

4455

#: bzrlib/builtins.py:6277

4451

4456

msgid " To list the current view::"

4452

4457

msgstr ""

4453

4458

4454

#: bzrlib/builtins.py:6288

4459

#: bzrlib/builtins.py:6279

4455

4460

msgid " bzr view"

4456

4461

msgstr ""

4457

4462

4458

#: bzrlib/builtins.py:6290

4463

#: bzrlib/builtins.py:6281

4459

4464

msgid " To delete the current view::"

4460

4465

msgstr ""

4461

4466

4462

#: bzrlib/builtins.py:6292

4467

#: bzrlib/builtins.py:6283

4463

4468

msgid " bzr view --delete"

4464

4469

msgstr ""

4465

4470

4466

#: bzrlib/builtins.py:6294

4471

#: bzrlib/builtins.py:6285

4467

4472

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

4468

4473

msgstr ""

4469

4474

4470

#: bzrlib/builtins.py:6296

4475

#: bzrlib/builtins.py:6287

4471

4476

msgid " bzr view --switch off"

4472

4477

msgstr ""

4473

4478

4474

#: bzrlib/builtins.py:6298

4479

#: bzrlib/builtins.py:6289

4475

4480

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

4476

4481

msgstr ""

4477

4482

4478

#: bzrlib/builtins.py:6300

4483

#: bzrlib/builtins.py:6291

4479

4484

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

4480

4485

msgstr ""

4481

4486

4482

#: bzrlib/builtins.py:6302

4487

#: bzrlib/builtins.py:6293

4483

4488

msgid " To list a named view::"

4484

4489

msgstr ""

4485

4490

4486

#: bzrlib/builtins.py:6304

4491

#: bzrlib/builtins.py:6295

4487

4492

msgid " bzr view --name view-name"

4488

4493

msgstr ""

4489

4494

4490

#: bzrlib/builtins.py:6306

4495

#: bzrlib/builtins.py:6297

4491

4496

msgid " To delete a named view::"

4492

4497

msgstr ""

4493

4498

4494

#: bzrlib/builtins.py:6308

4499

#: bzrlib/builtins.py:6299

4495

4500

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

4496

4501

msgstr ""

4497

4502

4498

#: bzrlib/builtins.py:6310

4503

#: bzrlib/builtins.py:6301

4499

4504

msgid " To switch to a named view::"

4500

4505

msgstr ""

4501

4506

4502

#: bzrlib/builtins.py:6312

4507

#: bzrlib/builtins.py:6303

4503

4508

msgid " bzr view --switch view-name"

4504

4509

msgstr ""

4505

4510

4506

#: bzrlib/builtins.py:6314

4511

#: bzrlib/builtins.py:6305

4507

4512

msgid " To list all views defined::"

4508

4513

msgstr ""

4509

4514

4510

#: bzrlib/builtins.py:6316

4515

#: bzrlib/builtins.py:6307

4511

4516

msgid " bzr view --all"

4512

4517

msgstr ""

4513

4518

4514

#: bzrlib/builtins.py:6318

4519

#: bzrlib/builtins.py:6309

4515

4520

msgid " To delete all views::"

4516

4521

msgstr ""

4517

4522

4518

#: bzrlib/builtins.py:6320

4523

#: bzrlib/builtins.py:6311

4519

4524

msgid " bzr view --delete --all"

4520

4525

msgstr ""

4521

4526

4522

#: bzrlib/builtins.py:6327

4527

#: bzrlib/builtins.py:6318

4523

4528

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

4524

4529

msgstr ""

4525

4530

4526

#: bzrlib/builtins.py:6330

4531

#: bzrlib/builtins.py:6321

4527

4532

msgid "Delete the view."

4528

4533

msgstr ""

4529

4534

4530

#: bzrlib/builtins.py:6333

4535

#: bzrlib/builtins.py:6324

4531

4536

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

4532

4537

msgstr ""

4533

4538

4534

#: bzrlib/builtins.py:6337

4539

#: bzrlib/builtins.py:6328

4535

4540

msgid "Name of the view to switch to."

4536

4541

msgstr ""

4537

4542

4538

#: bzrlib/builtins.py:6356

4543

#: bzrlib/builtins.py:6347

4539

4544

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

4540

4545

msgstr ""

4541

4546

4542

#: bzrlib/builtins.py:6359

4547

#: bzrlib/builtins.py:6350

4543

4548

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

4544

4549

msgstr ""

4545

4550

4546

#: bzrlib/builtins.py:6362

4551

#: bzrlib/builtins.py:6353

4547

4552

msgid "Deleted all views.\n"

4548

4553

msgstr ""

4549

4554

4550

#: bzrlib/builtins.py:6364

4555

#: bzrlib/builtins.py:6355

4551

4556

msgid "No current view to delete"

4552

4557

msgstr ""

4553

4558

4554

#: bzrlib/builtins.py:6367

4559

#: bzrlib/builtins.py:6358

4555

4560

#, python-format

4556

4561

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

4557

4562

msgstr ""

4558

4563

4559

#: bzrlib/builtins.py:6371

4564

#: bzrlib/builtins.py:6362

4560

4565

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

4561

4566

msgstr ""

4562

4567

4563

#: bzrlib/builtins.py:6374

4568

#: bzrlib/builtins.py:6365

4564

4569

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

4565

4570

msgstr ""

4566

4571

4567

#: bzrlib/builtins.py:6377

4572

#: bzrlib/builtins.py:6368

4568

4573

msgid "No current view to disable"

4569

4574

msgstr ""

4570

4575

4571

#: bzrlib/builtins.py:6379

4576

#: bzrlib/builtins.py:6370

4572

4577

#, python-format

4573

4578

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

4574

4579

msgstr ""

4575

4580

4576

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

4581

#: bzrlib/builtins.py:6374 bzrlib/builtins.py:6396

4577

4582

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

4578

4583

msgstr ""

4579

4584

4585

#: bzrlib/builtins.py:6377

4586

msgid "Views defined:\n"

4587

msgstr ""

4588

4580

4589

#: bzrlib/builtins.py:6386

4581

msgid "Views defined:\n"

4582

msgstr ""

4583

4584

#: bzrlib/builtins.py:6395

4585

4590

msgid "No views defined.\n"

4586

4591

msgstr ""

4587

4592

4588

#: bzrlib/builtins.py:6402

4593

#: bzrlib/builtins.py:6393

4589

4594

msgid "Cannot change the 'off' pseudo view"

4590

4595

msgstr ""

4591

4596

4592

#: bzrlib/builtins.py:6410

4597

#: bzrlib/builtins.py:6401

4593

4598

msgid "No current view.\n"

4594

4599

msgstr ""

4595

4600

4596

#: bzrlib/builtins.py:6413

4601

#: bzrlib/builtins.py:6404

4597

4602

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

4598

4603

msgstr ""

4599

4604

4600

#: bzrlib/builtins.py:6433

4605

#: bzrlib/builtins.py:6424

4601

4606

msgid " <no hooks installed>\n"

4602

4607

msgstr ""

4603

4608

4604

#: bzrlib/builtins.py:6437

4609

#: bzrlib/builtins.py:6428

4605

4610

msgid "Remove a branch."

4606

4611

msgstr ""

4607

4612

4608

#: bzrlib/builtins.py:6439

4613

#: bzrlib/builtins.py:6430

4609

4614

msgid ""

4610

4615

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

4611

4616

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

4612

4617

msgstr ""

4613

4618

4614

#: bzrlib/builtins.py:6444

4619

#: bzrlib/builtins.py:6435

4615

4620

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

4616

4621

msgstr ""

4617

4622

4618

#: bzrlib/builtins.py:6446

4623

#: bzrlib/builtins.py:6437

4619

4624

msgid " bzr remove-branch repo/trunk"

4620

4625

msgstr ""

4621

4626

4622

#: bzrlib/builtins.py:6461

4627

#: bzrlib/builtins.py:6444

4628

msgid "Remove branch even if it is the active branch."

4629

msgstr ""

4630

4631

#: bzrlib/builtins.py:6458

4632

msgid "Branch is active. Use --force to remove it."

4633

msgstr ""

4634

4635

#: bzrlib/builtins.py:6462

4623

4636

msgid "Plaintext diff output."

4624

4637

msgstr ""

4625

4638

4626

#: bzrlib/builtins.py:6462

4639

#: bzrlib/builtins.py:6463

4627

4640

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

4628

4641

msgstr ""

4629

4642

4630

#: bzrlib/builtins.py:6464

4643

#: bzrlib/builtins.py:6465

4631

4644

msgid ""

4632

4645

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

4633

4646

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

4636

4649

"will they survive its deletion."

4637

4650

msgstr ""

4638

4651

4639

#: bzrlib/builtins.py:6470

4652

#: bzrlib/builtins.py:6471

4640

4653

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

4641

4654

msgstr ""

4642

4655

4643

#: bzrlib/builtins.py:6472

4656

#: bzrlib/builtins.py:6473

4644

4657

msgid ""

4645

4658

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

4646

4659

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

4648

4661

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

4649

4662

msgstr ""

4650

4663

4651

#: bzrlib/builtins.py:6477

4664

#: bzrlib/builtins.py:6478

4652

4665

msgid ""

4653

4666

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

4654

4667

"shelved. Other files will be left untouched."

4655

4668

msgstr ""

4656

4669

4657

#: bzrlib/builtins.py:6480

4670

#: bzrlib/builtins.py:6481

4658

4671

msgid ""

4659

4672

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

4660

4673

msgstr ""

4661

4674

4662

#: bzrlib/builtins.py:6482

4675

#: bzrlib/builtins.py:6483

4663

4676

msgid ""

4664

4677

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

4665

4678

"restore the most recently shelved changes."

4666

4679

msgstr ""

4667

4680

4668

#: bzrlib/builtins.py:6485

4681

#: bzrlib/builtins.py:6486

4669

4682

msgid ""

4670

4683

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

4671

4684

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

4672

4685

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

4673

4686

msgstr ""

4674

4687

4675

#: bzrlib/builtins.py:6489

4688

#: bzrlib/builtins.py:6490

4676

4689

msgid " change_editor = PROGRAM @new_path @old_path"

4677

4690

msgstr ""

4678

4691

4679

#: bzrlib/builtins.py:6491

4692

#: bzrlib/builtins.py:6492

4680

4693

msgid ""

4681

4694

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

4682

4695

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

4685

4698

" "

4686

4699

msgstr ""

4687

4700

4688

#: bzrlib/builtins.py:6503

4701

#: bzrlib/builtins.py:6504

4689

4702

msgid "Shelve all changes."

4690

4703

msgstr ""

4691

4704

4692

#: bzrlib/builtins.py:6505

4705

#: bzrlib/builtins.py:6506

4693

4706

msgid "Method to use for writing diffs."

4694

4707

msgstr ""

4695

4708

4696

#: bzrlib/builtins.py:6505

4709

#: bzrlib/builtins.py:6506

4697

4710

msgid "writer"

4698

4711

msgstr ""

4699

4712

4700

#: bzrlib/builtins.py:6509

4713

#: bzrlib/builtins.py:6510

4701

4714

msgid "List shelved changes."

4702

4715

msgstr ""

4703

4716

4704

#: bzrlib/builtins.py:6511

4717

#: bzrlib/builtins.py:6512

4705

4718

msgid "Destroy removed changes instead of shelving them."

4706

4719

msgstr ""

4707

4720

4708

#: bzrlib/builtins.py:6540

4721

#: bzrlib/builtins.py:6541

4709

4722

msgid "No shelved changes."

4710

4723

msgstr ""

4711

4724

4712

#: bzrlib/builtins.py:6551

4725

#: bzrlib/builtins.py:6552

4713

4726

msgid "Restore shelved changes."

4714

4727

msgstr ""

4715

4728

4716

#: bzrlib/builtins.py:6553

4729

#: bzrlib/builtins.py:6554

4717

4730

msgid ""

4718

4731

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

4719

4732

"specify a shelf by id those changes will be restored instead. This works\n"

4720

4733

"best when the changes don't depend on each other."

4721

4734

msgstr ""

4722

4735

4723

#: bzrlib/builtins.py:6562

4736

#: bzrlib/builtins.py:6563

4724

4737

msgid "The action to perform."

4725

4738

msgstr ""

4726

4739

4727

#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694

4740

#: bzrlib/builtins.py:6563 bzrlib/conflicts.py:694

4728

4741

msgid "action"

4729

4742

msgstr ""

4730

4743

4731

#: bzrlib/builtins.py:6564

4744

#: bzrlib/builtins.py:6565

4732

4745

msgid "Apply changes and remove from the shelf."

4733

4746

msgstr ""

4734

4747

4735

#: bzrlib/builtins.py:6565

4748

#: bzrlib/builtins.py:6566

4736

4749

msgid "Show changes, but do not apply or remove them."

4737

4750

msgstr ""

4738

4751

4739

#: bzrlib/builtins.py:6566

4752

#: bzrlib/builtins.py:6567

4740

4753

msgid ""

4741

4754

"Instead of unshelving the changes, show the diff that would result from "

4742

4755

"unshelving."

4743

4756

msgstr ""

4744

4757

4745

#: bzrlib/builtins.py:6568

4758

#: bzrlib/builtins.py:6569

4746

4759

msgid "Delete changes without applying them."

4747

4760

msgstr ""

4748

4761

4749

#: bzrlib/builtins.py:6569

4762

#: bzrlib/builtins.py:6570

4750

4763

msgid "Apply changes but don't delete them."

4751

4764

msgstr ""

4752

4765

4753

#: bzrlib/builtins.py:6584

4766

#: bzrlib/builtins.py:6585

4754

4767

msgid "Remove unwanted files from working tree."

4755

4768

msgstr ""

4756

4769

4757

#: bzrlib/builtins.py:6586

4770

#: bzrlib/builtins.py:6587

4758

4771

msgid ""

4759

4772

"By default, only unknown files, not ignored files, are deleted. Versioned\n"

4760

4773

"files are never deleted."

4761

4774

msgstr ""

4762

4775

4763

#: bzrlib/builtins.py:6589

4776

#: bzrlib/builtins.py:6590

4764

4777

msgid ""

4765

4778

"Another class is 'detritus', which includes files emitted by bzr during\n"

4766

4779

"normal operations and selftests. (The value of these files decreases with\n"

4767

4780

"time.)"

4768

4781

msgstr ""

4769

4782

4770

#: bzrlib/builtins.py:6593

4783

#: bzrlib/builtins.py:6594

4771

4784

msgid ""

4772

4785

"If no options are specified, unknown files are deleted. Otherwise, option\n"

4773

4786

"flags are respected, and may be combined."

4774

4787

msgstr ""

4775

4788

4776

#: bzrlib/builtins.py:6596

4789

#: bzrlib/builtins.py:6597

4777

4790

msgid "To check what clean-tree will do, use --dry-run."

4778

4791

msgstr ""

4779

4792

4780

#: bzrlib/builtins.py:6599

4793

#: bzrlib/builtins.py:6600

4781

4794

msgid "Delete all ignored files."

4782

4795

msgstr ""

4783

4796

4784

#: bzrlib/builtins.py:6600

4797

#: bzrlib/builtins.py:6601

4785

4798

msgid ""

4786

4799

"Delete conflict files, merge and revert backups, and failed selftest dirs."

4787

4800

msgstr ""

4788

4801

4789

#: bzrlib/builtins.py:6603

4802

#: bzrlib/builtins.py:6604

4790

4803

msgid "Delete files unknown to bzr (default)."

4791

4804

msgstr ""

4792

4805

4793

#: bzrlib/builtins.py:6604

4806

#: bzrlib/builtins.py:6605

4794

4807

msgid "Show files to delete instead of deleting them."

4795

4808

msgstr ""

4796

4809

4797

#: bzrlib/builtins.py:6606

4810

#: bzrlib/builtins.py:6607

4798

4811

msgid "Do not prompt before deleting."

4799

4812

msgstr ""

4800

4813

4854

4867

msgstr[0] ""

4855

4868

msgstr[1] ""

4856

4869

4857

#: bzrlib/bzrdir.py:490

4870

#: bzrlib/bzrdir.py:486

4858

4871

msgid ""

4859

4872

"making backup of {0}\n"

4860

4873

" to {1}"

4861

4874

msgstr ""

4862

4875

4863

#: bzrlib/bzrdir.py:513

4876

#: bzrlib/bzrdir.py:509

4864

4877

msgid "renamed {0} to {1}"

4865

4878

msgstr ""

4866

4879

4867

#: bzrlib/bzrdir.py:1652

4880

#: bzrlib/bzrdir.py:1638

4868

4881

#, python-format

4869

4882

msgid ""

4870

4883

"Source repository format does not support stacking, using format:\n"

4871

4884

" %s"

4872

4885

msgstr ""

4873

4886

4874

#: bzrlib/bzrdir.py:1672

4887

#: bzrlib/bzrdir.py:1658

4875

4888

#, python-format

4876

4889

msgid ""

4877

4890

"Source branch format does not support stacking, using format:\n"

4878

4891

" %s"

4879

4892

msgstr ""

4880

4893

4881

#: bzrlib/bzrdir.py:1818

4894

#: bzrlib/bzrdir.py:1804

4882

4895

msgid "starting repository conversion"

4883

4896

msgstr ""

4884

4897

4885

#: bzrlib/bzrdir.py:2039

4898

#: bzrlib/bzrdir.py:2025

4886

4899

msgid "Using default stacking branch {0} at {1}"

4887

4900

msgstr ""

4888

4901

5192

5205

msgid ":See also: %s"

5193

5206

msgstr ":Смотрите также: %s"

5194

5207

5195

#: bzrlib/commands.py:816 bzrlib/gpg.py:324

5208

#: bzrlib/commands.py:826 bzrlib/gpg.py:347

5196

5209

msgid "Only ASCII permitted in option names"

5197

5210

msgstr "В именах опций разрешены только символы ASCII"

5198

5211

5199

#: bzrlib/commands.py:841 bzrlib/commands.py:849

5212

#: bzrlib/commands.py:851 bzrlib/commands.py:859

5200

5213

msgid "command {0!r} needs one or more {1}"

5201

5214

msgstr "команде {0!r} требуется один или больше {1}"

5202

5215

5203

#: bzrlib/commands.py:858

5216

#: bzrlib/commands.py:868

5204

5217

msgid "command {0!r} requires argument {1}"

5205

5218

msgstr "команде {0!r} требуется аргумент {1}"

5206

5219

5207

#: bzrlib/commands.py:865

5220

#: bzrlib/commands.py:875

5208

5221

msgid "extra argument to command {0}: {1}"

5209

5222

msgstr "лишний аргумент к команде {0}: {1}"

5210

5223

5211

#: bzrlib/commands.py:962

5224

#: bzrlib/commands.py:972

5212

5225

#, python-format

5213

5226

msgid "Profile data written to \"%s\"."

5214

5227

msgstr "Данные профиля записаны в «%s»."

5251

5264

msgid "renamed"

5252

5265

msgstr "переименованы"

5253

5266

5254

#: bzrlib/commit.py:977

5267

#: bzrlib/commit.py:976

5255

5268

msgid "unchanged"

5256

5269

msgstr "без изменений"

5257

5270

5258

#: bzrlib/commit.py:999

5271

#: bzrlib/commit.py:998

5259

5272

msgid "{0} [{1}] - Stage"

5260

5273

msgstr ""

5261

5274

5262

#: bzrlib/commit.py:1002

5275

#: bzrlib/commit.py:1001

5263

5276

#, python-format

5264

5277

msgid "%s - Stage"

5265

5278

msgstr ""

5266

5279

5280

#: bzrlib/commit_signature_commands.py:34

5281

msgid "Sign all commits by a given committer."

5282

msgstr ""

5283

5267

5284

#: bzrlib/commit_signature_commands.py:36

5268

msgid "Sign all commits by a given committer."

5269

msgstr ""

5270

5271

#: bzrlib/commit_signature_commands.py:38

5272

5285

msgid ""

5273

5286

"If location is not specified the local tree is used.\n"

5274

5287

"If committer is not specified the default committer is used."

5275

5288

msgstr ""

5276

5289

5277

#: bzrlib/commit_signature_commands.py:41

5290

#: bzrlib/commit_signature_commands.py:39

5278

5291

msgid "This does not sign commits that already have signatures."

5279

5292

msgstr ""

5280

5293

5281

#: bzrlib/commit_signature_commands.py:49

5294

#: bzrlib/commit_signature_commands.py:47

5282

5295

msgid ""

5283

5296

"Don't actually sign anything, just print the revisions that would be signed."

5284

5297

msgstr ""

5285

5298

5299

#: bzrlib/commit_signature_commands.py:98

5300

#, python-format

5301

msgid "Signed %d revision.\n"

5302

msgid_plural "Signed %d revisions.\n"

5303

msgstr[0] ""

5304

msgstr[1] ""

5305

5286

5306

#: bzrlib/commit_signature_commands.py:103

5287

5307

msgid "Verify all commit signatures."

5288

5308

msgstr ""

5298

5318

"verification."

5299

5319

msgstr ""

5300

5320

5301

#: bzrlib/commit_signature_commands.py:147

5321

#: bzrlib/commit_signature_commands.py:148

5302

5322

msgid "Cannot verify a range of non-revision-history revisions"

5303

5323

msgstr ""

5304

5324

5305

#: bzrlib/commit_signature_commands.py:168

5325

#: bzrlib/commit_signature_commands.py:166

5306

5326

msgid "All commits signed with verifiable keys"

5307

5327

msgstr ""

5308

5328

5309

#: bzrlib/config.py:475

5329

#: bzrlib/config.py:436

5310

5330

msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."

5311

5331

msgstr ""

5312

5332

5313

#: bzrlib/config.py:2485

5333

#: bzrlib/config.py:2451

5314

5334

msgid "{0} is not an SI unit."

5315

5335

msgstr ""

5316

5336

5317

#: bzrlib/config.py:2949

5337

#: bzrlib/config.py:2970

5318

5338

msgid ""

5319

5339

"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "

5320

5340

"will be saved."

5321

5341

msgstr ""

5322

5342

5323

#: bzrlib/config.py:3093

5343

#: bzrlib/config.py:3114

5324

5344

#, python-format

5325

5345

msgid "Invalid '%s', should be of the form 'name=value'"

5326

5346

msgstr ""

5327

5347

5328

#: bzrlib/config.py:3962

5348

#: bzrlib/config.py:4004

5329

5349

msgid "Display, set or remove a configuration option."

5330

5350

msgstr ""

5331

5351

5332

#: bzrlib/config.py:3964

5352

#: bzrlib/config.py:4006

5333

5353

msgid "Display the active value for a given option."

5334

5354

msgstr ""

5335

5355

5336

#: bzrlib/config.py:3966

5356

#: bzrlib/config.py:4008

5337

5357

msgid ""

5338

5358

"If --all is specified, NAME is interpreted as a regular expression and all\n"

5339

5359

"matching options are displayed mentioning their scope. The active value\n"

5340

5360

"that bzr will take into account is the first one displayed for each option."

5341

5361

msgstr ""

5342

5362

5343

#: bzrlib/config.py:3970

5363

#: bzrlib/config.py:4012

5344

5364

msgid "If no NAME is given, --all .* is implied."

5345

5365

msgstr ""

5346

5366

5347

#: bzrlib/config.py:3972

5367

#: bzrlib/config.py:4014

5348

5368

msgid ""

5349

5369

"Setting a value is achieved by using name=value without spaces. The value\n"

5350

5370

"is set in the most relevant scope and can be checked by displaying the\n"

5351

5371

"option again."

5352

5372

msgstr ""

5353

5373

5354

#: bzrlib/config.py:3984

5374

#: bzrlib/config.py:4026

5355

5375

msgid "Reduce the scope to the specified configuration file."

5356

5376

msgstr ""

5357

5377

5358

#: bzrlib/config.py:3988

5378

#: bzrlib/config.py:4030

5359

5379

msgid "Display all the defined values for the matching options."

5360

5380

msgstr ""

5361

5381

5362

#: bzrlib/config.py:3990

5382

#: bzrlib/config.py:4032

5363

5383

msgid "Remove the option from the configuration file."

5364

5384

msgstr ""

5365

5385

5439

5459

msgstr[0] ""

5440

5460

msgstr[1] ""

5441

5461

5442

#: bzrlib/controldir.py:710

5462

#: bzrlib/controldir.py:712

5443

5463

msgid "{0} is{1} redirected to {2}"

5444

5464

msgstr ""

5445

5465

5656

5676

msgstr ""

5657

5677

5658

5678

#: bzrlib/errors.py:715

5679

msgid "Invalid branch name: %(name)s"

5680

msgstr ""

5681

5682

#: bzrlib/errors.py:724

5659

5683

msgid "Parent branch already exists: \"%(path)s\"."

5660

5684

msgstr ""

5661

5685

5662

#: bzrlib/errors.py:721

5686

#: bzrlib/errors.py:730

5663

5687

msgid ""

5664

5688

"Directory contains a branch, but no working tree (use bzr checkout if you "

5665

5689

"wish to build a working tree): \"%(path)s\""

5666

5690

msgstr ""

5667

5691

5668

#: bzrlib/errors.py:726

5692

#: bzrlib/errors.py:735

5669

5693

msgid ""

5670

5694

"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""

5671

5695

msgstr ""

5672

5696

5673

#: bzrlib/errors.py:736

5697

#: bzrlib/errors.py:745

5674

5698

msgid ""

5675

5699

"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""

5676

5700

msgstr ""

5677

5701

5678

#: bzrlib/errors.py:746

5702

#: bzrlib/errors.py:755

5679

5703

msgid "No repository present: \"%(path)s\""

5680

5704

msgstr ""

5681

5705

5682

#: bzrlib/errors.py:753

5706

#: bzrlib/errors.py:762

5683

5707

msgid ""

5684

5708

"Unsupported branch format: %(format)s\n"

5685

5709

"Please run 'bzr upgrade'"

5686

5710

msgstr ""

5687

5711

5688

#: bzrlib/errors.py:759

5712

#: bzrlib/errors.py:768

5689

5713

msgid "Unknown %(kind)s format: %(format)r"

5690

5714

msgstr ""

5691

5715

5692

#: bzrlib/errors.py:768

5716

#: bzrlib/errors.py:777

5693

5717

msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."

5694

5718

msgstr ""

5695

5719

5696

#: bzrlib/errors.py:778

5720

#: bzrlib/errors.py:787

5697

5721

msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"

5698

5722

msgstr ""

5699

5723

5700

#: bzrlib/errors.py:793

5724

#: bzrlib/errors.py:802

5701

5725

msgid ""

5702

5726

"%(target)s\n"

5703

5727

"is not compatible with\n"

5705

5729

"%(details)s"

5706

5730

msgstr ""

5707

5731

5708

#: bzrlib/errors.py:809

5732

#: bzrlib/errors.py:818

5709

5733

msgid "Revision is not compatible with %(repo_format)s"

5710

5734

msgstr ""

5711

5735

5712

#: bzrlib/errors.py:819

5736

#: bzrlib/errors.py:828

5713

5737

msgid "%(context_info)s%(path)s is already versioned."

5714

5738

msgstr ""

5715

5739

5716

#: bzrlib/errors.py:840

5740

#: bzrlib/errors.py:849

5717

5741

msgid "%(context_info)s%(path)s is not versioned."

5718

5742

msgstr ""

5719

5743

5720

#: bzrlib/errors.py:861

5744

#: bzrlib/errors.py:870

5721

5745

msgid "Path(s) are not versioned: %(paths_as_string)s"

5722

5746

msgstr ""

5723

5747

5724

#: bzrlib/errors.py:872

5748

#: bzrlib/errors.py:881

5725

5749

msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"

5726

5750

msgstr ""

5727

5751

5728

#: bzrlib/errors.py:891

5752

#: bzrlib/errors.py:900

5729

5753

msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""

5730

5754

msgstr ""

5731

5755

5732

#: bzrlib/errors.py:899

5756

#: bzrlib/errors.py:908

5733

5757

msgid ""

5734

5758

"Filename %(filename)r is not valid in your current filesystem encoding "

5735

5759

"%(fs_encoding)s"

5736

5760

msgstr ""

5737

5761

5738

#: bzrlib/errors.py:910

5762

#: bzrlib/errors.py:919

5739

5763

msgid "Cannot operate on \"%(filename)s\" because it is a control file"

5740

5764

msgstr ""

5741

5765

5742

#: bzrlib/errors.py:928

5766

#: bzrlib/errors.py:937

5743

5767

msgid "The lock for '%(lock_description)s' is in use and cannot be broken."

5744

5768

msgstr ""

5745

5769

5746

#: bzrlib/errors.py:967

5770

#: bzrlib/errors.py:976

5747

5771

msgid "Cannot lock %(lock)s: %(why)s"

5748

5772

msgstr ""

5749

5773

5750

#: bzrlib/errors.py:977

5774

#: bzrlib/errors.py:986

5751

5775

msgid ""

5752

5776

"A transaction related operation was attempted after the transaction finished."

5753

5777

msgstr ""

5754

5778

5755

#: bzrlib/errors.py:1004

5779

#: bzrlib/errors.py:1013

5756

5780

msgid "Cannot lock: transport is read only: %(transport)s"

5757

5781

msgstr ""

5758

5782

5759

#: bzrlib/errors.py:1012

5783

#: bzrlib/errors.py:1021

5760

5784

msgid "Could not acquire lock \"%(lock)s\": %(msg)s"

5761

5785

msgstr ""

5762

5786

5763

#: bzrlib/errors.py:1023

5787

#: bzrlib/errors.py:1032

5764

5788

msgid ""

5765

5789

"Lock was broken while still open: %(lock)s - check storage consistency!"

5766

5790

msgstr ""

5767

5791

5768

#: bzrlib/errors.py:1034

5792

#: bzrlib/errors.py:1043

5769

5793

msgid ""

5770

5794

"Lock was released and re-acquired before being broken: %(lock)s: held by "

5771

5795

"%(holder)r, wanted to break %(target)r"

5772

5796

msgstr ""

5773

5797

5774

#: bzrlib/errors.py:1046

5798

#: bzrlib/errors.py:1055

5775

5799

msgid ""

5776

5800

"Lock is apparently held, but corrupted: %(corruption_info)s\n"

5777

5801

"Use 'bzr break-lock' to clear it"

5778

5802

msgstr ""

5779

5803

5780

#: bzrlib/errors.py:1059

5804

#: bzrlib/errors.py:1068

5781

5805

msgid "Lock not held: %(lock)s"

5782

5806

msgstr ""

5783

5807

5784

#: bzrlib/errors.py:1088

5808

#: bzrlib/errors.py:1097

5785

5809

msgid "No changes to commit"

5786

5810

msgstr ""

5787

5811

5788

#: bzrlib/errors.py:1093

5812

#: bzrlib/errors.py:1102

5789

5813

msgid ""

5790

5814

"Selected-file commit of merges is not supported yet: files %(files_str)s"

5791

5815

msgstr ""

5792

5816

5793

#: bzrlib/errors.py:1103

5817

#: bzrlib/errors.py:1112

5794

5818

msgid ""

5795

5819

"Excluding paths during commit is not supported by repository at "

5796

5820

"%(repository)r."

5797

5821

msgstr ""

5798

5822

5799

#: bzrlib/errors.py:1112

5823

#: bzrlib/errors.py:1121

5800

5824

msgid ""

5801

5825

"The specified commit message contains characters unsupported by the current "

5802

5826

"encoding."

5803

5827

msgstr ""

5804

5828

5805

#: bzrlib/errors.py:1118

5829

#: bzrlib/errors.py:1127

5806

5830

msgid "Upgrade URL cannot work with readonly URLs."

5807

5831

msgstr ""

5808

5832

5809

#: bzrlib/errors.py:1123

5833

#: bzrlib/errors.py:1132

5810

5834

msgid "The branch format %(format)s is already at the most recent format."

5811

5835

msgstr ""

5812

5836

5813

#: bzrlib/errors.py:1146

5837

#: bzrlib/errors.py:1155

5814

5838

msgid "Option --change does not accept revision ranges"

5815

5839

msgstr ""

5816

5840

5817

#: bzrlib/errors.py:1151

5841

#: bzrlib/errors.py:1160

5818

5842

msgid "No namespace registered for string: %(spec)r"

5819

5843

msgstr ""

5820

5844

5821

#: bzrlib/errors.py:1170

5845

#: bzrlib/errors.py:1179

5822

5846

msgid ""

5823

5847

"Requested revision: '%(spec)s' does not exist in branch: "

5824

5848

"%(branch_url)s%(extra)s"

5825

5849

msgstr ""

5826

5850

5827

#: bzrlib/errors.py:1184

5851

#: bzrlib/errors.py:1193

5828

5852

msgid ""

5829

5853

"Operation denied because it would change the main history, which is not "

5830

5854

"permitted by the append_revisions_only setting on branch \"%(location)s\"."

5831

5855

msgstr ""

5832

5856

5833

#: bzrlib/errors.py:1195

5857

#: bzrlib/errors.py:1204

5834

5858

msgid ""

5835

5859

"These branches have diverged. Use the missing command to see how.\n"

5836

5860

"Use the merge command to reconcile them."

5837

5861

msgstr ""

5838

5862

5839

#: bzrlib/errors.py:1215

5863

#: bzrlib/errors.py:1224

5840

5864

msgid ""

5841

5865

"Branches have no common ancestor, and no merge base revision was specified."

5842

5866

msgstr ""

5843

5867

5844

#: bzrlib/errors.py:1221

5868

#: bzrlib/errors.py:1230

5845

5869

msgid ""

5846

5870

"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."

5847

5871

msgstr ""

5848

5872

5849

#: bzrlib/errors.py:1227

5873

#: bzrlib/errors.py:1236

5850

5874

msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"

5851

5875

msgstr ""

5852

5876

5853

#: bzrlib/errors.py:1236

5877

#: bzrlib/errors.py:1245

5854

5878

msgid ""

5855

5879

"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."

5856

5880

msgstr ""

5857

5881

5858

#: bzrlib/errors.py:1245

5882

#: bzrlib/errors.py:1254

5859

5883

msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"

5860

5884

msgstr ""

5861

5885

5862

#: bzrlib/errors.py:1254

5886

#: bzrlib/errors.py:1263

5863

5887

msgid "Branch %(branch)s has no commits."

5864

5888

msgstr ""

5865

5889

5866

#: bzrlib/errors.py:1272

5890

#: bzrlib/errors.py:1281

5867

5891

msgid ""

5868

5892

"Bound branch %(branch)s is out of date with master branch "

5869

5893

"%(master)s.%(extra_help)s"

5870

5894

msgstr ""

5871

5895

5872

#: bzrlib/errors.py:1284

5896

#: bzrlib/errors.py:1293

5873

5897

msgid ""

5874

5898

"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "

5875

5899

"bound to %(remote)s."

5876

5900

msgstr ""

5877

5901

5878

#: bzrlib/errors.py:1296

5902

#: bzrlib/errors.py:1305

5879

5903

msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"

5880

5904

msgstr ""

5881

5905

5882

#: bzrlib/errors.py:1305

5906

#: bzrlib/errors.py:1314

5883

5907

msgid ""

5884

5908

"Unable to connect to target of bound branch %(branch)s => %(target)s: "

5885

5909

"%(error)s"

5886

5910

msgstr ""

5887

5911

5888

#: bzrlib/errors.py:1317

5912

#: bzrlib/errors.py:1326

5889

5913

msgid "Error in processing weave: %(msg)s"

5890

5914

msgstr ""

5891

5915

5892

#: bzrlib/errors.py:1326

5916

#: bzrlib/errors.py:1335

5893

5917

msgid "Revision {%(revision_id)s} already present in %(weave)s"

5894

5918

msgstr ""

5895

5919

5896

#: bzrlib/errors.py:1337

5920

#: bzrlib/errors.py:1346

5897

5921

msgid "Revision {%(revision_id)s} not present in %(weave)s"

5898

5922

msgstr ""

5899

5923

5900

#: bzrlib/errors.py:1347

5924

#: bzrlib/errors.py:1356

5901

5925

msgid "Weave invariant violated: %(what)s"

5902

5926

msgstr ""

5903

5927

5904

#: bzrlib/errors.py:1356

5928

#: bzrlib/errors.py:1365

5905

5929

msgid "Parents are mismatched between two revisions. %(msg)s"

5906

5930

msgstr ""

5907

5931

5908

#: bzrlib/errors.py:1378

5932

#: bzrlib/errors.py:1387

5909

5933

msgid ""

5910

5934

"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "

5911

5935

"%(weave_b)s"

5912

5936

msgstr ""

5913

5937

5914

#: bzrlib/errors.py:1390

5938

#: bzrlib/errors.py:1399

5915

5939

msgid "Versioned file error"

5916

5940

msgstr ""

5917

5941

5918

#: bzrlib/errors.py:1395

5942

#: bzrlib/errors.py:1404

5919

5943

msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."

5920

5944

msgstr ""

5921

5945

5922

#: bzrlib/errors.py:1405

5946

#: bzrlib/errors.py:1414

5923

5947

msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."

5924

5948

msgstr ""

5925

5949

5926

#: bzrlib/errors.py:1415

5950

#: bzrlib/errors.py:1424

5927

5951

msgid "Text did not match its checksum: %(msg)s"

5928

5952

msgstr ""

5929

5953

5930

#: bzrlib/errors.py:1541

5954

#: bzrlib/errors.py:1550

5931

5955

msgid "Export format %(format)r not supported"

5932

5956

msgstr ""

5933

5957

5934

#: bzrlib/errors.py:1550

5958

#: bzrlib/errors.py:1559

5935

5959

msgid "Transport error: %(msg)s %(orig_error)s"

5936

5960

msgstr ""

5937

5961

5938

#: bzrlib/errors.py:1576

5962

#: bzrlib/errors.py:1585

5939

5963

msgid "Generic bzr smart protocol error: %(details)s"

5940

5964

msgstr ""

5941

5965

5942

#: bzrlib/errors.py:1584

5966

#: bzrlib/errors.py:1593

5943

5967

msgid "Received bad protocol version marker: %(marker)r"

5944

5968

msgstr ""

5945

5969

5946

#: bzrlib/errors.py:1616

5970

#: bzrlib/errors.py:1625

5947

5971

msgid "Transport operation not possible: %(msg)s %(orig_error)s"

5948

5972

msgstr ""

5949

5973

5950

#: bzrlib/errors.py:1621

5974

#: bzrlib/errors.py:1630

5951

5975

msgid "Connection error: %(msg)s %(orig_error)s"

5952

5976

msgstr ""

5953

5977

5954

#: bzrlib/errors.py:1626

5978

#: bzrlib/errors.py:1635

5955

5979

msgid "%(msg)s %(host)s%(port)s%(orig_error)s"

5956

5980

msgstr ""

5957

5981

5958

#: bzrlib/errors.py:1647

5982

#: bzrlib/errors.py:1656

5959

5983

msgid "Connection closed: %(msg)s %(orig_error)s"

5960

5984

msgstr ""

5961

5985

5962

#: bzrlib/errors.py:1652

5986

#: bzrlib/errors.py:1661

5963

5987

msgid "Connection Timeout: %(msg)s%(orig_error)s"

5964

5988

msgstr ""

5965

5989

5966

#: bzrlib/errors.py:1657

5990

#: bzrlib/errors.py:1666

5967

5991

msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"

5968

5992

msgstr ""

5969

5993

5970

#: bzrlib/errors.py:1667

5994

#: bzrlib/errors.py:1676

5971

5995

msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"

5972

5996

msgstr ""

5973

5997

5974

#: bzrlib/errors.py:1682

5998

#: bzrlib/errors.py:1691

5975

5999

msgid "Certificate error: %(error)s"

5976

6000

msgstr ""

5977

6001

5978

#: bzrlib/errors.py:1690

6002

#: bzrlib/errors.py:1699

5979

6003

msgid "Invalid http range %(range)r for %(path)s: %(msg)s"

5980

6004

msgstr ""

5981

6005

5982

#: bzrlib/errors.py:1704

6006

#: bzrlib/errors.py:1713

5983

6007

msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"

5984

6008

msgstr ""

5985

6009

5986

#: bzrlib/errors.py:1712

6010

#: bzrlib/errors.py:1721

5987

6011

msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"

5988

6012

msgstr ""

5989

6013

5990

#: bzrlib/errors.py:1721

6014

#: bzrlib/errors.py:1730

5991

6015

msgid "%(source)s is%(permanently)s redirected to %(target)s"

5992

6016

msgstr ""

5993

6017

5994

#: bzrlib/errors.py:1735

6018

#: bzrlib/errors.py:1744

5995

6019

msgid "Too many redirections"

5996

6020

msgstr ""

5997

6021

5998

#: bzrlib/errors.py:1740

6022

#: bzrlib/errors.py:1749

5999

6023

msgid "Working tree has conflicts."

6000

6024

msgstr ""

6001

6025

6002

#: bzrlib/errors.py:1744

6026

#: bzrlib/errors.py:1753

6003

6027

msgid "Config file %(filename)s is not UTF-8 encoded\n"

6004

6028

msgstr ""

6005

6029

6006

#: bzrlib/errors.py:1753

6030

#: bzrlib/errors.py:1762

6007

6031

msgid ""

6008

6032

"Error(s) parsing config file %(filename)s:\n"

6009

6033

"%(errors)s"

6010

6034

msgstr ""

6011

6035

6012

#: bzrlib/errors.py:1763

6036

#: bzrlib/errors.py:1772

6013

6037

msgid ""

6014

6038

"Bad value \"%(value)s\" for option \"%(name)s\".\n"

6015

6039

"See ``bzr help %(name)s``"

6016

6040

msgstr ""

6017

6041

6018

#: bzrlib/errors.py:1773

6042

#: bzrlib/errors.py:1782

6019

6043

msgid "%(username)r does not seem to contain a reasonable email address"

6020

6044

msgstr ""

6021

6045

6022

#: bzrlib/errors.py:1782

6046

#: bzrlib/errors.py:1791

6023

6047

msgid "Failed to GPG sign data with command \"%(command_line)s\""

6024

6048

msgstr ""

6025

6049

6026

#: bzrlib/errors.py:1790

6050

#: bzrlib/errors.py:1799

6027

6051

msgid "Failed to verify GPG signature data with error \"%(error)s\""

6028

6052

msgstr "Не удалось верифицировать подпись GPG с ошибкой «%(error)s»"

6029

6053

6030

#: bzrlib/errors.py:1798

6054

#: bzrlib/errors.py:1807

6031

6055

msgid "Unable to import library \"%(library)s\": %(error)s"

6032

6056

msgstr "Не удалось импортировать библиотеку «%(library)s»: %(error)s"

6033

6057

6034

#: bzrlib/errors.py:1806

6058

#: bzrlib/errors.py:1815

6035

6059

msgid "python-gpgme is not installed, it is needed to verify signatures"

6036

6060

msgstr "python-gpgme не устонвлен, он нужен для верификации подписей"

6037

6061

6038

#: bzrlib/errors.py:1814

6062

#: bzrlib/errors.py:1823

6039

6063

msgid ""

6040

6064

"The working tree for %(basedir)s has changed since the last commit, but "

6041

6065

"weave merge requires that it be unchanged"

6043

6067

"Рабочее дерево для %(basedir)s изменилось с последнего закрепления, но merge "

6044

6068

"требует, чтобы оно не содержало изменений"

6045

6069

6046

#: bzrlib/errors.py:1824

6070

#: bzrlib/errors.py:1833

6047

6071

msgid ""

6048

6072

"Can't reprocess and show base, because reprocessing obscures the "

6049

6073

"relationship of conflicting lines to the base"

6050

6074

msgstr ""

6051

6075

6052

#: bzrlib/errors.py:1830

6076

#: bzrlib/errors.py:1839

6053

6077

msgid "Cycle in graph %(graph)r"

6054

6078

msgstr "Цикл в графе %(graph)r"

6055

6079

6056

#: bzrlib/errors.py:1858

6080

#: bzrlib/errors.py:1867

6057

6081

msgid "File %(filename)s is not conflicted."

6058

6082

msgstr "Файл %(filename)s не содержит конфликтов."

6059

6083

6060

#: bzrlib/errors.py:1880

6084

#: bzrlib/errors.py:1889

6061

6085

msgid "No bundle was found in \"%(filename)s\"."

6062

6086

msgstr "В файле «%(filename)s» нет пакета."

6063

6087

6064

#: bzrlib/errors.py:1889

6088

#: bzrlib/errors.py:1898

6065

6089

msgid "Unable to handle bundle version %(version)s: %(msg)s"

6066

6090

msgstr "Не удалось обработать версию пакета %(version)s: %(msg)s"

6067

6091

6068

#: bzrlib/errors.py:1899

6092

#: bzrlib/errors.py:1908

6069

6093

msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"

6070

6094

msgstr ""

6071

6095

"В ветви %(base)s отсутствует ревизия %(text_revision)s файла %(file_id)s"

6072

6096

6073

#: bzrlib/errors.py:1912

6097

#: bzrlib/errors.py:1921

6074

6098

msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"

6075

6099

msgstr ""

6076

6100

"Идентификатор файла {%(file_id)s} уже присутствует в инвентаре как %(entry)s"

6077

6101

6078

#: bzrlib/errors.py:1922

6102

#: bzrlib/errors.py:1931

6079

6103

msgid "Key %(key)s is already present in map"

6080

6104

msgstr ""

6081

6105

6082

#: bzrlib/errors.py:1927

6106

#: bzrlib/errors.py:1936

6083

6107

msgid "The prefix %(prefix)s is in the help search path twice."

6084

6108

msgstr ""

6085

6109

6086

#: bzrlib/errors.py:1937

6110

#: bzrlib/errors.py:1946

6087

6111

msgid ""

6088

6112

"No final name for trans_id %(trans_id)r\n"

6089

6113

"file-id: %(file_id)r\n"

6090

6114

"root trans-id: %(root_trans_id)r\n"

6091

6115

msgstr ""

6092

6116

6093

#: bzrlib/errors.py:1969

6117

#: bzrlib/errors.py:1978

6094

6118

msgid "Attempt to reuse a transform that has already been applied."

6095

6119

msgstr ""

6096

6120

6097

#: bzrlib/errors.py:1974

6121

#: bzrlib/errors.py:1983

6098

6122

msgid "Moving the root directory is not supported at this time"

6099

6123

msgstr "Перемещение в корневую директорию пока не поддерживается"

6100

6124

6101

#: bzrlib/errors.py:1979

6125

#: bzrlib/errors.py:1988

6102

6126

msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"

6103

6127

msgstr "Не удалось переименовать %(from_path)s в %(to_path)s: %(why)s"

6104

6128

6105

#: bzrlib/errors.py:1990

6129

#: bzrlib/errors.py:1999

6106

6130

msgid ""

6107

6131

"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

6108

6132

msgstr ""

6109

6133

"Не удалось переместить %(from_path)s%(operator)s "

6110

6134

"%(to_path)s%(_has_extra)s%(extra)s"

6111

6135

6112

#: bzrlib/errors.py:2026

6136

#: bzrlib/errors.py:2035

6113

6137

msgid ""

6114

6138

"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

6115

6139

msgstr ""

6116

6140

"Не удалось переименовать %(from_path)s%(operator)s "

6117

6141

"%(to_path)s%(_has_extra)s%(extra)s"

6118

6142

6119

#: bzrlib/errors.py:2056

6143

#: bzrlib/errors.py:2065

6120

6144

msgid "Unable to import paramiko (required for sftp support): %(error)s"

6121

6145

msgstr ""

6122

6146

6123

#: bzrlib/errors.py:2064

6147

#: bzrlib/errors.py:2073

6124

6148

msgid "Nothing to merge."

6125

6149

msgstr "Нечего совмещать."

6126

6150

6127

#: bzrlib/errors.py:2069

6151

#: bzrlib/errors.py:2078

6128

6152

msgid "Format %(format)s cannot be initialised by this version of bzr."

6129

6153

msgstr ""

6130

6154

6131

#: bzrlib/errors.py:2078

6155

#: bzrlib/errors.py:2087

6132

6156

msgid ""

6133

6157

"Cannot convert from format %(from_format)s to format %(format)s. "

6134

6158

"%(problem)s"

6135

6159

msgstr ""

6136

6160

6137

#: bzrlib/errors.py:2090

6161

#: bzrlib/errors.py:2099

6138

6162

msgid "Could not find an appropriate Differ for file \"%(path)s\""

6139

6163

msgstr ""

6140

6164

6141

#: bzrlib/errors.py:2098

6165

#: bzrlib/errors.py:2107

6142

6166

msgid "%(exe_name)s could not be found on this machine"

6143

6167

msgstr ""

6144

6168

6145

#: bzrlib/errors.py:2106

6169

#: bzrlib/errors.py:2115

6146

6170

msgid "Diff is not installed on this machine: %(msg)s"

6147

6171

msgstr ""

6148

6172

6149

#: bzrlib/errors.py:2114

6173

#: bzrlib/errors.py:2123

6150

6174

msgid "Diff3 is not installed on this machine."

6151

6175

msgstr "Diff3 не установлен на этой машине."

6152

6176

6153

#: bzrlib/errors.py:2120

6177

#: bzrlib/errors.py:2129

6154

6178

msgid "The content being inserted is already present."

6155

6179

msgstr ""

6156

6180

6157

#: bzrlib/errors.py:2125

6181

#: bzrlib/errors.py:2134

6158

6182

msgid ""

6159

6183

"This tree contains left-over files from a failed operation.\n"

6160

6184

" Please examine %(limbo_dir)s to see if it contains any files you wish "

6162

6186

" keep, and delete it when you are done."

6163

6187

msgstr ""

6164

6188

6165

#: bzrlib/errors.py:2136

6189

#: bzrlib/errors.py:2145

6166

6190

msgid ""

6167

6191

"This tree contains left-over files from a failed operation.\n"

6168

6192

" Please examine %(pending_deletion)s to see if it contains any files you\n"

6169

6193

" wish to keep, and delete it when you are done."

6170

6194

msgstr ""

6171

6195

6172

#: bzrlib/errors.py:2146

6196

#: bzrlib/errors.py:2155

6173

6197

msgid ""

6174

6198

"Unable to delete transform temporary directory %(limbo_dir)s.\n"

6175

6199

" Please examine %(limbo_dir)s to see if it contains any files you wish "

6177

6201

" keep, and delete it when you are done."

6178

6202

msgstr ""

6179

6203

6180

#: bzrlib/errors.py:2157

6204

#: bzrlib/errors.py:2166

6181

6205

msgid ""

6182

6206

"Unable to delete transform temporary directory %(pending_deletion)s. Please "

6183

6207

"examine %(pending_deletion)s to see if it contains any files you wish to "

6184

6208

"keep, and delete it when you are done."

6185

6209

msgstr ""

6186

6210

6187

#: bzrlib/errors.py:2167

6211

#: bzrlib/errors.py:2176

6188

6212

msgid "Working tree is out of date, please run 'bzr update'.%(more)s"

6189

6213

msgstr ""

6190

6214

6191

#: bzrlib/errors.py:2181

6215

#: bzrlib/errors.py:2190

6192

6216

msgid ""

6193

6217

"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."

6194

6218

msgstr ""

6195

6219

6196

#: bzrlib/errors.py:2194

6220

#: bzrlib/errors.py:2203

6197

6221

msgid "Error in merge modified format"

6198

6222

msgstr ""

6199

6223

6200

#: bzrlib/errors.py:2199

6224

#: bzrlib/errors.py:2208

6201

6225

msgid "Format error in conflict listings"

6202

6226

msgstr ""

6203

6227

6204

#: bzrlib/errors.py:2203

6228

#: bzrlib/errors.py:2212

6205

6229

msgid ""

6206

6230

"Inconsistency in dirstate file %(dirstate_path)s.\n"

6207

6231

"Error: %(description)s"

6208

6232

msgstr ""

6209

6233

6210

#: bzrlib/errors.py:2214

6234

#: bzrlib/errors.py:2223

6211

6235

msgid ""

6212

6236

"An error has been detected in the repository %(repo_path)s.\n"

6213

6237

"Please run bzr reconcile on this repository."

6214

6238

msgstr ""

6215

6239

6216

#: bzrlib/errors.py:2225

6240

#: bzrlib/errors.py:2234

6217

6241

msgid ""

6218

6242

"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"

6219

6243

"reason: %(reason)s"

6220

6244

msgstr ""

6221

6245

6222

#: bzrlib/errors.py:2238

6246

#: bzrlib/errors.py:2247

6223

6247

msgid ""

6224

6248

"An inconsistent delta was supplied: %(delta)r\n"

6225

6249

"reason: %(reason)s"

6226

6250

msgstr ""

6227

6251

6228

#: bzrlib/errors.py:2250

6252

#: bzrlib/errors.py:2259

6229

6253

msgid "To use this feature you must upgrade your branch at %(path)s."

6230

6254

msgstr ""

6231

6255

6232

#: bzrlib/errors.py:2259

6256

#: bzrlib/errors.py:2268

6233

6257

msgid "To use this feature you must upgrade your repository at %(path)s."

6234

6258

msgstr ""

6235

6259

6236

#: bzrlib/errors.py:2264

6260

#: bzrlib/errors.py:2273

6237

6261

msgid ""

6238

6262

"To use this feature you must upgrade your branch at %(path)s to a format "

6239

6263

"which supports rich roots."

6240

6264

msgstr ""

6241

6265

6242

#: bzrlib/errors.py:2270

6266

#: bzrlib/errors.py:2279

6243

6267

msgid "Cannot perform local-only commits on unbound branches."

6244

6268

msgstr ""

6245

6269

6246

#: bzrlib/errors.py:2275

6270

#: bzrlib/errors.py:2284

6247

6271

msgid "The method %(mname)s is not supported on objects of type %(tname)s."

6248

6272

msgstr ""

6249

6273

6250

#: bzrlib/errors.py:2296

6274

#: bzrlib/errors.py:2305

6251

6275

msgid "Ghost tags not supported by format %(format)r."

6252

6276

msgstr ""

6253

6277

6254

#: bzrlib/errors.py:2304

6278

#: bzrlib/errors.py:2313

6255

6279

msgid "File is binary but should be text."

6256

6280

msgstr ""

6257

6281

6258

#: bzrlib/errors.py:2309

6282

#: bzrlib/errors.py:2318

6259

6283

msgid "The path %(path)s is not permitted on this platform"

6260

6284

msgstr ""

6261

6285

6262

#: bzrlib/errors.py:2318

6286

#: bzrlib/errors.py:2327

6263

6287

msgid ""

6264

6288

"Testament did not match expected value.\n"

6265

6289

" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"

6266

6290

" {%(measured)s}"

6267

6291

msgstr ""

6268

6292

6269

#: bzrlib/errors.py:2330

6293

#: bzrlib/errors.py:2339

6270

6294

msgid "Not a bzr revision-bundle: %(text)r"

6271

6295

msgstr ""

6272

6296

6273

#: bzrlib/errors.py:2339

6297

#: bzrlib/errors.py:2348

6274

6298

msgid "Bad bzr revision-bundle: %(text)r"

6275

6299

msgstr ""

6276

6300

6277

#: bzrlib/errors.py:2348

6301

#: bzrlib/errors.py:2357

6278

6302

msgid "Malformed bzr revision-bundle header: %(text)r"

6279

6303

msgstr ""

6280

6304

6281

#: bzrlib/errors.py:2353

6305

#: bzrlib/errors.py:2362

6282

6306

msgid "Malformed patches in bzr revision-bundle: %(text)r"

6283

6307

msgstr ""

6284

6308

6285

#: bzrlib/errors.py:2358

6309

#: bzrlib/errors.py:2367

6286

6310

msgid "Malformed footer in bzr revision-bundle: %(text)r"

6287

6311

msgstr ""

6288

6312

6289

#: bzrlib/errors.py:2363

6313

#: bzrlib/errors.py:2372

6290

6314

msgid "End of line marker was not \\n in bzr revision-bundle"

6291

6315

msgstr ""

6292

6316

6293

#: bzrlib/errors.py:2373

6317

#: bzrlib/errors.py:2382

6294

6318

msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"

6295

6319

msgstr ""

6296

6320

6297

#: bzrlib/errors.py:2383

6321

#: bzrlib/errors.py:2392

6298

6322

msgid "Root class for inventory serialization errors"

6299

6323

msgstr ""

6300

6324

6301

#: bzrlib/errors.py:2387

6325

#: bzrlib/errors.py:2396

6302

6326

msgid ""

6303

6327

"The inventory was not in the expected format:\n"

6304

6328

" %(msg)s"

6305

6329

msgstr ""

6306

6330

6307

#: bzrlib/errors.py:2396

6331

#: bzrlib/errors.py:2405

6308

6332

msgid "This operation requires rich root data storage"

6309

6333

msgstr ""

6310

6334

6311

#: bzrlib/errors.py:2409

6335

#: bzrlib/errors.py:2418

6312

6336

msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"

6313

6337

msgstr ""

6314

6338

6315

#: bzrlib/errors.py:2418

6339

#: bzrlib/errors.py:2427

6316

6340

msgid ""

6317

6341

"Don't know how to handle SSH connections. Please set BZR_SSH environment "

6318

6342

"variable."

6319

6343

msgstr ""

6320

6344

6321

#: bzrlib/errors.py:2425

6345

#: bzrlib/errors.py:2434

6322

6346

msgid ""

6323

6347

"Could not determine revno for {%(revision_id)s} because its ancestry shows a "

6324

6348

"ghost at {%(ghost_revision_id)s}"

6325

6349

msgstr ""

6326

6350

6327

#: bzrlib/errors.py:2435

6351

#: bzrlib/errors.py:2444

6328

6352

msgid "Ghost revision {%(revision_id)s} cannot be used here."

6329

6353

msgstr ""

6330

6354

6331

#: bzrlib/errors.py:2486

6355

#: bzrlib/errors.py:2495

6332

6356

msgid ""

6333

6357

"A merge directive must provide either a bundle or a public branch location."

6334

6358

msgstr ""

6335

6359

6336

#: bzrlib/errors.py:2493

6360

#: bzrlib/errors.py:2502

6337

6361

msgid "Bad merge directive payload %(start)r"

6338

6362

msgstr ""

6339

6363

6340

#: bzrlib/errors.py:2503

6364

#: bzrlib/errors.py:2512

6341

6365

msgid "Preview patch does not match requested changes."

6342

6366

msgstr ""

6343

6367

6344

#: bzrlib/errors.py:2509

6368

#: bzrlib/errors.py:2518

6345

6369

msgid "Patch_type was %(patch_type)s, but no patch was supplied."

6346

6370

msgstr ""

6347

6371

6348

#: bzrlib/errors.py:2519

6372

#: bzrlib/errors.py:2528

6349

6373

msgid ""

6350

6374

"Your branch does not have all of the revisions required in order to merge "

6351

6375

"this merge directive and the target location specified in the merge "

6352

6376

"directive is not a branch: %(location)s."

6353

6377

msgstr ""

6354

6378

6355

#: bzrlib/errors.py:2531

6379

#: bzrlib/errors.py:2540

6356

6380

msgid "Unsupported entry kind %(kind)s"

6357

6381

msgstr ""

6358

6382

6359

#: bzrlib/errors.py:2539

6383

#: bzrlib/errors.py:2548

6360

6384

msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"

6361

6385

msgstr ""

6362

6386

6363

#: bzrlib/errors.py:2549

6387

#: bzrlib/errors.py:2558

6364

6388

msgid "Subsume target %(other_tree)s needs to be upgraded."

6365

6389

msgstr ""

6366

6390

6367

#: bzrlib/errors.py:2568

6391

#: bzrlib/errors.py:2577

6368

6392

msgid "No such tag: %(tag_name)s"

6369

6393

msgstr ""

6370

6394

6371

#: bzrlib/errors.py:2576

6395

#: bzrlib/errors.py:2585

6372

6396

msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."

6373

6397

msgstr ""

6374

6398

6375

#: bzrlib/errors.py:2585

6399

#: bzrlib/errors.py:2594

6376

6400

msgid "Tag %(tag_name)s already exists."

6377

6401

msgstr ""

6378

6402

6379

#: bzrlib/errors.py:2593

6403

#: bzrlib/errors.py:2602

6380

6404

msgid ""

6381

6405

"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "

6382

6406

"bugs\" for more information on this feature."

6383

6407

msgstr ""

6384

6408

6385

#: bzrlib/errors.py:2603

6409

#: bzrlib/errors.py:2612

6386

6410

msgid ""

6387

6411

"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"

6388

6412

msgstr ""

6389

6413

6390

#: bzrlib/errors.py:2613

6414

#: bzrlib/errors.py:2622

6391

6415

msgid ""

6392

6416

"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"

6393

6417

msgstr ""

6394

6418

6395

#: bzrlib/errors.py:2623

6419

#: bzrlib/errors.py:2632

6396

6420

msgid "Invalid line in bugs property: '%(line)s'"

6397

6421

msgstr ""

6398

6422

6399

#: bzrlib/errors.py:2631

6423

#: bzrlib/errors.py:2640

6400

6424

msgid "Invalid bug status: '%(status)s'"

6401

6425

msgstr ""

6402

6426

6403

#: bzrlib/errors.py:2639

6427

#: bzrlib/errors.py:2648

6404

6428

msgid "Could not understand response from smart server: %(response_tuple)r"

6405

6429

msgstr ""

6406

6430

6407

#: bzrlib/errors.py:2678

6431

#: bzrlib/errors.py:2687

6408

6432

msgid "Server sent an unexpected error: %(error_tuple)r"

6409

6433

msgstr ""

6410

6434

6411

#: bzrlib/errors.py:2697

6435

#: bzrlib/errors.py:2706

6412

6436

msgid "Unrecognised container format: %(container_format)r"

6413

6437

msgstr ""

6414

6438

6415

#: bzrlib/errors.py:2705

6439

#: bzrlib/errors.py:2714

6416

6440

msgid "Unexpected end of container stream"

6417

6441

msgstr ""

6418

6442

6419

#: bzrlib/errors.py:2710

6443

#: bzrlib/errors.py:2719

6420

6444

msgid "Unknown record type: %(record_type)r"

6421

6445

msgstr ""

6422

6446

6423

#: bzrlib/errors.py:2718

6447

#: bzrlib/errors.py:2727

6424

6448

msgid "Invalid record: %(reason)s"

6425

6449

msgstr ""

6426

6450

6427

#: bzrlib/errors.py:2726

6451

#: bzrlib/errors.py:2735

6428

6452

msgid "Container has data after end marker: %(excess)r"

6429

6453

msgstr ""

6430

6454

6431

#: bzrlib/errors.py:2734

6455

#: bzrlib/errors.py:2743

6432

6456

msgid "Container has multiple records with the same name: %(name)s"

6433

6457

msgstr ""

6434

6458

6435

#: bzrlib/errors.py:2747

6459

#: bzrlib/errors.py:2756

6436

6460

msgid "Corrupt or incompatible data stream: %(reason)s"

6437

6461

msgstr ""

6438

6462

6439

#: bzrlib/errors.py:2755

6463

#: bzrlib/errors.py:2764

6440

6464

msgid "SMTP error: %(error)s"

6441

6465

msgstr ""

6442

6466

6443

#: bzrlib/errors.py:2763

6467

#: bzrlib/errors.py:2772

6444

6468

msgid "No message supplied."

6445

6469

msgstr ""

6446

6470

6447

#: bzrlib/errors.py:2768

6471

#: bzrlib/errors.py:2777

6448

6472

msgid "No mail-to address (--mail-to) or output (-o) specified."

6449

6473

msgstr ""

6450

6474

6451

#: bzrlib/errors.py:2773

6452

msgid "Unknown mail client: %(mail_client)s"

6453

msgstr ""

6454

6455

#: bzrlib/errors.py:2781

6475

#: bzrlib/errors.py:2782

6456

6476

msgid ""

6457

6477

"Unable to find mail client with the following names: "

6458

6478

"%(mail_command_list_string)s"

6459

6479

msgstr ""

6460

6480

6461

#: bzrlib/errors.py:2791

6481

#: bzrlib/errors.py:2792

6462

6482

msgid "SMTP connection to %(host)s refused"

6463

6483

msgstr ""

6464

6484

6465

#: bzrlib/errors.py:2800

6485

#: bzrlib/errors.py:2801

6466

6486

msgid "Please specify smtp_server. No server at default %(host)s."

6467

6487

msgstr ""

6468

6488

6469

#: bzrlib/errors.py:2814

6489

#: bzrlib/errors.py:2815

6470

6490

msgid ""

6471

6491

"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"

6472

6492

"reconfigure."

6473

6493

msgstr ""

6474

6494

6475

#: bzrlib/errors.py:2826

6495

#: bzrlib/errors.py:2827

6476

6496

msgid "'%(display_url)s' is already a branch."

6477

6497

msgstr ""

6478

6498

6479

#: bzrlib/errors.py:2831

6499

#: bzrlib/errors.py:2832

6480

6500

msgid "'%(display_url)s' is already a tree."

6481

6501

msgstr ""

6482

6502

6483

#: bzrlib/errors.py:2836

6503

#: bzrlib/errors.py:2837

6484

6504

msgid "'%(display_url)s' is already a checkout."

6485

6505

msgstr ""

6486

6506

6487

#: bzrlib/errors.py:2841

6507

#: bzrlib/errors.py:2842

6488

6508

msgid "'%(display_url)s' is already a lightweight checkout."

6489

6509

msgstr ""

6490

6510

6491

#: bzrlib/errors.py:2846

6511

#: bzrlib/errors.py:2847

6492

6512

msgid "'%(display_url)s' is already using a shared repository."

6493

6513

msgstr ""

6494

6514

6495

#: bzrlib/errors.py:2851

6515

#: bzrlib/errors.py:2852

6496

6516

msgid "'%(display_url)s' is already standalone."

6497

6517

msgstr ""

6498

6518

6499

#: bzrlib/errors.py:2856

6519

#: bzrlib/errors.py:2857

6500

6520

msgid "Shared repository '%(display_url)s' already creates working trees."

6501

6521

msgstr ""

6502

6522

6503

#: bzrlib/errors.py:2862

6523

#: bzrlib/errors.py:2863

6504

6524

msgid ""

6505

6525

"Shared repository '%(display_url)s' already doesn't create working trees."

6506

6526

msgstr ""

6507

6527

6508

#: bzrlib/errors.py:2868

6528

#: bzrlib/errors.py:2869

6509

6529

msgid "Requested reconfiguration of '%(display_url)s' is not supported."

6510

6530

msgstr ""

6511

6531

6512

#: bzrlib/errors.py:2873

6532

#: bzrlib/errors.py:2874

6513

6533

msgid "No location could be found to bind to at %(display_url)s."

6514

6534

msgstr ""

6515

6535

6516

#: bzrlib/errors.py:2878

6536

#: bzrlib/errors.py:2879

6517

6537

msgid ""

6518

6538

"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "

6519

6539

"status).%(more)s"

6520

6540

msgstr ""

6521

6541

6522

#: bzrlib/errors.py:2897

6542

#: bzrlib/errors.py:2898

6523

6543

msgid ""

6524

6544

"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"

6525

6545

"list).%(more)s"

6526

6546

msgstr ""

6527

6547

6528

#: bzrlib/errors.py:2903

6548

#: bzrlib/errors.py:2904

6529

6549

msgid "Variable {%(name)s} is not available."

6530

6550

msgstr ""

6531

6551

6532

#: bzrlib/errors.py:2911

6552

#: bzrlib/errors.py:2912

6533

6553

msgid "No template specified."

6534

6554

msgstr ""

6535

6555

6536

#: bzrlib/errors.py:2916

6556

#: bzrlib/errors.py:2917

6537

6557

msgid "Unable to create symlink %(path_str)son this platform"

6538

6558

msgstr ""

6539

6559

6540

#: bzrlib/errors.py:2931

6560

#: bzrlib/errors.py:2932

6541

6561

msgid ""

6542

6562

"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "

6543

6563

"\"original\", \"local\"."

6544

6564

msgstr ""

6545

6565

6546

#: bzrlib/errors.py:2965

6566

#: bzrlib/errors.py:2966

6547

6567

msgid ""

6548

6568

"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"

6549

6569

msgstr ""

6550

6570

6551

#: bzrlib/errors.py:2977

6571

#: bzrlib/errors.py:2978

6552

6572

msgid "The \"%(config_id)s\" configuration does not exist."

6553

6573

msgstr ""

6554

6574

6555

#: bzrlib/errors.py:2985

6575

#: bzrlib/errors.py:2986

6556

6576

msgid "The \"%(option_name)s\" configuration option does not exist."

6557

6577

msgstr ""

6558

6578

6559

#: bzrlib/errors.py:2993

6579

#: bzrlib/errors.py:2994

6560

6580

msgid "The alias \"%(alias_name)s\" does not exist."

6561

6581

msgstr ""

6562

6582

6563

#: bzrlib/errors.py:3007

6583

#: bzrlib/errors.py:3008

6564

6584

msgid "\"%(alias_name)s\" is not a valid location alias."

6565

6585

msgstr ""

6566

6586

6567

#: bzrlib/errors.py:3015

6587

#: bzrlib/errors.py:3016

6568

6588

msgid "No %(alias_name)s location assigned."

6569

6589

msgstr ""

6570

6590

6571

#: bzrlib/errors.py:3023

6591

#: bzrlib/errors.py:3024

6572

6592

msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."

6573

6593

msgstr ""

6574

6594

6575

#: bzrlib/errors.py:3033

6595

#: bzrlib/errors.py:3034

6576

6596

msgid "Unknown rules detected: %(unknowns_str)s."

6577

6597

msgstr ""

6578

6598

6579

#: bzrlib/errors.py:3044

6599

#: bzrlib/errors.py:3045

6580

6600

msgid "Tip change rejected: %(msg)s"

6581

6601

msgstr ""

6582

6602

6583

#: bzrlib/errors.py:3052

6603

#: bzrlib/errors.py:3053

6584

6604

msgid "Shelf corrupt."

6585

6605

msgstr ""

6586

6606

6587

#: bzrlib/errors.py:3057

6607

#: bzrlib/errors.py:3058

6588

6608

msgid "Corruption while decompressing repository file%(orig_error)s"

6589

6609

msgstr ""

6590

6610

6591

#: bzrlib/errors.py:3069

6611

#: bzrlib/errors.py:3070

6592

6612

msgid "No changes are shelved with id \"%(shelf_id)d\"."

6593

6613

msgstr ""

6594

6614

6595

#: bzrlib/errors.py:3077

6615

#: bzrlib/errors.py:3078

6596

6616

msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."

6597

6617

msgstr ""

6598

6618

6599

#: bzrlib/errors.py:3085

6619

#: bzrlib/errors.py:3086

6600

6620

msgid ""

6601

6621

"An attempt to access a url outside the server jail was made: '%(url)s'."

6602

6622

msgstr ""

6603

6623

6604

#: bzrlib/errors.py:3093

6624

#: bzrlib/errors.py:3094

6605

6625

msgid "The user aborted the operation."

6606

6626

msgstr ""

6607

6627

6608

#: bzrlib/errors.py:3098

6628

#: bzrlib/errors.py:3099

6609

6629

msgid "Branching '%(url)s'(%(format)s) must create a working tree."

6610

6630

msgstr ""

6611

6631

6612

#: bzrlib/errors.py:3108

6632

#: bzrlib/errors.py:3109

6613

6633

msgid "No such view: %(view_name)s."

6614

6634

msgstr ""

6615

6635

6616

#: bzrlib/errors.py:3118

6636

#: bzrlib/errors.py:3119

6617

6637

msgid ""

6618

6638

"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "

6619

6639

"to a later format."

6620

6640

msgstr ""

6621

6641

6622

#: bzrlib/errors.py:3127

6642

#: bzrlib/errors.py:3128

6623

6643

msgid ""

6624

6644

"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"

6625

6645

msgstr ""

6626

6646

6627

#: bzrlib/errors.py:3194

6647

#: bzrlib/errors.py:3195

6628

6648

msgid "%(bzrdir)r does not support co-located branches."

6629

6649

msgstr ""

6630

6650

6631

#: bzrlib/errors.py:3200

6651

#: bzrlib/errors.py:3201

6632

6652

msgid ""

6633

6653

"Unable to determine your name.\n"

6634

6654

"Please, set your name with the 'whoami' command.\n"

6635

6655

"E.g. bzr whoami \"Your Name <name@example.com>\""

6636

6656

msgstr ""

6637

6657

6638

#: bzrlib/errors.py:3209

6658

#: bzrlib/errors.py:3210

6639

6659

msgid "Invalid pattern(s) found. %(msg)s"

6640

6660

msgstr ""

6641

6661

6642

#: bzrlib/errors.py:3217

6662

#: bzrlib/errors.py:3218

6643

6663

msgid ""

6644

6664

"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "

6645

6665

"unbind` to fix."

6646

6666

msgstr ""

6647

6667

6648

#: bzrlib/errors.py:3228

6668

#: bzrlib/errors.py:3229

6649

6669

msgid "Loop involving %(refs)r while expanding \"%(string)s\"."

6650

6670

msgstr ""

6651

6671

6652

#: bzrlib/errors.py:3237

6672

#: bzrlib/errors.py:3238

6653

6673

msgid "Option %(name)s is not defined while expanding \"%(string)s\"."

6654

6674

msgstr ""

6655

6675

6656

#: bzrlib/errors.py:3246

6676

#: bzrlib/errors.py:3247

6657

6677

msgid ""

6658

6678

"No compatible object available for operations from %(source)r to %(target)r."

6659

6679

msgstr ""

6660

6680

6661

#: bzrlib/errors.py:3256

6681

#: bzrlib/errors.py:3257

6662

6682

msgid ""

6663

6683

"VFS requests over the smart server are not allowed. Encountered: %(method)s, "

6664

6684

"%(arguments)s."

6665

6685

msgstr ""

6666

6686

6667

#: bzrlib/errors.py:3266

6687

#: bzrlib/errors.py:3267

6668

6688

msgid ""

6669

6689

"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "

6670

6690

"format %(format)r"

6671

6691

msgstr ""

6672

6692

6673

#: bzrlib/errors.py:3278

6693

#: bzrlib/errors.py:3279

6674

6694

msgid ""

6675

6695

"Missing feature %(feature)s not provided by this version of Bazaar or any "

6676

6696

"plugin."

6677

6697

msgstr ""

6678

6698

6679

#: bzrlib/errors.py:3291

6699

#: bzrlib/errors.py:3292

6680

6700

msgid "Binary files section encountered."

6681

6701

msgstr ""

6682

6702

6683

#: bzrlib/errors.py:3299

6703

#: bzrlib/errors.py:3300

6684

6704

msgid ""

6685

6705

"Malformed patch header. %(desc)s\n"

6686

6706

"%(line)r"

6687

6707

msgstr ""

6688

6708

6689

#: bzrlib/errors.py:3308

6709

#: bzrlib/errors.py:3309

6690

6710

msgid ""

6691

6711

"Malformed hunk header. %(desc)s\n"

6692

6712

"%(line)r"

6693

6713

msgstr ""

6694

6714

6695

#: bzrlib/errors.py:3317

6715

#: bzrlib/errors.py:3318

6696

6716

msgid ""

6697

6717

"Malformed line. %(desc)s\n"

6698

6718

"%(line)r"

6699

6719

msgstr ""

6700

6720

6701

#: bzrlib/errors.py:3327

6721

#: bzrlib/errors.py:3328

6702

6722

msgid ""

6703

6723

"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "

6704

6724

"but patch says it should be \"%(patch_line)s\""

6705

6725

msgstr ""

6706

6726

6707

#: bzrlib/errors.py:3338

6727

#: bzrlib/errors.py:3339

6708

6728

msgid "The feature %(feature)s has already been registered."

6709

6729

msgstr ""

6710

6730

6756

6776

"regular push."

6757

6777

msgstr ""

6758

6778

6759

#: bzrlib/gpg.py:119 bzrlib/gpg.py:460

6779

#: bzrlib/gpg.py:366

6780

msgid "No GnuPG key results for pattern: {0}"

6781

msgstr ""

6782

6783

#: bzrlib/gpg.py:439

6760

6784

msgid "{0} commits with valid signatures"

6761

6785

msgstr ""

6762

6786

6763

#: bzrlib/gpg.py:123 bzrlib/gpg.py:465

6787

#: bzrlib/gpg.py:445

6764

6788

msgid "{0} commit with unknown key"

6765

6789

msgid_plural "{0} commits with unknown keys"

6766

6790

msgstr[0] "{0} закрепление с неизвестным ключом"

6767

6791

msgstr[1] "{0} закрепления с неизвестным ключом"

6768

6792

msgstr[2] "{0} закреплений с неизвестным ключом"

6769

6793

6770

#: bzrlib/gpg.py:129 bzrlib/gpg.py:472

6794

#: bzrlib/gpg.py:453

6771

6795

msgid "{0} commit not valid"

6772

6796

msgid_plural "{0} commits not valid"

6773

6797

msgstr[0] ""

6774

6798

msgstr[1] ""

6775

6799

6776

#: bzrlib/gpg.py:135 bzrlib/gpg.py:479

6800

#: bzrlib/gpg.py:461

6777

6801

msgid "{0} commit not signed"

6778

6802

msgid_plural "{0} commits not signed"

6779

6803

msgstr[0] ""

6780

6804

msgstr[1] ""

6781

6805

6782

#: bzrlib/gpg.py:141 bzrlib/gpg.py:486

6806

#: bzrlib/gpg.py:469

6783

6807

msgid "{0} commit with key now expired"

6784

6808

msgid_plural "{0} commits with key now expired"

6785

6809

msgstr[0] ""

6786

6810

msgstr[1] ""

6787

6811

6788

#: bzrlib/gpg.py:343

6789

msgid "No GnuPG key results for pattern: {0}"

6790

msgstr ""

6812

#: bzrlib/gpg.py:489

6813

msgid "{0} commit by author {1} with key {2} now expired"

6814

msgid_plural "{0} commits by author {1} with key {2} now expired"

6815

msgstr[0] ""

6816

msgstr[1] ""

6791

6817

6792

#: bzrlib/gpg.py:386

6818

#: bzrlib/gpg.py:505

6793

6819

msgid "{0} signed {1} commit"

6794

6820

msgid_plural "{0} signed {1} commits"

6795

6821

msgstr[0] ""

6796

6822

msgstr[1] ""

6797

6823

6798

#: bzrlib/gpg.py:403 bzrlib/gpg.py:419

6824

#: bzrlib/gpg.py:522 bzrlib/gpg.py:539

6799

6825

msgid "{0} commit by author {1}"

6800

6826

msgid_plural "{0} commits by author {1}"

6801

6827

msgstr[0] ""

6802

6828

msgstr[1] ""

6803

6829

6804

#: bzrlib/gpg.py:433

6830

#: bzrlib/gpg.py:554

6805

6831

msgid "Unknown key {0} signed {1} commit"

6806

6832

msgid_plural "Unknown key {0} signed {1} commits"

6807

6833

msgstr[0] "Неизвестным ключом {0} подписано {1} закрепление"

6808

6834

msgstr[1] "Неизвестным ключом {0} подписаны {1} закрепления"

6809

6835

msgstr[2] "Неизвестным ключом {0} подписаны {1} закреплений"

6810

6836

6811

#: bzrlib/gpg.py:452

6812

msgid "{0} commit by author {1} with key {2} now expired"

6813

msgid_plural "{0} commits by author {1} with key {2} now expired"

6814

msgstr[0] ""

6815

msgstr[1] ""

6816

6817

6837

#: bzrlib/groupcompress.py:1739

6818

6838

#, python-format

6819

6839

msgid "Insert claimed random_id=True, but then inserted %r two times"

6820

6840

msgstr ""

6821

6841

6822

#: bzrlib/hooks.py:331

6842

#: bzrlib/hooks.py:313

6823

6843

#, python-format

6824

6844

msgid "Introduced in: %s"

6825

6845

msgstr ""

6826

6846

6827

#: bzrlib/hooks.py:334

6847

#: bzrlib/hooks.py:316

6828

6848

#, python-format

6829

6849

msgid "Deprecated in: %s"

6830

6850

msgstr ""

6873

6893

"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"

6874

6894

msgstr ""

6875

6895

6876

#: bzrlib/log.py:572

6896

#: bzrlib/log.py:563

6877

6897

msgid "--exclude-common-ancestry requires two different revisions"

6878

6898

msgstr ""

6879

6899

6880

#: bzrlib/log.py:574

6900

#: bzrlib/log.py:565

6881

6901

#, python-format

6882

6902

msgid "invalid direction %r"

6883

6903

msgstr ""

6884

6904

6885

#: bzrlib/log.py:662

6905

#: bzrlib/log.py:653

6886

6906

msgid "Start revision not found in history of end revision."

6887

6907

msgstr ""

6888

6908

6889

#: bzrlib/log.py:1080 bzrlib/log.py:1138

6909

#: bzrlib/log.py:1071 bzrlib/log.py:1129

6890

6910

msgid "Logging revision 0 is invalid."

6891

6911

msgstr ""

6892

6912

6893

#: bzrlib/log.py:1082 bzrlib/log.py:1140

6913

#: bzrlib/log.py:1073 bzrlib/log.py:1131

6894

6914

msgid "Start revision must be older than the end revision."

6895

6915

msgstr ""

6896

6916

6897

#: bzrlib/log.py:1827

6917

#: bzrlib/log.py:1818

6898

6918

#, python-format

6899

6919

msgid "unknown log formatter: %r"

6900

6920

msgstr ""

6901

6921

6902

#: bzrlib/log.py:2123

6922

#: bzrlib/log.py:2114

6903

6923

msgid "fixes bug"

6904

6924

msgid_plural "fixes bugs"

6905

6925

msgstr[0] ""

6914

6934

msgid "%d conflicts encountered."

6915

6935

msgstr ""

6916

6936

6917

#: bzrlib/merge.py:845 bzrlib/merge.py:1933

6937

#: bzrlib/merge.py:845 bzrlib/merge.py:1868

6918

6938

msgid "Preparing file merge"

6919

6939

msgstr ""

6920

6940

7036

7056

msgid "lstat/stat of ({0!r}): {1!r}"

7037

7057

msgstr ""

7038

7058

7039

#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019

7059

#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041

7040

7060

#, python-format

7041

7061

msgid "sorry, %r not allowed in path"

7042

7062

msgstr ""

7043

7063

7044

#: bzrlib/osutils.py:1237

7064

#: bzrlib/osutils.py:1259

7045

7065

#, python-format

7046

7066

msgid "%r is too short to calculate a relative path"

7047

7067

msgstr ""

7080

7100

msgid "Generate only the shell function, don't enable it"

7081

7101

msgstr ""

7082

7102

7083

#: bzrlib/plugins/launchpad/__init__.py:81

7103

#: bzrlib/plugins/launchpad/account.py:66

7104

msgid "Setting ssh/sftp usernames for launchpad.net."

7105

msgstr ""

7106

7107

#: bzrlib/plugins/launchpad/cmds.py:44

7084

7108

msgid "Register a branch with launchpad.net."

7085

7109

msgstr ""

7086

7110

7087

#: bzrlib/plugins/launchpad/__init__.py:83

7111

#: bzrlib/plugins/launchpad/cmds.py:46

7088

7112

msgid ""

7089

7113

"This command lists a bzr branch in the directory of branches on\n"

7090

7114

"launchpad.net. Registration allows the branch to be associated with\n"

7091

7115

"bugs or specifications."

7092

7116

msgstr ""

7093

7117

7094

#: bzrlib/plugins/launchpad/__init__.py:87

7118

#: bzrlib/plugins/launchpad/cmds.py:50

7095

7119

msgid ""

7096

7120

"Before using this command you must register the project to which the\n"

7097

7121

"branch belongs, and create an account for yourself on launchpad.net."

7098

7122

msgstr ""

7099

7123

7100

#: bzrlib/plugins/launchpad/__init__.py:90

7124

#: bzrlib/plugins/launchpad/cmds.py:53

7101

7125

msgid ""

7102

7126

"arguments:\n"

7103

7127

" public_url: The publicly visible url for the branch to register.\n"

7109

7133

" otherwise error."

7110

7134

msgstr ""

7111

7135

7112

#: bzrlib/plugins/launchpad/__init__.py:99

7136

#: bzrlib/plugins/launchpad/cmds.py:62

7113

7137

msgid ""

7114

7138

"example:\n"

7115

7139

" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"

7116

7140

" --project fooproject"

7117

7141

msgstr ""

7118

7142

7119

#: bzrlib/plugins/launchpad/__init__.py:106

7143

#: bzrlib/plugins/launchpad/cmds.py:69

7120

7144

msgid "Launchpad project short name to associate with the branch."

7121

7145

msgstr ""

7122

7146

7123

#: bzrlib/plugins/launchpad/__init__.py:113

7147

#: bzrlib/plugins/launchpad/cmds.py:76

7124

7148

msgid ""

7125

7149

"Short name for the branch; by default taken from the last component of the "

7126

7150

"url."

7127

7151

msgstr ""

7128

7152

7129

#: bzrlib/plugins/launchpad/__init__.py:117

7153

#: bzrlib/plugins/launchpad/cmds.py:80

7130

7154

msgid "One-sentence description of the branch."

7131

7155

msgstr ""

7132

7156

7133

#: bzrlib/plugins/launchpad/__init__.py:120

7157

#: bzrlib/plugins/launchpad/cmds.py:83

7134

7158

msgid "Longer description of the purpose or contents of the branch."

7135

7159

msgstr ""

7136

7160

7137

#: bzrlib/plugins/launchpad/__init__.py:123

7161

#: bzrlib/plugins/launchpad/cmds.py:86

7138

7162

msgid "Branch author's email address, if not yourself."

7139

7163

msgstr ""

7140

7164

7141

#: bzrlib/plugins/launchpad/__init__.py:126

7165

#: bzrlib/plugins/launchpad/cmds.py:89

7142

7166

msgid "The bug this branch fixes."

7143

7167

msgstr ""

7144

7168

7145

#: bzrlib/plugins/launchpad/__init__.py:129

7169

#: bzrlib/plugins/launchpad/cmds.py:92

7146

7170

msgid "Prepare the request but don't actually send it."

7147

7171

msgstr ""

7148

7172

7149

#: bzrlib/plugins/launchpad/__init__.py:151

7173

#: bzrlib/plugins/launchpad/cmds.py:114

7150

7174

msgid ""

7151

7175

"register-branch requires a public branch url - see bzr help register-branch."

7152

7176

msgstr ""

7153

7177

7154

#: bzrlib/plugins/launchpad/__init__.py:159

7178

#: bzrlib/plugins/launchpad/cmds.py:122

7155

7179

msgid "--product is deprecated; please use --project."

7156

7180

msgstr ""

7157

7181

7158

#: bzrlib/plugins/launchpad/__init__.py:191

7182

#: bzrlib/plugins/launchpad/cmds.py:152

7159

7183

msgid "Open a Launchpad branch page in your web browser."

7160

7184

msgstr ""

7161

7185

7162

#: bzrlib/plugins/launchpad/__init__.py:196

7186

#: bzrlib/plugins/launchpad/cmds.py:157

7163

7187

msgid "Do not actually open the browser. Just say the URL we would use."

7164

7188

msgstr ""

7165

7189

7166

#: bzrlib/plugins/launchpad/__init__.py:231

7190

#: bzrlib/plugins/launchpad/cmds.py:192

7167

7191

#, python-format

7168

7192

msgid "Opening %s in web browser"

7169

7193

msgstr ""

7170

7194

7171

#: bzrlib/plugins/launchpad/__init__.py:241

7195

#: bzrlib/plugins/launchpad/cmds.py:200

7172

7196

msgid "Show or set the Launchpad user ID."

7173

7197

msgstr ""

7174

7198

7175

#: bzrlib/plugins/launchpad/__init__.py:243

7199

#: bzrlib/plugins/launchpad/cmds.py:202

7176

7200

msgid ""

7177

7201

"When communicating with Launchpad, some commands need to know your\n"

7178

7202

"Launchpad user ID. This command can be used to set or show the\n"

7179

7203

"user ID that Bazaar will use for such communication."

7180

7204

msgstr ""

7181

7205

7182

#: bzrlib/plugins/launchpad/__init__.py:247

7206

#: bzrlib/plugins/launchpad/cmds.py:206

7183

7207

msgid ""

7184

7208

":Examples:\n"

7185

7209

" Show the Launchpad ID of the current user::"

7186

7210

msgstr ""

7187

7211

7188

#: bzrlib/plugins/launchpad/__init__.py:250

7212

#: bzrlib/plugins/launchpad/cmds.py:209

7189

7213

msgid " bzr launchpad-login"

7190

7214

msgstr ""

7191

7215

7192

#: bzrlib/plugins/launchpad/__init__.py:252

7216

#: bzrlib/plugins/launchpad/cmds.py:211

7193

7217

msgid " Set the Launchpad ID of the current user to 'bob'::"

7194

7218

msgstr ""

7195

7219

7196

#: bzrlib/plugins/launchpad/__init__.py:254

7220

#: bzrlib/plugins/launchpad/cmds.py:213

7197

7221

msgid " bzr launchpad-login bob"

7198

7222

msgstr ""

7199

7223

7200

#: bzrlib/plugins/launchpad/__init__.py:261

7224

#: bzrlib/plugins/launchpad/cmds.py:220

7201

7225

msgid "Don't check that the user name is valid."

7202

7226

msgstr ""

7203

7227

7204

#: bzrlib/plugins/launchpad/__init__.py:276

7205

#: bzrlib/plugins/launchpad/__init__.py:287

7228

#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246

7206

7229

msgid "Launchpad user ID exists and has SSH keys.\n"

7207

7230

msgstr ""

7208

7231

7209

#: bzrlib/plugins/launchpad/__init__.py:279

7232

#: bzrlib/plugins/launchpad/cmds.py:238

7210

7233

msgid "No Launchpad user ID configured.\n"

7211

7234

msgstr ""

7212

7235

7213

#: bzrlib/plugins/launchpad/__init__.py:290

7236

#: bzrlib/plugins/launchpad/cmds.py:249

7214

7237

#, python-format

7215

7238

msgid "Launchpad user ID set to '%s'.\n"

7216

7239

msgstr ""

7217

7240

7218

#: bzrlib/plugins/launchpad/__init__.py:298

7241

#: bzrlib/plugins/launchpad/cmds.py:255

7219

7242

msgid "Ask Launchpad to mirror a branch now."

7220

7243

msgstr ""

7221

7244

7222

#: bzrlib/plugins/launchpad/__init__.py:318

7245

#: bzrlib/plugins/launchpad/cmds.py:272

7223

7246

msgid "Propose merging a branch on Launchpad."

7224

7247

msgstr ""

7225

7248

7226

#: bzrlib/plugins/launchpad/__init__.py:320

7249

#: bzrlib/plugins/launchpad/cmds.py:274

7227

7250

msgid ""

7228

7251

"This will open your usual editor to provide the initial comment. When it\n"

7229

7252

"has created the proposal, it will open it in your default web browser."

7230

7253

msgstr ""

7231

7254

7232

#: bzrlib/plugins/launchpad/__init__.py:323

7255

#: bzrlib/plugins/launchpad/cmds.py:277

7233

7256

msgid ""

7234

7257

"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"

7235

7258

"is not supplied, the remembered submit branch will be used. If no submit\n"

7236

7259

"branch is remembered, the development focus will be used."

7237

7260

msgstr ""

7238

7261

7239

#: bzrlib/plugins/launchpad/__init__.py:327

7262

#: bzrlib/plugins/launchpad/cmds.py:281

7240

7263

msgid ""

7241

7264

"By default, the SUBMIT_BRANCH's review team will be requested to review\n"

7242

7265

"the merge proposal. This can be overriden by specifying --review (-R).\n"

7244

7267

"may optionally be followed by '=' and the review type. For example:"

7245

7268

msgstr ""

7246

7269

7247

#: bzrlib/plugins/launchpad/__init__.py:332

7270

#: bzrlib/plugins/launchpad/cmds.py:286

7248

7271

msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"

7249

7272

msgstr ""

7250

7273

7251

#: bzrlib/plugins/launchpad/__init__.py:334

7274

#: bzrlib/plugins/launchpad/cmds.py:288

7252

7275

msgid ""

7253

7276

"This will propose a merge, request \"jrandom\" to perform a review of\n"

7254

7277

"unspecified type, and request \"review-team\" to perform a \"qa\" review."

7255

7278

msgstr ""

7256

7279

7257

#: bzrlib/plugins/launchpad/__init__.py:339

7280

#: bzrlib/plugins/launchpad/cmds.py:293

7258

7281

msgid "Propose the merge on staging."

7259

7282

msgstr ""

7260

7283

7261

#: bzrlib/plugins/launchpad/__init__.py:341

7284

#: bzrlib/plugins/launchpad/cmds.py:295

7262

7285

msgid "Commit message."

7263

7286

msgstr ""

7264

7287

7265

#: bzrlib/plugins/launchpad/__init__.py:343

7288

#: bzrlib/plugins/launchpad/cmds.py:297

7266

7289

msgid "Mark the proposal as approved immediately."

7267

7290

msgstr ""

7268

7291

7269

#: bzrlib/plugins/launchpad/__init__.py:345

7292

#: bzrlib/plugins/launchpad/cmds.py:298

7293

msgid "The bug this proposal fixes."

7294

msgstr ""

7295

7296

#: bzrlib/plugins/launchpad/cmds.py:300

7270

7297

msgid "Requested reviewer and optional type."

7271

7298

msgstr ""

7272

7299

7273

#: bzrlib/plugins/launchpad/__init__.py:382

7300

#: bzrlib/plugins/launchpad/cmds.py:335

7274

7301

msgid "Find the proposal to merge this revision."

7275

7302

msgstr ""

7276

7303

7277

#: bzrlib/plugins/launchpad/__init__.py:384

7304

#: bzrlib/plugins/launchpad/cmds.py:337

7278

7305

msgid ""

7279

7306

"Finds the merge proposal(s) that discussed landing the specified revision.\n"

7280

7307

"This works only if the selected branch was the merge proposal target, and\n"

7282

7309

"are opened in a web browser."

7283

7310

msgstr ""

7284

7311

7285

#: bzrlib/plugins/launchpad/__init__.py:389

7312

#: bzrlib/plugins/launchpad/cmds.py:342

7286

7313

msgid ""

7287

7314

"Any revision involved in the merge may be specified-- the revision in\n"

7288

7315

"which the merge was performed, or one of the revisions that was merged."

7289

7316

msgstr ""

7290

7317

7291

#: bzrlib/plugins/launchpad/__init__.py:392

7318

#: bzrlib/plugins/launchpad/cmds.py:345

7292

7319

msgid "So, to find the merge proposal that reviewed line 1 of README::"

7293

7320

msgstr ""

7294

7321

7295

#: bzrlib/plugins/launchpad/__init__.py:394

7322

#: bzrlib/plugins/launchpad/cmds.py:347

7296

7323

msgid " bzr lp-find-proposal -r annotate:README:1"

7297

7324

msgstr ""

7298

7325

7299

#: bzrlib/plugins/launchpad/__init__.py:409

7326

#: bzrlib/plugins/launchpad/cmds.py:363

7300

7327

msgid "No review found."

7301

7328

msgstr ""

7302

7329

7303

#: bzrlib/plugins/launchpad/__init__.py:410

7330

#: bzrlib/plugins/launchpad/cmds.py:364

7304

7331

#, python-format

7305

7332

msgid "%d proposals(s) found."

7306

7333

msgstr ""

7307

7334

7308

#: bzrlib/plugins/launchpad/__init__.py:420

7335

#: bzrlib/plugins/launchpad/cmds.py:374

7309

7336

msgid "Finding revision-id"

7310

7337

msgstr ""

7311

7338

7312

#: bzrlib/plugins/launchpad/__init__.py:427

7339

#: bzrlib/plugins/launchpad/cmds.py:381

7313

7340

msgid "Finding merge"

7314

7341

msgstr ""

7315

7342

7316

#: bzrlib/plugins/launchpad/__init__.py:432

7343

#: bzrlib/plugins/launchpad/cmds.py:386

7317

7344

msgid "Finding revno"

7318

7345

msgstr ""

7319

7346

7320

#: bzrlib/plugins/launchpad/__init__.py:437

7347

#: bzrlib/plugins/launchpad/cmds.py:392

7321

7348

msgid "Finding Launchpad branch"

7322

7349

msgstr ""

7323

7350

7324

#: bzrlib/plugins/launchpad/__init__.py:440

7351

#: bzrlib/plugins/launchpad/cmds.py:395

7325

7352

msgid "Finding proposals"

7326

7353

msgstr ""

7327

7354

7328

#: bzrlib/plugins/launchpad/account.py:66

7329

msgid "Setting ssh/sftp usernames for launchpad.net."

7330

msgstr ""

7331

7332

7355

#: bzrlib/plugins/launchpad/lp_api.py:241

7333

7356

#: bzrlib/plugins/launchpad/lp_api.py:246

7334

7357

#, python-format

7372

7395

" remote: {2}"

7373

7396

msgstr ""

7374

7397

7375

#: bzrlib/plugins/launchpad/lp_propose.py:149

7398

#: bzrlib/plugins/launchpad/lp_propose.py:150

7376

7399

#, python-format

7377

7400

msgid "There is already a branch merge proposal: %s"

7378

7401

msgstr ""

7379

7402

7380

#: bzrlib/plugins/weave_fmt/bzrdir.py:236

7403

#: bzrlib/plugins/weave_fmt/bzrdir.py:237

7381

7404

msgid "pb parameter to convert() is deprecated"

7382

7405

msgstr ""

7383

7406

7384

#: bzrlib/plugins/weave_fmt/bzrdir.py:239

7407

#: bzrlib/plugins/weave_fmt/bzrdir.py:240

7385

7408

msgid "starting upgrade from format 4 to 5"

7386

7409

msgstr ""

7387

7410

7388

#: bzrlib/plugins/weave_fmt/bzrdir.py:249

7411

#: bzrlib/plugins/weave_fmt/bzrdir.py:250

7389

7412

msgid "note: upgrade may be faster if all store files are ungzipped first"

7390

7413

msgstr ""

7391

7414

7392

#: bzrlib/plugins/weave_fmt/bzrdir.py:278

7415

#: bzrlib/plugins/weave_fmt/bzrdir.py:279

7393

7416

msgid "converting revision"

7394

7417

msgstr ""

7395

7418

7396

#: bzrlib/plugins/weave_fmt/bzrdir.py:283

7419

#: bzrlib/plugins/weave_fmt/bzrdir.py:284

7397

7420

msgid "upgraded to weaves:"

7398

7421

msgstr ""

7399

7422

7400

#: bzrlib/plugins/weave_fmt/bzrdir.py:284

7423

#: bzrlib/plugins/weave_fmt/bzrdir.py:285

7401

7424

#, python-format

7402

7425

msgid "%6d revisions and inventories"

7403

7426

msgstr ""

7404

7427

7405

#: bzrlib/plugins/weave_fmt/bzrdir.py:286

7428

#: bzrlib/plugins/weave_fmt/bzrdir.py:287

7406

7429

#, python-format

7407

7430

msgid "%6d revisions not present"

7408

7431

msgstr ""

7409

7432

7410

#: bzrlib/plugins/weave_fmt/bzrdir.py:288

7433

#: bzrlib/plugins/weave_fmt/bzrdir.py:289

7411

7434

#, python-format

7412

7435

msgid "%6d texts"

7413

7436

msgstr ""

7414

7437

7415

#: bzrlib/plugins/weave_fmt/bzrdir.py:324

7438

#: bzrlib/plugins/weave_fmt/bzrdir.py:325

7416

7439

msgid "writing weave"

7417

7440

msgstr ""

7418

7441

7419

#: bzrlib/plugins/weave_fmt/bzrdir.py:328

7420

#: bzrlib/plugins/weave_fmt/bzrdir.py:330

7442

#: bzrlib/plugins/weave_fmt/bzrdir.py:329

7443

#: bzrlib/plugins/weave_fmt/bzrdir.py:331

7421

7444

msgid "inventory"

7422

7445

msgstr ""

7423

7446

7424

#: bzrlib/plugins/weave_fmt/bzrdir.py:347

7447

#: bzrlib/plugins/weave_fmt/bzrdir.py:348

7425

7448

msgid "write revision"

7426

7449

msgstr ""

7427

7450

7428

#: bzrlib/plugins/weave_fmt/bzrdir.py:361

7451

#: bzrlib/plugins/weave_fmt/bzrdir.py:362

7429

7452

msgid "loading revision"

7430

7453

msgstr ""

7431

7454

7432

#: bzrlib/plugins/weave_fmt/bzrdir.py:366

7455

#: bzrlib/plugins/weave_fmt/bzrdir.py:367

7433

7456

#, python-format

7434

7457

msgid "revision {%s} not present in branch; will be converted as a ghost"

7435

7458

msgstr ""

7436

7459

7437

#: bzrlib/plugins/weave_fmt/bzrdir.py:506

7460

#: bzrlib/plugins/weave_fmt/bzrdir.py:507

7438

7461

msgid "starting upgrade from format 5 to 6"

7439

7462

msgstr ""

7440

7463

7441

#: bzrlib/plugins/weave_fmt/bzrdir.py:516

7464

#: bzrlib/plugins/weave_fmt/bzrdir.py:517

7442

7465

#, python-format

7443

7466

msgid "adding prefixes to %s"

7444

7467

msgstr ""

7445

7468

7446

#: bzrlib/plugins/weave_fmt/bzrdir.py:556

7469

#: bzrlib/plugins/weave_fmt/bzrdir.py:557

7447

7470

msgid "starting upgrade from format 6 to metadir"

7448

7471

msgstr ""

7449

7472

7450

#: bzrlib/plugins/weave_fmt/bzrdir.py:564

7473

#: bzrlib/plugins/weave_fmt/bzrdir.py:565

7451

7474

msgid "Removing ancestry.weave"

7452

7475

msgstr ""

7453

7476

7454

#: bzrlib/plugins/weave_fmt/bzrdir.py:569

7477

#: bzrlib/plugins/weave_fmt/bzrdir.py:570

7455

7478

msgid "Finding branch files"

7456

7479

msgstr ""

7457

7480

7458

#: bzrlib/plugins/weave_fmt/bzrdir.py:579

7481

#: bzrlib/plugins/weave_fmt/bzrdir.py:580

7459

7482

msgid "Upgrading repository"

7460

7483

msgstr ""

7461

7484

7462

#: bzrlib/plugins/weave_fmt/bzrdir.py:589

7485

#: bzrlib/plugins/weave_fmt/bzrdir.py:590

7463

7486

msgid "Upgrading branch"

7464

7487

msgstr ""

7465

7488

7466

#: bzrlib/plugins/weave_fmt/bzrdir.py:612

7489

#: bzrlib/plugins/weave_fmt/bzrdir.py:613

7467

7490

msgid "No working tree."

7468

7491

msgstr ""

7469

7492

7470

#: bzrlib/plugins/weave_fmt/bzrdir.py:619

7493

#: bzrlib/plugins/weave_fmt/bzrdir.py:620

7471

7494

msgid "Upgrading working tree"

7472

7495

msgstr ""

7473

7496

7474

#: bzrlib/plugins/weave_fmt/bzrdir.py:640

7497

#: bzrlib/plugins/weave_fmt/bzrdir.py:641

7475

7498

#, python-format

7476

7499

msgid "Make %s lock"

7477

7500

msgstr ""

7478

7501

7479

#: bzrlib/plugins/weave_fmt/bzrdir.py:651

7502

#: bzrlib/plugins/weave_fmt/bzrdir.py:652

7480

7503

#, python-format

7481

7504

msgid "Moving %s"

7482

7505

msgstr ""

7503

7526

msgid "Too many redirections trying to make %s."

7504

7527

msgstr ""

7505

7528

7506

#: bzrlib/push.py:147

7529

#: bzrlib/push.py:148

7507

7530

msgid ""

7508

7531

"These branches have diverged. See \"bzr help diverged-branches\" for more "

7509

7532

"information."

7510

7533

msgstr ""

7511

7534

7512

#: bzrlib/push.py:151

7535

#: bzrlib/push.py:152

7513

7536

#, python-format

7514

7537

msgid ""

7515

7538

"It is not possible to losslessly push to %s. You may want to use dpush "

7516

7539

"instead."

7517

7540

msgstr ""

7518

7541

7519

#: bzrlib/push.py:157

7542

#: bzrlib/push.py:158

7520

7543

#, python-format

7521

7544

msgid ""

7522

7545

"At %s you have a valid .bzr control directory, but not a branch or "

7633

7656

msgid "{0} => {1}"

7634

7657

msgstr "{0} => {1}"

7635

7658

7636

#: bzrlib/repository.py:1787

7659

#: bzrlib/repository.py:1799

7637

7660

msgid "Moving repository to repository.backup"

7638

7661

msgstr "Перемещение репозитория в repository.backup"

7639

7662

7640

#: bzrlib/repository.py:1794

7663

#: bzrlib/repository.py:1806

7641

7664

msgid "Creating new repository"

7642

7665

msgstr "Создание нового репозитория"

7643

7666

7644

#: bzrlib/repository.py:1799

7667

#: bzrlib/repository.py:1811

7645

7668

msgid "Copying content"

7646

7669

msgstr "Копирование содержимого"

7647

7670

7648

#: bzrlib/repository.py:1803

7671

#: bzrlib/repository.py:1815

7649

7672

msgid "Deleting old repository content"

7650

7673

msgstr "Удаление старого содержимого репозитория"

7651

7674

7652

#: bzrlib/repository.py:1805

7675

#: bzrlib/repository.py:1817

7653

7676

msgid "repository converted"

7654

7677

msgstr "репозиторий преобразован"

7655

7678

7657

7680

msgid "Using {0} {1}"

7658

7681

msgstr "Используется {0} {1}"

7659

7682

7660

#: bzrlib/send.py:58

7683

#: bzrlib/send.py:59

7661

7684

#, python-format

7662

7685

msgid "Mail client \"%s\" does not support specifying body"

7663

7686

msgstr "Почтовый клиент «%s» не поддерживает определение тела"

7664

7687

7665

#: bzrlib/send.py:62

7688

#: bzrlib/send.py:63

7666

7689

msgid "--remember requires a branch to be specified."

7667

7690

msgstr "--remember требует указания ветви."

7668

7691

7669

#: bzrlib/send.py:77

7692

#: bzrlib/send.py:78

7670

7693

msgid "No submit branch known or specified"

7671

7694

msgstr "Ветвь для отсылки неизвестна и не задана"

7672

7695

7673

#: bzrlib/send.py:80

7696

#: bzrlib/send.py:81

7674

7697

msgid "Using saved {0} location \"{1}\" to determine what changes to submit."

7675

7698

msgstr ""

7676

7699

"Используется сохранённое {0} местоположение «{1}» для определения изменений, "

7677

7700

"которые необходимо отправить."

7678

7701

7679

#: bzrlib/send.py:98

7702

#: bzrlib/send.py:99

7680

7703

#, python-format

7681

7704

msgid "No such send format '%s'."

7682

7705

msgstr "Нет такого формата отправки '%s'."

7683

7706

7684

#: bzrlib/send.py:114

7707

#: bzrlib/send.py:115

7685

7708

msgid "bzr send takes at most two one revision identifiers"

7686

7709

msgstr "bzr send принимает не более двух идентификаторов ревизии"

7687

7710

7688

#: bzrlib/send.py:127

7711

#: bzrlib/send.py:128

7689

7712

msgid "No revisions to submit."

7690

7713

msgstr "Нет ревизий для отправки."

7691

7714

7692

#: bzrlib/send.py:139

7715

#: bzrlib/send.py:140

7693

7716

msgid ""

7694

7717

"- not supported for merge directives that use more than one output file."

7695

7718

msgstr ""

7696

7719

"- не поддерживается для директив merge, которые используют более, чем один "

7697

7720

"файл вывода."

7698

7721

7699

#: bzrlib/send.py:185

7722

#: bzrlib/send.py:186

7700

7723

msgid "Format 0.9 does not permit bundle with no patch"

7701

7724

msgstr "Формат 0.9 не разрешает пакеты без патчей"

7702

7725

7855

7878

"Не удалось соединиться с текущей основной ветвью %(target)s: %(error)s Для "

7856

7879

"принудительного переключения используйте --force."

7857

7880

7858

#: bzrlib/switch.py:125

7881

#: bzrlib/switch.py:129

7859

7882

msgid "Cannot switch a branch, only a checkout."

7860

7883

msgstr ""

7861

7884

7862

#: bzrlib/switch.py:163

7885

#: bzrlib/switch.py:167

7863

7886

#, python-format

7864

7887

msgid "Tree is up to date at revision %d."

7865

7888

msgstr "Дерево в актуальной ревизии %d."

7866

7889

7867

#: bzrlib/switch.py:169

7890

#: bzrlib/switch.py:173

7868

7891

#, python-format

7869

7892

msgid "Updated to revision %d."

7870

7893

msgstr "Обновлено до ревизии %d."

7871

7894

7872

#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747

7895

#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736

7873

7896

msgid "Apply phase"

7874

7897

msgstr "Применить фазу"

7875

7898

7876

#: bzrlib/transform.py:1773 bzrlib/transform.py:1841

7899

#: bzrlib/transform.py:1762 bzrlib/transform.py:1830

7877

7900

msgid "removing file"

7878

7901

msgstr "удаление файла"

7879

7902

7880

#: bzrlib/transform.py:1791 bzrlib/transform.py:1876

7903

#: bzrlib/transform.py:1780 bzrlib/transform.py:1865

7881

7904

msgid "adding file"

7882

7905

msgstr "добавление файла"

7883

7906

7884

#: bzrlib/transform.py:2591

7907

#: bzrlib/transform.py:2590

7885

7908

msgid "Building tree"

7886

7909

msgstr "Построение дерева"

7887

7910

7888

#: bzrlib/transform.py:2681 bzrlib/transform.py:2708

7911

#: bzrlib/transform.py:2680 bzrlib/transform.py:2707

7889

7912

msgid "Adding file contents"

7890

7913

msgstr "Добавление содержимого файлй"

7891

7914

7892

#: bzrlib/transform.py:3028

7915

#: bzrlib/transform.py:3009

7893

7916

msgid "Resolution pass"

7894

7917

msgstr ""

7895

7918

7898

7921

msgid "Authenticated as %s"

7899

7922

msgstr ""

7900

7923

7901

#: bzrlib/tree.py:634

7924

#: bzrlib/tree.py:637

7902

7925

msgid "*** {0} content-filter: {1} => {2!r}"

7903

7926

msgstr "*** {0} content-filter: {1} => {2!r}"

7904

7927

7959

7982

msgid "failed to clean-up {0}: {1}"

7960

7983

msgstr "не удалось очистить {0}: {1}"

7961

7984

7962

#: bzrlib/vf_repository.py:1090

7985

#: bzrlib/vf_repository.py:1091

7963

7986

msgid "inventories"

7964

7987

msgstr ""

7965

7988

7966

#: bzrlib/vf_repository.py:1116

7989

#: bzrlib/vf_repository.py:1117

7967

7990

msgid "texts"

7968

7991

msgstr ""

7969

7992

7970

#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630

7993

#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631

7971

7994

msgid "Calculating text parents"

7972

7995

msgstr ""

7973

7996

7974

#: bzrlib/vf_repository.py:1706

7997

#: bzrlib/vf_repository.py:1707

7975

7998

msgid "Fetch texts"

7976

7999

msgstr ""

7977

8000

7978

#: bzrlib/vf_repository.py:2535

8001

#: bzrlib/vf_repository.py:2536

7979

8002

msgid "loading text store"

7980

8003

msgstr ""

7981

8004

7982

#: bzrlib/vf_repository.py:2541

8005

#: bzrlib/vf_repository.py:2542

7983

8006

msgid "checking text graph"

7984

8007

msgstr ""

7985

8008

7986

#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009

7987

#: bzrlib/vf_repository.py:3124

8009

#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012

8010

#: bzrlib/vf_repository.py:3127

7988

8011

msgid "Transferring revisions"

7989

8012

msgstr ""

7990

8013

8031

8054

msgid "PageFaultCount %8d"

8032

8055

msgstr "PageFaultCount %8d"

8033

8056

8034

#: bzrlib/workingtree.py:1478

8057

#: bzrlib/workingtree.py:1482

8035

8058

msgid "Rerun update after fixing the conflicts."

8036

8059

msgstr "Снова запустите обновление после исправления конфликтов."

8037

8060

8041

8064

8042

8065

#: dummy/help_topics/basic/detail.txt:1

8043

8066

msgid ""

8044

"Bazaar 2.5b6 -- a free distributed version-control tool\n"

8067

"Bazaar 2.6.0dev1 -- a free distributed version-control tool\n"

8045

8068

"http://bazaar.canonical.com/"

8046

8069

msgstr ""

8047

8070

12296

12319

msgstr ""

12297

12320

12298

12321

#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56

12299

#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259

12322

#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262

12300

12323

msgid "Introduced in: 2.2"

12301

12324

msgstr ""

12302

12325

12314

12337

"~~~~"

12315

12338

msgstr ""

12316

12339

12317

#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290

12318

#: en/help_topics/hooks.txt:304

12340

#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293

12341

#: en/help_topics/hooks.txt:307

12319

12342

msgid "Introduced in: 1.8"

12320

12343

msgstr ""

12321

12344

12345

12368

"~~~~~~~~~~~~~~~~~~~~~~"

12346

12369

msgstr ""

12347

12370

12348

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418

12371

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421

12349

12372

msgid "Introduced in: 1.4"

12350

12373

msgstr ""

12351

12374

12357

12380

"uncommit will all trigger this hook."

12358

12381

msgstr ""

12359

12382

12360

#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389

12383

#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392

12361

12384

msgid ""

12362

12385

"post_commit\n"

12363

12386

"~~~~~~~~~~~"

12365

12388

12366

12389

#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86

12367

12390

#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110

12368

#: en/help_topics/hooks.txt:145

12369

12391

msgid "Introduced in: 0.15"

12370

12392

msgstr ""

12371

12393

12470

12492

12471

12493

#: en/help_topics/hooks.txt:142

12472

12494

msgid ""

12473

"set_rh\n"

12474

"~~~~~~"

12475

msgstr ""

12476

12477

#: en/help_topics/hooks.txt:147

12478

msgid ""

12479

"Invoked whenever the revision history has been set via\n"

12480

"set_revision_history. The api signature is (branch, revision_history),\n"

12481

"and the branch will be write-locked. The set_rh hook can be expensive\n"

12482

"for bzr to trigger, a better hook to use is\n"

12483

"Branch.post_change_branch_tip."

12484

msgstr ""

12485

12486

#: en/help_topics/hooks.txt:153

12487

msgid ""

12488

12495

"transform_fallback_location\n"

12489

12496

"~~~~~~~~~~~~~~~~~~~~~~~~~~~"

12490

12497

msgstr ""

12491

12498

12492

#: en/help_topics/hooks.txt:156

12499

#: en/help_topics/hooks.txt:145

12493

12500

msgid "Introduced in: 1.9"

12494

12501

msgstr ""

12495

12502

12496

#: en/help_topics/hooks.txt:158

12503

#: en/help_topics/hooks.txt:147

12497

12504

msgid ""

12498

12505

"Called when a stacked branch is activating its fallback locations.\n"

12499

12506

"transform_fallback_location is called with (branch, url), and should\n"

12507

12514

"however undefined."

12508

12515

msgstr ""

12509

12516

12510

#: en/help_topics/hooks.txt:169

12517

#: en/help_topics/hooks.txt:158

12511

12518

msgid ""

12512

12519

"CommandHooks\n"

12513

12520

"------------"

12514

12521

msgstr ""

12515

12522

12516

#: en/help_topics/hooks.txt:172

12523

#: en/help_topics/hooks.txt:161

12517

12524

msgid ""

12518

12525

"extend_command\n"

12519

12526

"~~~~~~~~~~~~~~"

12520

12527

msgstr ""

12521

12528

12522

#: en/help_topics/hooks.txt:175

12529

#: en/help_topics/hooks.txt:164

12523

12530

msgid "Introduced in: 1.13"

12524

12531

msgstr ""

12525

12532

12526

#: en/help_topics/hooks.txt:177

12533

#: en/help_topics/hooks.txt:166

12527

12534

msgid ""

12528

12535

"Called after creating a command object to allow modifications such as\n"

12529

12536

"adding or removing options, docs etc. Called with the new\n"

12530

12537

"bzrlib.commands.Command object."

12531

12538

msgstr ""

12532

12539

12533

#: en/help_topics/hooks.txt:181

12540

#: en/help_topics/hooks.txt:170

12534

12541

msgid ""

12535

12542

"get_command\n"

12536

12543

"~~~~~~~~~~~"

12537

12544

msgstr ""

12538

12545

12539

#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196

12540

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464

12546

#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185

12547

#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467

12541

12548

msgid "Introduced in: 1.17"

12542

12549

msgstr ""

12543

12550

12544

#: en/help_topics/hooks.txt:186

12551

#: en/help_topics/hooks.txt:175

12545

12552

msgid ""

12546

12553

"Called when creating a single command. Called with (cmd_or_None,\n"

12547

12554

"command_name). get_command should either return the cmd_or_None\n"

12551

12558

"plugin_cmds.register_lazy."

12552

12559

msgstr ""

12553

12560

12554

#: en/help_topics/hooks.txt:193

12561

#: en/help_topics/hooks.txt:182

12555

12562

msgid ""

12556

12563

"get_missing_command\n"

12557

12564

"~~~~~~~~~~~~~~~~~~~"

12558

12565

msgstr ""

12559

12566

12560

#: en/help_topics/hooks.txt:198

12567

#: en/help_topics/hooks.txt:187

12561

12568

msgid ""

12562

12569

"Called when creating a single command if no command could be found.\n"

12563

12570

"Called with (command_name). get_missing_command should either return\n"

12564

12571

"None, or a Command object to be used for the command."

12565

12572

msgstr ""

12566

12573

12567

#: en/help_topics/hooks.txt:202

12574

#: en/help_topics/hooks.txt:191

12568

12575

msgid ""

12569

12576

"list_commands\n"

12570

12577

"~~~~~~~~~~~~~"

12571

12578

msgstr ""

12572

12579

12573

#: en/help_topics/hooks.txt:207

12580

#: en/help_topics/hooks.txt:196

12574

12581

msgid ""

12575

12582

"Called when enumerating commands. Called with a set of cmd_name\n"

12576

12583

"strings for all the commands found so far. This set is safe to mutate\n"

12578

12585

"set of command names."

12579

12586

msgstr ""

12580

12587

12581

#: en/help_topics/hooks.txt:212

12588

#: en/help_topics/hooks.txt:201

12589

msgid ""

12590

"post_command\n"

12591

"~~~~~~~~~~~~"

12592

msgstr ""

12593

12594

#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211

12595

msgid "Introduced in: 2.6"

12596

msgstr ""

12597

12598

#: en/help_topics/hooks.txt:206

12599

msgid "Called after executing a command. Called with the command object."

12600

msgstr ""

12601

12602

#: en/help_topics/hooks.txt:208

12603

msgid ""

12604

"pre_command\n"

12605

"~~~~~~~~~~~"

12606

msgstr ""

12607

12608

#: en/help_topics/hooks.txt:213

12609

msgid "Called prior to executing a command. Called with the command object."

12610

msgstr ""

12611

12612

#: en/help_topics/hooks.txt:215

12582

12613

msgid ""

12583

12614

"_ConfigHooks\n"

12584

12615

"------------"

12585

12616

msgstr ""

12586

12617

12587

#: en/help_topics/hooks.txt:215

12618

#: en/help_topics/hooks.txt:218

12588

12619

msgid ""

12589

12620

"get\n"

12590

12621

"~~~"

12591

12622

msgstr ""

12592

12623

12593

#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226

12594

#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241

12595

#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370

12596

#: en/help_topics/hooks.txt:443

12624

#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229

12625

#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244

12626

#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373

12627

#: en/help_topics/hooks.txt:446

12597

12628

msgid "Introduced in: 2.4"

12598

12629

msgstr ""

12599

12630

12600

#: en/help_topics/hooks.txt:220

12631

#: en/help_topics/hooks.txt:223

12601

12632

msgid ""

12602

12633

"Invoked when a config option is read. The signature is (stack, name,\n"

12603

12634

"value)."

12604

12635

msgstr ""

12605

12636

12606

#: en/help_topics/hooks.txt:223

12637

#: en/help_topics/hooks.txt:226

12607

12638

msgid ""

12608

12639

"load\n"

12609

12640

"~~~~"

12610

12641

msgstr ""

12611

12642

12612

#: en/help_topics/hooks.txt:228

12643

#: en/help_topics/hooks.txt:231

12613

12644

msgid "Invoked when a config store is loaded. The signature is (store)."

12614

12645

msgstr ""

12615

12646

12616

#: en/help_topics/hooks.txt:230

12647

#: en/help_topics/hooks.txt:233

12617

12648

msgid ""

12618

12649

"remove\n"

12619

12650

"~~~~~~"

12620

12651

msgstr ""

12621

12652

12622

#: en/help_topics/hooks.txt:235

12653

#: en/help_topics/hooks.txt:238

12623

12654

msgid ""

12624

12655

"Invoked when a config option is removed. The signature is (stack,\n"

12625

12656

"name)."

12626

12657

msgstr ""

12627

12658

12628

#: en/help_topics/hooks.txt:238

12659

#: en/help_topics/hooks.txt:241

12629

12660

msgid ""

12630

12661

"save\n"

12631

12662

"~~~~"

12632

12663

msgstr ""

12633

12664

12634

#: en/help_topics/hooks.txt:243

12665

#: en/help_topics/hooks.txt:246

12635

12666

msgid "Invoked when a config store is saved. The signature is (store)."

12636

12667

msgstr ""

12637

12668

12638

#: en/help_topics/hooks.txt:245

12669

#: en/help_topics/hooks.txt:248

12639

12670

msgid ""

12640

12671

"set\n"

12641

12672

"~~~"

12642

12673

msgstr ""

12643

12674

12644

#: en/help_topics/hooks.txt:250

12675

#: en/help_topics/hooks.txt:253

12645

12676

msgid ""

12646

12677

"Invoked when a config option is set. The signature is (stack, name,\n"

12647

12678

"value)."

12648

12679

msgstr ""

12649

12680

12650

#: en/help_topics/hooks.txt:253

12681

#: en/help_topics/hooks.txt:256

12651

12682

msgid ""

12652

12683

"ControlDirHooks\n"

12653

12684

"---------------"

12654

12685

msgstr ""

12655

12686

12656

#: en/help_topics/hooks.txt:256

12687

#: en/help_topics/hooks.txt:259

12657

12688

msgid ""

12658

12689

"post_repo_init\n"

12659

12690

"~~~~~~~~~~~~~~"

12660

12691

msgstr ""

12661

12692

12662

#: en/help_topics/hooks.txt:261

12693

#: en/help_topics/hooks.txt:264

12663

12694

msgid ""

12664

12695

"Invoked after a repository has been initialized. post_repo_init is\n"

12665

12696

"called with a bzrlib.controldir.RepoInitHookParams."

12666

12697

msgstr ""

12667

12698

12668

#: en/help_topics/hooks.txt:264

12699

#: en/help_topics/hooks.txt:267

12669

12700

msgid ""

12670

12701

"pre_open\n"

12671

12702

"~~~~~~~~"

12672

12703

msgstr ""

12673

12704

12674

#: en/help_topics/hooks.txt:267

12705

#: en/help_topics/hooks.txt:270

12675

12706

msgid "Introduced in: 1.14"

12676

12707

msgstr ""

12677

12708

12678

#: en/help_topics/hooks.txt:269

12709

#: en/help_topics/hooks.txt:272

12679

12710

msgid ""

12680

12711

"Invoked before attempting to open a ControlDir with the transport that\n"

12681

12712

"the open will use."

12682

12713

msgstr ""

12683

12714

12684

#: en/help_topics/hooks.txt:272

12715

#: en/help_topics/hooks.txt:275

12685

12716

msgid ""

12686

12717

"InfoHooks\n"

12687

12718

"---------"

12688

12719

msgstr ""

12689

12720

12690

#: en/help_topics/hooks.txt:275

12721

#: en/help_topics/hooks.txt:278

12691

12722

msgid ""

12692

12723

"repository\n"

12693

12724

"~~~~~~~~~~"

12694

12725

msgstr ""

12695

12726

12696

#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297

12697

#: en/help_topics/hooks.txt:521

12727

#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300

12728

#: en/help_topics/hooks.txt:524

12698

12729

msgid "Introduced in: 1.15"

12699

12730

msgstr ""

12700

12731

12701

#: en/help_topics/hooks.txt:280

12732

#: en/help_topics/hooks.txt:283

12702

12733

msgid ""

12703

12734

"Invoked when displaying the statistics for a repository. repository is\n"

12704

12735

"called with a statistics dictionary as returned by the repository and\n"

12705

12736

"a file-like object to write to."

12706

12737

msgstr ""

12707

12738

12708

#: en/help_topics/hooks.txt:284

12739

#: en/help_topics/hooks.txt:287

12709

12740

msgid ""

12710

12741

"LockHooks\n"

12711

12742

"---------"

12712

12743

msgstr ""

12713

12744

12714

#: en/help_topics/hooks.txt:287

12745

#: en/help_topics/hooks.txt:290

12715

12746

msgid ""

12716

12747

"lock_acquired\n"

12717

12748

"~~~~~~~~~~~~~"

12718

12749

msgstr ""

12719

12750

12720

#: en/help_topics/hooks.txt:292

12751

#: en/help_topics/hooks.txt:295

12721

12752

msgid ""

12722

12753

"Called with a bzrlib.lock.LockResult when a physical lock is acquired."

12723

12754

msgstr ""

12724

12755

12725

#: en/help_topics/hooks.txt:294

12756

#: en/help_topics/hooks.txt:297

12726

12757

msgid ""

12727

12758

"lock_broken\n"

12728

12759

"~~~~~~~~~~~"

12729

12760

msgstr ""

12730

12761

12731

#: en/help_topics/hooks.txt:299

12762

#: en/help_topics/hooks.txt:302

12732

12763

msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."

12733

12764

msgstr ""

12734

12765

12735

#: en/help_topics/hooks.txt:301

12766

#: en/help_topics/hooks.txt:304

12736

12767

msgid ""

12737

12768

"lock_released\n"

12738

12769

"~~~~~~~~~~~~~"

12739

12770

msgstr ""

12740

12771

12741

#: en/help_topics/hooks.txt:306

12772

#: en/help_topics/hooks.txt:309

12742

12773

msgid ""

12743

12774

"Called with a bzrlib.lock.LockResult when a physical lock is released."

12744

12775

msgstr ""

12745

12776

12746

#: en/help_topics/hooks.txt:308

12777

#: en/help_topics/hooks.txt:311

12747

12778

msgid ""

12748

12779

"MergeHooks\n"

12749

12780

"----------"

12750

12781

msgstr ""

12751

12782

12752

#: en/help_topics/hooks.txt:311

12783

#: en/help_topics/hooks.txt:314

12753

12784

msgid ""

12754

12785

"merge_file_content\n"

12755

12786

"~~~~~~~~~~~~~~~~~~"

12756

12787

msgstr ""

12757

12788

12758

#: en/help_topics/hooks.txt:314

12789

#: en/help_topics/hooks.txt:317

12759

12790

msgid "Introduced in: 2.1"

12760

12791

msgstr ""

12761

12792

12762

#: en/help_topics/hooks.txt:316

12793

#: en/help_topics/hooks.txt:319

12763

12794

msgid ""

12764

12795

"Called with a bzrlib.merge.Merger object to create a per file merge\n"

12765

12796

"object when starting a merge. Should return either None or a subclass\n"

12769

12800

"AbstractPerFileMerger API docs for details on how it is used by merge."

12770

12801

msgstr ""

12771

12802

12772

#: en/help_topics/hooks.txt:323

12803

#: en/help_topics/hooks.txt:326

12773

12804

msgid ""

12774

12805

"post_merge\n"

12775

12806

"~~~~~~~~~~"

12776

12807

msgstr ""

12777

12808

12778

#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334

12779

#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402

12780

#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509

12809

#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337

12810

#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405

12811

#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512

12781

12812

msgid "Introduced in: 2.5"

12782

12813

msgstr ""

12783

12814

12784

#: en/help_topics/hooks.txt:328

12815

#: en/help_topics/hooks.txt:331

12785

12816

msgid ""

12786

12817

"Called after a merge. Receives a Merger object as the single argument.\n"

12787

12818

"The return value is ignored."

12788

12819

msgstr ""

12789

12820

12790

#: en/help_topics/hooks.txt:331

12821

#: en/help_topics/hooks.txt:334

12791

12822

msgid ""

12792

12823

"pre_merge\n"

12793

12824

"~~~~~~~~~"

12794

12825

msgstr ""

12795

12826

12796

#: en/help_topics/hooks.txt:336

12827

#: en/help_topics/hooks.txt:339

12797

12828

msgid ""

12798

12829

"Called before a merge. Receives a Merger object as the single\n"

12799

12830

"argument."

12800

12831

msgstr ""

12801

12832

12802

#: en/help_topics/hooks.txt:339

12833

#: en/help_topics/hooks.txt:342

12803

12834

msgid ""

12804

12835

"MergeDirectiveHooks\n"

12805

12836

"-------------------"

12806

12837

msgstr ""

12807

12838

12808

#: en/help_topics/hooks.txt:342

12839

#: en/help_topics/hooks.txt:345

12809

12840

msgid ""

12810

12841

"merge_request_body\n"

12811

12842

"~~~~~~~~~~~~~~~~~~"

12812

12843

msgstr ""

12813

12844

12814

#: en/help_topics/hooks.txt:345

12845

#: en/help_topics/hooks.txt:348

12815

12846

msgid "Introduced in: 1.15.0"

12816

12847

msgstr ""

12817

12848

12818

#: en/help_topics/hooks.txt:347

12849

#: en/help_topics/hooks.txt:350

12819

12850

msgid ""

12820

12851

"Called with a MergeRequestBodyParams when a body is needed for a merge\n"

12821

12852

"request. Callbacks must return a body. If more than one callback is\n"

12822

12853

"registered, the output of one callback is provided to the next."

12823

12854

msgstr ""

12824

12855

12825

#: en/help_topics/hooks.txt:351

12856

#: en/help_topics/hooks.txt:354

12826

12857

msgid ""

12827

12858

"MessageEditorHooks\n"

12828

12859

"------------------"

12829

12860

msgstr ""

12830

12861

12831

#: en/help_topics/hooks.txt:354

12862

#: en/help_topics/hooks.txt:357

12832

12863

msgid ""

12833

12864

"commit_message_template\n"

12834

12865

"~~~~~~~~~~~~~~~~~~~~~~~"

12835

12866

msgstr ""

12836

12867

12837

#: en/help_topics/hooks.txt:357

12868

#: en/help_topics/hooks.txt:360

12838

12869

msgid "Introduced in: 1.10"

12839

12870

msgstr ""

12840

12871

12841

#: en/help_topics/hooks.txt:359

12872

#: en/help_topics/hooks.txt:362

12842

12873

msgid ""

12843

12874

"Called when a commit message is being generated.\n"

12844

12875

"commit_message_template is called with the bzrlib.commit.Commit object\n"

12849

12880

"second, and so on."

12850

12881

msgstr ""

12851

12882

12852

#: en/help_topics/hooks.txt:367

12883

#: en/help_topics/hooks.txt:370

12853

12884

msgid ""

12854

12885

"set_commit_message\n"

12855

12886

"~~~~~~~~~~~~~~~~~~"

12856

12887

msgstr ""

12857

12888

12858

#: en/help_topics/hooks.txt:372

12889

#: en/help_topics/hooks.txt:375

12859

12890

msgid ""

12860

12891

"Set a fixed commit message. set_commit_message is called with the\n"

12861

12892

"bzrlib.commit.Commit object (so you can also change e.g. revision\n"

12864

12895

"should use the message editor as normal."

12865

12896

msgstr ""

12866

12897

12867

#: en/help_topics/hooks.txt:378

12898

#: en/help_topics/hooks.txt:381

12868

12899

msgid ""

12869

12900

"MutableTreeHooks\n"

12870

12901

"----------------"

12871

12902

msgstr ""

12872

12903

12873

#: en/help_topics/hooks.txt:381

12904

#: en/help_topics/hooks.txt:384

12874

12905

msgid ""

12875

12906

"post_build_tree\n"

12876

12907

"~~~~~~~~~~~~~~~"

12877

12908

msgstr ""

12878

12909

12879

#: en/help_topics/hooks.txt:386

12910

#: en/help_topics/hooks.txt:389

12880

12911

msgid ""

12881

12912

"Called after a completely new tree is built. The hook is called with\n"

12882

12913

"the tree as its only argument."

12883

12914

msgstr ""

12884

12915

12885

#: en/help_topics/hooks.txt:392

12916

#: en/help_topics/hooks.txt:395

12886

12917

msgid "Introduced in: 2.0"

12887

12918

msgstr ""

12888

12919

12889

#: en/help_topics/hooks.txt:394

12920

#: en/help_topics/hooks.txt:397

12890

12921

msgid ""

12891

12922

"Called after a commit is performed on a tree. The hook is called with\n"

12892

12923

"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"

12894

12925

"that object."

12895

12926

msgstr ""

12896

12927

12897

#: en/help_topics/hooks.txt:399

12928

#: en/help_topics/hooks.txt:402

12898

12929

msgid ""

12899

12930

"post_transform\n"

12900

12931

"~~~~~~~~~~~~~~"

12901

12932

msgstr ""

12902

12933

12903

#: en/help_topics/hooks.txt:404

12934

#: en/help_topics/hooks.txt:407

12904

12935

msgid ""

12905

12936

"Called after a tree transform has been performed on a tree. The hook\n"

12906

12937

"is called with the tree that is being transformed and the transform."

12907

12938

msgstr ""

12908

12939

12909

#: en/help_topics/hooks.txt:407

12940

#: en/help_topics/hooks.txt:410

12910

12941

msgid ""

12911

12942

"pre_transform\n"

12912

12943

"~~~~~~~~~~~~~"

12913

12944

msgstr ""

12914

12945

12915

#: en/help_topics/hooks.txt:412

12946

#: en/help_topics/hooks.txt:415

12916

12947

msgid ""

12917

12948

"Called before a tree transform on this tree. The hook is called with\n"

12918

12949

"the tree that is being transformed and the transform."

12919

12950

msgstr ""

12920

12951

12921

#: en/help_topics/hooks.txt:415

12952

#: en/help_topics/hooks.txt:418

12922

12953

msgid ""

12923

12954

"start_commit\n"

12924

12955

"~~~~~~~~~~~~"

12925

12956

msgstr ""

12926

12957

12927

#: en/help_topics/hooks.txt:420

12958

#: en/help_topics/hooks.txt:423

12928

12959

msgid ""

12929

12960

"Called before a commit is performed on a tree. The start commit hook\n"

12930

12961

"is able to change the tree before the commit takes place. start_commit\n"

12932

12963

"being performed on."

12933

12964

msgstr ""

12934

12965

12935

#: en/help_topics/hooks.txt:425

12966

#: en/help_topics/hooks.txt:428

12936

12967

msgid ""

12937

12968

"SmartClientHooks\n"

12938

12969

"----------------"

12939

12970

msgstr ""

12940

12971

12941

#: en/help_topics/hooks.txt:428

12972

#: en/help_topics/hooks.txt:431

12942

12973

msgid ""

12943

12974

"call\n"

12944

12975

"~~~~"

12945

12976

msgstr ""

12946

12977

12947

#: en/help_topics/hooks.txt:431

12978

#: en/help_topics/hooks.txt:434

12948

12979

msgid "Introduced in: unknown"

12949

12980

msgstr ""

12950

12981

12951

#: en/help_topics/hooks.txt:433

12982

#: en/help_topics/hooks.txt:436

12952

12983

msgid ""

12953

12984

"Called when the smart client is submitting a request to the smart\n"

12954

12985

"server. Called with a bzrlib.smart.client.CallHookParams object.\n"

12955

12986

"Streaming request bodies, and responses, are not accessible."

12956

12987

msgstr ""

12957

12988

12958

#: en/help_topics/hooks.txt:437

12989

#: en/help_topics/hooks.txt:440

12959

12990

msgid ""

12960

12991

"SmartServerHooks\n"

12961

12992

"----------------"

12962

12993

msgstr ""

12963

12994

12964

#: en/help_topics/hooks.txt:440

12995

#: en/help_topics/hooks.txt:443

12965

12996

msgid ""

12966

12997

"server_exception\n"

12967

12998

"~~~~~~~~~~~~~~~~"

12968

12999

msgstr ""

12969

13000

12970

#: en/help_topics/hooks.txt:445

13001

#: en/help_topics/hooks.txt:448

12971

13002

msgid ""

12972

13003

"Called by the bzr server when an exception occurs. server_exception is\n"

12973

13004

"called with the sys.exc_info() tuple return true for the hook if the\n"

12975

13006

"normally."

12976

13007

msgstr ""

12977

13008

12978

#: en/help_topics/hooks.txt:450

13009

#: en/help_topics/hooks.txt:453

12979

13010

msgid ""

12980

13011

"server_started\n"

12981

13012

"~~~~~~~~~~~~~~"

12982

13013

msgstr ""

12983

13014

12984

#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472

13015

#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475

12985

13016

msgid "Introduced in: 0.16"

12986

13017

msgstr ""

12987

13018

12988

#: en/help_topics/hooks.txt:455

13019

#: en/help_topics/hooks.txt:458

12989

13020

msgid ""

12990

13021

"Called by the bzr server when it starts serving a directory.\n"

12991

13022

"server_started is called with (backing urls, public url), where\n"

12994

13025

"served."

12995

13026

msgstr ""

12996

13027

12997

#: en/help_topics/hooks.txt:461

13028

#: en/help_topics/hooks.txt:464

12998

13029

msgid ""

12999

13030

"server_started_ex\n"

13000

13031

"~~~~~~~~~~~~~~~~~"

13001

13032

msgstr ""

13002

13033

13003

#: en/help_topics/hooks.txt:466

13034

#: en/help_topics/hooks.txt:469

13004

13035

msgid ""

13005

13036

"Called by the bzr server when it starts serving a directory.\n"

13006

13037

"server_started is called with (backing_urls, server_obj)."

13007

13038

msgstr ""

13008

13039

13009

#: en/help_topics/hooks.txt:469

13040

#: en/help_topics/hooks.txt:472

13010

13041

msgid ""

13011

13042

"server_stopped\n"

13012

13043

"~~~~~~~~~~~~~~"

13013

13044

msgstr ""

13014

13045

13015

#: en/help_topics/hooks.txt:474

13046

#: en/help_topics/hooks.txt:477

13016

13047

msgid ""

13017

13048

"Called by the bzr server when it stops serving a directory.\n"

13018

13049

"server_stopped is called with the same parameters as the\n"

13019

13050

"server_started hook: (backing_urls, public_url)."

13020

13051

msgstr ""

13021

13052

13022

#: en/help_topics/hooks.txt:478

13053

#: en/help_topics/hooks.txt:481

13023

13054

msgid ""

13024

13055

"StatusHooks\n"

13025

13056

"-----------"

13026

13057

msgstr ""

13027

13058

13028

#: en/help_topics/hooks.txt:481

13059

#: en/help_topics/hooks.txt:484

13029

13060

msgid ""

13030

13061

"post_status\n"

13031

13062

"~~~~~~~~~~~"

13032

13063

msgstr ""

13033

13064

13034

#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495

13065

#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498

13035

13066

msgid "Introduced in: 2.3"

13036

13067

msgstr ""

13037

13068

13038

#: en/help_topics/hooks.txt:486

13069

#: en/help_topics/hooks.txt:489

13039

13070

msgid ""

13040

13071

"Called with argument StatusHookParams after Bazaar has displayed the\n"

13041

13072

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

13044

13075

"status command. to_file is the output stream for writing."

13045

13076

msgstr ""

13046

13077

13047

#: en/help_topics/hooks.txt:492

13078

#: en/help_topics/hooks.txt:495

13048

13079

msgid ""

13049

13080

"pre_status\n"

13050

13081

"~~~~~~~~~~"

13051

13082

msgstr ""

13052

13083

13053

#: en/help_topics/hooks.txt:497

13084

#: en/help_topics/hooks.txt:500

13054

13085

msgid ""

13055

13086

"Called with argument StatusHookParams before Bazaar displays the\n"

13056

13087

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

13059

13090

"status command. to_file is the output stream for writing."

13060

13091

msgstr ""

13061

13092

13062

#: en/help_topics/hooks.txt:503

13093

#: en/help_topics/hooks.txt:506

13063

13094

msgid ""

13064

13095

"TransportHooks\n"

13065

13096

"--------------"

13066

13097

msgstr ""

13067

13098

13068

#: en/help_topics/hooks.txt:506

13099

#: en/help_topics/hooks.txt:509

13069

13100

msgid ""

13070

13101

"post_connect\n"

13071

13102

"~~~~~~~~~~~~"

13072

13103

msgstr ""

13073

13104

13074

#: en/help_topics/hooks.txt:511

13105

#: en/help_topics/hooks.txt:514

13075

13106

msgid ""

13076

13107

"Called after a new connection is established or a reconnect occurs.\n"

13077

13108

"The sole argument passed is either the connected transport or smart\n"

13078

13109

"medium instance."

13079

13110

msgstr ""

13080

13111

13081

#: en/help_topics/hooks.txt:515

13112

#: en/help_topics/hooks.txt:518

13082

13113

msgid ""

13083

13114

"RioVersionInfoBuilderHooks\n"

13084

13115

"--------------------------"

13085

13116

msgstr ""

13086

13117

13087

#: en/help_topics/hooks.txt:518

13118

#: en/help_topics/hooks.txt:521

13088

13119

msgid ""

13089

13120

"revision\n"

13090

13121

"~~~~~~~~"

13091

13122

msgstr ""

13092

13123

13093

#: en/help_topics/hooks.txt:523

13124

#: en/help_topics/hooks.txt:526

13094

13125

msgid ""

13095

13126

"Invoked when adding information about a revision to the RIO stanza\n"

13096

13127

"that is printed. revision is called with a revision object and a RIO\n"