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

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-07-10 11:35+0200\n"

11

"PO-Revision-Date: 2013-04-08 07:57+0000\n"

12

"Last-Translator: Артём Воротников <Unknown>\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: 2013-04-09 04:32+0000\n"

20

"X-Generator: Launchpad (build 16550)\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:2955

31

#, python-format

32

msgid "Pushed up to revision %d."

33

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

34

35

#: bzrlib/branch.py:3207

35

#: bzrlib/branch.py:2957

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

44

msgid "No new revisions or tags to push."

45

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

46

47

#: bzrlib/branch.py:3212

47

#: bzrlib/branch.py:2962

48

msgid "No new revisions to push."

49

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

50

51

#: bzrlib/branch.py:3232

51

#: bzrlib/branch.py:2982

52

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

53

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

54

55

#: bzrlib/branch.py:3235

55

#: bzrlib/branch.py:2985

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:3045 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:5230

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

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

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

635

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

636

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

637

638

#: bzrlib/builtins.py:1184

638

#: bzrlib/builtins.py:1205

639

msgid "No pull location known or specified."

640

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

641

642

#: bzrlib/builtins.py:1190

642

#: bzrlib/builtins.py:1211

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:1218 bzrlib/builtins.py:4425

648

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

649

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

650

651

#: bzrlib/builtins.py:1238

651

#: bzrlib/builtins.py:1261

652

msgid "Update a mirror of this branch."

653

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

654

655

#: bzrlib/builtins.py:1240

655

#: bzrlib/builtins.py:1263

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

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

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

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

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

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

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:1296 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:1299

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

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

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

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

772

msgid "Overwrite tags only."

773

msgstr "Переписать только теги."

774

775

#: bzrlib/builtins.py:1369

772

776

msgid "Could not determine branch to refer to."

773

777

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

774

778

775

#: bzrlib/builtins.py:1345

779

#: bzrlib/builtins.py:1378

776

780

#, python-format

777

781

msgid ""

778

782

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

779

783

"use 'bzr push :parent'."

780

784

msgstr ""

785

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

786

"%s) используйте 'bzr push :parent'."

781

787

782

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

788

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

783

789

msgid "No push location known or specified."

784

790

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

785

791

786

#: bzrlib/builtins.py:1355

792

#: bzrlib/builtins.py:1388

787

793

#, python-format

788

794

msgid "Using saved push location: %s"

789

795

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

790

796

791

#: bzrlib/builtins.py:1365

797

#: bzrlib/builtins.py:1398

792

798

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

793

799

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

794

800

795

#: bzrlib/builtins.py:1367

801

#: bzrlib/builtins.py:1400

796

802

msgid ""

797

803

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

798

804

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

808

814

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

809

815

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

810

816

811

#: bzrlib/builtins.py:1374

817

#: bzrlib/builtins.py:1407

812

818

msgid ""

813

819

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

814

820

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

816

822

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

817

823

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

818

824

819

#: bzrlib/builtins.py:1377

825

#: bzrlib/builtins.py:1410

820

826

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

821

827

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

822

828

823

#: bzrlib/builtins.py:1387

829

#: bzrlib/builtins.py:1420

824

830

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

825

831

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

826

832

827

#: bzrlib/builtins.py:1389

833

#: bzrlib/builtins.py:1422

828

834

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

829

835

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

830

836

831

#: bzrlib/builtins.py:1392

837

#: bzrlib/builtins.py:1425

832

838

msgid ""

833

839

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

834

840

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

836

842

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

837

843

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

838

844

839

#: bzrlib/builtins.py:1396

845

#: bzrlib/builtins.py:1429

840

846

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

841

847

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

842

848

843

#: bzrlib/builtins.py:1398

849

#: bzrlib/builtins.py:1431

844

850

msgid ""

845

851

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

846

852

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

849

855

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

850

856

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

851

857

852

#: bzrlib/builtins.py:1403

858

#: bzrlib/builtins.py:1436

853

859

msgid "Bind new branch to from location."

854

860

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

855

861

856

#: bzrlib/builtins.py:1450

862

#: bzrlib/builtins.py:1483

857

863

#, python-format

858

864

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

859

865

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

860

866

861

#: bzrlib/builtins.py:1462

867

#: bzrlib/builtins.py:1495

862

868

#, python-format

863

869

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

864

870

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

865

871

866

#: bzrlib/builtins.py:1481

872

#: bzrlib/builtins.py:1514

867

873

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

868

874

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

869

875

870

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

876

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

871

877

#, python-format

872

878

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

873

879

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

874

880

875

#: bzrlib/builtins.py:1500

881

#: bzrlib/builtins.py:1533

876

882

#, python-format

877

883

msgid "Branched %d revision."

878

884

msgid_plural "Branched %d revisions."

880

886

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

881

887

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

882

888

883

#: bzrlib/builtins.py:1505

889

#: bzrlib/builtins.py:1538

884

890

#, python-format

885

891

msgid "New branch bound to %s"

886

892

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

887

893

888

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

894

#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280

889

895

#, python-format

890

896

msgid "Switched to branch: %s"

891

897

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

892

898

893

#: bzrlib/builtins.py:1515

899

#: bzrlib/builtins.py:1548

894

900

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

895

901

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

896

902

897

#: bzrlib/builtins.py:1517

903

#: bzrlib/builtins.py:1550

898

904

msgid ""

899

905

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

900

906

"location."

901

907

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

902

908

903

#: bzrlib/builtins.py:1524

909

#: bzrlib/builtins.py:1557

904

910

msgid ""

905

911

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

906

912

"location."

907

913

msgstr ""

908

914

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

909

915

910

#: bzrlib/builtins.py:1554

916

#: bzrlib/builtins.py:1586

911

917

msgid "(default)"

912

918

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

913

919

914

#: bzrlib/builtins.py:1566

920

#: bzrlib/builtins.py:1598

915

921

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

916

922

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

917

923

918

#: bzrlib/builtins.py:1568

924

#: bzrlib/builtins.py:1600

919

925

msgid ""

920

926

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

921

927

"for\n"

928

934

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

929

935

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

930

936

931

#: bzrlib/builtins.py:1573

937

#: bzrlib/builtins.py:1605

932

938

msgid ""

933

939

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

934

940

"will\n"

945

951

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

946

952

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

947

953

948

#: bzrlib/builtins.py:1580

954

#: bzrlib/builtins.py:1612

949

955

msgid ""

950

956

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

951

957

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

959

965

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

960

966

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

961

967

962

#: bzrlib/builtins.py:1590

968

#: bzrlib/builtins.py:1622

963

969

msgid ""

964

970

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

965

971

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

971

977

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

972

978

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

973

979

974

#: bzrlib/builtins.py:1597

980

#: bzrlib/builtins.py:1629

975

981

msgid "Get file contents from this tree."

976

982

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

977

983

978

#: bzrlib/builtins.py:1599

984

#: bzrlib/builtins.py:1631

979

985

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

980

986

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

981

987

982

#: bzrlib/builtins.py:1640

988

#: bzrlib/builtins.py:1672

983

989

msgid ""

984

990

"Show list of renamed files.\n"

985

991

" "

987

993

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

988

994

" "

989

995

990

#: bzrlib/builtins.py:1670

996

#: bzrlib/builtins.py:1700

991

997

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

992

998

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

993

999

994

#: bzrlib/builtins.py:1672

1000

#: bzrlib/builtins.py:1702

995

1001

msgid ""

996

1002

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

997

1003

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

998

1004

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

999

1005

msgstr ""

1000

1006

1001

#: bzrlib/builtins.py:1676

1007

#: bzrlib/builtins.py:1706

1002

1008

msgid ""

1003

1009

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

1004

1010

"that is out of date from its branch."

1005

1011

msgstr ""

1012

"Вы можете использовать это для того, чтобы увидеть старые ревизии или "

1013

"обновить рабочее дерево, которое устарело по отношению к своей ветке."

1006

1014

1007

#: bzrlib/builtins.py:1679

1015

#: bzrlib/builtins.py:1709

1008

1016

msgid ""

1009

1017

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

1010

1018

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

1011

1019

"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"

1012

1020

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

1013

1021

msgstr ""

1022

"При наличии не подтверждённых изменений в рабочем дереве,они будут "

1023

"осуществлены и оставлены как неподтвержденные после обновления. Чтобы "

1024

"отменить эти изменения используйте 'bzr revert'. Не подтверждённые изменения "

1025

"могут конфликтовать с изменениями, вызванными обновлением."

1014

1026

1015

#: bzrlib/builtins.py:1684

1027

#: bzrlib/builtins.py:1714

1016

1028

msgid ""

1017

1029

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

1018

1030

"the branch from the master."

1019

1031

msgstr ""

1020

1032

1021

#: bzrlib/builtins.py:1687

1033

#: bzrlib/builtins.py:1717

1022

1034

msgid ""

1023

1035

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

1024

1036

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

1035

1047

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

1036

1048

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

1037

1049

1038

#: bzrlib/builtins.py:1694

1050

#: bzrlib/builtins.py:1724

1039

1051

msgid ""

1040

1052

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

1041

1053

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

1042

1054

"current working directory is used."

1043

1055

msgstr ""

1044

1056

1045

#: bzrlib/builtins.py:1710

1057

#: bzrlib/builtins.py:1740

1046

1058

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

1047

1059

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

1048

1060

1049

#: bzrlib/builtins.py:1718

1061

#: bzrlib/builtins.py:1748

1050

1062

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

1051

1063

msgstr ""

1052

1064

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

1053

1065

1054

#: bzrlib/builtins.py:1749

1066

#: bzrlib/builtins.py:1779

1055

1067

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

1056

1068

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

1057

1069

1058

#: bzrlib/builtins.py:1765

1070

#: bzrlib/builtins.py:1795

1059

1071

#, python-format

1060

1072

msgid ""

1061

1073

"branch has no revision %s\n"

1064

1076

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

1065

1077

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

1066

1078

1067

#: bzrlib/builtins.py:1771

1079

#: bzrlib/builtins.py:1801

1068

1080

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

1069

1081

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

1070

1082

1071

#: bzrlib/builtins.py:1775

1083

#: bzrlib/builtins.py:1805

1072

1084

msgid ""

1073

1085

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

1074

1086

"can be committed with 'bzr commit'."

1076

1088

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

1077

1089

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

1078

1090

1079

#: bzrlib/builtins.py:1784

1091

#: bzrlib/builtins.py:1814

1080

1092

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

1081

1093

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

1082

1094

1083

#: bzrlib/builtins.py:1786

1095

#: bzrlib/builtins.py:1816

1084

1096

msgid ""

1085

1097

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

1086

1098

"tree, branch or repository."

1088

1100

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

1089

1101

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

1090

1102

1091

#: bzrlib/builtins.py:1789

1103

#: bzrlib/builtins.py:1819

1092

1104

msgid ""

1093

1105

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

1094

1106

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

1098

1110

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

1099

1111

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

1100

1112

1101

#: bzrlib/builtins.py:1793

1113

#: bzrlib/builtins.py:1823

1102

1114

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

1103

1115

msgstr ""

1104

1116

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

1105

1117

1106

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

1107

#: bzrlib/builtins.py:6442

1118

#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885

1119

#: bzrlib/builtins.py:6466

1108

1120

msgid ":Examples:"

1109

1121

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

1110

1122

1111

#: bzrlib/builtins.py:1797

1123

#: bzrlib/builtins.py:1827

1112

1124

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

1113

1125

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

1114

1126

1115

#: bzrlib/builtins.py:1799

1127

#: bzrlib/builtins.py:1829

1116

1128

msgid " bzr info"

1117

1129

msgstr " bzr info"

1118

1130

1119

#: bzrlib/builtins.py:1801

1131

#: bzrlib/builtins.py:1831

1120

1132

msgid ""

1121

1133

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

1122

1134

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

1126

1138

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

1127

1139

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

1128

1140

1129

#: bzrlib/builtins.py:1805

1141

#: bzrlib/builtins.py:1835

1130

1142

msgid " bzr info -v"

1131

1143

msgstr " bzr info -v"

1132

1144

1133

#: bzrlib/builtins.py:1807

1145

#: bzrlib/builtins.py:1837

1134

1146

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

1135

1147

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

1136

1148

1137

#: bzrlib/builtins.py:1809

1149

#: bzrlib/builtins.py:1839

1138

1150

msgid " bzr info -vv"

1139

1151

msgstr " bzr info -vv"

1140

1152

1141

#: bzrlib/builtins.py:1828

1153

#: bzrlib/builtins.py:1858

1142

1154

msgid "Remove files or directories."

1143

1155

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

1144

1156

1145

#: bzrlib/builtins.py:1830

1157

#: bzrlib/builtins.py:1860

1146

1158

msgid ""

1147

1159

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

1148

1160

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

1149

"will be backed up (adding an extention of the form .~#~). If no options or\n"

1161

"will be backed up (adding an extension of the form .~#~). If no options or\n"

1150

1162

"parameters are given Bazaar will scan for files that are being tracked by\n"

1151

1163

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

1152

1164

msgstr ""

1153

"Прекращает отслеживание изменений в указанных файлах. Bazaar удалит их,\n"

1154

"если их можно легко восстановить с помощью revert, иначе будут созданы\n"

1155

"их резервные копии (с расширением вида .~#~). Если не указано ни опций,\n"

1156

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

1157

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

1158

1165

1159

#: bzrlib/builtins.py:1838

1166

#: bzrlib/builtins.py:1868

1160

1167

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

1161

1168

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

1162

1169

1163

#: bzrlib/builtins.py:1840

1170

#: bzrlib/builtins.py:1870

1164

1171

msgid "The file deletion mode to be used."

1165

1172

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

1166

1173

1167

#: bzrlib/builtins.py:1841

1174

#: bzrlib/builtins.py:1871

1168

1175

msgid "Deletion Strategy"

1169

1176

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

1170

1177

1171

#: bzrlib/builtins.py:1842

1178

#: bzrlib/builtins.py:1872

1172

1179

msgid "Backup changed files (default)."

1173

msgstr ""

1180

msgstr "Создать резервную копию изменённых файлов (по умолчанию)."

1174

1181

1175

#: bzrlib/builtins.py:1843

1182

#: bzrlib/builtins.py:1873

1176

1183

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

1177

1184

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

1178

1185

1179

#: bzrlib/builtins.py:1844

1186

#: bzrlib/builtins.py:1874

1180

1187

msgid "Don't backup changed files."

1181

1188

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

1182

1189

1183

#: bzrlib/builtins.py:1845

1190

#: bzrlib/builtins.py:1875

1184

1191

msgid ""

1185

1192

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

1186

1193

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

1188

1195

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

1189

1196

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

1190

1197

1191

#: bzrlib/builtins.py:1854

1198

#: bzrlib/builtins.py:1884

1192

1199

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

1193

1200

msgstr ""

1194

1201

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

1195

1202

1196

#: bzrlib/builtins.py:1871

1203

#: bzrlib/builtins.py:1901

1197

1204

msgid "No matching files."

1198

1205

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

1199

1206

1200

#: bzrlib/builtins.py:1932

1207

#: bzrlib/builtins.py:1962

1201

1208

msgid "Reconcile bzr metadata in a branch."

1202

1209

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

1203

1210

1204

#: bzrlib/builtins.py:1934

1211

#: bzrlib/builtins.py:1964

1205

1212

msgid ""

1206

1213

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

1207

1214

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

1212

1219

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

1213

1220

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

1214

1221

1215

#: bzrlib/builtins.py:1939

1222

#: bzrlib/builtins.py:1969

1216

1223

msgid ""

1217

1224

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

1218

1225

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

1224

1231

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

1225

1232

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

1226

1233

1227

#: bzrlib/builtins.py:1944

1234

#: bzrlib/builtins.py:1974

1228

1235

msgid ""

1229

1236

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

1230

1237

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

1233

1240

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

1234

1241

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

1235

1242

1236

#: bzrlib/builtins.py:1947

1243

#: bzrlib/builtins.py:1977

1237

1244

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

1238

1245

msgstr ""

1239

1246

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

1240

1247

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

1241

1248

1242

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

1249

#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779

1243

1250

msgid ""

1244

1251

"Format for the bzr 2.0 series.\n"

1245

1252

"Uses group-compress storage.\n"

1246

1253

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

1247

1254

msgstr ""

1248

1255

1249

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

1256

#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779

1250

1257

msgid ""

1251

1258

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

1252

1259

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

1253

1260

msgstr ""

1261

"Пакетный формат, используемый в версиях 1.х. Представлен в 0.92. "

1262

"Взаимодействует с хранилищами bzr 0.92 и ниже, но не читается bzr ниже 0.92. "

1254

1263

1255

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

1264

#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779

1256

1265

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

1257

1266

msgstr ""

1258

1267

1259

#: bzrlib/builtins.py:2015

1268

#: bzrlib/builtins.py:2045

1260

1269

msgid "Make a directory into a versioned branch."

1261

1270

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

1262

1271

1263

#: bzrlib/builtins.py:2017

1272

#: bzrlib/builtins.py:2047

1264

1273

msgid ""

1265

1274

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

1266

1275

"existing project."

1268

1277

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

1269

1278

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

1270

1279

1271

#: bzrlib/builtins.py:2020

1280

#: bzrlib/builtins.py:2050

1272

1281

msgid ""

1273

1282

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

1274

1283

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

1279

1288

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

1280

1289

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

1281

1290

1282

#: bzrlib/builtins.py:2025

1291

#: bzrlib/builtins.py:2055

1283

1292

msgid ""

1284

1293

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

1285

1294

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

1287

1296

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

1288

1297

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

1289

1298

1290

#: bzrlib/builtins.py:2028

1299

#: bzrlib/builtins.py:2058

1291

1300

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

1292

1301

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

1293

1302

1294

#: bzrlib/builtins.py:2030

1303

#: bzrlib/builtins.py:2060

1295

1304

msgid ""

1296

1305

" cd ~/project\n"

1297

1306

" bzr init\n"

1305

1314

" bzr status\n"

1306

1315

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

1307

1316

1308

#: bzrlib/builtins.py:2041

1317

#: bzrlib/builtins.py:2071

1309

1318

msgid ""

1310

1319

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

1311

1320

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

1312

1321

1313

#: bzrlib/builtins.py:2044

1322

#: bzrlib/builtins.py:2074

1314

1323

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

1315

1324

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

1316

1325

1317

#: bzrlib/builtins.py:2052

1326

#: bzrlib/builtins.py:2082

1318

1327

msgid ""

1319

1328

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

1320

1329

msgstr ""

1321

1330

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

1322

1331

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

1323

1332

1324

#: bzrlib/builtins.py:2055

1333

#: bzrlib/builtins.py:2085

1325

1334

msgid "Create a branch without a working tree."

1326

1335

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

1327

1336

1328

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

1337

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

1329

1338

#, python-format

1330

1339

msgid ""

1331

1340

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

1335

1344

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

1336

1345

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

1337

1346

1338

#: bzrlib/builtins.py:2109

1347

#: bzrlib/builtins.py:2139

1339

1348

msgid ""

1340

1349

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

1341

1350

msgstr ""

1342

1351

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

1343

1352

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

1344

1353

1345

#: bzrlib/builtins.py:2120

1354

#: bzrlib/builtins.py:2150

1346

1355

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

1347

1356

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

1348

1357

1349

#: bzrlib/builtins.py:2129

1358

#: bzrlib/builtins.py:2159

1350

1359

#, python-format

1351

1360

msgid "Using shared repository: %s\n"

1352

1361

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

1353

1362

1354

#: bzrlib/builtins.py:2133

1363

#: bzrlib/builtins.py:2163

1355

1364

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

1356

1365

msgstr ""

1357

1366

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

1358

1367

1359

#: bzrlib/builtins.py:2135

1368

#: bzrlib/builtins.py:2165

1360

1369

msgid ""

1361

1370

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

1362

1371

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

1368

1377

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

1369

1378

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

1370

1379

1371

#: bzrlib/builtins.py:2140

1380

#: bzrlib/builtins.py:2170

1372

1381

msgid ""

1373

1382

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

1374

1383

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

1384

1393

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

1385

1394

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

1386

1395

1387

#: bzrlib/builtins.py:2147

1396

#: bzrlib/builtins.py:2177

1388

1397

msgid ""

1389

1398

":Examples:\n"

1390

1399

" Create a shared repository holding just branches::"

1392

1401

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

1393

1402

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

1394

1403

1395

#: bzrlib/builtins.py:2150

1404

#: bzrlib/builtins.py:2180

1396

1405

msgid ""

1397

1406

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

1398

1407

" bzr init repo/trunk"

1400

1409

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

1401

1410

" bzr init repo/trunk"

1402

1411

1403

#: bzrlib/builtins.py:2153

1412

#: bzrlib/builtins.py:2183

1404

1413

msgid " Make a lightweight checkout elsewhere::"

1405

1414

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

1406

1415

1407

#: bzrlib/builtins.py:2155

1416

#: bzrlib/builtins.py:2185

1408

1417

msgid ""

1409

1418

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

1410

1419

" cd trunk-checkout\n"

1414

1423

" cd trunk-checkout\n"

1415

1424

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

1416

1425

1417

#: bzrlib/builtins.py:2163

1426

#: bzrlib/builtins.py:2193

1418

1427

msgid ""

1419

1428

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

1420

1429

msgstr ""

1421

1430

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

1422

1431

"formats»."

1423

1432

1424

#: bzrlib/builtins.py:2167

1433

#: bzrlib/builtins.py:2197

1425

1434

msgid "Repository format"

1426

1435

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

1427

1436

1428

#: bzrlib/builtins.py:2169

1437

#: bzrlib/builtins.py:2199

1429

1438

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

1430

1439

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

1431

1440

1432

#: bzrlib/builtins.py:2195

1441

#: bzrlib/builtins.py:2225

1433

1442

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

1434

1443

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

1435

1444

1436

#: bzrlib/builtins.py:2197

1445

#: bzrlib/builtins.py:2227

1437

1446

msgid ""

1438

1447

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

1439

1448

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

1448

1457

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

1449

1458

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

1450

1459

1451

#: bzrlib/builtins.py:2204

1460

#: bzrlib/builtins.py:2234

1452

1461

msgid ""

1453

1462

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

1454

1463

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

1456

1465

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

1457

1466

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

1458

1467

1459

#: bzrlib/builtins.py:2207

1468

#: bzrlib/builtins.py:2237

1460

1469

msgid ""

1461

1470

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

1462

1471

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

1471

1480

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

1472

1481

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

1473

1482

1474

#: bzrlib/builtins.py:2214

1483

#: bzrlib/builtins.py:2244

1475

1484

msgid ""

1476

1485

":Exit values:\n"

1477

1486

" 1 - changed\n"

1485

1494

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

1486

1495

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

1487

1496

1488

#: bzrlib/builtins.py:2220

1497

#: bzrlib/builtins.py:2250

1489

1498

msgid ""

1490

1499

":Examples:\n"

1491

1500

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

1493

1502

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

1494

1503

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

1495

1504

1496

#: bzrlib/builtins.py:2223

1505

#: bzrlib/builtins.py:2253

1497

1506

msgid " bzr diff"

1498

1507

msgstr " bzr diff"

1499

1508

1500

#: bzrlib/builtins.py:2225

1509

#: bzrlib/builtins.py:2255

1501

1510

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

1502

1511

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

1503

1512

1504

#: bzrlib/builtins.py:2227

1513

#: bzrlib/builtins.py:2257

1505

1514

msgid " bzr diff -r1"

1506

1515

msgstr " bzr diff -r1"

1507

1516

1508

#: bzrlib/builtins.py:2229

1517

#: bzrlib/builtins.py:2259

1509

1518

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

1510

1519

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

1511

1520

1512

#: bzrlib/builtins.py:2231

1521

#: bzrlib/builtins.py:2261

1513

1522

msgid " bzr diff -r1..3"

1514

1523

msgstr " bzr diff -r1..3"

1515

1524

1516

#: bzrlib/builtins.py:2233

1525

#: bzrlib/builtins.py:2263

1517

1526

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

1518

1527

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

1519

1528

1520

#: bzrlib/builtins.py:2235

1529

#: bzrlib/builtins.py:2265

1521

1530

msgid " bzr diff -r1..3 xxx"

1522

1531

msgstr " bzr diff -r1..3 xxx"

1523

1532

1524

#: bzrlib/builtins.py:2237

1533

#: bzrlib/builtins.py:2267

1525

1534

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

1526

1535

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

1527

1536

1528

#: bzrlib/builtins.py:2239

1537

#: bzrlib/builtins.py:2269

1529

1538

msgid " bzr diff -c2"

1530

1539

msgstr " bzr diff -c2"

1531

1540

1532

#: bzrlib/builtins.py:2241

1541

#: bzrlib/builtins.py:2271

1533

1542

msgid ""

1534

1543

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

1535

1544

" \n"

1539

1548

" \n"

1540

1549

" bzr diff -cX"

1541

1550

1542

#: bzrlib/builtins.py:2245

1551

#: bzrlib/builtins.py:2275

1543

1552

msgid ""

1544

1553

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

1545

1554

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

1549

1558

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

1550

1559

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

1551

1560

1552

#: bzrlib/builtins.py:2249

1561

#: bzrlib/builtins.py:2279

1553

1562

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

1554

1563

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

1555

1564

1556

#: bzrlib/builtins.py:2251

1565

#: bzrlib/builtins.py:2281

1557

1566

msgid ""

1558

1567

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

1559

1568

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

1561

1570

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

1562

1571

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

1563

1572

1564

#: bzrlib/builtins.py:2254

1573

#: bzrlib/builtins.py:2284

1565

1574

msgid " bzr diff -r-2.."

1566

1575

msgstr " bzr diff -r-2.."

1567

1576

1568

#: bzrlib/builtins.py:2256

1577

#: bzrlib/builtins.py:2286

1569

1578

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

1570

1579

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

1571

1580

1572

#: bzrlib/builtins.py:2258

1581

#: bzrlib/builtins.py:2288

1573

1582

msgid " bzr diff NEWS"

1574

1583

msgstr " bzr diff NEWS"

1575

1584

1576

#: bzrlib/builtins.py:2260

1585

#: bzrlib/builtins.py:2290

1577

1586

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

1578

1587

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

1579

1588

1580

#: bzrlib/builtins.py:2262

1589

#: bzrlib/builtins.py:2292

1581

1590

msgid " bzr diff xxx/NEWS"

1582

1591

msgstr " bzr diff xxx/NEWS"

1583

1592

1584

#: bzrlib/builtins.py:2264

1593

#: bzrlib/builtins.py:2294

1585

1594

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

1586

1595

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

1587

1596

1588

#: bzrlib/builtins.py:2266

1597

#: bzrlib/builtins.py:2296

1589

1598

msgid " bzr diff --old xxx"

1590

1599

msgstr " bzr diff --old xxx"

1591

1600

1592

#: bzrlib/builtins.py:2268

1601

#: bzrlib/builtins.py:2298

1593

1602

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

1594

1603

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

1595

1604

1596

#: bzrlib/builtins.py:2270

1605

#: bzrlib/builtins.py:2300

1597

1606

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

1598

1607

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

1599

1608

1600

#: bzrlib/builtins.py:2272

1609

#: bzrlib/builtins.py:2302

1601

1610

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

1602

1611

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

1603

1612

1604

#: bzrlib/builtins.py:2274

1613

#: bzrlib/builtins.py:2304

1605

1614

msgid ""

1606

1615

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

1607

1616

" \n"

1616

1625

" \n"

1617

1626

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

1618

1627

1619

#: bzrlib/builtins.py:2284

1628

#: bzrlib/builtins.py:2314

1620

1629

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

1621

1630

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

1622

1631

1623

#: bzrlib/builtins.py:2287

1632

#: bzrlib/builtins.py:2317

1624

1633

msgid ""

1625

1634

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

1626

1635

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

1628

1637

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

1629

1638

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

1630

1639

1631

#: bzrlib/builtins.py:2290

1640

#: bzrlib/builtins.py:2320

1632

1641

msgid "Branch/tree to compare from."

1633

1642

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

1634

1643

1635

#: bzrlib/builtins.py:2294

1644

#: bzrlib/builtins.py:2324

1636

1645

msgid "Branch/tree to compare to."

1637

1646

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

1638

1647

1639

#: bzrlib/builtins.py:2300

1648

#: bzrlib/builtins.py:2330

1640

1649

msgid "Use this command to compare files."

1641

1650

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

1642

1651

1643

#: bzrlib/builtins.py:2305

1652

#: bzrlib/builtins.py:2335

1644

1653

msgid "Diff format to use."

1645

1654

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

1646

1655

1647

#: bzrlib/builtins.py:2307

1656

#: bzrlib/builtins.py:2337

1648

1657

msgid "Diff format"

1649

1658

msgstr "Формат diff"

1650

1659

1651

#: bzrlib/builtins.py:2329

1660

#: bzrlib/builtins.py:2359

1652

1661

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

1653

1662

msgstr ""

1654

1663

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

1655

1664

1656

#: bzrlib/builtins.py:2333

1665

#: bzrlib/builtins.py:2363

1657

1666

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

1658

1667

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

1659

1668

1660

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

1661

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

1669

#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778

1670

#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959

1662

1671

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

1663

1672

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

1664

1673

1665

#: bzrlib/builtins.py:2358

1674

#: bzrlib/builtins.py:2388

1666

1675

msgid ""

1667

1676

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

1668

1677

" "

1670

1679

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

1671

1680

" "

1672

1681

1673

#: bzrlib/builtins.py:2436

1682

#: bzrlib/builtins.py:2465

1674

1683

msgid "Show the tree root directory."

1675

1684

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

1676

1685

1677

#: bzrlib/builtins.py:2438

1686

#: bzrlib/builtins.py:2467

1678

1687

msgid ""

1679

1688

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

1680

1689

"directory."

1682

1691

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

1683

1692

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

1684

1693

1685

#: bzrlib/builtins.py:2453

1694

#: bzrlib/builtins.py:2482

1686

1695

msgid "The limit argument must be an integer."

1687

1696

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

1688

1697

1689

#: bzrlib/builtins.py:2461

1698

#: bzrlib/builtins.py:2490

1690

1699

msgid "The levels argument must be an integer."

1691

1700

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

1692

1701

1693

#: bzrlib/builtins.py:2466

1702

#: bzrlib/builtins.py:2495

1694

1703

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

1695

1704

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

1696

1705

1697

#: bzrlib/builtins.py:2468

1706

#: bzrlib/builtins.py:2497

1698

1707

msgid ""

1699

1708

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

1700

1709

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

1706

1715

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

1707

1716

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

1708

1717

1709

#: bzrlib/builtins.py:2473

1718

#: bzrlib/builtins.py:2502

1710

1719

msgid ""

1711

1720

" bzr log log the current branch\n"

1712

1721

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

1716

1725

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

1717

1726

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

1718

1727

1719

#: bzrlib/builtins.py:2477

1728

#: bzrlib/builtins.py:2506

1720

1729

msgid ""

1721

1730

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

1722

1731

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

1732

1741

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

1733

1742

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

1734

1743

1735

#: bzrlib/builtins.py:2484

1744

#: bzrlib/builtins.py:2513

1736

1745

msgid ":Output control:"

1737

1746

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

1738

1747

1739

#: bzrlib/builtins.py:2486

1748

#: bzrlib/builtins.py:2515

1740

1749

msgid ""

1741

1750

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

1742

1751

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

1748

1757

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

1749

1758

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

1750

1759

1751

#: bzrlib/builtins.py:2491

1760

#: bzrlib/builtins.py:2520

1752

1761

msgid ""

1753

1762

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

1754

1763

" displayed::"

1756

1765

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

1757

1766

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

1758

1767

1759

#: bzrlib/builtins.py:2494

1768

#: bzrlib/builtins.py:2523

1760

1769

msgid ""

1761

1770

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

1762

1771

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

1770

1779

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

1771

1780

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

1772

1781

1773

#: bzrlib/builtins.py:2500

1782

#: bzrlib/builtins.py:2529

1774

1783

msgid ""

1775

1784

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

1776

1785

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

1780

1789

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

1781

1790

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

1782

1791

1783

#: bzrlib/builtins.py:2504

1792

#: bzrlib/builtins.py:2533

1784

1793

msgid ""

1785

1794

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

1786

1795

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

1790

1799

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

1791

1800

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

1792

1801

1793

#: bzrlib/builtins.py:2508

1802

#: bzrlib/builtins.py:2537

1794

1803

msgid ":Ordering control:"

1795

1804

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

1796

1805

1797

#: bzrlib/builtins.py:2510

1806

#: bzrlib/builtins.py:2539

1798

1807

msgid ""

1799

1808

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

1800

1809

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

1806

1815

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

1807

1816

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

1808

1817

1809

#: bzrlib/builtins.py:2515

1818

#: bzrlib/builtins.py:2544

1810

1819

msgid ":Revision filtering:"

1811

1820

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

1812

1821

1813

#: bzrlib/builtins.py:2517

1822

#: bzrlib/builtins.py:2546

1814

1823

msgid ""

1815

1824

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

1816

1825

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

1818

1827

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

1819

1828

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

1820

1829

1821

#: bzrlib/builtins.py:2520

1830

#: bzrlib/builtins.py:2549

1822

1831

msgid ""

1823

1832

" -rX display revision X\n"

1824

1833

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

1830

1839

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

1831

1840

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

1832

1841

1833

#: bzrlib/builtins.py:2525

1842

#: bzrlib/builtins.py:2554

1834

1843

msgid ""

1835

1844

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

1836

1845

" Some common examples are given below::"

1838

1847

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

1839

1848

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

1840

1849

1841

#: bzrlib/builtins.py:2528

1850

#: bzrlib/builtins.py:2557

1842

1851

msgid ""

1843

1852

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

1844

1853

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

1854

1863

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

1855

1864

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

1856

1865

1857

#: bzrlib/builtins.py:2535

1866

#: bzrlib/builtins.py:2564

1858

1867

msgid ""

1859

1868

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

1860

1869

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

1864

1873

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

1865

1874

msgstr ""

1866

1875

1867

#: bzrlib/builtins.py:2542

1876

#: bzrlib/builtins.py:2571

1868

1877

msgid ":Path filtering:"

1869

1878

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

1870

1879

1871

#: bzrlib/builtins.py:2544

1880

#: bzrlib/builtins.py:2573

1872

1881

msgid ""

1873

1882

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

1874

1883

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

1877

1886

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

1878

1887

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

1879

1888

1880

#: bzrlib/builtins.py:2548

1889

#: bzrlib/builtins.py:2577

1881

1890

msgid ""

1882

1891

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

1883

1892

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

1887

1896

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

1888

1897

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

1889

1898

1890

#: bzrlib/builtins.py:2552

1899

#: bzrlib/builtins.py:2581

1891

1900

msgid ""

1892

1901

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

1893

1902

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

1895

1904

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

1896

1905

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

1897

1906

1898

#: bzrlib/builtins.py:2555

1907

#: bzrlib/builtins.py:2584

1899

1908

msgid ""

1900

1909

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

1901

1910

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

1905

1914

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

1906

1915

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

1907

1916

1908

#: bzrlib/builtins.py:2559

1917

#: bzrlib/builtins.py:2588

1909

1918

msgid " In this case:"

1910

1919

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

1911

1920

1912

#: bzrlib/builtins.py:2561

1921

#: bzrlib/builtins.py:2590

1913

1922

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

1914

1923

msgstr ""

1915

1924

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

1916

1925

1917

#: bzrlib/builtins.py:2563

1926

#: bzrlib/builtins.py:2592

1918

1927

msgid ""

1919

1928

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

1920

1929

msgstr ""

1921

1930

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

1922

1931

" в ревизии 3"

1923

1932

1924

#: bzrlib/builtins.py:2565

1933

#: bzrlib/builtins.py:2594

1925

1934

msgid ""

1926

1935

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

1927

1936

" the original file in revision 2."

1929

1938

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

1930

1939

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

1931

1940

1932

#: bzrlib/builtins.py:2568

1941

#: bzrlib/builtins.py:2597

1933

1942

msgid ""

1934

1943

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

1935

1944

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

1937

1946

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

1938

1947

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

1939

1948

1940

#: bzrlib/builtins.py:2571

1949

#: bzrlib/builtins.py:2600

1941

1950

msgid ""

1942

1951

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

1943

1952

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

1944

1953

" until it was last renamed)."

1945

1954

msgstr ""

1946

1955

1947

#: bzrlib/builtins.py:2575

1956

#: bzrlib/builtins.py:2604

1948

1957

msgid ":Other filtering:"

1949

1958

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

1950

1959

1951

#: bzrlib/builtins.py:2577

1960

#: bzrlib/builtins.py:2606

1952

1961

msgid ""

1953

1962

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

1954

1963

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

1963

1972

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

1964

1973

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

1965

1974

1966

#: bzrlib/builtins.py:2583

1975

#: bzrlib/builtins.py:2612

1967

1976

msgid ":Tips & tricks:"

1968

1977

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

1969

1978

1970

#: bzrlib/builtins.py:2585

1979

#: bzrlib/builtins.py:2614

1971

1980

msgid ""

1972

1981

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

1973

1982

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

1981

1990

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

1982

1991

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

1983

1992

1984

#: bzrlib/builtins.py:2591

1993

#: bzrlib/builtins.py:2620

1985

1994

msgid ""

1986

1995

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

1987

1996

msgstr ""

1988

1997

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

1989

1998

1990

#: bzrlib/builtins.py:2593

1999

#: bzrlib/builtins.py:2622

1991

2000

msgid ""

1992

2001

" [ALIASES]\n"

1993

2002

" tip = log -r-1\n"

1999

2008

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

2000

2009

" show = log -v -p"

2001

2010

2002

#: bzrlib/builtins.py:2598

2011

#: bzrlib/builtins.py:2627

2003

2012

msgid ""

2004

2013

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

2005

2014

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

2009

2018

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

2010

2019

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

2011

2020

2012

#: bzrlib/builtins.py:2602

2021

#: bzrlib/builtins.py:2631

2013

2022

msgid ""

2014

2023

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

2015

2024

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

2017

2026

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

2018

2027

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

2019

2028

2020

#: bzrlib/builtins.py:2605

2029

#: bzrlib/builtins.py:2634

2021

2030

msgid ""

2022

2031

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

2023

2032

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

2029

2038

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

2030

2039

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

2031

2040

2032

#: bzrlib/builtins.py:2610

2041

#: bzrlib/builtins.py:2639

2033

2042

msgid ""

2034

2043

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

2035

2044

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

2037

2046

" a list of words but not others."

2038

2047

msgstr ""

2039

2048

2040

#: bzrlib/builtins.py:2615

2049

#: bzrlib/builtins.py:2644

2041

2050

msgid ""

2042

2051

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

2043

2052

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

2045

2054

" trading disk space for faster speed."

2046

2055

msgstr ""

2047

2056

2048

#: bzrlib/builtins.py:2624

2057

#: bzrlib/builtins.py:2653

2049

2058

msgid "Show from oldest to newest."

2050

2059

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

2051

2060

2052

#: bzrlib/builtins.py:2627

2061

#: bzrlib/builtins.py:2656

2053

2062

msgid "Show files changed in each revision."

2054

2063

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

2055

2064

2056

#: bzrlib/builtins.py:2633

2065

#: bzrlib/builtins.py:2662

2057

2066

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

2058

2067

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

2059

2068

2060

#: bzrlib/builtins.py:2637

2069

#: bzrlib/builtins.py:2666

2061

2070

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

2062

2071

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

2063

2072

2064

#: bzrlib/builtins.py:2638

2073

#: bzrlib/builtins.py:2667

2065

2074

msgid "Authors"

2066

2075

msgstr "Авторы"

2067

2076

2068

#: bzrlib/builtins.py:2643

2077

#: bzrlib/builtins.py:2672

2069

2078

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

2070

2079

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

2071

2080

2072

#: bzrlib/builtins.py:2653

2081

#: bzrlib/builtins.py:2682

2073

2082

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

2074

2083

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

2075

2084

2076

#: bzrlib/builtins.py:2658

2085

#: bzrlib/builtins.py:2687

2077

2086

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

2078

2087

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

2079

2088

2080

#: bzrlib/builtins.py:2660

2089

#: bzrlib/builtins.py:2689

2081

2090

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

2082

2091

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

2083

2092

2084

#: bzrlib/builtins.py:2664

2093

#: bzrlib/builtins.py:2693

2085

2094

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

2086

2095

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

2087

2096

2088

#: bzrlib/builtins.py:2666

2097

#: bzrlib/builtins.py:2695

2089

2098

msgid ""

2090

2099

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

2091

2100

"rX..Y)."

2093

2102

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

2094

2103

"rX..Y)."

2095

2104

2096

#: bzrlib/builtins.py:2670

2105

#: bzrlib/builtins.py:2699

2097

2106

msgid "Show digital signature validity."

2098

msgstr ""

2107

msgstr "Показать корректность цифровой подписи."

2099

2108

2100

#: bzrlib/builtins.py:2673

2109

#: bzrlib/builtins.py:2702

2101

2110

msgid "Show revisions whose properties match this expression."

2102

2111

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

2103

2112

2104

#: bzrlib/builtins.py:2677

2113

#: bzrlib/builtins.py:2706

2105

2114

msgid "Show revisions whose message matches this expression."

2106

2115

msgstr ""

2107

2116

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

2108

2117

2109

#: bzrlib/builtins.py:2681

2118

#: bzrlib/builtins.py:2710

2110

2119

msgid "Show revisions whose committer matches this expression."

2111

2120

msgstr ""

2112

2121

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

2113

2122

2114

#: bzrlib/builtins.py:2685

2123

#: bzrlib/builtins.py:2714

2115

2124

msgid "Show revisions whose authors match this expression."

2116

2125

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

2117

2126

2118

#: bzrlib/builtins.py:2689

2127

#: bzrlib/builtins.py:2718

2119

2128

msgid "Show revisions whose bugs match this expression."

2120

2129

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

2121

2130

2122

#: bzrlib/builtins.py:2743

2131

#: bzrlib/builtins.py:2772

2123

2132

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

2124

2133

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

2125

2134

2126

#: bzrlib/builtins.py:2771

2135

#: bzrlib/builtins.py:2800

2127

2136

#, python-format

2128

2137

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

2129

2138

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

2130

2139

2131

#: bzrlib/builtins.py:2888

2140

#: bzrlib/builtins.py:2917

2132

2141

#, python-format

2133

2142

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

2134

2143

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

2135

2144

2136

#: bzrlib/builtins.py:2904

2145

#: bzrlib/builtins.py:2933

2137

2146

#, python-format

2138

2147

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

2139

2148

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

2140

2149

2141

#: bzrlib/builtins.py:2949

2150

#: bzrlib/builtins.py:2978

2142

2151

msgid ""

2143

2152

"List files in a tree.\n"

2144

2153

" "

2146

2155

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

2147

2156

" "

2148

2157

2149

#: bzrlib/builtins.py:2958

2158

#: bzrlib/builtins.py:2987

2150

2159

msgid "Recurse into subdirectories."

2151

2160

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

2152

2161

2153

#: bzrlib/builtins.py:2960

2162

#: bzrlib/builtins.py:2989

2154

2163

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

2155

2164

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

2156

2165

2157

#: bzrlib/builtins.py:2962

2166

#: bzrlib/builtins.py:2991

2158

2167

msgid "Print unknown files."

2159

2168

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

2160

2169

2161

#: bzrlib/builtins.py:2963

2170

#: bzrlib/builtins.py:2992

2162

2171

msgid "Print versioned files."

2163

2172

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

2164

2173

2165

#: bzrlib/builtins.py:2966

2174

#: bzrlib/builtins.py:2995

2166

2175

msgid "Print ignored files."

2167

2176

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

2168

2177

2169

#: bzrlib/builtins.py:2968

2178

#: bzrlib/builtins.py:2997

2170

2179

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

2171

2180

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

2172

2181

2173

#: bzrlib/builtins.py:2981

2182

#: bzrlib/builtins.py:3010

2174

2183

msgid "invalid kind specified"

2175

2184

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

2176

2185

2177

#: bzrlib/builtins.py:2984

2186

#: bzrlib/builtins.py:3013

2178

2187

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

2179

2188

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

2180

2189

2181

#: bzrlib/builtins.py:2993

2190

#: bzrlib/builtins.py:3022

2182

2191

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

2183

2192

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

2184

2193

2185

#: bzrlib/builtins.py:3080

2194

#: bzrlib/builtins.py:3109

2186

2195

msgid "Ignore specified files or patterns."

2187

2196

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

2188

2197

2189

#: bzrlib/builtins.py:3082

2198

#: bzrlib/builtins.py:3111

2190

2199

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

2191

2200

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

2192

2201

2193

#: bzrlib/builtins.py:3084

2202

#: bzrlib/builtins.py:3113

2194

2203

msgid ""

2195

2204

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

2196

2205

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

2204

2213

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

2205

2214

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

2206

2215

2207

#: bzrlib/builtins.py:3090

2216

#: bzrlib/builtins.py:3119

2208

2217

msgid ""

2209

2218

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

2210

2219

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

2216

2225

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

2217

2226

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

2218

2227

2219

#: bzrlib/builtins.py:3095

2228

#: bzrlib/builtins.py:3124

2220

2229

msgid ""

2221

2230

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

2222

2231

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

2232

2241

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

2233

2242

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

2234

2243

2235

#: bzrlib/builtins.py:3101

2244

#: bzrlib/builtins.py:3130

2236

2245

msgid ""

2237

2246

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

2238

2247

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

2243

2252

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

2244

2253

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

2245

2254

2246

#: bzrlib/builtins.py:3105

2255

#: bzrlib/builtins.py:3134

2247

2256

msgid ""

2248

2257

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

2249

2258

"precedence over the '!' exception patterns."

2251

2260

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

2252

2261

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

2253

2262

2254

#: bzrlib/builtins.py:3108

2263

#: bzrlib/builtins.py:3137

2255

2264

msgid ""

2256

2265

":Notes: \n"

2257

2266

" \n"

2263

2272

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

2264

2273

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

2265

2274

2266

#: bzrlib/builtins.py:3113

2275

#: bzrlib/builtins.py:3142

2267

2276

msgid ""

2268

2277

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

2269

2278

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

2272

2281

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

2273

2282

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

2274

2283

2275

#: bzrlib/builtins.py:3116

2284

#: bzrlib/builtins.py:3145

2276

2285

msgid ""

2277

2286

":Examples:\n"

2278

2287

" Ignore the top level Makefile::"

2280

2289

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

2281

2290

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

2282

2291

2283

#: bzrlib/builtins.py:3119

2292

#: bzrlib/builtins.py:3148

2284

2293

msgid " bzr ignore ./Makefile"

2285

2294

msgstr " bzr ignore ./Makefile"

2286

2295

2287

#: bzrlib/builtins.py:3121

2296

#: bzrlib/builtins.py:3150

2288

2297

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

2289

2298

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

2290

2299

2291

#: bzrlib/builtins.py:3123

2300

#: bzrlib/builtins.py:3152

2292

2301

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

2293

2302

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

2294

2303

2295

#: bzrlib/builtins.py:3125

2304

#: bzrlib/builtins.py:3154

2296

2305

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

2297

2306

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

2298

2307

2299

#: bzrlib/builtins.py:3127

2308

#: bzrlib/builtins.py:3156

2300

2309

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

2301

2310

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

2302

2311

2303

#: bzrlib/builtins.py:3129

2312

#: bzrlib/builtins.py:3158

2304

2313

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

2305

2314

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

2306

2315

2307

#: bzrlib/builtins.py:3131

2316

#: bzrlib/builtins.py:3160

2308

2317

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

2309

2318

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

2310

2319

2311

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

2320

#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166

2312

2321

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

2313

2322

msgstr " Игнорировать файлы .o в директории lib::"

2314

2323

2315

#: bzrlib/builtins.py:3135

2324

#: bzrlib/builtins.py:3164

2316

2325

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

2317

2326

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

2318

2327

2319

#: bzrlib/builtins.py:3139

2328

#: bzrlib/builtins.py:3168

2320

2329

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

2321

2330

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

2322

2331

2323

#: bzrlib/builtins.py:3141

2332

#: bzrlib/builtins.py:3170

2324

2333

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

2325

2334

msgstr " Игнорировать всё, кроме верхней директории \"debian\"::"

2326

2335

2327

#: bzrlib/builtins.py:3143

2336

#: bzrlib/builtins.py:3172

2328

2337

msgid ""

2329

2338

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

2330

2339

" \n"

2344

2353

" bzr ignore \"!./local\"\n"

2345

2354

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

2346

2355

2347

#: bzrlib/builtins.py:3157

2356

#: bzrlib/builtins.py:3186

2348

2357

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

2349

2358

msgstr "Вывести правила игнорирования, которые bzr использует по умолчанию."

2350

2359

2351

#: bzrlib/builtins.py:3169

2360

#: bzrlib/builtins.py:3198

2352

2361

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

2353

2362

msgstr ""

2354

2363

"Для ignore требуется как минимум одно из NAME_PATTERN или --default-rules."

2355

2364

2356

#: bzrlib/builtins.py:3180

2365

#: bzrlib/builtins.py:3209

2357

2366

#, python-format

2358

2367

msgid "Invalid ignore pattern found. %s"

2359

2368

msgid_plural "Invalid ignore patterns found. %s"

2361

2370

msgstr[1] "Найдены некорректные шаблоны игнорирования. %s"

2362

2371

msgstr[2] "Найдены некорректные шаблоны игнорирования. %s"

2363

2372

2364

#: bzrlib/builtins.py:3189

2373

#: bzrlib/builtins.py:3218

2365

2374

msgid "NAME_PATTERN should not be an absolute path"

2366

2375

msgstr "NAME_PATTERN не должен быть абсолютным путём"

2367

2376

2368

#: bzrlib/builtins.py:3202

2377

#: bzrlib/builtins.py:3231

2369

2378

#, python-format

2370

2379

msgid ""

2371

2380

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

2380

2389

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

2381

2390

"выполните 'bzr remove'.\n"

2382

2391

2383

#: bzrlib/builtins.py:3209

2392

#: bzrlib/builtins.py:3238

2384

2393

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

2385

2394

msgstr "Вывести игнорируемые файлы и шаблоны, которым они удовлетворяют."

2386

2395

2387

#: bzrlib/builtins.py:3211

2396

#: bzrlib/builtins.py:3240

2388

2397

msgid ""

2389

2398

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

2390

2399

"be ignored."

2392

2401

"Вывести все игнорируемые файлы и шаблоны игнорирования, из-за которых эти\n"

2393

2402

"файлы игнорируются."

2394

2403

2395

#: bzrlib/builtins.py:3214

2404

#: bzrlib/builtins.py:3243

2396

2405

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

2397

2406

msgstr "Альтернативно, чтобы вывести только файлы::"

2398

2407

2399

#: bzrlib/builtins.py:3216

2408

#: bzrlib/builtins.py:3245

2400

2409

msgid " bzr ls --ignored"

2401

2410

msgstr " bzr ls --ignored"

2402

2411

2403

#: bzrlib/builtins.py:3250

2412

#: bzrlib/builtins.py:3279

2404

2413

#, python-format

2405

2414

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

2406

2415

msgstr "некорректный номер ревизии: %r"

2407

2416

2408

#: bzrlib/builtins.py:3257

2417

#: bzrlib/builtins.py:3286

2409

2418

msgid ""

2410

2419

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

2411

2420

msgstr ""

2412

2421

"Экспортировать текущую или прошлую ревизию в директорию назначения\r\n"

2413

2422

"или архив."

2414

2423

2415

#: bzrlib/builtins.py:3259

2424

#: bzrlib/builtins.py:3288

2416

2425

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

2417

2426

msgstr "Если ревизия не указана, экспортирует последнюю ревизию."

2418

2427

2419

#: bzrlib/builtins.py:3261

2428

#: bzrlib/builtins.py:3290

2420

2429

msgid ""

2421

2430

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

2422

2431

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

2426

2435

"Если не указан, формат определяется по расширению. Если расширение\n"

2427

2436

"отсутствует, экспортирует в директорию (эквивалентно --format=dir)."

2428

2437

2429

#: bzrlib/builtins.py:3265

2438

#: bzrlib/builtins.py:3294

2430

2439

msgid ""

2431

2440

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

2432

2441

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

2437

2446

"умолчанию используется имя файла для эскпорта. Опция root не имеет\n"

2438

2447

"эффекта для формата 'dir'."

2439

2448

2440

#: bzrlib/builtins.py:3269

2449

#: bzrlib/builtins.py:3298

2441

2450

msgid ""

2442

2451

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

2443

2452

"directory will be used."

2445

2454

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

2446

2455

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

2447

2456

2448

#: bzrlib/builtins.py:3272

2457

#: bzrlib/builtins.py:3301

2449

2458

msgid ""

2450

2459

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

2451

2460

msgstr ""

2452

2461

"Замечание: Экспорт в zip деревьев с именами файлов, содержащими не-ASCII\r\n"

2453

2462

"символы, не поддерживается."

2454

2463

2455

#: bzrlib/builtins.py:3274

2464

#: bzrlib/builtins.py:3303

2456

2465

msgid ""

2457

2466

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

2458

2467

" Supported formats Autodetected by extension\n"

2474

2483

" zip .zip\n"

2475

2484

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

2476

2485

2477

#: bzrlib/builtins.py:3288

2486

#: bzrlib/builtins.py:3317

2478

2487

msgid "Type of file to export to."

2479

2488

msgstr "Тип файла для экспорта."

2480

2489

2481

#: bzrlib/builtins.py:3291

2490

#: bzrlib/builtins.py:3320

2482

2491

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

2483

msgstr ""

2492

msgstr "Применить фильтры содержимого для экспорта в удобной форме."

2484

2493

2485

#: bzrlib/builtins.py:3295

2494

#: bzrlib/builtins.py:3324

2486

2495

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

2487

2496

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

2488

2497

2489

#: bzrlib/builtins.py:3297

2498

#: bzrlib/builtins.py:3326

2490

2499

msgid ""

2491

2500

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

2492

2501

"changed."

2494

2503

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

2495

2504

"были изменены."

2496

2505

2497

#: bzrlib/builtins.py:3300

2506

#: bzrlib/builtins.py:3329

2498

2507

msgid ""

2499

2508

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

2500

msgstr ""

2509

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

2501

2510

2502

#: bzrlib/builtins.py:3319

2511

#: bzrlib/builtins.py:3348

2503

2512

msgid "--uncommitted requires a working tree"

2504

2513

msgstr "--uncommitted требует рабочее дерево"

2505

2514

2506

#: bzrlib/builtins.py:3328

2515

#: bzrlib/builtins.py:3357

2507

2516

#, python-format

2508

2517

msgid "Unsupported export format: %s"

2509

2518

msgstr "Неподдерживаемый формат экспорта: %s"

2510

2519

2511

#: bzrlib/builtins.py:3332

2520

#: bzrlib/builtins.py:3361

2512

2521

msgid ""

2513

2522

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

2514

2523

msgstr ""

2515

2524

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

2516

2525

2517

#: bzrlib/builtins.py:3334

2526

#: bzrlib/builtins.py:3363

2518

2527

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

2519

2528

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

2520

2529

2521

#: bzrlib/builtins.py:3336

2530

#: bzrlib/builtins.py:3365

2522

2531

msgid ""

2523

2532

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

2524

2533

"binary file."

2526

2535

"Замечание: Не забывайте перенаправлять стандартный вывод при использовании\n"

2527

2536

"этой команды на двоичном файле."

2528

2537

2529

#: bzrlib/builtins.py:3342

2538

#: bzrlib/builtins.py:3371

2530

2539

msgid "The path name in the old tree."

2531

2540

msgstr "Имя пути в старом дереве."

2532

2541

2533

#: bzrlib/builtins.py:3343

2542

#: bzrlib/builtins.py:3372

2534

2543

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

2535

2544

msgstr "Применить фильтры содержимого для отображения в удобной форме."

2536

2545

2537

#: bzrlib/builtins.py:3354

2546

#: bzrlib/builtins.py:3383

2538

2547

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

2539

2548

msgstr "bzr cat --revision принимает ровно один спецификатор ревизии"

2540

2549

2541

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

2550

#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420

2542

2551

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

2543

2552

msgstr "{0!r} не представлен в ревизии {1}"

2544

2553

2545

#: bzrlib/builtins.py:3414

2554

#: bzrlib/builtins.py:3443

2546

2555

msgid "Commit changes into a new revision."

2547

2556

msgstr "Закрепить изменения в новой ревизии."

2548

2557

2549

#: bzrlib/builtins.py:3416

2558

#: bzrlib/builtins.py:3445

2550

2559

msgid ""

2551

2560

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

2552

2561

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

2556

2565

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

2557

2566

msgstr ""

2558

2567

2559

#: bzrlib/builtins.py:3423

2568

#: bzrlib/builtins.py:3452

2560

2569

msgid ""

2561

2570

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

2562

2571

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

2565

2574

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

2566

2575

"Эти умолчания могут быть перезаписаны, как объяснено ниже."

2567

2576

2568

#: bzrlib/builtins.py:3427

2577

#: bzrlib/builtins.py:3456

2569

2578

msgid ":Selective commits:"

2570

2579

msgstr ":Выборочные закрепления:"

2571

2580

2572

#: bzrlib/builtins.py:3429

2581

#: bzrlib/builtins.py:3458

2573

2582

msgid ""

2574

2583

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

2575

2584

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

2579

2588

" Если указана директория, то закрепляется директория и всё её\n"

2580

2589

" содержимое."

2581

2590

2582

#: bzrlib/builtins.py:3433

2591

#: bzrlib/builtins.py:3462

2583

2592

msgid ""

2584

2593

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

2585

2594

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

2589

2598

" Например, чтобы закрепить изменения внутри foo, но не изменения\n"

2590

2599

" в foo/bar::"

2591

2600

2592

#: bzrlib/builtins.py:3437

2601

#: bzrlib/builtins.py:3466

2593

2602

msgid " bzr commit foo -x foo/bar"

2594

2603

msgstr " bzr commit foo -x foo/bar"

2595

2604

2596

#: bzrlib/builtins.py:3439

2605

#: bzrlib/builtins.py:3468

2597

2606

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

2598

2607

msgstr " Выборочные закрепления после слияния пока не поддерживаются."

2599

2608

2600

#: bzrlib/builtins.py:3441

2609

#: bzrlib/builtins.py:3470

2601

2610

msgid ":Custom authors:"

2602

2611

msgstr ":Выбор автора:"

2603

2612

2604

#: bzrlib/builtins.py:3443

2613

#: bzrlib/builtins.py:3472

2605

2614

msgid ""

2606

2615

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

2607

2616

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

2616

2625

" \"John Doe <jdoe@example.com>\". Если в изменении участвовал более,\n"

2617

2626

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

2618

2627

2619

#: bzrlib/builtins.py:3450

2628

#: bzrlib/builtins.py:3479

2620

2629

msgid ":Checks:"

2621

2630

msgstr ":Проверки:"

2622

2631

2623

#: bzrlib/builtins.py:3452

2632

#: bzrlib/builtins.py:3481

2624

2633

msgid ""

2625

2634

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

2626

2635

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

2634

2643

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

2635

2644

" выполнив команду ``bzr help hooks''."

2636

2645

2637

#: bzrlib/builtins.py:3458

2646

#: bzrlib/builtins.py:3487

2638

2647

msgid ":Things to note:"

2639

2648

msgstr ":На заметку:"

2640

2649

2641

#: bzrlib/builtins.py:3460

2650

#: bzrlib/builtins.py:3489

2642

2651

msgid ""

2643

2652

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

2644

2653

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

2649

2658

" uncommit, чтобы отменить последнее закрепление. Подробности смотрите\n"

2650

2659

" в «bzr help uncommit»."

2651

2660

2652

#: bzrlib/builtins.py:3464

2661

#: bzrlib/builtins.py:3493

2653

2662

msgid ""

2654

2663

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

2655

2664

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

2657

2666

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

2658

2667

msgstr ""

2659

2668

2660

#: bzrlib/builtins.py:3474

2669

#: bzrlib/builtins.py:3503

2661

2670

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

2662

2671

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

2663

2672

2664

#: bzrlib/builtins.py:3477

2673

#: bzrlib/builtins.py:3506

2665

2674

msgid "Description of the new revision."

2666

2675

msgstr "Описание новой ревизии."

2667

2676

2668

#: bzrlib/builtins.py:3480

2677

#: bzrlib/builtins.py:3509

2669

2678

msgid "Commit even if nothing has changed."

2670

2679

msgstr "Закрепить, даже если ничего не изменилось."

2671

2680

2672

#: bzrlib/builtins.py:3484

2681

#: bzrlib/builtins.py:3513

2673

2682

msgid "Take commit message from this file."

2674

2683

msgstr "Взять сообщение о закреплении из этого файла."

2675

2684

2676

#: bzrlib/builtins.py:3486

2685

#: bzrlib/builtins.py:3515

2677

2686

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

2678

2687

msgstr ""

2679

2688

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

2680

2689

2681

#: bzrlib/builtins.py:3489

2690

#: bzrlib/builtins.py:3518

2682

2691

msgid ""

2683

2692

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

2684

2693

"08:00:00 +0100'."

2686

2695

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

2687

2696

"напр. '2009-10-10 08:00:00 +0100'."

2688

2697

2689

#: bzrlib/builtins.py:3492

2698

#: bzrlib/builtins.py:3521

2690

2699

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

2691

2700

msgstr ""

2692

2701

"Отметить ошибку, как исправленную в этой ревизии (см. «bzr help bugs»)."

2693

2702

2694

#: bzrlib/builtins.py:3495

2703

#: bzrlib/builtins.py:3524

2695

2704

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

2696

2705

msgstr "Установить имя автора, если оно отличается от имени закрепляющего."

2697

2706

2698

#: bzrlib/builtins.py:3498

2707

#: bzrlib/builtins.py:3527

2699

2708

msgid ""

2700

2709

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

2701

2710

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

2704

2713

"выгружаются в основную ветвь до тех пор, пока не совершено нормальное "

2705

2714

"закрепление."

2706

2715

2707

#: bzrlib/builtins.py:3504

2716

#: bzrlib/builtins.py:3533

2708

2717

msgid ""

2709

2718

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

2710

2719

"the message editor."

2712

2721

"Если не указано сообщение, показывать изменения формате diff вместе с "

2713

2722

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

2714

2723

2715

#: bzrlib/builtins.py:3507

2724

#: bzrlib/builtins.py:3536

2716

2725

msgid ""

2717

2726

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

2718

2727

"can not be natively represented."

2720

2729

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

2721

2730

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

2722

2731

2723

#: bzrlib/builtins.py:3525

2732

#: bzrlib/builtins.py:3554

2724

2733

#, python-format

2725

2734

msgid ""

2726

2735

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

2732

2741

"Больше информации об этом можно узнать, выполнив «bzr help bugs». "

2733

2742

"Закрепление отклонено."

2734

2743

2735

#: bzrlib/builtins.py:3534

2744

#: bzrlib/builtins.py:3563

2736

2745

#, python-format

2737

2746

msgid ""

2738

2747

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

2743

2752

"информации об этом можно узнать, выполнив «bzr help bugs».\n"

2744

2753

"Закрепление отклонено."

2745

2754

2746

#: bzrlib/builtins.py:3543

2755

#: bzrlib/builtins.py:3572

2747

2756

#, python-format

2748

2757

msgid "Unrecognized bug %s. Commit refused."

2749

2758

msgstr "Ошибка %s не распознана. Закрепление отклонено."

2750

2759

2751

#: bzrlib/builtins.py:3546

2760

#: bzrlib/builtins.py:3575

2752

2761

#, python-format

2753

2762

msgid ""

2754

2763

"%s\n"

2757

2766

"%s\n"

2758

2767

"Закрепление отклонено."

2759

2768

2760

#: bzrlib/builtins.py:3570

2769

#: bzrlib/builtins.py:3599

2761

2770

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

2762

2771

msgstr "Не удалось разобрать --commit-time: "

2763

2772

2764

#: bzrlib/builtins.py:3610

2773

#: bzrlib/builtins.py:3639

2765

2774

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

2766

2775

msgstr "укажите либо --message, либо --file"

2767

2776

2768

#: bzrlib/builtins.py:3639

2777

#: bzrlib/builtins.py:3668

2769

2778

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

2770

2779

msgstr "укажите сообщение о закреплении, используя --message либо --file"

2771

2780

2772

#: bzrlib/builtins.py:3642

2781

#: bzrlib/builtins.py:3671

2773

2782

msgid ""

2774

2783

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

2775

2784

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

2777

2786

"Указано пустое сообщение о закреплении. Пожалуйста, укажите сообщение опцией "

2778

2787

"--message либо --file или оставьте пустым, указав --message \"\"."

2779

2788

2780

#: bzrlib/builtins.py:3662

2789

#: bzrlib/builtins.py:3691

2781

2790

msgid ""

2782

2791

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

2783

2792

"-unchanged to force an empty commit."

2786

2795

"командой 'bzr add', или используйте --unchanged, чтобы принудительно сделать "

2787

2796

"пустое закрепление."

2788

2797

2789

#: bzrlib/builtins.py:3666

2798

#: bzrlib/builtins.py:3695

2790

2799

msgid ""

2791

2800

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

2792

2801

"resolve FILE\" to resolve."

2794

2803

"В рабочем дереве обнаружены конфликты. Выполните «bzr conflicts», чтобы "

2795

2804

"вывести список конфликтов и «bzr resolve ФАЙЛ» для исправления."

2796

2805

2797

#: bzrlib/builtins.py:3670

2806

#: bzrlib/builtins.py:3699

2798

2807

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

2799

2808

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

2800

2809

2801

#: bzrlib/builtins.py:3673

2810

#: bzrlib/builtins.py:3702

2802

2811

msgid ""

2803

2812

"\n"

2804

2813

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

2805

2814

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

2806

2815

msgstr ""

2807

2816

2808

#: bzrlib/builtins.py:3681

2817

#: bzrlib/builtins.py:3710

2809

2818

msgid ""

2810

2819

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

2811

2820

msgstr ""

2812

2821

2813

#: bzrlib/builtins.py:3683

2822

#: bzrlib/builtins.py:3712

2814

2823

msgid ""

2815

2824

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

2816

2825

"to detect data corruption or bzr bugs."

2817

2826

msgstr ""

2818

2827

2819

#: bzrlib/builtins.py:3686

2828

#: bzrlib/builtins.py:3715

2820

2829

msgid ""

2821

2830

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

2822

2831

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

2824

2833

"Проверки рабочего дерева и ветви выведут что-либо только в случае\n"

2825

2834

"обнаружения проблемы. Поля вывода проверки репозитория следующие:"

2826

2835

2827

#: bzrlib/builtins.py:3689

2836

#: bzrlib/builtins.py:3718

2828

2837

msgid ""

2829

2838

"revisions\n"

2830

2839

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

2834

2843

" Это просто число проверенных ревизий. Оно не указывает\n"

2835

2844

" на проблему."

2836

2845

2837

#: bzrlib/builtins.py:3693

2846

#: bzrlib/builtins.py:3722

2838

2847

msgid ""

2839

2848

"versionedfiles\n"

2840

2849

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

2844

2853

" Это просто число проверенных файлов под контролем системы\n"

2845

2854

" версий. Оно не указывает на проблему."

2846

2855

2847

#: bzrlib/builtins.py:3697

2856

#: bzrlib/builtins.py:3726

2848

2857

msgid ""

2849

2858

"unreferenced ancestors\n"

2850

2859

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

2856

2865

" корректных ссылок в истории ревизии. Это небольшая\n"

2857

2866

" проблема, с которой Bazaar может разобраться."

2858

2867

2859

#: bzrlib/builtins.py:3702

2868

#: bzrlib/builtins.py:3731

2860

2869

msgid ""

2861

2870

"unique file texts\n"

2862

2871

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

2866

2875

" Это общее число уникального содержимого файлов, встреченного\n"

2867

2876

" в проверенных ревизиях. Оно не указывает на проблему."

2868

2877

2869

#: bzrlib/builtins.py:3706

2878

#: bzrlib/builtins.py:3735

2870

2879

msgid ""

2871

2880

"repeated file texts\n"

2872

2881

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

2880

2889

" файлов изменились, но их содержимое осталось прежним. Оно не\n"

2881

2890

" указывает на проблему."

2882

2891

2883

#: bzrlib/builtins.py:3712

2892

#: bzrlib/builtins.py:3741

2884

2893

msgid ""

2885

2894

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

2886

2895

"given\n"

2887

2896

"location will be checked."

2888

2897

msgstr ""

2889

2898

2890

#: bzrlib/builtins.py:3717

2899

#: bzrlib/builtins.py:3746

2891

2900

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

2892

2901

msgstr " Проверить рабочее дерево и ветвь в 'foo'::"

2893

2902

2894

#: bzrlib/builtins.py:3719

2903

#: bzrlib/builtins.py:3748

2895

2904

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

2896

2905

msgstr " bzr check --tree --branch foo"

2897

2906

2898

#: bzrlib/builtins.py:3721

2907

#: bzrlib/builtins.py:3750

2899

2908

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

2900

2909

msgstr " Проверить только репозиторий в 'bar'::"

2901

2910

2902

#: bzrlib/builtins.py:3723

2911

#: bzrlib/builtins.py:3752

2903

2912

msgid " bzr check --repo bar"

2904

2913

msgstr " bzr check --repo bar"

2905

2914

2906

#: bzrlib/builtins.py:3725

2915

#: bzrlib/builtins.py:3754

2907

2916

msgid " Check everything at 'baz'::"

2908

2917

msgstr " Проверить всё в 'baz'::"

2909

2918

2910

#: bzrlib/builtins.py:3727

2919

#: bzrlib/builtins.py:3756

2911

2920

msgid " bzr check baz"

2912

2921

msgstr " bzr check baz"

2913

2922

2914

#: bzrlib/builtins.py:3733

2923

#: bzrlib/builtins.py:3762

2915

2924

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

2916

2925

msgstr "Проверить ветвь, относящуюся к текущей директории."

2917

2926

2918

#: bzrlib/builtins.py:3735

2927

#: bzrlib/builtins.py:3764

2919

2928

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

2920

2929

msgstr "Проверить репозиторий, относящийся к текущей директории."

2921

2930

2922

#: bzrlib/builtins.py:3737

2931

#: bzrlib/builtins.py:3766

2923

2932

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

2924

2933

msgstr "Проверить рабочее дерево, относящееся к текущей директории."

2925

2934

2926

#: bzrlib/builtins.py:3751

2935

#: bzrlib/builtins.py:3780

2927

2936

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

2928

2937

msgstr "Обновить репозиторий, ветвь или рабочее дерево до нового формата."

2929

2938

2930

#: bzrlib/builtins.py:3753

2939

#: bzrlib/builtins.py:3782

2931

2940

msgid ""

2932

2941

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

2933

2942

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

2936

2945

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

2937

2946

msgstr ""

2938

2947

2939

#: bzrlib/builtins.py:3759

2948

#: bzrlib/builtins.py:3788

2940

2949

msgid ""

2941

2950

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

2942

2951

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

2946

2955

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

2947

2956

msgstr ""

2948

2957

2949

#: bzrlib/builtins.py:3766

2958

#: bzrlib/builtins.py:3795

2950

2959

msgid ""

2951

2960

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

2952

2961

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

2957

2966

"afterwards."

2958

2967

msgstr ""

2959

2968

2960

#: bzrlib/builtins.py:3774

2969

#: bzrlib/builtins.py:3803

2961

2970

msgid ""

2962

2971

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

2963

2972

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

2965

2974

"tried."

2966

2975

msgstr ""

2967

2976

2968

#: bzrlib/builtins.py:3779

2977

#: bzrlib/builtins.py:3808

2969

2978

msgid ""

2970

2979

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

2971

2980

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

2972

2981

msgstr ""

2973

2982

2974

#: bzrlib/builtins.py:3787

2983

#: bzrlib/builtins.py:3816

2975

2984

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

2976

2985

msgstr ""

2977

2986

"Обновить до определённого формата. Подробности см. в «bzr help formats»."

2978

2987

2979

#: bzrlib/builtins.py:3791

2988

#: bzrlib/builtins.py:3820

2980

2989

msgid "Branch format"

2981

2990

msgstr "Формат ветви"

2982

2991

2983

#: bzrlib/builtins.py:3793

2992

#: bzrlib/builtins.py:3822

2984

2993

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

2985

2994

msgstr "Удалить директорию backup.bzr при успешном завершении."

2986

2995

2987

#: bzrlib/builtins.py:3795

2996

#: bzrlib/builtins.py:3824

2988

2997

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

2989

2998

msgstr ""

2990

2999

2991

#: bzrlib/builtins.py:3810

3000

#: bzrlib/builtins.py:3839

2992

3001

msgid "Show or set bzr user id."

2993

3002

msgstr ""

2994

3003

2995

#: bzrlib/builtins.py:3812

3004

#: bzrlib/builtins.py:3841

2996

3005

msgid ""

2997

3006

":Examples:\n"

2998

3007

" Show the email of the current user::"

3000

3009

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

3001

3010

" Показать email текущего пользователя::"

3002

3011

3003

#: bzrlib/builtins.py:3815

3012

#: bzrlib/builtins.py:3844

3004

3013

msgid " bzr whoami --email"

3005

3014

msgstr " bzr whoami --email"

3006

3015

3007

#: bzrlib/builtins.py:3817

3016

#: bzrlib/builtins.py:3846

3008

3017

msgid " Set the current user::"

3009

3018

msgstr " Установить текущего пользователя::"

3010

3019

3011

#: bzrlib/builtins.py:3819

3020

#: bzrlib/builtins.py:3848

3012

3021

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

3013

3022

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

3014

3023

3015

#: bzrlib/builtins.py:3823

3024

#: bzrlib/builtins.py:3852

3016

3025

msgid "Display email address only."

3017

3026

msgstr "Показать только адрес email."

3018

3027

3019

#: bzrlib/builtins.py:3825

3028

#: bzrlib/builtins.py:3854

3020

3029

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

3021

3030

msgstr ""

3022

3031

3023

#: bzrlib/builtins.py:3851

3032

#: bzrlib/builtins.py:3880

3024

3033

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

3025

3034

msgstr ""

3026

3035

3027

#: bzrlib/builtins.py:3873

3036

#: bzrlib/builtins.py:3904

3028

3037

msgid "Print or set the branch nickname."

3029

3038

msgstr "Вывести или установить имя ветви."

3030

3039

3031

#: bzrlib/builtins.py:3875

3040

#: bzrlib/builtins.py:3906

3032

3041

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

3042

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

3043

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

3044

"current nickname, execute with no argument."

3035

3045

msgstr ""

3036

3046

3037

#: bzrlib/builtins.py:3878

3047

#: bzrlib/builtins.py:3910

3038

3048

msgid ""

3039

3049

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

3040

3050

"locally."

3041

3051

msgstr ""

3042

3052

3043

#: bzrlib/builtins.py:3898

3053

#: bzrlib/builtins.py:3930

3044

3054

msgid "Set/unset and display aliases."

3045

3055

msgstr "Установить, удалить или отобразить псевдонимы."

3046

3056

3047

#: bzrlib/builtins.py:3900

3057

#: bzrlib/builtins.py:3932

3048

3058

msgid ""

3049

3059

":Examples:\n"

3050

3060

" Show the current aliases::"

3052

3062

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

3053

3063

" Показать текущие псевдонимы::"

3054

3064

3055

#: bzrlib/builtins.py:3903

3065

#: bzrlib/builtins.py:3935

3056

3066

msgid " bzr alias"

3057

3067

msgstr " bzr alias"

3058

3068

3059

#: bzrlib/builtins.py:3905

3069

#: bzrlib/builtins.py:3937

3060

3070

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

3061

3071

msgstr " Показать псевдоним для 'll'::"

3062

3072

3063

#: bzrlib/builtins.py:3907

3073

#: bzrlib/builtins.py:3939

3064

3074

msgid " bzr alias ll"

3065

3075

msgstr " bzr alias ll"

3066

3076

3067

#: bzrlib/builtins.py:3909

3077

#: bzrlib/builtins.py:3941

3068

3078

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

3069

3079

msgstr " Установить псевдоним для 'll'::"

3070

3080

3071

#: bzrlib/builtins.py:3911

3081

#: bzrlib/builtins.py:3943

3072

3082

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

3073

3083

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

3074

3084

3075

#: bzrlib/builtins.py:3913

3085

#: bzrlib/builtins.py:3945

3076

3086

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

3077

3087

msgstr " Удалить псевдоним для 'll'::"

3078

3088

3079

#: bzrlib/builtins.py:3915

3089

#: bzrlib/builtins.py:3947

3080

3090

msgid " bzr alias --remove ll"

3081

3091

msgstr " bzr alias --remove ll"

3082

3092

3083

#: bzrlib/builtins.py:3920

3093

#: bzrlib/builtins.py:3952

3084

3094

msgid "Remove the alias."

3085

3095

msgstr "Удалить псевдоним."

3086

3096

3087

#: bzrlib/builtins.py:3938

3097

#: bzrlib/builtins.py:3970

3088

3098

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

3089

3099

msgstr "bzr alias --remove требуется псевдоним для удаления."

3090

3100

3091

#: bzrlib/builtins.py:4119

3101

#: bzrlib/builtins.py:4151

3092

3102

msgid ""

3093

3103

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

3094

3104

msgstr ""

3095

3105

"subunit не доступен. Нужно установить subunit, чтобы использовать --subunit."

3096

3106

3097

#: bzrlib/builtins.py:4136

3107

#: bzrlib/builtins.py:4168

3098

3108

msgid ""

3099

3109

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

3100

3110

msgstr ""

3101

3111

"--benchmark не поддерживается начиная с версии bzr 2.2; вместо этого "

3102

3112

"используйте bzr-usertest"

3103

3113

3104

#: bzrlib/builtins.py:4183

3114

#: bzrlib/builtins.py:4215

3105

3115

msgid "Show version of bzr."

3106

3116

msgstr "Вывести версию bzr."

3107

3117

3108

#: bzrlib/builtins.py:4187

3118

#: bzrlib/builtins.py:4219

3109

3119

msgid "Print just the version number."

3110

3120

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

3111

3121

3112

#: bzrlib/builtins.py:4206

3122

#: bzrlib/builtins.py:4238

3113

3123

msgid "It sure does!\n"

3114

3124

msgstr "Да, он крут!\n"

3115

3125

3116

#: bzrlib/builtins.py:4230

3126

#: bzrlib/builtins.py:4262

3117

3127

#, python-format

3118

3128

msgid "merge base is revision %s\n"

3119

3129

msgstr ""

3120

3130

3121

#: bzrlib/builtins.py:4234

3131

#: bzrlib/builtins.py:4266

3122

3132

msgid "Perform a three-way merge."

3123

3133

msgstr ""

3124

3134

3125

#: bzrlib/builtins.py:4236

3135

#: bzrlib/builtins.py:4268

3126

3136

msgid ""

3127

3137

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

3128

3138

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

3133

3143

"the current working tree."

3134

3144

msgstr ""

3135

3145

3136

#: bzrlib/builtins.py:4244

3146

#: bzrlib/builtins.py:4276

3137

3147

msgid ""

3138

3148

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

3139

3149

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

3140

3150

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

3141

3151

msgstr ""

3142

3152

3143

#: bzrlib/builtins.py:4248

3153

#: bzrlib/builtins.py:4280

3144

3154

msgid ""

3145

3155

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

3146

3156

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

3147

3157

msgstr ""

3148

3158

3149

#: bzrlib/builtins.py:4251

3159

#: bzrlib/builtins.py:4283

3150

3160

msgid ""

3151

3161

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

3152

3162

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

3157

3167

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

3158

3168

msgstr ""

3159

3169

3160

#: bzrlib/builtins.py:4259

3170

#: bzrlib/builtins.py:4291

3161

3171

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

3162

3172

msgstr ""

3163

3173

3164

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

3174

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

3165

3175

msgid ""

3166

3176

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

3167

3177

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

3169

3179

"before you can commit."

3170

3180

msgstr ""

3171

3181

3172

#: bzrlib/builtins.py:4266

3182

#: bzrlib/builtins.py:4298

3173

3183

msgid ""

3174

3184

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

3175

3185

msgstr ""

3176

3186

3177

#: bzrlib/builtins.py:4268

3187

#: bzrlib/builtins.py:4300

3178

3188

msgid ""

3179

3189

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

3180

3190

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

3182

3192

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

3183

3193

msgstr ""

3184

3194

3185

#: bzrlib/builtins.py:4273

3195

#: bzrlib/builtins.py:4305

3186

3196

msgid ""

3187

3197

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

3188

3198

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

3189

3199

"committed to record the result of the merge."

3190

3200

msgstr ""

3191

3201

3192

#: bzrlib/builtins.py:4277

3202

#: bzrlib/builtins.py:4309

3193

3203

msgid ""

3194

3204

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

3195

3205

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

3198

3208

"merge revision which has more than two parents."

3199

3209

msgstr ""

3200

3210

3201

#: bzrlib/builtins.py:4283

3211

#: bzrlib/builtins.py:4315

3202

3212

msgid ""

3203

3213

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

3204

3214

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

3205

3215

"can be given."

3206

3216

msgstr ""

3207

3217

3208

#: bzrlib/builtins.py:4287

3218

#: bzrlib/builtins.py:4319

3209

3219

msgid ""

3210

3220

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

3211

3221

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

3212

3222

msgstr ""

3213

3223

3214

#: bzrlib/builtins.py:4290

3224

#: bzrlib/builtins.py:4322

3215

3225

msgid ""

3216

3226

":Examples:\n"

3217

3227

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

3218

3228

msgstr ""

3219

3229

3220

#: bzrlib/builtins.py:4293

3230

#: bzrlib/builtins.py:4325

3221

3231

msgid " bzr merge ../bzr.dev"

3222

3232

msgstr ""

3223

3233

3224

#: bzrlib/builtins.py:4295

3234

#: bzrlib/builtins.py:4327

3225

3235

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

3226

3236

msgstr ""

3227

3237

3228

#: bzrlib/builtins.py:4297

3238

#: bzrlib/builtins.py:4329

3229

3239

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

3230

3240

msgstr ""

3231

3241

3232

#: bzrlib/builtins.py:4299

3242

#: bzrlib/builtins.py:4331

3233

3243

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

3234

3244

msgstr ""

3235

3245

3236

#: bzrlib/builtins.py:4301

3246

#: bzrlib/builtins.py:4333

3237

3247

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

3238

3248

msgstr ""

3239

3249

3240

#: bzrlib/builtins.py:4303

3250

#: bzrlib/builtins.py:4335

3241

3251

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

3242

3252

msgstr ""

3243

3253

3244

#: bzrlib/builtins.py:4305

3254

#: bzrlib/builtins.py:4337

3245

3255

msgid " bzr merge /tmp/merge"

3246

3256

msgstr ""

3247

3257

3248

#: bzrlib/builtins.py:4307

3258

#: bzrlib/builtins.py:4339

3249

3259

msgid ""

3250

3260

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

3251

3261

" feature1a and feature1b:"

3252

3262

msgstr ""

3253

3263

3254

#: bzrlib/builtins.py:4310

3264

#: bzrlib/builtins.py:4342

3255

3265

msgid ""

3256

3266

" bzr merge ../feature1a\n"

3257

3267

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

3258

3268

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

3259

3269

msgstr ""

3260

3270

3261

#: bzrlib/builtins.py:4322

3271

#: bzrlib/builtins.py:4354

3262

3272

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

3263

3273

msgstr ""

3264

3274

3265

#: bzrlib/builtins.py:4328

3275

#: bzrlib/builtins.py:4360

3266

3276

msgid ""

3267

3277

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

3268

3278

msgstr ""

3269

3279

3270

#: bzrlib/builtins.py:4330

3280

#: bzrlib/builtins.py:4362

3271

3281

msgid ""

3272

3282

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

3273

3283

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

3274

3284

"commit the result."

3275

3285

msgstr ""

3276

3286

3277

#: bzrlib/builtins.py:4335

3287

#: bzrlib/builtins.py:4367

3278

3288

msgid ""

3279

3289

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

3280

3290

msgstr ""

3281

3291

3282

#: bzrlib/builtins.py:4337

3292

#: bzrlib/builtins.py:4369

3283

3293

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

3284

3294

msgstr ""

3285

3295

3286

#: bzrlib/builtins.py:4339

3296

#: bzrlib/builtins.py:4371

3287

3297

msgid "Select changes interactively."

3288

3298

msgstr ""

3289

3299

3290

#: bzrlib/builtins.py:4361

3300

#: bzrlib/builtins.py:4393

3291

3301

msgid ""

3292

3302

"Merging into empty branches not currently supported, "

3293

3303

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

3294

3304

msgstr ""

3295

3305

3296

#: bzrlib/builtins.py:4388

3306

#: bzrlib/builtins.py:4420

3297

3307

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

3298

3308

msgstr ""

3299

3309

3300

#: bzrlib/builtins.py:4399

3310

#: bzrlib/builtins.py:4431

3301

3311

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

3302

3312

msgstr ""

3303

3313

3304

#: bzrlib/builtins.py:4419

3314

#: bzrlib/builtins.py:4451

3305

3315

msgid "merger: "

3306

3316

msgstr ""

3307

3317

3308

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

3318

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

3309

3319

msgid "Nothing to do."

3310

3320

msgstr ""

3311

3321

3312

#: bzrlib/builtins.py:4425

3322

#: bzrlib/builtins.py:4457

3313

3323

msgid "Cannot pull individual files"

3314

3324

msgstr ""

3315

3325

3316

#: bzrlib/builtins.py:4433

3326

#: bzrlib/builtins.py:4465

3317

3327

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

3318

3328

msgstr ""

3319

3329

3320

#: bzrlib/builtins.py:4491

3330

#: bzrlib/builtins.py:4523

3321

3331

#, python-format

3322

3332

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

3323

3333

msgstr ""

3324

3334

3325

#: bzrlib/builtins.py:4500

3335

#: bzrlib/builtins.py:4532

3326

3336

#, python-format

3327

3337

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

3328

3338

msgstr ""

3329

3339

3330

#: bzrlib/builtins.py:4504

3340

#: bzrlib/builtins.py:4536

3331

3341

msgid "Cannot do conflict reduction and show base."

3332

3342

msgstr ""

3333

3343

3334

#: bzrlib/builtins.py:4615

3344

#: bzrlib/builtins.py:4647

3335

3345

msgid "No location specified or remembered"

3336

3346

msgstr ""

3337

3347

3338

#: bzrlib/builtins.py:4617

3348

#: bzrlib/builtins.py:4649

3339

3349

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

3340

3350

msgstr ""

3341

3351

3342

#: bzrlib/builtins.py:4623

3352

#: bzrlib/builtins.py:4655

3343

3353

msgid "Redo a merge."

3344

3354

msgstr ""

3345

3355

3346

#: bzrlib/builtins.py:4625

3356

#: bzrlib/builtins.py:4657

3347

3357

msgid ""

3348

3358

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

3349

3359

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

3350

3360

"lets you try different ones on different files."

3351

3361

msgstr ""

3352

3362

3353

#: bzrlib/builtins.py:4629

3363

#: bzrlib/builtins.py:4661

3354

3364

msgid ""

3355

3365

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

3356

3366

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

3357

3367

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

3358

3368

msgstr ""

3359

3369

3360

#: bzrlib/builtins.py:4633

3370

#: bzrlib/builtins.py:4665

3361

3371

msgid ""

3362

3372

":Examples:\n"

3363

3373

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

3364

3374

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

3365

3375

msgstr ""

3366

3376

3367

#: bzrlib/builtins.py:4637

3377

#: bzrlib/builtins.py:4669

3368

3378

msgid " bzr remerge --show-base"

3369

3379

msgstr ""

3370

3380

3371

#: bzrlib/builtins.py:4639

3381

#: bzrlib/builtins.py:4671

3372

3382

msgid ""

3373

3383

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

3374

3384

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

3375

3385

msgstr ""

3376

3386

3377

#: bzrlib/builtins.py:4642

3387

#: bzrlib/builtins.py:4674

3378

3388

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

3379

3389

msgstr ""

3380

3390

3381

#: bzrlib/builtins.py:4649

3391

#: bzrlib/builtins.py:4681

3382

3392

msgid "Show base revision text in conflicts."

3383

3393

msgstr ""

3384

3394

3385

#: bzrlib/builtins.py:4661

3395

#: bzrlib/builtins.py:4693

3386

3396

msgid ""

3387

3397

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

3388

3398

"merges."

3389

3399

msgstr ""

3390

3400

3391

#: bzrlib/builtins.py:4717

3392

msgid "Revert files to a previous revision."

3401

#: bzrlib/builtins.py:4751

3402

msgid ""

3403

"Set files in the working tree back to the contents of a previous revision."

3393

3404

msgstr ""

3394

3405

3395

#: bzrlib/builtins.py:4719

3406

#: bzrlib/builtins.py:4753

3396

3407

msgid ""

3397

3408

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

3398

3409

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

3399

"last committed revision is used."

3410

"working tree basis revision is used. A revert operation affects only the\n"

3411

"working tree, not any revision history like the branch and repository or\n"

3412

"the working tree basis revision."

3400

3413

msgstr ""

3401

3414

3402

#: bzrlib/builtins.py:4723

3415

#: bzrlib/builtins.py:4759

3403

3416

msgid ""

3404

3417

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

3405

3418

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

3406

3419

"will remove the changes introduced by the second last commit (-2), without\n"

3407

3420

"affecting the changes introduced by the last commit (-1). To remove\n"

3408

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

3421

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

3422

"To update the branch to a specific revision or the latest revision and\n"

3423

"update the working tree accordingly while preserving local changes, see the\n"

3424

"update command."

3409

3425

msgstr ""

3410

3426

3411

#: bzrlib/builtins.py:4729

3427

#: bzrlib/builtins.py:4768

3412

3428

msgid ""

3413

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

3414

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

3415

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

3429

"Uncommitted changes to files that are reverted will be discarded.\n"

3430

"Howver, by default, any files that have been manually changed will be\n"

3431

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

3432

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

3416

3433

msgstr ""

3417

3434

3418

#: bzrlib/builtins.py:4733

3435

#: bzrlib/builtins.py:4773

3419

3436

msgid ""

3420

3437

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

3421

3438

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

3423

3440

"reverted."

3424

3441

msgstr ""

3425

3442

3426

#: bzrlib/builtins.py:4738

3443

#: bzrlib/builtins.py:4778

3427

3444

msgid ""

3428

3445

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

3429

3446

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

3431

3448

"deleted."

3432

3449

msgstr ""

3433

3450

3434

#: bzrlib/builtins.py:4743

3451

#: bzrlib/builtins.py:4783

3435

3452

msgid ""

3436

3453

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

3437

3454

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

3443

3460

"reverting any files."

3444

3461

msgstr ""

3445

3462

3446

#: bzrlib/builtins.py:4752

3463

#: bzrlib/builtins.py:4792

3447

3464

msgid ""

3448

3465

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

3449

3466

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

3457

3474

"target branches."

3458

3475

msgstr ""

3459

3476

3460

#: bzrlib/builtins.py:4766

3477

#: bzrlib/builtins.py:4806

3461

3478

msgid "Do not save backups of reverted files."

3462

3479

msgstr ""

3463

3480

3464

#: bzrlib/builtins.py:4768

3481

#: bzrlib/builtins.py:4808

3465

3482

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

3466

3483

msgstr ""

3467

3484

3468

#: bzrlib/builtins.py:4799

3485

#: bzrlib/builtins.py:4839

3469

3486

msgid ""

3470

3487

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

3471

3488

" "

3472

3489

msgstr ""

3473

3490

3474

#: bzrlib/builtins.py:4804

3491

#: bzrlib/builtins.py:4844

3475

3492

msgid "Show help on all commands."

3476

3493

msgstr ""

3477

3494

3478

#: bzrlib/builtins.py:4833

3495

#: bzrlib/builtins.py:4873

3479

3496

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

3480

3497

msgstr ""

3481

3498

3482

#: bzrlib/builtins.py:4835

3499

#: bzrlib/builtins.py:4875

3483

3500

msgid "OTHER_BRANCH may be local or remote."

3484

3501

msgstr ""

3485

3502

3486

#: bzrlib/builtins.py:4837

3503

#: bzrlib/builtins.py:4877

3487

3504

msgid ""

3488

3505

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

3489

3506

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

3494

3511

" 0 - no missing revisions"

3495

3512

msgstr ""

3496

3513

3497

#: bzrlib/builtins.py:4847

3514

#: bzrlib/builtins.py:4887

3498

3515

msgid ""

3499

3516

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

3500

3517

" remembered pull location::"

3501

3518

msgstr ""

3502

3519

3503

#: bzrlib/builtins.py:4850

3520

#: bzrlib/builtins.py:4890

3504

3521

msgid " bzr missing"

3505

3522

msgstr ""

3506

3523

3507

#: bzrlib/builtins.py:4852

3524

#: bzrlib/builtins.py:4892

3508

3525

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

3509

3526

msgstr ""

3510

3527

3511

#: bzrlib/builtins.py:4854

3528

#: bzrlib/builtins.py:4894

3512

3529

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

3513

3530

msgstr ""

3514

3531

3515

#: bzrlib/builtins.py:4856

3532

#: bzrlib/builtins.py:4896

3516

3533

msgid ""

3517

3534

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

3518

3535

" branch::"

3519

3536

msgstr ""

3520

3537

3521

#: bzrlib/builtins.py:4859

3538

#: bzrlib/builtins.py:4899

3522

3539

msgid " bzr missing -r ..-10"

3523

3540

msgstr ""

3524

3541

3525

#: bzrlib/builtins.py:4861

3542

#: bzrlib/builtins.py:4901

3526

3543

msgid ""

3527

3544

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

3528

3545

" branch::"

3529

3546

msgstr ""

3530

3547

3531

#: bzrlib/builtins.py:4864

3548

#: bzrlib/builtins.py:4904

3532

3549

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

3533

3550

msgstr ""

3534

3551

3535

#: bzrlib/builtins.py:4871

3552

#: bzrlib/builtins.py:4911

3536

3553

msgid "Reverse the order of revisions."

3537

3554

msgstr ""

3538

3555

3539

#: bzrlib/builtins.py:4873

3556

#: bzrlib/builtins.py:4913

3540

3557

msgid "Display changes in the local branch only."

3541

3558

msgstr ""

3542

3559

3543

#: bzrlib/builtins.py:4874

3560

#: bzrlib/builtins.py:4914

3544

3561

msgid "Same as --mine-only."

3545

3562

msgstr ""

3546

3563

3547

#: bzrlib/builtins.py:4876

3564

#: bzrlib/builtins.py:4916

3548

3565

msgid "Display changes in the remote branch only."

3549

3566

msgstr ""

3550

3567

3551

#: bzrlib/builtins.py:4877

3568

#: bzrlib/builtins.py:4917

3552

3569

msgid "Same as --theirs-only."

3553

3570

msgstr ""

3554

3571

3555

#: bzrlib/builtins.py:4882

3572

#: bzrlib/builtins.py:4922

3556

3573

msgid ""

3557

3574

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

3558

3575

"details."

3559

3576

msgstr ""

3560

3577

3561

#: bzrlib/builtins.py:4886

3578

#: bzrlib/builtins.py:4926

3562

3579

msgid ""

3563

3580

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

3564

3581

"details."

3565

3582

msgstr ""

3566

3583

3567

#: bzrlib/builtins.py:4889

3584

#: bzrlib/builtins.py:4929

3568

3585

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

3569

3586

msgstr ""

3570

3587

3571

#: bzrlib/builtins.py:4943

3588

#: bzrlib/builtins.py:4983

3572

3589

msgid "No peer location known or specified."

3573

3590

msgstr ""

3574

3591

3575

#: bzrlib/builtins.py:4947

3592

#: bzrlib/builtins.py:4987

3576

3593

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

3577

3594

msgstr ""

3578

3595

3579

#: bzrlib/builtins.py:4980

3596

#: bzrlib/builtins.py:5020

3580

3597

#, python-format

3581

3598

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

3582

3599

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

3583

3600

msgstr[0] ""

3584

3601

msgstr[1] ""

3585

3602

3586

#: bzrlib/builtins.py:4996

3603

#: bzrlib/builtins.py:5040

3587

3604

#, python-format

3588

3605

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

3589

3606

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

3590

3607

msgstr[0] ""

3591

3608

msgstr[1] ""

3592

3609

3593

#: bzrlib/builtins.py:5008

3610

#: bzrlib/builtins.py:5055

3594

3611

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

3595

3612

msgstr ""

3596

3613

3597

#: bzrlib/builtins.py:5011

3614

#: bzrlib/builtins.py:5058

3598

3615

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

3599

3616

msgstr ""

3600

3617

3601

#: bzrlib/builtins.py:5016

3618

#: bzrlib/builtins.py:5063

3602

3619

msgid "Branches are up to date.\n"

3603

3620

msgstr ""

3604

3621

3605

#: bzrlib/builtins.py:5027

3622

#: bzrlib/builtins.py:5074

3606

3623

msgid "Compress the data within a repository."

3607

3624

msgstr ""

3608

3625

3609

#: bzrlib/builtins.py:5029

3626

#: bzrlib/builtins.py:5076

3610

3627

msgid ""

3611

3628

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

3612

3629

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

3613

3630

"normally not required to be done manually."

3614

3631

msgstr ""

3615

3632

3616

#: bzrlib/builtins.py:5033

3633

#: bzrlib/builtins.py:5080

3617

3634

msgid ""

3618

3635

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

3619

3636

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

3622

3639

"used."

3623

3640

msgstr ""

3624

3641

3625

#: bzrlib/builtins.py:5039

3642

#: bzrlib/builtins.py:5086

3626

3643

msgid ""

3627

3644

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

3628

3645

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

3630

3647

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

3631

3648

msgstr ""

3632

3649

3633

#: bzrlib/builtins.py:5048

3650

#: bzrlib/builtins.py:5095

3634

3651

msgid "Delete obsolete packs to save disk space."

3635

3652

msgstr ""

3636

3653

3637

#: bzrlib/builtins.py:5062

3654

#: bzrlib/builtins.py:5109

3638

3655

msgid "List the installed plugins."

3639

3656

msgstr ""

3640

3657

3641

#: bzrlib/builtins.py:5064

3658

#: bzrlib/builtins.py:5111

3642

3659

msgid ""

3643

3660

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

3644

3661

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

3645

3662

msgstr ""

3646

3663

3647

#: bzrlib/builtins.py:5067

3664

#: bzrlib/builtins.py:5114

3648

3665

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

3649

3666

msgstr ""

3650

3667

3651

#: bzrlib/builtins.py:5069

3668

#: bzrlib/builtins.py:5116

3652

3669

msgid ""

3653

3670

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

3654

3671

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

3657

3674

"customizing log output."

3658

3675

msgstr ""

3659

3676

3660

#: bzrlib/builtins.py:5075

3677

#: bzrlib/builtins.py:5122

3661

3678

msgid ""

3662

3679

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

3663

3680

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

3665

3682

"plugins using the Python programming language."

3666

3683

msgstr ""

3667

3684

3668

#: bzrlib/builtins.py:5091

3685

#: bzrlib/builtins.py:5138

3669

3686

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

3670

3687

msgstr ""

3671

3688

3672

#: bzrlib/builtins.py:5094

3689

#: bzrlib/builtins.py:5141

3673

3690

msgid "Produce long-format testament."

3674

3691

msgstr ""

3675

3692

3676

#: bzrlib/builtins.py:5096

3693

#: bzrlib/builtins.py:5143

3677

3694

msgid "Produce a strict-format testament."

3678

3695

msgstr ""

3679

3696

3680

#: bzrlib/builtins.py:5122

3697

#: bzrlib/builtins.py:5169

3681

3698

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

3682

3699

msgstr ""

3683

3700

3684

#: bzrlib/builtins.py:5124

3701

#: bzrlib/builtins.py:5171

3685

3702

msgid ""

3686

3703

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

3687

3704

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

3688

3705

msgstr ""

3689

3706

3690

#: bzrlib/builtins.py:5127

3707

#: bzrlib/builtins.py:5174

3691

3708

msgid ""

3692

3709

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

3693

3710

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

3694

3711

msgstr ""

3695

3712

3696

#: bzrlib/builtins.py:5135

3713

#: bzrlib/builtins.py:5182

3697

3714

msgid "Show annotations on all lines."

3698

3715

msgstr ""

3699

3716

3700

#: bzrlib/builtins.py:5136

3717

#: bzrlib/builtins.py:5183

3701

3718

msgid "Show commit date in annotations."

3702

3719

msgstr ""

3703

3720

3704

#: bzrlib/builtins.py:5223

3721

#: bzrlib/builtins.py:5270

3705

3722

msgid "Cannot sign a range of non-revision-history revisions"

3706

3723

msgstr ""

3707

3724

3708

#: bzrlib/builtins.py:5235

3725

#: bzrlib/builtins.py:5282

3709

3726

msgid "Please supply either one revision, or a range."

3710

3727

msgstr ""

3711

3728

3712

#: bzrlib/builtins.py:5239

3729

#: bzrlib/builtins.py:5286

3713

3730

msgid ""

3714

3731

"Convert the current branch into a checkout of the supplied branch.\n"

3715

3732

"If no branch is supplied, rebind to the last bound location."

3717

3734

"Преобразовать текущую ветвь в рабочую копию указанной ветви.\n"

3718

3735

"Если ветвь не указаны, перепривязать последнее расположение привязки."

3719

3736

3720

#: bzrlib/builtins.py:5242

3737

#: bzrlib/builtins.py:5289

3721

3738

msgid ""

3722

3739

"Once converted into a checkout, commits must succeed on the master branch\n"

3723

3740

"before they will be applied to the local branch."

3725

3742

"После преобразования в рабочую копию, закрепления должны производиться\n"

3726

3743

"над основной ветвью, прежде чем они могут быть применены к локальной."

3727

3744

3728

#: bzrlib/builtins.py:5245

3745

#: bzrlib/builtins.py:5292

3729

3746

msgid ""

3730

3747

"Bound branches use the nickname of its master branch unless it is set\n"

3731

3748

"locally, in which case binding will update the local nickname to be\n"

3732

3749

"that of the master."

3733

3750

msgstr ""

3734

3751

3735

#: bzrlib/builtins.py:5260

3752

#: bzrlib/builtins.py:5307

3736

3753

msgid "No location supplied. This format does not remember old locations."

3737

3754

msgstr ""

3738

3755

3739

#: bzrlib/builtins.py:5265

3756

#: bzrlib/builtins.py:5313

3740

3757

msgid "Branch is already bound"

3741

3758

msgstr ""

3742

3759

3743

#: bzrlib/builtins.py:5267

3760

#: bzrlib/builtins.py:5316

3744

3761

msgid "No location supplied and no previous location known"

3745

3762

msgstr ""

3746

3763

3747

#: bzrlib/builtins.py:5273

3764

#: bzrlib/builtins.py:5322

3748

3765

msgid "These branches have diverged. Try merging, and then bind again."

3749

3766

msgstr ""

3750

3767

3751

#: bzrlib/builtins.py:5280

3768

#: bzrlib/builtins.py:5329

3752

3769

msgid "Convert the current checkout into a regular branch."

3753

3770

msgstr "Преобразовать текущую рабочую копию в обычную ветвь."

3754

3771

3755

#: bzrlib/builtins.py:5282

3772

#: bzrlib/builtins.py:5331

3756

3773

msgid ""

3757

3774

"After unbinding, the local branch is considered independent and subsequent\n"

3758

3775

"commits will be local only."

3759

3776

msgstr ""

3760

3777

3761

#: bzrlib/builtins.py:5293

3778

#: bzrlib/builtins.py:5342

3762

3779

msgid "Local branch is not bound"

3763

3780

msgstr ""

3764

3781

3765

#: bzrlib/builtins.py:5297

3782

#: bzrlib/builtins.py:5346

3766

3783

msgid "Remove the last committed revision."

3767

3784

msgstr ""

3768

3785

3769

#: bzrlib/builtins.py:5299

3786

#: bzrlib/builtins.py:5348

3770

3787

msgid ""

3771

3788

"--verbose will print out what is being removed.\n"

3772

3789

"--dry-run will go through all the motions, but not actually\n"

3773

3790

"remove anything."

3774

3791

msgstr ""

3775

3792

3776

#: bzrlib/builtins.py:5303

3793

#: bzrlib/builtins.py:5352

3777

3794

msgid ""

3778

3795

"If --revision is specified, uncommit revisions to leave the branch at the\n"

3779

3796

"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"

3780

3797

"branch at revision 15."

3781

3798

msgstr ""

3782

3799

3783

#: bzrlib/builtins.py:5307

3800

#: bzrlib/builtins.py:5356

3784

3801

msgid ""

3785

3802

"Uncommit leaves the working tree ready for a new commit. The only change\n"

3786

3803

"it may make is to restore any pending merges that were present before\n"

3787

3804

"the commit."

3788

3805

msgstr ""

3789

3806

3790

#: bzrlib/builtins.py:5318

3807

#: bzrlib/builtins.py:5367

3791

3808

msgid "Don't actually make changes."

3792

3809

msgstr ""

3793

3810

3794

#: bzrlib/builtins.py:5319

3811

#: bzrlib/builtins.py:5368

3795

3812

msgid "Say yes to all questions."

3796

3813

msgstr ""

3797

3814

3798

#: bzrlib/builtins.py:5321

3815

#: bzrlib/builtins.py:5370

3799

3816

msgid "Keep tags that point to removed revisions."

3800

3817

msgstr ""

3801

3818

3802

#: bzrlib/builtins.py:5323

3819

#: bzrlib/builtins.py:5372

3803

3820

msgid "Only remove the commits from the local branch when in a checkout."

3804

3821

msgstr "Удалить закрепления из локальной ветви только в рабочей копии."

3805

3822

3806

#: bzrlib/builtins.py:5372

3823

#: bzrlib/builtins.py:5421

3807

3824

msgid "No revisions to uncommit.\n"

3808

3825

msgstr ""

3809

3826

3810

#: bzrlib/builtins.py:5387

3827

#: bzrlib/builtins.py:5436

3811

3828

msgid "Dry-run, pretending to remove the above revisions.\n"

3812

3829

msgstr ""

3813

3830

3814

#: bzrlib/builtins.py:5390

3831

#: bzrlib/builtins.py:5439

3815

3832

msgid "The above revision(s) will be removed.\n"

3816

3833

msgstr ""

3817

3834

3818

#: bzrlib/builtins.py:5394

3835

#: bzrlib/builtins.py:5443

3819

3836

msgid "Uncommit these revisions"

3820

3837

msgstr ""

3821

3838

3822

#: bzrlib/builtins.py:5397

3839

#: bzrlib/builtins.py:5446

3823

3840

msgid "Canceled\n"

3824

3841

msgstr ""

3825

3842

3826

#: bzrlib/builtins.py:5404

3843

#: bzrlib/builtins.py:5453

3827

3844

#, python-format

3828

3845

msgid ""

3829

3846

"You can restore the old tip by running:\n"

3830

3847

" bzr pull . -r revid:%s\n"

3831

3848

msgstr ""

3832

3849

3833

#: bzrlib/builtins.py:5409

3850

#: bzrlib/builtins.py:5458

3834

3851

msgid "Break a dead lock."

3835

3852

msgstr ""

3836

3853

3837

#: bzrlib/builtins.py:5411

3854

#: bzrlib/builtins.py:5460

3838

3855

msgid ""

3839

3856

"This command breaks a lock on a repository, branch, working directory or\n"

3840

3857

"config file."

3841

3858

msgstr ""

3842

3859

3843

#: bzrlib/builtins.py:5414

3860

#: bzrlib/builtins.py:5463

3844

3861

msgid ""

3845

3862

"CAUTION: Locks should only be broken when you are sure that the process\n"

3846

3863

"holding the lock has been stopped."

3847

3864

msgstr ""

3848

3865

3849

#: bzrlib/builtins.py:5417

3866

#: bzrlib/builtins.py:5466

3850

3867

msgid ""

3851

3868

"You can get information on what locks are open via the 'bzr info\n"

3852

3869

"[location]' command."

3853

3870

msgstr ""

3854

3871

3855

#: bzrlib/builtins.py:5420

3872

#: bzrlib/builtins.py:5469

3856

3873

msgid ""

3857

3874

":Examples:\n"

3858

3875

" bzr break-lock\n"

3860

3877

" bzr break-lock --conf ~/.bazaar"

3861

3878

msgstr ""

3862

3879

3863

#: bzrlib/builtins.py:5429

3880

#: bzrlib/builtins.py:5478

3864

3881

msgid "LOCATION is the directory where the config lock is."

3865

3882

msgstr ""

3866

3883

3867

#: bzrlib/builtins.py:5431

3884

#: bzrlib/builtins.py:5480

3868

3885

msgid "Do not ask for confirmation before breaking the lock."

3869

3886

msgstr ""

3870

3887

3871

#: bzrlib/builtins.py:5466

3888

#: bzrlib/builtins.py:5515

3872

3889

msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"

3873

3890

msgstr ""

3874

3891

3875

#: bzrlib/builtins.py:5467

3892

#: bzrlib/builtins.py:5516

3876

3893

msgid "Run the bzr server."

3877

3894

msgstr ""

3878

3895

3879

#: bzrlib/builtins.py:5473

3896

#: bzrlib/builtins.py:5522

3880

3897

msgid "Serve on stdin/out for use from inetd or sshd."

3881

3898

msgstr ""

3882

3899

3883

#: bzrlib/builtins.py:5474

3900

#: bzrlib/builtins.py:5523

3884

3901

msgid "protocol"

3885

3902

msgstr ""

3886

3903

3887

#: bzrlib/builtins.py:5475

3904

#: bzrlib/builtins.py:5524

3888

3905

msgid "Protocol to serve."

3889

3906

msgstr ""

3890

3907

3891

#: bzrlib/builtins.py:5479

3908

#: bzrlib/builtins.py:5528

3909

msgid "Listen for connections on nominated address."

3910

msgstr ""

3911

3912

#: bzrlib/builtins.py:5530

3892

3913

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."

3914

"Listen for connections on nominated port. Passing 0 as the port number will "

3915

"result in a dynamically allocated port. The default port depends on the "

3916

"protocol."

3896

3917

msgstr ""

3897

3918

3898

#: bzrlib/builtins.py:5485

3919

#: bzrlib/builtins.py:5535

3899

3920

msgid "Serve contents of this directory."

3900

3921

msgstr ""

3901

3922

3902

#: bzrlib/builtins.py:5487

3923

#: bzrlib/builtins.py:5537

3903

3924

msgid ""

3904

3925

"By default the server is a readonly server. Supplying --allow-writes "

3905

3926

"enables write access to the contents of the served directory and below. "

3908

3929

"uncontrolled write access to your file system."

3909

3930

msgstr ""

3910

3931

3911

#: bzrlib/builtins.py:5496

3932

#: bzrlib/builtins.py:5546

3912

3933

msgid "Override the default idle client timeout (5min)."

3913

3934

msgstr ""

3914

3935

3915

#: bzrlib/builtins.py:5546

3936

#: bzrlib/builtins.py:5564

3916

3937

msgid "Combine a tree into its containing tree."

3917

3938

msgstr ""

3918

3939

3919

#: bzrlib/builtins.py:5548

3940

#: bzrlib/builtins.py:5566

3920

3941

msgid "This command requires the target tree to be in a rich-root format."

3921

3942

msgstr ""

3922

3943

3923

#: bzrlib/builtins.py:5550

3944

#: bzrlib/builtins.py:5568

3924

3945

msgid ""

3925

3946

"The TREE argument should be an independent tree, inside another tree, but\n"

3926

3947

"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"

3927

3948

"running \"bzr branch\" with the target inside a tree.)"

3928

3949

msgstr ""

3929

3950

3930

#: bzrlib/builtins.py:5554

3951

#: bzrlib/builtins.py:5572

3931

3952

msgid ""

3932

3953

"The result is a combined tree, with the subtree no longer an independent\n"

3933

3954

"part. This is marked as a merge of the subtree into the containing tree,\n"

3934

3955

"and all history is preserved."

3935

3956

msgstr ""

3936

3957

3937

#: bzrlib/builtins.py:5572

3958

#: bzrlib/builtins.py:5590

3938

3959

#, python-format

3939

3960

msgid ""

3940

3961

"Can't join trees because %s doesn't support rich root data.\n"

3941

3962

"You can use bzr upgrade on the repository."

3942

3963

msgstr ""

3943

3964

3944

#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588

3965

#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606

3945

3966

msgid "Cannot join {0}. {1}"

3946

3967

msgstr ""

3947

3968

3948

#: bzrlib/builtins.py:5592

3969

#: bzrlib/builtins.py:5610

3949

3970

msgid "Split a subdirectory of a tree into a separate tree."

3950

3971

msgstr ""

3951

3972

3952

#: bzrlib/builtins.py:5594

3973

#: bzrlib/builtins.py:5612

3953

3974

msgid ""

3954

3975

"This command will produce a target tree in a format that supports\n"

3955

3976

"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"

3956

3977

"converted into earlier formats like 'dirstate-tags'."

3957

3978

msgstr ""

3958

3979

3959

#: bzrlib/builtins.py:5598

3980

#: bzrlib/builtins.py:5616

3960

3981

msgid ""

3961

3982

"The TREE argument should be a subdirectory of a working tree. That\n"

3962

3983

"subdirectory will be converted into an independent tree, with its own\n"

3963

3984

"branch. Commits in the top-level tree will not apply to the new subtree."

3964

3985

msgstr ""

3965

3986

3966

#: bzrlib/builtins.py:5678

3987

#: bzrlib/builtins.py:5696

3967

3988

msgid "No submit branch specified or known"

3968

3989

msgstr ""

3969

3990

3970

#: bzrlib/builtins.py:5686 bzrlib/send.py:108

3991

#: bzrlib/builtins.py:5705 bzrlib/send.py:109

3971

3992

msgid "No public branch specified or known"

3972

3993

msgstr ""

3973

3994

3974

#: bzrlib/builtins.py:5691

3995

#: bzrlib/builtins.py:5710

3975

3996

msgid "bzr merge-directive takes at most two one revision identifiers"

3976

3997

msgstr ""

3977

3998

3978

#: bzrlib/builtins.py:5700

3999

#: bzrlib/builtins.py:5719

3979

4000

msgid "No revisions to bundle."

3980

4001

msgstr ""

3981

4002

3982

#: bzrlib/builtins.py:5719

4003

#: bzrlib/builtins.py:5738

3983

4004

msgid "Mail or create a merge-directive for submitting changes."

3984

4005

msgstr ""

3985

4006

3986

#: bzrlib/builtins.py:5721

4007

#: bzrlib/builtins.py:5740

3987

4008

msgid "A merge directive provides many things needed for requesting merges:"

3988

4009

msgstr ""

3989

4010

3990

#: bzrlib/builtins.py:5723

4011

#: bzrlib/builtins.py:5742

3991

4012

msgid "* A machine-readable description of the merge to perform"

3992

4013

msgstr ""

3993

4014

3994

#: bzrlib/builtins.py:5725

4015

#: bzrlib/builtins.py:5744

3995

4016

msgid "* An optional patch that is a preview of the changes requested"

3996

4017

msgstr ""

3997

4018

3998

#: bzrlib/builtins.py:5727

4019

#: bzrlib/builtins.py:5746

3999

4020

msgid ""

4000

4021

"* An optional bundle of revision data, so that the changes can be applied\n"

4001

4022

" directly from the merge directive, without retrieving data from a\n"

4002

4023

" branch."

4003

4024

msgstr ""

4004

4025

4005

#: bzrlib/builtins.py:5731

4026

#: bzrlib/builtins.py:5750

4006

4027

msgid ""

4007

4028

"`bzr send` creates a compact data set that, when applied using bzr\n"

4008

4029

"merge, has the same effect as merging from the source branch. "

4009

4030

msgstr ""

4010

4031

4011

#: bzrlib/builtins.py:5734

4032

#: bzrlib/builtins.py:5753

4012

4033

msgid ""

4013

4034

"By default the merge directive is self-contained and can be applied to any\n"

4014

4035

"branch containing submit_branch in its ancestory without needing access to\n"

4015

4036

"the source branch."

4016

4037

msgstr ""

4017

4038

4018

#: bzrlib/builtins.py:5738

4039

#: bzrlib/builtins.py:5757

4019

4040

msgid ""

4020

4041

"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"

4021

4042

"revisions, but only a structured request to merge from the\n"

4024

4045

"included if known, so that people can check it later."

4025

4046

msgstr ""

4026

4047

4027

#: bzrlib/builtins.py:5744

4048

#: bzrlib/builtins.py:5763

4028

4049

msgid ""

4029

4050

"The submit branch defaults to the parent of the source branch, but can be\n"

4030

4051

"overridden. Both submit branch and public branch will be remembered in\n"

4033

4054

"be changed using --from."

4034

4055

msgstr ""

4035

4056

4036

#: bzrlib/builtins.py:5750

4057

#: bzrlib/builtins.py:5769

4037

4058

msgid ""

4038

4059

"Both the submit branch and the public branch follow the usual behavior with\n"

4039

4060

"respect to --remember: If there is no default location set, the first send\n"

4042

4063

"--remember. The value will only be saved if the location can be accessed."

4043

4064

msgstr ""

4044

4065

4045

#: bzrlib/builtins.py:5756

4066

#: bzrlib/builtins.py:5775

4046

4067

msgid ""

4047

4068

"In order to calculate those changes, bzr must analyse the submit branch.\n"

4048

4069

"Therefore it is most efficient for the submit branch to be a local mirror.\n"

4050

4071

"in the merge directive."

4051

4072

msgstr ""

4052

4073

4053

#: bzrlib/builtins.py:5761

4074

#: bzrlib/builtins.py:5780

4054

4075

msgid ""

4055

4076

"The default behaviour is to send the merge directive by mail, unless -o is\n"

4056

4077

"given, in which case it is sent to a file."

4057

4078

msgstr ""

4058

4079

4059

#: bzrlib/builtins.py:5764

4080

#: bzrlib/builtins.py:5783

4060

4081

msgid ""

4061

4082

"Mail is sent using your preferred mail program. This should be transparent\n"

4062

4083

"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"

4063

4084

"If the preferred client can't be found (or used), your editor will be used."

4064

4085

msgstr ""

4065

4086

4066

#: bzrlib/builtins.py:5768

4087

#: bzrlib/builtins.py:5787

4067

4088

msgid ""

4068

4089

"To use a specific mail program, set the mail_client configuration option.\n"

4069

4090

"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"

4075

4096

"supported clients."

4076

4097

msgstr ""

4077

4098

4078

#: bzrlib/builtins.py:5775

4099

#: bzrlib/builtins.py:5794

4079

4100

msgid ""

4080

4101

"If mail is being sent, a to address is required. This can be supplied\n"

4081

4102

"either on the commandline, by setting the submit_to configuration\n"

4083

4104

"in the submit branch."

4084

4105

msgstr ""

4085

4106

4086

#: bzrlib/builtins.py:5780

4107

#: bzrlib/builtins.py:5799

4087

4108

msgid ""

4088

4109

"Two formats are currently supported: \"4\" uses revision bundle format 4 "

4089

4110

"and\n"

4093

4114

"format 1. It is compatible with Bazaar 0.12 - 0.18."

4094

4115

msgstr ""

4095

4116

4096

#: bzrlib/builtins.py:5786

4117

#: bzrlib/builtins.py:5805

4097

4118

msgid ""

4098

4119

"The merge directives created by bzr send may be applied using bzr merge or\n"

4099

4120

"bzr pull by specifying a file containing a merge directive as the location."

4100

4121

msgstr ""

4101

4122

4102

#: bzrlib/builtins.py:5789

4123

#: bzrlib/builtins.py:5808

4103

4124

msgid ""

4104

4125

"bzr send makes extensive use of public locations to map local locations "

4105

4126

"into\n"

4107

4128

"set them, and use `bzr info` to display them."

4108

4129

msgstr ""

4109

4130

4110

#: bzrlib/builtins.py:5813

4131

#: bzrlib/builtins.py:5832

4111

4132

msgid "Write merge directive to this file or directory; use - for stdout."

4112

4133

msgstr ""

4113

4134

4114

#: bzrlib/builtins.py:5817

4135

#: bzrlib/builtins.py:5836

4115

4136

msgid ""

4116

4137

"Refuse to send if there are uncommitted changes in the working tree, --no-"

4117

4138

"strict disables the check."

4118

4139

msgstr ""

4119

4140

4120

#: bzrlib/builtins.py:5819

4141

#: bzrlib/builtins.py:5838

4121

4142

msgid "Mail the request to this address."

4122

4143

msgstr ""

4123

4144

4124

#: bzrlib/builtins.py:5823

4145

#: bzrlib/builtins.py:5842

4125

4146

msgid "Body for the email."

4126

4147

msgstr ""

4127

4148

4128

#: bzrlib/builtins.py:5876

4149

#: bzrlib/builtins.py:5895

4129

4150

msgid "Do not include a bundle in the merge directive."

4130

4151

msgstr ""

4131

4152

4132

#: bzrlib/builtins.py:5877

4153

#: bzrlib/builtins.py:5896

4133

4154

msgid "Do not include a preview patch in the merge directive."

4134

4155

msgstr ""

4135

4156

4136

#: bzrlib/builtins.py:5880

4157

#: bzrlib/builtins.py:5899

4137

4158

msgid "Remember submit and public branch."

4138

4159

msgstr ""

4139

4160

4140

#: bzrlib/builtins.py:5882

4161

#: bzrlib/builtins.py:5901

4141

4162

msgid ""

4142

4163

"Branch to generate the submission from, rather than the one containing the "

4143

4164

"working directory."

4144

4165

msgstr ""

4145

4166

4146

#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76

4167

#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76

4147

4168

msgid "format"

4148

4169

msgstr ""

4149

4170

4150

#: bzrlib/builtins.py:5893

4171

#: bzrlib/builtins.py:5912

4151

4172

msgid "Use the specified output format."

4152

4173

msgstr ""

4153

4174

4154

#: bzrlib/builtins.py:5915

4175

#: bzrlib/builtins.py:5934

4155

4176

msgid "Create, remove or modify a tag naming a revision."

4156

4177

msgstr ""

4157

4178

4158

#: bzrlib/builtins.py:5917

4179

#: bzrlib/builtins.py:5936

4159

4180

msgid ""

4160

4181

"Tags give human-meaningful names to revisions. Commands that take a -r\n"

4161

4182

"(--revision) option can be given -rtag:X, where X is any previously\n"

4162

4183

"created tag."

4163

4184

msgstr ""

4164

4185

4165

#: bzrlib/builtins.py:5921

4186

#: bzrlib/builtins.py:5940

4166

4187

msgid ""

4167

4188

"Tags are stored in the branch. Tags are copied from one branch to another\n"

4168

4189

"along when you branch, push, pull or merge."

4169

4190

msgstr ""

4170

4191

4171

#: bzrlib/builtins.py:5924

4192

#: bzrlib/builtins.py:5943

4172

4193

msgid ""

4173

4194

"It is an error to give a tag name that already exists unless you pass\n"

4174

4195

"--force, in which case the tag is moved to point to the new revision."

4175

4196

msgstr ""

4176

4197

4177

#: bzrlib/builtins.py:5927

4198

#: bzrlib/builtins.py:5946

4178

4199

msgid ""

4179

4200

"To rename a tag (change the name but keep it on the same revsion), run "

4180

4201

"``bzr\n"

4181

4202

"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."

4182

4203

msgstr ""

4183

4204

4184

#: bzrlib/builtins.py:5930

4205

#: bzrlib/builtins.py:5949

4185

4206

msgid ""

4186

4207

"If no tag name is specified it will be determined through the \n"

4187

4208

"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"

4189

4210

"details."

4190

4211

msgstr ""

4191

4212

4192

#: bzrlib/builtins.py:5940

4213

#: bzrlib/builtins.py:5959

4193

4214

msgid "Delete this tag rather than placing it."

4194

4215

msgstr ""

4195

4216

4196

#: bzrlib/builtins.py:5943

4217

#: bzrlib/builtins.py:5962

4197

4218

msgid "Branch in which to place the tag."

4198

4219

msgstr ""

4199

4220

4200

#: bzrlib/builtins.py:5945

4221

#: bzrlib/builtins.py:5964

4201

4222

msgid "Replace existing tags."

4202

4223

msgstr ""

4203

4224

4204

#: bzrlib/builtins.py:5960

4225

#: bzrlib/builtins.py:5979

4205

4226

msgid "No tag specified to delete."

4206

4227

msgstr ""

4207

4228

4208

#: bzrlib/builtins.py:5962

4229

#: bzrlib/builtins.py:5981

4209

4230

#, python-format

4210

4231

msgid "Deleted tag %s."

4211

4232

msgstr ""

4212

4233

4213

#: bzrlib/builtins.py:5976

4234

#: bzrlib/builtins.py:5995

4214

4235

msgid "Please specify a tag name."

4215

4236

msgstr ""

4216

4237

4217

#: bzrlib/builtins.py:5984

4238

#: bzrlib/builtins.py:6003

4218

4239

#, python-format

4219

4240

msgid "Tag %s already exists for that revision."

4220

4241

msgstr ""

4221

4242

4222

#: bzrlib/builtins.py:5988

4243

#: bzrlib/builtins.py:6007

4223

4244

#, python-format

4224

4245

msgid "Created tag %s."

4225

4246

msgstr ""

4226

4247

4227

#: bzrlib/builtins.py:5990

4248

#: bzrlib/builtins.py:6009

4228

4249

#, python-format

4229

4250

msgid "Updated tag %s."

4230

4251

msgstr ""

4231

4252

4232

#: bzrlib/builtins.py:5994

4253

#: bzrlib/builtins.py:6013

4233

4254

msgid "List tags."

4234

4255

msgstr ""

4235

4256

4236

#: bzrlib/builtins.py:5996

4257

#: bzrlib/builtins.py:6015

4237

4258

msgid ""

4238

4259

"This command shows a table of tag names and the revisions they reference."

4239

4260

msgstr ""

4240

4261

4241

#: bzrlib/builtins.py:6002

4262

#: bzrlib/builtins.py:6021

4242

4263

msgid "Branch whose tags should be displayed."

4243

4264

msgstr ""

4244

4265

4245

#: bzrlib/builtins.py:6004

4266

#: bzrlib/builtins.py:6023

4246

4267

msgid "Sort tags by different criteria."

4247

4268

msgstr ""

4248

4269

4249

#: bzrlib/builtins.py:6004

4270

#: bzrlib/builtins.py:6023

4250

4271

msgid "Sorting"

4251

4272

msgstr ""

4252

4273

4253

#: bzrlib/builtins.py:6073

4274

#: bzrlib/builtins.py:6092

4254

4275

msgid "Reconfigure the type of a bzr directory."

4255

4276

msgstr ""

4256

4277

4257

#: bzrlib/builtins.py:6075

4278

#: bzrlib/builtins.py:6094

4258

4279

msgid "A target configuration must be specified."

4259

4280

msgstr ""

4260

4281

4261

#: bzrlib/builtins.py:6077

4282

#: bzrlib/builtins.py:6096

4262

4283

msgid ""

4263

4284

"For checkouts, the bind-to location will be auto-detected if not specified.\n"

4264

4285

"The order of preference is\n"

4269

4290

"If none of these is available, --bind-to must be specified."

4270

4291

msgstr ""

4271

4292

4272

#: bzrlib/builtins.py:6091

4293

#: bzrlib/builtins.py:6110

4273

4294

msgid "Tree type"

4274

4295

msgstr ""

4275

4296

4276

#: bzrlib/builtins.py:6092

4297

#: bzrlib/builtins.py:6111

4277

4298

msgid "The relation between branch and tree."

4278

4299

msgstr ""

4279

4300

4280

#: bzrlib/builtins.py:6094

4301

#: bzrlib/builtins.py:6113

4281

4302

msgid "Reconfigure to be an unbound branch with no working tree."

4282

4303

msgstr ""

4283

4304

4284

#: bzrlib/builtins.py:6095

4305

#: bzrlib/builtins.py:6114

4285

4306

msgid "Reconfigure to be an unbound branch with a working tree."

4286

4307

msgstr ""

4287

4308

4288

#: bzrlib/builtins.py:6096

4309

#: bzrlib/builtins.py:6115

4289

4310

msgid "Reconfigure to be a bound branch with a working tree."

4290

4311

msgstr ""

4291

4312

4292

#: bzrlib/builtins.py:6097

4313

#: bzrlib/builtins.py:6116

4293

4314

msgid "Reconfigure to be a lightweight checkout (with no local history)."

4294

4315

msgstr ""

4295

4316

4296

#: bzrlib/builtins.py:6102

4317

#: bzrlib/builtins.py:6121

4297

4318

msgid "Repository type"

4298

4319

msgstr ""

4299

4320

4300

#: bzrlib/builtins.py:6103

4321

#: bzrlib/builtins.py:6122

4301

4322

msgid "Location fo the repository."

4302

4323

msgstr ""

4303

4324

4304

#: bzrlib/builtins.py:6105

4325

#: bzrlib/builtins.py:6124

4305

4326

msgid ""

4306

4327

"Reconfigure to be a standalone branch (i.e. stop using shared repository)."

4307

4328

msgstr ""

4308

4329

4309

#: bzrlib/builtins.py:6107

4330

#: bzrlib/builtins.py:6126

4310

4331

msgid "Reconfigure to use a shared repository."

4311

4332

msgstr ""

4312

4333

4313

#: bzrlib/builtins.py:6111

4334

#: bzrlib/builtins.py:6130

4314

4335

msgid "Trees in Repository"

4315

4336

msgstr ""

4316

4337

4317

#: bzrlib/builtins.py:6112

4338

#: bzrlib/builtins.py:6131

4318

4339

msgid "Whether new branches in the repository have trees."

4319

4340

msgstr ""

4320

4341

4321

#: bzrlib/builtins.py:6114

4342

#: bzrlib/builtins.py:6133

4322

4343

msgid ""

4323

4344

"Reconfigure repository to create working trees on branches by default."

4324

4345

msgstr ""

4325

4346

4326

#: bzrlib/builtins.py:6116

4347

#: bzrlib/builtins.py:6135

4327

4348

msgid ""

4328

4349

"Reconfigure repository to not create working trees on branches by default."

4329

4350

msgstr ""

4330

4351

4331

#: bzrlib/builtins.py:6119

4352

#: bzrlib/builtins.py:6138

4332

4353

msgid "Branch to bind checkout to."

4333

4354

msgstr "Ветвь, с которой связать рабочую копию."

4334

4355

4335

#: bzrlib/builtins.py:6121

4356

#: bzrlib/builtins.py:6140

4336

4357

msgid "Perform reconfiguration even if local changes will be lost."

4337

4358

msgstr ""

4338

4359

4339

#: bzrlib/builtins.py:6124

4360

#: bzrlib/builtins.py:6143

4340

4361

msgid "Reconfigure a branch to be stacked on another branch."

4341

4362

msgstr ""

4342

4363

4343

#: bzrlib/builtins.py:6128

4364

#: bzrlib/builtins.py:6147

4344

4365

msgid ""

4345

4366

"Reconfigure a branch to be unstacked. This may require copying substantial "

4346

4367

"data into it."

4347

4368

msgstr ""

4348

4369

4349

#: bzrlib/builtins.py:6138

4370

#: bzrlib/builtins.py:6157

4350

4371

msgid "Can't use both --stacked-on and --unstacked"

4351

4372

msgstr ""

4352

4373

4353

#: bzrlib/builtins.py:6152

4374

#: bzrlib/builtins.py:6171

4354

4375

msgid "No target configuration specified"

4355

4376

msgstr ""

4356

4377

4357

#: bzrlib/builtins.py:6187

4378

#: bzrlib/builtins.py:6206

4358

4379

msgid "Set the branch of a checkout and update."

4359

4380

msgstr "Выбрать ветвь рабочей копии и обновить."

4360

4381

4361

#: bzrlib/builtins.py:6189

4382

#: bzrlib/builtins.py:6208

4362

4383

msgid ""

4363

4384

"For lightweight checkouts, this changes the branch being referenced.\n"

4364

4385

"For heavyweight checkouts, this checks that there are no local commits\n"

4366

4387

"of the new location and binds to it."

4367

4388

msgstr ""

4368

4389

4369

#: bzrlib/builtins.py:6194

4390

#: bzrlib/builtins.py:6213

4370

4391

msgid ""

4371

4392

"In both cases, the working tree is updated and uncommitted changes\n"

4372

4393

"are merged. The user can commit or revert these as they desire."

4373

4394

msgstr ""

4374

4395

4375

#: bzrlib/builtins.py:6197

4396

#: bzrlib/builtins.py:6216

4376

4397

msgid "Pending merges need to be committed or reverted before using switch."

4377

4398

msgstr ""

4378

4399

4379

#: bzrlib/builtins.py:6199

4400

#: bzrlib/builtins.py:6218

4380

4401

msgid ""

4381

4402

"The path to the branch to switch to can be specified relative to the parent\n"

4382

4403

"directory of the current branch. For example, if you are currently in a\n"

4384

4405

"/path/to/newbranch."

4385

4406

msgstr ""

4386

4407

4387

#: bzrlib/builtins.py:6204

4408

#: bzrlib/builtins.py:6223

4388

4409

msgid ""

4389

4410

"Bound branches use the nickname of its master branch unless it is set\n"

4390

4411

"locally, in which case switching will update the local nickname to be\n"

4391

4412

"that of the master."

4392

4413

msgstr ""

4393

4414

4394

#: bzrlib/builtins.py:6212

4415

#: bzrlib/builtins.py:6231

4395

4416

msgid "Switch even if local commits will be lost."

4396

4417

msgstr ""

4397

4418

4398

#: bzrlib/builtins.py:6215

4419

#: bzrlib/builtins.py:6234

4399

4420

msgid "Create the target branch from this one before switching to it."

4400

4421

msgstr ""

4401

4422

4402

#: bzrlib/builtins.py:6229

4423

#: bzrlib/builtins.py:6248

4403

4424

msgid "You must supply either a revision or a location"

4404

4425

msgstr ""

4405

4426

4406

#: bzrlib/builtins.py:6242

4427

#: bzrlib/builtins.py:6261

4407

4428

msgid "cannot create branch without source branch"

4408

4429

msgstr ""

4409

4430

4410

#: bzrlib/builtins.py:6262

4431

#: bzrlib/builtins.py:6286

4411

4432

msgid "Manage filtered views."

4412

4433

msgstr ""

4413

4434

4414

#: bzrlib/builtins.py:6264

4435

#: bzrlib/builtins.py:6288

4415

4436

msgid ""

4416

4437

"Views provide a mask over the tree so that users can focus on\n"

4417

4438

"a subset of a tree when doing their work. After creating a view,\n"

4421

4442

"must be within the current view."

4422

4443

msgstr ""

4423

4444

4424

#: bzrlib/builtins.py:6271

4445

#: bzrlib/builtins.py:6295

4425

4446

msgid ""

4426

4447

"In most cases, a view has a short life-span: it is created to make\n"

4427

4448

"a selected change and is deleted once that change is committed.\n"

4429

4450

"and switch between them."

4430

4451

msgstr ""

4431

4452

4432

#: bzrlib/builtins.py:6276

4453

#: bzrlib/builtins.py:6300

4433

4454

msgid ""

4434

4455

"To disable the current view without deleting it, you can switch to\n"

4435

4456

"the pseudo view called ``off``. This can be useful when you need\n"

4437

4458

"want to switch back to your view after that."

4438

4459

msgstr ""

4439

4460

4440

#: bzrlib/builtins.py:6281

4461

#: bzrlib/builtins.py:6305

4441

4462

msgid ""

4442

4463

":Examples:\n"

4443

4464

" To define the current view::"

4444

4465

msgstr ""

4445

4466

4446

#: bzrlib/builtins.py:6284

4467

#: bzrlib/builtins.py:6308

4447

4468

msgid " bzr view file1 dir1 ..."

4448

4469

msgstr ""

4449

4470

4450

#: bzrlib/builtins.py:6286

4471

#: bzrlib/builtins.py:6310

4451

4472

msgid " To list the current view::"

4452

4473

msgstr ""

4453

4474

4454

#: bzrlib/builtins.py:6288

4475

#: bzrlib/builtins.py:6312

4455

4476

msgid " bzr view"

4456

4477

msgstr ""

4457

4478

4458

#: bzrlib/builtins.py:6290

4479

#: bzrlib/builtins.py:6314

4459

4480

msgid " To delete the current view::"

4460

4481

msgstr ""

4461

4482

4462

#: bzrlib/builtins.py:6292

4483

#: bzrlib/builtins.py:6316

4463

4484

msgid " bzr view --delete"

4464

4485

msgstr ""

4465

4486

4466

#: bzrlib/builtins.py:6294

4487

#: bzrlib/builtins.py:6318

4467

4488

msgid " To disable the current view without deleting it::"

4468

4489

msgstr ""

4469

4490

4470

#: bzrlib/builtins.py:6296

4491

#: bzrlib/builtins.py:6320

4471

4492

msgid " bzr view --switch off"

4472

4493

msgstr ""

4473

4494

4474

#: bzrlib/builtins.py:6298

4495

#: bzrlib/builtins.py:6322

4475

4496

msgid " To define a named view and switch to it::"

4476

4497

msgstr ""

4477

4498

4478

#: bzrlib/builtins.py:6300

4499

#: bzrlib/builtins.py:6324

4479

4500

msgid " bzr view --name view-name file1 dir1 ..."

4480

4501

msgstr ""

4481

4502

4482

#: bzrlib/builtins.py:6302

4503

#: bzrlib/builtins.py:6326

4483

4504

msgid " To list a named view::"

4484

4505

msgstr ""

4485

4506

4486

#: bzrlib/builtins.py:6304

4507

#: bzrlib/builtins.py:6328

4487

4508

msgid " bzr view --name view-name"

4488

4509

msgstr ""

4489

4510

4490

#: bzrlib/builtins.py:6306

4511

#: bzrlib/builtins.py:6330

4491

4512

msgid " To delete a named view::"

4492

4513

msgstr ""

4493

4514

4494

#: bzrlib/builtins.py:6308

4515

#: bzrlib/builtins.py:6332

4495

4516

msgid " bzr view --name view-name --delete"

4496

4517

msgstr ""

4497

4518

4498

#: bzrlib/builtins.py:6310

4519

#: bzrlib/builtins.py:6334

4499

4520

msgid " To switch to a named view::"

4500

4521

msgstr ""

4501

4522

4502

#: bzrlib/builtins.py:6312

4523

#: bzrlib/builtins.py:6336

4503

4524

msgid " bzr view --switch view-name"

4504

4525

msgstr ""

4505

4526

4506

#: bzrlib/builtins.py:6314

4527

#: bzrlib/builtins.py:6338

4507

4528

msgid " To list all views defined::"

4508

4529

msgstr ""

4509

4530

4510

#: bzrlib/builtins.py:6316

4531

#: bzrlib/builtins.py:6340

4511

4532

msgid " bzr view --all"

4512

4533

msgstr ""

4513

4534

4514

#: bzrlib/builtins.py:6318

4535

#: bzrlib/builtins.py:6342

4515

4536

msgid " To delete all views::"

4516

4537

msgstr ""

4517

4538

4518

#: bzrlib/builtins.py:6320

4539

#: bzrlib/builtins.py:6344

4519

4540

msgid " bzr view --delete --all"

4520

4541

msgstr ""

4521

4542

4522

#: bzrlib/builtins.py:6327

4543

#: bzrlib/builtins.py:6351

4523

4544

msgid "Apply list or delete action to all views."

4524

4545

msgstr ""

4525

4546

4526

#: bzrlib/builtins.py:6330

4547

#: bzrlib/builtins.py:6354

4527

4548

msgid "Delete the view."

4528

4549

msgstr ""

4529

4550

4530

#: bzrlib/builtins.py:6333

4551

#: bzrlib/builtins.py:6357

4531

4552

msgid "Name of the view to define, list or delete."

4532

4553

msgstr ""

4533

4554

4534

#: bzrlib/builtins.py:6337

4555

#: bzrlib/builtins.py:6361

4535

4556

msgid "Name of the view to switch to."

4536

4557

msgstr ""

4537

4558

4538

#: bzrlib/builtins.py:6356

4559

#: bzrlib/builtins.py:6380

4539

4560

msgid "Both --delete and a file list specified"

4540

4561

msgstr ""

4541

4562

4542

#: bzrlib/builtins.py:6359

4563

#: bzrlib/builtins.py:6383

4543

4564

msgid "Both --delete and --switch specified"

4544

4565

msgstr ""

4545

4566

4546

#: bzrlib/builtins.py:6362

4567

#: bzrlib/builtins.py:6386

4547

4568

msgid "Deleted all views.\n"

4548

4569

msgstr ""

4549

4570

4550

#: bzrlib/builtins.py:6364

4571

#: bzrlib/builtins.py:6388

4551

4572

msgid "No current view to delete"

4552

4573

msgstr ""

4553

4574

4554

#: bzrlib/builtins.py:6367

4575

#: bzrlib/builtins.py:6391

4555

4576

#, python-format

4556

4577

msgid "Deleted '%s' view.\n"

4557

4578

msgstr ""

4558

4579

4559

#: bzrlib/builtins.py:6371

4580

#: bzrlib/builtins.py:6395

4560

4581

msgid "Both --switch and a file list specified"

4561

4582

msgstr ""

4562

4583

4563

#: bzrlib/builtins.py:6374

4584

#: bzrlib/builtins.py:6398

4564

4585

msgid "Both --switch and --all specified"

4565

4586

msgstr ""

4566

4587

4567

#: bzrlib/builtins.py:6377

4588

#: bzrlib/builtins.py:6401

4568

4589

msgid "No current view to disable"

4569

4590

msgstr ""

4570

4591

4571

#: bzrlib/builtins.py:6379

4592

#: bzrlib/builtins.py:6403

4572

4593

#, python-format

4573

4594

msgid "Disabled '%s' view.\n"

4574

4595

msgstr ""

4575

4596

4576

#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405

4597

#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429

4577

4598

msgid "Using '{0}' view: {1}\n"

4578

4599

msgstr ""

4579

4600

4580

#: bzrlib/builtins.py:6386

4601

#: bzrlib/builtins.py:6410

4581

4602

msgid "Views defined:\n"

4582

4603

msgstr ""

4583

4604

4584

#: bzrlib/builtins.py:6395

4605

#: bzrlib/builtins.py:6419

4585

4606

msgid "No views defined.\n"

4586

4607

msgstr ""

4587

4608

4588

#: bzrlib/builtins.py:6402

4609

#: bzrlib/builtins.py:6426

4589

4610

msgid "Cannot change the 'off' pseudo view"

4590

4611

msgstr ""

4591

4612

4592

#: bzrlib/builtins.py:6410

4613

#: bzrlib/builtins.py:6434

4593

4614

msgid "No current view.\n"

4594

4615

msgstr ""

4595

4616

4596

#: bzrlib/builtins.py:6413

4617

#: bzrlib/builtins.py:6437

4597

4618

msgid "'{0}' view is: {1}\n"

4598

4619

msgstr ""

4599

4620

4600

#: bzrlib/builtins.py:6433

4621

#: bzrlib/builtins.py:6457

4601

4622

msgid " <no hooks installed>\n"

4602

4623

msgstr ""

4603

4624

4604

#: bzrlib/builtins.py:6437

4625

#: bzrlib/builtins.py:6461

4605

4626

msgid "Remove a branch."

4606

4627

msgstr ""

4607

4628

4608

#: bzrlib/builtins.py:6439

4629

#: bzrlib/builtins.py:6463

4609

4630

msgid ""

4610

4631

"This will remove the branch from the specified location but \n"

4611

4632

"will keep any working tree or repository in place."

4612

4633

msgstr ""

4613

4634

4614

#: bzrlib/builtins.py:6444

4635

#: bzrlib/builtins.py:6468

4615

4636

msgid " Remove the branch at repo/trunk::"

4616

4637

msgstr ""

4617

4638

4618

#: bzrlib/builtins.py:6446

4639

#: bzrlib/builtins.py:6470

4619

4640

msgid " bzr remove-branch repo/trunk"

4620

4641

msgstr ""

4621

4642

4622

#: bzrlib/builtins.py:6461

4643

#: bzrlib/builtins.py:6477

4644

msgid "Remove branch even if it is the active branch."

4645

msgstr ""

4646

4647

#: bzrlib/builtins.py:6491

4648

msgid "Branch is active. Use --force to remove it."

4649

msgstr ""

4650

4651

#: bzrlib/builtins.py:6495

4623

4652

msgid "Plaintext diff output."

4624

4653

msgstr ""

4625

4654

4626

#: bzrlib/builtins.py:6462

4655

#: bzrlib/builtins.py:6496

4627

4656

msgid "Temporarily set aside some changes from the current tree."

4628

4657

msgstr ""

4629

4658

4630

#: bzrlib/builtins.py:6464

4659

#: bzrlib/builtins.py:6498

4631

4660

msgid ""

4632

4661

"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"

4633

4662

"ie. out of the way, until a later time when you can bring them back from\n"

4636

4665

"will they survive its deletion."

4637

4666

msgstr ""

4638

4667

4639

#: bzrlib/builtins.py:6470

4668

#: bzrlib/builtins.py:6504

4640

4669

msgid "If shelve --list is specified, previously-shelved changes are listed."

4641

4670

msgstr ""

4642

4671

4643

#: bzrlib/builtins.py:6472

4672

#: bzrlib/builtins.py:6506

4644

4673

msgid ""

4645

4674

"Shelve is intended to help separate several sets of changes that have\n"

4646

4675

"been inappropriately mingled. If you just want to get rid of all changes\n"

4648

4677

"shelve all text changes at once, use shelve --all."

4649

4678

msgstr ""

4650

4679

4651

#: bzrlib/builtins.py:6477

4680

#: bzrlib/builtins.py:6511

4652

4681

msgid ""

4653

4682

"If filenames are specified, only the changes to those files will be\n"

4654

4683

"shelved. Other files will be left untouched."

4655

4684

msgstr ""

4656

4685

4657

#: bzrlib/builtins.py:6480

4686

#: bzrlib/builtins.py:6514

4658

4687

msgid ""

4659

4688

"If a revision is specified, changes since that revision will be shelved."

4660

4689

msgstr ""

4661

4690

4662

#: bzrlib/builtins.py:6482

4691

#: bzrlib/builtins.py:6516

4663

4692

msgid ""

4664

4693

"You can put multiple items on the shelf, and by default, 'unshelve' will\n"

4665

4694

"restore the most recently shelved changes."

4666

4695

msgstr ""

4667

4696

4668

#: bzrlib/builtins.py:6485

4697

#: bzrlib/builtins.py:6519

4669

4698

msgid ""

4670

4699

"For complicated changes, it is possible to edit the changes in a separate\n"

4671

4700

"editor program to decide what the file remaining in the working copy\n"

4672

4701

"should look like. To do this, add the configuration option"

4673

4702

msgstr ""

4674

4703

4675

#: bzrlib/builtins.py:6489

4704

#: bzrlib/builtins.py:6523

4676

4705

msgid " change_editor = PROGRAM @new_path @old_path"

4677

4706

msgstr ""

4678

4707

4679

#: bzrlib/builtins.py:6491

4708

#: bzrlib/builtins.py:6525

4680

4709

msgid ""

4681

4710

"where @new_path is replaced with the path of the new version of the \n"

4682

4711

"file and @old_path is replaced with the path of the old version of \n"

4685

4714

" "

4686

4715

msgstr ""

4687

4716

4688

#: bzrlib/builtins.py:6503

4717

#: bzrlib/builtins.py:6537

4689

4718

msgid "Shelve all changes."

4690

4719

msgstr ""

4691

4720

4692

#: bzrlib/builtins.py:6505

4721

#: bzrlib/builtins.py:6539

4693

4722

msgid "Method to use for writing diffs."

4694

4723

msgstr ""

4695

4724

4696

#: bzrlib/builtins.py:6505

4725

#: bzrlib/builtins.py:6539

4697

4726

msgid "writer"

4698

4727

msgstr ""

4699

4728

4700

#: bzrlib/builtins.py:6509

4729

#: bzrlib/builtins.py:6543

4701

4730

msgid "List shelved changes."

4702

4731

msgstr ""

4703

4732

4704

#: bzrlib/builtins.py:6511

4733

#: bzrlib/builtins.py:6545

4705

4734

msgid "Destroy removed changes instead of shelving them."

4706

4735

msgstr ""

4707

4736

4708

#: bzrlib/builtins.py:6540

4737

#: bzrlib/builtins.py:6574

4709

4738

msgid "No shelved changes."

4710

4739

msgstr ""

4711

4740

4712

#: bzrlib/builtins.py:6551

4741

#: bzrlib/builtins.py:6585

4713

4742

msgid "Restore shelved changes."

4714

4743

msgstr ""

4715

4744

4716

#: bzrlib/builtins.py:6553

4745

#: bzrlib/builtins.py:6587

4717

4746

msgid ""

4718

4747

"By default, the most recently shelved changes are restored. However if you\n"

4719

4748

"specify a shelf by id those changes will be restored instead. This works\n"

4720

4749

"best when the changes don't depend on each other."

4721

4750

msgstr ""

4722

4751

4723

#: bzrlib/builtins.py:6562

4752

#: bzrlib/builtins.py:6596

4724

4753

msgid "The action to perform."

4725

4754

msgstr ""

4726

4755

4727

#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694

4756

#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694

4728

4757

msgid "action"

4729

4758

msgstr ""

4730

4759

4731

#: bzrlib/builtins.py:6564

4760

#: bzrlib/builtins.py:6598

4732

4761

msgid "Apply changes and remove from the shelf."

4733

4762

msgstr ""

4734

4763

4735

#: bzrlib/builtins.py:6565

4764

#: bzrlib/builtins.py:6599

4736

4765

msgid "Show changes, but do not apply or remove them."

4737

4766

msgstr ""

4738

4767

4739

#: bzrlib/builtins.py:6566

4768

#: bzrlib/builtins.py:6600

4740

4769

msgid ""

4741

4770

"Instead of unshelving the changes, show the diff that would result from "

4742

4771

"unshelving."

4743

4772

msgstr ""

4744

4773

4745

#: bzrlib/builtins.py:6568

4774

#: bzrlib/builtins.py:6602

4746

4775

msgid "Delete changes without applying them."

4747

4776

msgstr ""

4748

4777

4749

#: bzrlib/builtins.py:6569

4778

#: bzrlib/builtins.py:6603

4750

4779

msgid "Apply changes but don't delete them."

4751

4780

msgstr ""

4752

4781

4753

#: bzrlib/builtins.py:6584

4782

#: bzrlib/builtins.py:6618

4754

4783

msgid "Remove unwanted files from working tree."

4755

4784

msgstr ""

4756

4785

4757

#: bzrlib/builtins.py:6586

4786

#: bzrlib/builtins.py:6620

4758

4787

msgid ""

4759

4788

"By default, only unknown files, not ignored files, are deleted. Versioned\n"

4760

4789

"files are never deleted."

4761

4790

msgstr ""

4762

4791

4763

#: bzrlib/builtins.py:6589

4792

#: bzrlib/builtins.py:6623

4764

4793

msgid ""

4765

4794

"Another class is 'detritus', which includes files emitted by bzr during\n"

4766

4795

"normal operations and selftests. (The value of these files decreases with\n"

4767

4796

"time.)"

4768

4797

msgstr ""

4769

4798

4770

#: bzrlib/builtins.py:6593

4799

#: bzrlib/builtins.py:6627

4771

4800

msgid ""

4772

4801

"If no options are specified, unknown files are deleted. Otherwise, option\n"

4773

4802

"flags are respected, and may be combined."

4774

4803

msgstr ""

4775

4804

4776

#: bzrlib/builtins.py:6596

4805

#: bzrlib/builtins.py:6630

4777

4806

msgid "To check what clean-tree will do, use --dry-run."

4778

4807

msgstr ""

4779

4808

4780

#: bzrlib/builtins.py:6599

4809

#: bzrlib/builtins.py:6633

4781

4810

msgid "Delete all ignored files."

4782

4811

msgstr ""

4783

4812

4784

#: bzrlib/builtins.py:6600

4813

#: bzrlib/builtins.py:6634

4785

4814

msgid ""

4786

4815

"Delete conflict files, merge and revert backups, and failed selftest dirs."

4787

4816

msgstr ""

4788

4817

4789

#: bzrlib/builtins.py:6603

4818

#: bzrlib/builtins.py:6637

4790

4819

msgid "Delete files unknown to bzr (default)."

4791

4820

msgstr ""

4792

4821

4793

#: bzrlib/builtins.py:6604

4822

#: bzrlib/builtins.py:6638

4794

4823

msgid "Show files to delete instead of deleting them."

4795

4824

msgstr ""

4796

4825

4797

#: bzrlib/builtins.py:6606

4826

#: bzrlib/builtins.py:6640

4798

4827

msgid "Do not prompt before deleting."

4799

4828

msgstr ""

4800

4829

4854

4883

msgstr[0] ""

4855

4884

msgstr[1] ""

4856

4885

4857

#: bzrlib/bzrdir.py:490

4886

#: bzrlib/bzrdir.py:487

4858

4887

msgid ""

4859

4888

"making backup of {0}\n"

4860

4889

" to {1}"

4861

4890

msgstr ""

4862

4891

4863

#: bzrlib/bzrdir.py:513

4892

#: bzrlib/bzrdir.py:510

4864

4893

msgid "renamed {0} to {1}"

4865

4894

msgstr ""

4866

4895

4867

#: bzrlib/bzrdir.py:1652

4896

#: bzrlib/bzrdir.py:1639

4868

4897

#, python-format

4869

4898

msgid ""

4870

4899

"Source repository format does not support stacking, using format:\n"

4871

4900

" %s"

4872

4901

msgstr ""

4873

4902

4874

#: bzrlib/bzrdir.py:1672

4903

#: bzrlib/bzrdir.py:1659

4875

4904

#, python-format

4876

4905

msgid ""

4877

4906

"Source branch format does not support stacking, using format:\n"

4878

4907

" %s"

4879

4908

msgstr ""

4880

4909

4881

#: bzrlib/bzrdir.py:1818

4910

#: bzrlib/bzrdir.py:1805

4882

4911

msgid "starting repository conversion"

4883

4912

msgstr ""

4884

4913

4885

#: bzrlib/bzrdir.py:2039

4914

#: bzrlib/bzrdir.py:2026

4886

4915

msgid "Using default stacking branch {0} at {1}"

4887

4916

msgstr ""

4888

4917

5065

5094

"supported formats or in a custom format based on a template."

5066

5095

msgstr ""

5067

5096

5068

#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700

5069

#: en/help_topics/configuration.txt:710

5097

#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712

5098

#: en/help_topics/configuration.txt:722

5070

5099

msgid "For example::"

5071

5100

msgstr ""

5072

5101

5192

5221

msgid ":See also: %s"

5193

5222

msgstr ":Смотрите также: %s"

5194

5223

5195

#: bzrlib/commands.py:816 bzrlib/gpg.py:324

5224

#: bzrlib/commands.py:826 bzrlib/gpg.py:347

5196

5225

msgid "Only ASCII permitted in option names"

5197

5226

msgstr "В именах опций разрешены только символы ASCII"

5198

5227

5199

#: bzrlib/commands.py:841 bzrlib/commands.py:849

5228

#: bzrlib/commands.py:851 bzrlib/commands.py:859

5200

5229

msgid "command {0!r} needs one or more {1}"

5201

5230

msgstr "команде {0!r} требуется один или больше {1}"

5202

5231

5203

#: bzrlib/commands.py:858

5232

#: bzrlib/commands.py:868

5204

5233

msgid "command {0!r} requires argument {1}"

5205

5234

msgstr "команде {0!r} требуется аргумент {1}"

5206

5235

5207

#: bzrlib/commands.py:865

5236

#: bzrlib/commands.py:875

5208

5237

msgid "extra argument to command {0}: {1}"

5209

5238

msgstr "лишний аргумент к команде {0}: {1}"

5210

5239

5211

#: bzrlib/commands.py:962

5240

#: bzrlib/commands.py:972

5212

5241

#, python-format

5213

5242

msgid "Profile data written to \"%s\"."

5214

5243

msgstr "Данные профиля записаны в «%s»."

5251

5280

msgid "renamed"

5252

5281

msgstr "переименованы"

5253

5282

5254

#: bzrlib/commit.py:977

5283

#: bzrlib/commit.py:976

5255

5284

msgid "unchanged"

5256

5285

msgstr "без изменений"

5257

5286

5258

#: bzrlib/commit.py:999

5287

#: bzrlib/commit.py:998

5259

5288

msgid "{0} [{1}] - Stage"

5260

5289

msgstr ""

5261

5290

5262

#: bzrlib/commit.py:1002

5291

#: bzrlib/commit.py:1001

5263

5292

#, python-format

5264

5293

msgid "%s - Stage"

5265

5294

msgstr ""

5266

5295

5296

#: bzrlib/commit_signature_commands.py:34

5297

msgid "Sign all commits by a given committer."

5298

msgstr ""

5299

5267

5300

#: 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

5301

msgid ""

5273

5302

"If location is not specified the local tree is used.\n"

5274

5303

"If committer is not specified the default committer is used."

5275

5304

msgstr ""

5276

5305

5277

#: bzrlib/commit_signature_commands.py:41

5306

#: bzrlib/commit_signature_commands.py:39

5278

5307

msgid "This does not sign commits that already have signatures."

5279

5308

msgstr ""

5280

5309

5281

#: bzrlib/commit_signature_commands.py:49

5310

#: bzrlib/commit_signature_commands.py:47

5282

5311

msgid ""

5283

5312

"Don't actually sign anything, just print the revisions that would be signed."

5284

5313

msgstr ""

5285

5314

5315

#: bzrlib/commit_signature_commands.py:98

5316

#, python-format

5317

msgid "Signed %d revision.\n"

5318

msgid_plural "Signed %d revisions.\n"

5319

msgstr[0] ""

5320

msgstr[1] ""

5321

5286

5322

#: bzrlib/commit_signature_commands.py:103

5287

5323

msgid "Verify all commit signatures."

5288

5324

msgstr ""

5298

5334

"verification."

5299

5335

msgstr ""

5300

5336

5301

#: bzrlib/commit_signature_commands.py:147

5337

#: bzrlib/commit_signature_commands.py:148

5302

5338

msgid "Cannot verify a range of non-revision-history revisions"

5303

5339

msgstr ""

5304

5340

5305

#: bzrlib/commit_signature_commands.py:168

5341

#: bzrlib/commit_signature_commands.py:166

5306

5342

msgid "All commits signed with verifiable keys"

5307

5343

msgstr ""

5308

5344

5309

#: bzrlib/config.py:475

5345

#: bzrlib/config.py:436

5310

5346

msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."

5311

5347

msgstr ""

5312

5348

5313

#: bzrlib/config.py:2485

5349

#: bzrlib/config.py:2452

5314

5350

msgid "{0} is not an SI unit."

5315

5351

msgstr ""

5316

5352

5317

#: bzrlib/config.py:2949

5353

#: bzrlib/config.py:2971

5318

5354

msgid ""

5319

5355

"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "

5320

5356

"will be saved."

5321

5357

msgstr ""

5322

5358

5323

#: bzrlib/config.py:3093

5359

#: bzrlib/config.py:3116

5324

5360

#, python-format

5325

5361

msgid "Invalid '%s', should be of the form 'name=value'"

5326

5362

msgstr ""

5327

5363

5328

#: bzrlib/config.py:3962

5364

#: bzrlib/config.py:4018

5329

5365

msgid "Display, set or remove a configuration option."

5330

5366

msgstr ""

5331

5367

5332

#: bzrlib/config.py:3964

5368

#: bzrlib/config.py:4020

5333

5369

msgid "Display the active value for a given option."

5334

5370

msgstr ""

5335

5371

5336

#: bzrlib/config.py:3966

5372

#: bzrlib/config.py:4022

5337

5373

msgid ""

5338

5374

"If --all is specified, NAME is interpreted as a regular expression and all\n"

5339

5375

"matching options are displayed mentioning their scope. The active value\n"

5340

5376

"that bzr will take into account is the first one displayed for each option."

5341

5377

msgstr ""

5342

5378

5343

#: bzrlib/config.py:3970

5379

#: bzrlib/config.py:4026

5344

5380

msgid "If no NAME is given, --all .* is implied."

5345

5381

msgstr ""

5346

5382

5347

#: bzrlib/config.py:3972

5383

#: bzrlib/config.py:4028

5348

5384

msgid ""

5349

5385

"Setting a value is achieved by using name=value without spaces. The value\n"

5350

5386

"is set in the most relevant scope and can be checked by displaying the\n"

5351

5387

"option again."

5352

5388

msgstr ""

5353

5389

5354

#: bzrlib/config.py:3984

5390

#: bzrlib/config.py:4040

5355

5391

msgid "Reduce the scope to the specified configuration file."

5356

5392

msgstr ""

5357

5393

5358

#: bzrlib/config.py:3988

5394

#: bzrlib/config.py:4044

5359

5395

msgid "Display all the defined values for the matching options."

5360

5396

msgstr ""

5361

5397

5362

#: bzrlib/config.py:3990

5398

#: bzrlib/config.py:4046

5363

5399

msgid "Remove the option from the configuration file."

5364

5400

msgstr ""

5365

5401

5439

5475

msgstr[0] ""

5440

5476

msgstr[1] ""

5441

5477

5442

#: bzrlib/controldir.py:710

5478

#: bzrlib/controldir.py:712

5443

5479

msgid "{0} is{1} redirected to {2}"

5444

5480

msgstr ""

5445

5481

5656

5692

msgstr ""

5657

5693

5658

5694

#: bzrlib/errors.py:715

5695

msgid "Invalid branch name: %(name)s"

5696

msgstr ""

5697

5698

#: bzrlib/errors.py:724

5659

5699

msgid "Parent branch already exists: \"%(path)s\"."

5660

5700

msgstr ""

5661

5701

5662

#: bzrlib/errors.py:721

5702

#: bzrlib/errors.py:730

5663

5703

msgid ""

5664

5704

"Directory contains a branch, but no working tree (use bzr checkout if you "

5665

5705

"wish to build a working tree): \"%(path)s\""

5666

5706

msgstr ""

5667

5707

5668

#: bzrlib/errors.py:726

5708

#: bzrlib/errors.py:735

5669

5709

msgid ""

5670

5710

"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""

5671

5711

msgstr ""

5672

5712

5673

#: bzrlib/errors.py:736

5713

#: bzrlib/errors.py:745

5674

5714

msgid ""

5675

5715

"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""

5676

5716

msgstr ""

5677

5717

5678

#: bzrlib/errors.py:746

5718

#: bzrlib/errors.py:755

5679

5719

msgid "No repository present: \"%(path)s\""

5680

5720

msgstr ""

5681

5721

5682

#: bzrlib/errors.py:753

5722

#: bzrlib/errors.py:762

5683

5723

msgid ""

5684

5724

"Unsupported branch format: %(format)s\n"

5685

5725

"Please run 'bzr upgrade'"

5686

5726

msgstr ""

5687

5727

5688

#: bzrlib/errors.py:759

5728

#: bzrlib/errors.py:768

5689

5729

msgid "Unknown %(kind)s format: %(format)r"

5690

5730

msgstr ""

5691

5731

5692

#: bzrlib/errors.py:768

5732

#: bzrlib/errors.py:777

5693

5733

msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."

5694

5734

msgstr ""

5695

5735

5696

#: bzrlib/errors.py:778

5736

#: bzrlib/errors.py:787

5697

5737

msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"

5698

5738

msgstr ""

5699

5739

5700

#: bzrlib/errors.py:793

5740

#: bzrlib/errors.py:802

5701

5741

msgid ""

5702

5742

"%(target)s\n"

5703

5743

"is not compatible with\n"

5705

5745

"%(details)s"

5706

5746

msgstr ""

5707

5747

5708

#: bzrlib/errors.py:809

5748

#: bzrlib/errors.py:818

5709

5749

msgid "Revision is not compatible with %(repo_format)s"

5710

5750

msgstr ""

5711

5751

5712

#: bzrlib/errors.py:819

5752

#: bzrlib/errors.py:828

5713

5753

msgid "%(context_info)s%(path)s is already versioned."

5714

5754

msgstr ""

5715

5755

5716

#: bzrlib/errors.py:840

5756

#: bzrlib/errors.py:849

5717

5757

msgid "%(context_info)s%(path)s is not versioned."

5718

5758

msgstr ""

5719

5759

5720

#: bzrlib/errors.py:861

5760

#: bzrlib/errors.py:870

5721

5761

msgid "Path(s) are not versioned: %(paths_as_string)s"

5722

5762

msgstr ""

5723

5763

5724

#: bzrlib/errors.py:872

5764

#: bzrlib/errors.py:881

5725

5765

msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"

5726

5766

msgstr ""

5727

5767

5728

#: bzrlib/errors.py:891

5768

#: bzrlib/errors.py:900

5729

5769

msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""

5730

5770

msgstr ""

5731

5771

5732

#: bzrlib/errors.py:899

5772

#: bzrlib/errors.py:908

5733

5773

msgid ""

5734

5774

"Filename %(filename)r is not valid in your current filesystem encoding "

5735

5775

"%(fs_encoding)s"

5736

5776

msgstr ""

5737

5777

5738

#: bzrlib/errors.py:910

5778

#: bzrlib/errors.py:919

5739

5779

msgid "Cannot operate on \"%(filename)s\" because it is a control file"

5740

5780

msgstr ""

5741

5781

5742

#: bzrlib/errors.py:928

5782

#: bzrlib/errors.py:937

5743

5783

msgid "The lock for '%(lock_description)s' is in use and cannot be broken."

5744

5784

msgstr ""

5745

5785

5746

#: bzrlib/errors.py:967

5786

#: bzrlib/errors.py:976

5747

5787

msgid "Cannot lock %(lock)s: %(why)s"

5748

5788

msgstr ""

5749

5789

5750

#: bzrlib/errors.py:977

5790

#: bzrlib/errors.py:986

5751

5791

msgid ""

5752

5792

"A transaction related operation was attempted after the transaction finished."

5753

5793

msgstr ""

5754

5794

5755

#: bzrlib/errors.py:1004

5795

#: bzrlib/errors.py:1013

5756

5796

msgid "Cannot lock: transport is read only: %(transport)s"

5757

5797

msgstr ""

5758

5798

5759

#: bzrlib/errors.py:1012

5799

#: bzrlib/errors.py:1021

5760

5800

msgid "Could not acquire lock \"%(lock)s\": %(msg)s"

5761

5801

msgstr ""

5762

5802

5763

#: bzrlib/errors.py:1023

5803

#: bzrlib/errors.py:1032

5764

5804

msgid ""

5765

5805

"Lock was broken while still open: %(lock)s - check storage consistency!"

5766

5806

msgstr ""

5767

5807

5768

#: bzrlib/errors.py:1034

5808

#: bzrlib/errors.py:1043

5769

5809

msgid ""

5770

5810

"Lock was released and re-acquired before being broken: %(lock)s: held by "

5771

5811

"%(holder)r, wanted to break %(target)r"

5772

5812

msgstr ""

5773

5813

5774

#: bzrlib/errors.py:1046

5814

#: bzrlib/errors.py:1055

5775

5815

msgid ""

5776

5816

"Lock is apparently held, but corrupted: %(corruption_info)s\n"

5777

5817

"Use 'bzr break-lock' to clear it"

5778

5818

msgstr ""

5779

5819

5780

#: bzrlib/errors.py:1059

5820

#: bzrlib/errors.py:1068

5781

5821

msgid "Lock not held: %(lock)s"

5782

5822

msgstr ""

5783

5823

5784

#: bzrlib/errors.py:1088

5824

#: bzrlib/errors.py:1097

5785

5825

msgid "No changes to commit"

5786

5826

msgstr ""

5787

5827

5788

#: bzrlib/errors.py:1093

5828

#: bzrlib/errors.py:1102

5789

5829

msgid ""

5790

5830

"Selected-file commit of merges is not supported yet: files %(files_str)s"

5791

5831

msgstr ""

5792

5832

5793

#: bzrlib/errors.py:1103

5833

#: bzrlib/errors.py:1112

5794

5834

msgid ""

5795

5835

"Excluding paths during commit is not supported by repository at "

5796

5836

"%(repository)r."

5797

5837

msgstr ""

5798

5838

5799

#: bzrlib/errors.py:1112

5839

#: bzrlib/errors.py:1121

5800

5840

msgid ""

5801

5841

"The specified commit message contains characters unsupported by the current "

5802

5842

"encoding."

5803

5843

msgstr ""

5804

5844

5805

#: bzrlib/errors.py:1118

5845

#: bzrlib/errors.py:1127

5806

5846

msgid "Upgrade URL cannot work with readonly URLs."

5807

5847

msgstr ""

5808

5848

5809

#: bzrlib/errors.py:1123

5849

#: bzrlib/errors.py:1132

5810

5850

msgid "The branch format %(format)s is already at the most recent format."

5811

5851

msgstr ""

5812

5852

5813

#: bzrlib/errors.py:1146

5853

#: bzrlib/errors.py:1155

5814

5854

msgid "Option --change does not accept revision ranges"

5815

5855

msgstr ""

5816

5856

5817

#: bzrlib/errors.py:1151

5857

#: bzrlib/errors.py:1160

5818

5858

msgid "No namespace registered for string: %(spec)r"

5819

5859

msgstr ""

5820

5860

5821

#: bzrlib/errors.py:1170

5861

#: bzrlib/errors.py:1179

5822

5862

msgid ""

5823

5863

"Requested revision: '%(spec)s' does not exist in branch: "

5824

5864

"%(branch_url)s%(extra)s"

5825

5865

msgstr ""

5826

5866

5827

#: bzrlib/errors.py:1184

5867

#: bzrlib/errors.py:1193

5828

5868

msgid ""

5829

5869

"Operation denied because it would change the main history, which is not "

5830

5870

"permitted by the append_revisions_only setting on branch \"%(location)s\"."

5831

5871

msgstr ""

5832

5872

5833

#: bzrlib/errors.py:1195

5873

#: bzrlib/errors.py:1204

5834

5874

msgid ""

5835

5875

"These branches have diverged. Use the missing command to see how.\n"

5836

5876

"Use the merge command to reconcile them."

5837

5877

msgstr ""

5838

5878

5839

#: bzrlib/errors.py:1215

5879

#: bzrlib/errors.py:1224

5840

5880

msgid ""

5841

5881

"Branches have no common ancestor, and no merge base revision was specified."

5842

5882

msgstr ""

5843

5883

5844

#: bzrlib/errors.py:1221

5884

#: bzrlib/errors.py:1230

5845

5885

msgid ""

5846

5886

"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."

5847

5887

msgstr ""

5848

5888

5849

#: bzrlib/errors.py:1227

5889

#: bzrlib/errors.py:1236

5850

5890

msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"

5851

5891

msgstr ""

5852

5892

5853

#: bzrlib/errors.py:1236

5893

#: bzrlib/errors.py:1245

5854

5894

msgid ""

5855

5895

"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."

5856

5896

msgstr ""

5857

5897

5858

#: bzrlib/errors.py:1245

5898

#: bzrlib/errors.py:1254

5859

5899

msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"

5860

5900

msgstr ""

5861

5901

5862

#: bzrlib/errors.py:1254

5902

#: bzrlib/errors.py:1263

5863

5903

msgid "Branch %(branch)s has no commits."

5864

5904

msgstr ""

5865

5905

5866

#: bzrlib/errors.py:1272

5906

#: bzrlib/errors.py:1281

5867

5907

msgid ""

5868

5908

"Bound branch %(branch)s is out of date with master branch "

5869

5909

"%(master)s.%(extra_help)s"

5870

5910

msgstr ""

5871

5911

5872

#: bzrlib/errors.py:1284

5912

#: bzrlib/errors.py:1293

5873

5913

msgid ""

5874

5914

"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "

5875

5915

"bound to %(remote)s."

5876

5916

msgstr ""

5877

5917

5878

#: bzrlib/errors.py:1296

5918

#: bzrlib/errors.py:1305

5879

5919

msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"

5880

5920

msgstr ""

5881

5921

5882

#: bzrlib/errors.py:1305

5922

#: bzrlib/errors.py:1314

5883

5923

msgid ""

5884

5924

"Unable to connect to target of bound branch %(branch)s => %(target)s: "

5885

5925

"%(error)s"

5886

5926

msgstr ""

5887

5927

5888

#: bzrlib/errors.py:1317

5928

#: bzrlib/errors.py:1326

5889

5929

msgid "Error in processing weave: %(msg)s"

5890

5930

msgstr ""

5891

5931

5892

#: bzrlib/errors.py:1326

5932

#: bzrlib/errors.py:1335

5893

5933

msgid "Revision {%(revision_id)s} already present in %(weave)s"

5894

5934

msgstr ""

5895

5935

5896

#: bzrlib/errors.py:1337

5936

#: bzrlib/errors.py:1346

5897

5937

msgid "Revision {%(revision_id)s} not present in %(weave)s"

5898

5938

msgstr ""

5899

5939

5900

#: bzrlib/errors.py:1347

5940

#: bzrlib/errors.py:1356

5901

5941

msgid "Weave invariant violated: %(what)s"

5902

5942

msgstr ""

5903

5943

5904

#: bzrlib/errors.py:1356

5944

#: bzrlib/errors.py:1365

5905

5945

msgid "Parents are mismatched between two revisions. %(msg)s"

5906

5946

msgstr ""

5907

5947

5908

#: bzrlib/errors.py:1378

5948

#: bzrlib/errors.py:1387

5909

5949

msgid ""

5910

5950

"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "

5911

5951

"%(weave_b)s"

5912

5952

msgstr ""

5913

5953

5914

#: bzrlib/errors.py:1390

5954

#: bzrlib/errors.py:1399

5915

5955

msgid "Versioned file error"

5916

5956

msgstr ""

5917

5957

5918

#: bzrlib/errors.py:1395

5958

#: bzrlib/errors.py:1404

5919

5959

msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."

5920

5960

msgstr ""

5921

5961

5922

#: bzrlib/errors.py:1405

5962

#: bzrlib/errors.py:1414

5923

5963

msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."

5924

5964

msgstr ""

5925

5965

5926

#: bzrlib/errors.py:1415

5966

#: bzrlib/errors.py:1424

5927

5967

msgid "Text did not match its checksum: %(msg)s"

5928

5968

msgstr ""

5929

5969

5930

#: bzrlib/errors.py:1541

5970

#: bzrlib/errors.py:1550

5931

5971

msgid "Export format %(format)r not supported"

5932

5972

msgstr ""

5933

5973

5934

#: bzrlib/errors.py:1550

5974

#: bzrlib/errors.py:1559

5935

5975

msgid "Transport error: %(msg)s %(orig_error)s"

5936

5976

msgstr ""

5937

5977

5938

#: bzrlib/errors.py:1576

5978

#: bzrlib/errors.py:1585

5939

5979

msgid "Generic bzr smart protocol error: %(details)s"

5940

5980

msgstr ""

5941

5981

5942

#: bzrlib/errors.py:1584

5982

#: bzrlib/errors.py:1593

5943

5983

msgid "Received bad protocol version marker: %(marker)r"

5944

5984

msgstr ""

5945

5985

5946

#: bzrlib/errors.py:1616

5986

#: bzrlib/errors.py:1625

5947

5987

msgid "Transport operation not possible: %(msg)s %(orig_error)s"

5948

5988

msgstr ""

5949

5989

5950

#: bzrlib/errors.py:1621

5990

#: bzrlib/errors.py:1630

5951

5991

msgid "Connection error: %(msg)s %(orig_error)s"

5952

5992

msgstr ""

5953

5993

5954

#: bzrlib/errors.py:1626

5994

#: bzrlib/errors.py:1635

5955

5995

msgid "%(msg)s %(host)s%(port)s%(orig_error)s"

5956

5996

msgstr ""

5957

5997

5958

#: bzrlib/errors.py:1647

5998

#: bzrlib/errors.py:1656

5959

5999

msgid "Connection closed: %(msg)s %(orig_error)s"

5960

6000

msgstr ""

5961

6001

5962

#: bzrlib/errors.py:1652

6002

#: bzrlib/errors.py:1661

5963

6003

msgid "Connection Timeout: %(msg)s%(orig_error)s"

5964

6004

msgstr ""

5965

6005

5966

#: bzrlib/errors.py:1657

6006

#: bzrlib/errors.py:1666

5967

6007

msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"

5968

6008

msgstr ""

5969

6009

5970

#: bzrlib/errors.py:1667

6010

#: bzrlib/errors.py:1676

5971

6011

msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"

5972

6012

msgstr ""

5973

6013

5974

#: bzrlib/errors.py:1682

6014

#: bzrlib/errors.py:1691

5975

6015

msgid "Certificate error: %(error)s"

5976

6016

msgstr ""

5977

6017

5978

#: bzrlib/errors.py:1690

6018

#: bzrlib/errors.py:1699

5979

6019

msgid "Invalid http range %(range)r for %(path)s: %(msg)s"

5980

6020

msgstr ""

5981

6021

5982

#: bzrlib/errors.py:1704

6022

#: bzrlib/errors.py:1713

5983

6023

msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"

5984

6024

msgstr ""

5985

6025

5986

#: bzrlib/errors.py:1712

6026

#: bzrlib/errors.py:1721

5987

6027

msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"

5988

6028

msgstr ""

5989

6029

5990

#: bzrlib/errors.py:1721

6030

#: bzrlib/errors.py:1730

5991

6031

msgid "%(source)s is%(permanently)s redirected to %(target)s"

5992

6032

msgstr ""

5993

6033

5994

#: bzrlib/errors.py:1735

6034

#: bzrlib/errors.py:1744

5995

6035

msgid "Too many redirections"

5996

6036

msgstr ""

5997

6037

5998

#: bzrlib/errors.py:1740

6038

#: bzrlib/errors.py:1749

5999

6039

msgid "Working tree has conflicts."

6000

6040

msgstr ""

6001

6041

6002

#: bzrlib/errors.py:1744

6042

#: bzrlib/errors.py:1753

6003

6043

msgid "Config file %(filename)s is not UTF-8 encoded\n"

6004

6044

msgstr ""

6005

6045

6006

#: bzrlib/errors.py:1753

6046

#: bzrlib/errors.py:1762

6007

6047

msgid ""

6008

6048

"Error(s) parsing config file %(filename)s:\n"

6009

6049

"%(errors)s"

6010

6050

msgstr ""

6011

6051

6012

#: bzrlib/errors.py:1763

6052

#: bzrlib/errors.py:1772

6013

6053

msgid ""

6014

6054

"Bad value \"%(value)s\" for option \"%(name)s\".\n"

6015

6055

"See ``bzr help %(name)s``"

6016

6056

msgstr ""

6017

6057

6018

#: bzrlib/errors.py:1773

6058

#: bzrlib/errors.py:1782

6019

6059

msgid "%(username)r does not seem to contain a reasonable email address"

6020

6060

msgstr ""

6021

6061

6022

#: bzrlib/errors.py:1782

6062

#: bzrlib/errors.py:1791

6023

6063

msgid "Failed to GPG sign data with command \"%(command_line)s\""

6024

6064

msgstr ""

6025

6065

6026

#: bzrlib/errors.py:1790

6066

#: bzrlib/errors.py:1799

6027

6067

msgid "Failed to verify GPG signature data with error \"%(error)s\""

6028

6068

msgstr "Не удалось верифицировать подпись GPG с ошибкой «%(error)s»"

6029

6069

6030

#: bzrlib/errors.py:1798

6070

#: bzrlib/errors.py:1807

6031

6071

msgid "Unable to import library \"%(library)s\": %(error)s"

6032

6072

msgstr "Не удалось импортировать библиотеку «%(library)s»: %(error)s"

6033

6073

6034

#: bzrlib/errors.py:1806

6074

#: bzrlib/errors.py:1815

6035

6075

msgid "python-gpgme is not installed, it is needed to verify signatures"

6036

6076

msgstr "python-gpgme не устонвлен, он нужен для верификации подписей"

6037

6077

6038

#: bzrlib/errors.py:1814

6078

#: bzrlib/errors.py:1823

6039

6079

msgid ""

6040

6080

"The working tree for %(basedir)s has changed since the last commit, but "

6041

6081

"weave merge requires that it be unchanged"

6043

6083

"Рабочее дерево для %(basedir)s изменилось с последнего закрепления, но merge "

6044

6084

"требует, чтобы оно не содержало изменений"

6045

6085

6046

#: bzrlib/errors.py:1824

6086

#: bzrlib/errors.py:1833

6047

6087

msgid ""

6048

6088

"Can't reprocess and show base, because reprocessing obscures the "

6049

6089

"relationship of conflicting lines to the base"

6050

6090

msgstr ""

6051

6091

6052

#: bzrlib/errors.py:1830

6092

#: bzrlib/errors.py:1839

6053

6093

msgid "Cycle in graph %(graph)r"

6054

6094

msgstr "Цикл в графе %(graph)r"

6055

6095

6056

#: bzrlib/errors.py:1858

6096

#: bzrlib/errors.py:1867

6057

6097

msgid "File %(filename)s is not conflicted."

6058

6098

msgstr "Файл %(filename)s не содержит конфликтов."

6059

6099

6060

#: bzrlib/errors.py:1880

6100

#: bzrlib/errors.py:1889

6061

6101

msgid "No bundle was found in \"%(filename)s\"."

6062

6102

msgstr "В файле «%(filename)s» нет пакета."

6063

6103

6064

#: bzrlib/errors.py:1889

6104

#: bzrlib/errors.py:1898

6065

6105

msgid "Unable to handle bundle version %(version)s: %(msg)s"

6066

6106

msgstr "Не удалось обработать версию пакета %(version)s: %(msg)s"

6067

6107

6068

#: bzrlib/errors.py:1899

6108

#: bzrlib/errors.py:1908

6069

6109

msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"

6070

6110

msgstr ""

6071

6111

"В ветви %(base)s отсутствует ревизия %(text_revision)s файла %(file_id)s"

6072

6112

6073

#: bzrlib/errors.py:1912

6113

#: bzrlib/errors.py:1921

6074

6114

msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"

6075

6115

msgstr ""

6076

6116

"Идентификатор файла {%(file_id)s} уже присутствует в инвентаре как %(entry)s"

6077

6117

6078

#: bzrlib/errors.py:1922

6118

#: bzrlib/errors.py:1931

6079

6119

msgid "Key %(key)s is already present in map"

6080

6120

msgstr ""

6081

6121

6082

#: bzrlib/errors.py:1927

6122

#: bzrlib/errors.py:1936

6083

6123

msgid "The prefix %(prefix)s is in the help search path twice."

6084

6124

msgstr ""

6085

6125

6086

#: bzrlib/errors.py:1937

6126

#: bzrlib/errors.py:1946

6087

6127

msgid ""

6088

6128

"No final name for trans_id %(trans_id)r\n"

6089

6129

"file-id: %(file_id)r\n"

6090

6130

"root trans-id: %(root_trans_id)r\n"

6091

6131

msgstr ""

6092

6132

6093

#: bzrlib/errors.py:1969

6133

#: bzrlib/errors.py:1978

6094

6134

msgid "Attempt to reuse a transform that has already been applied."

6095

6135

msgstr ""

6096

6136

6097

#: bzrlib/errors.py:1974

6137

#: bzrlib/errors.py:1983

6098

6138

msgid "Moving the root directory is not supported at this time"

6099

6139

msgstr "Перемещение в корневую директорию пока не поддерживается"

6100

6140

6101

#: bzrlib/errors.py:1979

6141

#: bzrlib/errors.py:1988

6102

6142

msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"

6103

6143

msgstr "Не удалось переименовать %(from_path)s в %(to_path)s: %(why)s"

6104

6144

6105

#: bzrlib/errors.py:1990

6145

#: bzrlib/errors.py:1999

6106

6146

msgid ""

6107

6147

"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

6108

6148

msgstr ""

6109

6149

"Не удалось переместить %(from_path)s%(operator)s "

6110

6150

"%(to_path)s%(_has_extra)s%(extra)s"

6111

6151

6112

#: bzrlib/errors.py:2026

6152

#: bzrlib/errors.py:2035

6113

6153

msgid ""

6114

6154

"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

6115

6155

msgstr ""

6116

6156

"Не удалось переименовать %(from_path)s%(operator)s "

6117

6157

"%(to_path)s%(_has_extra)s%(extra)s"

6118

6158

6119

#: bzrlib/errors.py:2056

6159

#: bzrlib/errors.py:2065

6120

6160

msgid "Unable to import paramiko (required for sftp support): %(error)s"

6121

6161

msgstr ""

6122

6162

6123

#: bzrlib/errors.py:2064

6163

#: bzrlib/errors.py:2073

6124

6164

msgid "Nothing to merge."

6125

6165

msgstr "Нечего совмещать."

6126

6166

6127

#: bzrlib/errors.py:2069

6167

#: bzrlib/errors.py:2078

6128

6168

msgid "Format %(format)s cannot be initialised by this version of bzr."

6129

6169

msgstr ""

6130

6170

6131

#: bzrlib/errors.py:2078

6171

#: bzrlib/errors.py:2087

6132

6172

msgid ""

6133

6173

"Cannot convert from format %(from_format)s to format %(format)s. "

6134

6174

"%(problem)s"

6135

6175

msgstr ""

6136

6176

6137

#: bzrlib/errors.py:2090

6177

#: bzrlib/errors.py:2099

6138

6178

msgid "Could not find an appropriate Differ for file \"%(path)s\""

6139

6179

msgstr ""

6140

6180

6141

#: bzrlib/errors.py:2098

6181

#: bzrlib/errors.py:2107

6142

6182

msgid "%(exe_name)s could not be found on this machine"

6143

6183

msgstr ""

6144

6184

6145

#: bzrlib/errors.py:2106

6185

#: bzrlib/errors.py:2115

6146

6186

msgid "Diff is not installed on this machine: %(msg)s"

6147

6187

msgstr ""

6148

6188

6149

#: bzrlib/errors.py:2114

6189

#: bzrlib/errors.py:2123

6150

6190

msgid "Diff3 is not installed on this machine."

6151

6191

msgstr "Diff3 не установлен на этой машине."

6152

6192

6153

#: bzrlib/errors.py:2120

6193

#: bzrlib/errors.py:2129

6154

6194

msgid "The content being inserted is already present."

6155

6195

msgstr ""

6156

6196

6157

#: bzrlib/errors.py:2125

6197

#: bzrlib/errors.py:2134

6158

6198

msgid ""

6159

6199

"This tree contains left-over files from a failed operation.\n"

6160

6200

" Please examine %(limbo_dir)s to see if it contains any files you wish "

6162

6202

" keep, and delete it when you are done."

6163

6203

msgstr ""

6164

6204

6165

#: bzrlib/errors.py:2136

6205

#: bzrlib/errors.py:2145

6166

6206

msgid ""

6167

6207

"This tree contains left-over files from a failed operation.\n"

6168

6208

" Please examine %(pending_deletion)s to see if it contains any files you\n"

6169

6209

" wish to keep, and delete it when you are done."

6170

6210

msgstr ""

6171

6211

6172

#: bzrlib/errors.py:2146

6212

#: bzrlib/errors.py:2155

6173

6213

msgid ""

6174

6214

"Unable to delete transform temporary directory %(limbo_dir)s.\n"

6175

6215

" Please examine %(limbo_dir)s to see if it contains any files you wish "

6177

6217

" keep, and delete it when you are done."

6178

6218

msgstr ""

6179

6219

6180

#: bzrlib/errors.py:2157

6220

#: bzrlib/errors.py:2166

6181

6221

msgid ""

6182

6222

"Unable to delete transform temporary directory %(pending_deletion)s. Please "

6183

6223

"examine %(pending_deletion)s to see if it contains any files you wish to "

6184

6224

"keep, and delete it when you are done."

6185

6225

msgstr ""

6186

6226

6187

#: bzrlib/errors.py:2167

6227

#: bzrlib/errors.py:2176

6188

6228

msgid "Working tree is out of date, please run 'bzr update'.%(more)s"

6189

6229

msgstr ""

6190

6230

6191

#: bzrlib/errors.py:2181

6231

#: bzrlib/errors.py:2190

6192

6232

msgid ""

6193

6233

"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."

6194

6234

msgstr ""

6195

6235

6196

#: bzrlib/errors.py:2194

6236

#: bzrlib/errors.py:2203

6197

6237

msgid "Error in merge modified format"

6198

6238

msgstr ""

6199

6239

6200

#: bzrlib/errors.py:2199

6240

#: bzrlib/errors.py:2208

6201

6241

msgid "Format error in conflict listings"

6202

6242

msgstr ""

6203

6243

6204

#: bzrlib/errors.py:2203

6244

#: bzrlib/errors.py:2212

6205

6245

msgid ""

6206

6246

"Inconsistency in dirstate file %(dirstate_path)s.\n"

6207

6247

"Error: %(description)s"

6208

6248

msgstr ""

6209

6249

6210

#: bzrlib/errors.py:2214

6250

#: bzrlib/errors.py:2223

6211

6251

msgid ""

6212

6252

"An error has been detected in the repository %(repo_path)s.\n"

6213

6253

"Please run bzr reconcile on this repository."

6214

6254

msgstr ""

6215

6255

6216

#: bzrlib/errors.py:2225

6256

#: bzrlib/errors.py:2234

6217

6257

msgid ""

6218

6258

"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"

6219

6259

"reason: %(reason)s"

6220

6260

msgstr ""

6221

6261

6222

#: bzrlib/errors.py:2238

6262

#: bzrlib/errors.py:2247

6223

6263

msgid ""

6224

6264

"An inconsistent delta was supplied: %(delta)r\n"

6225

6265

"reason: %(reason)s"

6226

6266

msgstr ""

6227

6267

6228

#: bzrlib/errors.py:2250

6268

#: bzrlib/errors.py:2259

6229

6269

msgid "To use this feature you must upgrade your branch at %(path)s."

6230

6270

msgstr ""

6231

6271

6232

#: bzrlib/errors.py:2259

6272

#: bzrlib/errors.py:2268

6233

6273

msgid "To use this feature you must upgrade your repository at %(path)s."

6234

6274

msgstr ""

6235

6275

6236

#: bzrlib/errors.py:2264

6276

#: bzrlib/errors.py:2273

6237

6277

msgid ""

6238

6278

"To use this feature you must upgrade your branch at %(path)s to a format "

6239

6279

"which supports rich roots."

6240

6280

msgstr ""

6241

6281

6242

#: bzrlib/errors.py:2270

6282

#: bzrlib/errors.py:2279

6243

6283

msgid "Cannot perform local-only commits on unbound branches."

6244

6284

msgstr ""

6245

6285

6246

#: bzrlib/errors.py:2275

6286

#: bzrlib/errors.py:2284

6247

6287

msgid "The method %(mname)s is not supported on objects of type %(tname)s."

6248

6288

msgstr ""

6249

6289

6250

#: bzrlib/errors.py:2296

6290

#: bzrlib/errors.py:2305

6251

6291

msgid "Ghost tags not supported by format %(format)r."

6252

6292

msgstr ""

6253

6293

6254

#: bzrlib/errors.py:2304

6294

#: bzrlib/errors.py:2313

6255

6295

msgid "File is binary but should be text."

6256

6296

msgstr ""

6257

6297

6258

#: bzrlib/errors.py:2309

6298

#: bzrlib/errors.py:2318

6259

6299

msgid "The path %(path)s is not permitted on this platform"

6260

6300

msgstr ""

6261

6301

6262

#: bzrlib/errors.py:2318

6302

#: bzrlib/errors.py:2327

6263

6303

msgid ""

6264

6304

"Testament did not match expected value.\n"

6265

6305

" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"

6266

6306

" {%(measured)s}"

6267

6307

msgstr ""

6268

6308

6269

#: bzrlib/errors.py:2330

6309

#: bzrlib/errors.py:2339

6270

6310

msgid "Not a bzr revision-bundle: %(text)r"

6271

6311

msgstr ""

6272

6312

6273

#: bzrlib/errors.py:2339

6313

#: bzrlib/errors.py:2348

6274

6314

msgid "Bad bzr revision-bundle: %(text)r"

6275

6315

msgstr ""

6276

6316

6277

#: bzrlib/errors.py:2348

6317

#: bzrlib/errors.py:2357

6278

6318

msgid "Malformed bzr revision-bundle header: %(text)r"

6279

6319

msgstr ""

6280

6320

6281

#: bzrlib/errors.py:2353

6321

#: bzrlib/errors.py:2362

6282

6322

msgid "Malformed patches in bzr revision-bundle: %(text)r"

6283

6323

msgstr ""

6284

6324

6285

#: bzrlib/errors.py:2358

6325

#: bzrlib/errors.py:2367

6286

6326

msgid "Malformed footer in bzr revision-bundle: %(text)r"

6287

6327

msgstr ""

6288

6328

6289

#: bzrlib/errors.py:2363

6329

#: bzrlib/errors.py:2372

6290

6330

msgid "End of line marker was not \\n in bzr revision-bundle"

6291

6331

msgstr ""

6292

6332

6293

#: bzrlib/errors.py:2373

6333

#: bzrlib/errors.py:2382

6294

6334

msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"

6295

6335

msgstr ""

6296

6336

6297

#: bzrlib/errors.py:2383

6337

#: bzrlib/errors.py:2392

6298

6338

msgid "Root class for inventory serialization errors"

6299

6339

msgstr ""

6300

6340

6301

#: bzrlib/errors.py:2387

6341

#: bzrlib/errors.py:2396

6302

6342

msgid ""

6303

6343

"The inventory was not in the expected format:\n"

6304

6344

" %(msg)s"

6305

6345

msgstr ""

6306

6346

6307

#: bzrlib/errors.py:2396

6347

#: bzrlib/errors.py:2405

6308

6348

msgid "This operation requires rich root data storage"

6309

6349

msgstr ""

6310

6350

6311

#: bzrlib/errors.py:2409

6351

#: bzrlib/errors.py:2418

6312

6352

msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"

6313

6353

msgstr ""

6314

6354

6315

#: bzrlib/errors.py:2418

6355

#: bzrlib/errors.py:2427

6316

6356

msgid ""

6317

6357

"Don't know how to handle SSH connections. Please set BZR_SSH environment "

6318

6358

"variable."

6319

6359

msgstr ""

6320

6360

6321

#: bzrlib/errors.py:2425

6361

#: bzrlib/errors.py:2434

6322

6362

msgid ""

6323

6363

"Could not determine revno for {%(revision_id)s} because its ancestry shows a "

6324

6364

"ghost at {%(ghost_revision_id)s}"

6325

6365

msgstr ""

6326

6366

6327

#: bzrlib/errors.py:2435

6367

#: bzrlib/errors.py:2444

6328

6368

msgid "Ghost revision {%(revision_id)s} cannot be used here."

6329

6369

msgstr ""

6330

6370

6331

#: bzrlib/errors.py:2486

6371

#: bzrlib/errors.py:2495

6332

6372

msgid ""

6333

6373

"A merge directive must provide either a bundle or a public branch location."

6334

6374

msgstr ""

6335

6375

6336

#: bzrlib/errors.py:2493

6376

#: bzrlib/errors.py:2502

6337

6377

msgid "Bad merge directive payload %(start)r"

6338

6378

msgstr ""

6339

6379

6340

#: bzrlib/errors.py:2503

6380

#: bzrlib/errors.py:2512

6341

6381

msgid "Preview patch does not match requested changes."

6342

6382

msgstr ""

6343

6383

6344

#: bzrlib/errors.py:2509

6384

#: bzrlib/errors.py:2518

6345

6385

msgid "Patch_type was %(patch_type)s, but no patch was supplied."

6346

6386

msgstr ""

6347

6387

6348

#: bzrlib/errors.py:2519

6388

#: bzrlib/errors.py:2528

6349

6389

msgid ""

6350

6390

"Your branch does not have all of the revisions required in order to merge "

6351

6391

"this merge directive and the target location specified in the merge "

6352

6392

"directive is not a branch: %(location)s."

6353

6393

msgstr ""

6354

6394

6355

#: bzrlib/errors.py:2531

6395

#: bzrlib/errors.py:2540

6356

6396

msgid "Unsupported entry kind %(kind)s"

6357

6397

msgstr ""

6358

6398

6359

#: bzrlib/errors.py:2539

6399

#: bzrlib/errors.py:2548

6360

6400

msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"

6361

6401

msgstr ""

6362

6402

6363

#: bzrlib/errors.py:2549

6403

#: bzrlib/errors.py:2558

6364

6404

msgid "Subsume target %(other_tree)s needs to be upgraded."

6365

6405

msgstr ""

6366

6406

6367

#: bzrlib/errors.py:2568

6407

#: bzrlib/errors.py:2577

6368

6408

msgid "No such tag: %(tag_name)s"

6369

6409

msgstr ""

6370

6410

6371

#: bzrlib/errors.py:2576

6411

#: bzrlib/errors.py:2585

6372

6412

msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."

6373

6413

msgstr ""

6374

6414

6375

#: bzrlib/errors.py:2585

6415

#: bzrlib/errors.py:2594

6376

6416

msgid "Tag %(tag_name)s already exists."

6377

6417

msgstr ""

6378

6418

6379

#: bzrlib/errors.py:2593

6419

#: bzrlib/errors.py:2602

6380

6420

msgid ""

6381

6421

"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "

6382

6422

"bugs\" for more information on this feature."

6383

6423

msgstr ""

6384

6424

6385

#: bzrlib/errors.py:2603

6425

#: bzrlib/errors.py:2612

6386

6426

msgid ""

6387

6427

"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"

6388

6428

msgstr ""

6389

6429

6390

#: bzrlib/errors.py:2613

6430

#: bzrlib/errors.py:2622

6391

6431

msgid ""

6392

6432

"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"

6393

6433

msgstr ""

6394

6434

6395

#: bzrlib/errors.py:2623

6435

#: bzrlib/errors.py:2632

6396

6436

msgid "Invalid line in bugs property: '%(line)s'"

6397

6437

msgstr ""

6398

6438

6399

#: bzrlib/errors.py:2631

6439

#: bzrlib/errors.py:2640

6400

6440

msgid "Invalid bug status: '%(status)s'"

6401

6441

msgstr ""

6402

6442

6403

#: bzrlib/errors.py:2639

6443

#: bzrlib/errors.py:2648

6404

6444

msgid "Could not understand response from smart server: %(response_tuple)r"

6405

6445

msgstr ""

6406

6446

6407

#: bzrlib/errors.py:2678

6447

#: bzrlib/errors.py:2687

6408

6448

msgid "Server sent an unexpected error: %(error_tuple)r"

6409

6449

msgstr ""

6410

6450

6411

#: bzrlib/errors.py:2697

6451

#: bzrlib/errors.py:2706

6412

6452

msgid "Unrecognised container format: %(container_format)r"

6413

6453

msgstr ""

6414

6454

6415

#: bzrlib/errors.py:2705

6455

#: bzrlib/errors.py:2714

6416

6456

msgid "Unexpected end of container stream"

6417

6457

msgstr ""

6418

6458

6419

#: bzrlib/errors.py:2710

6459

#: bzrlib/errors.py:2719

6420

6460

msgid "Unknown record type: %(record_type)r"

6421

6461

msgstr ""

6422

6462

6423

#: bzrlib/errors.py:2718

6463

#: bzrlib/errors.py:2727

6424

6464

msgid "Invalid record: %(reason)s"

6425

6465

msgstr ""

6426

6466

6427

#: bzrlib/errors.py:2726

6467

#: bzrlib/errors.py:2735

6428

6468

msgid "Container has data after end marker: %(excess)r"

6429

6469

msgstr ""

6430

6470

6431

#: bzrlib/errors.py:2734

6471

#: bzrlib/errors.py:2743

6432

6472

msgid "Container has multiple records with the same name: %(name)s"

6433

6473

msgstr ""

6434

6474

6435

#: bzrlib/errors.py:2747

6475

#: bzrlib/errors.py:2756

6436

6476

msgid "Corrupt or incompatible data stream: %(reason)s"

6437

6477

msgstr ""

6438

6478

6439

#: bzrlib/errors.py:2755

6479

#: bzrlib/errors.py:2764

6440

6480

msgid "SMTP error: %(error)s"

6441

6481

msgstr ""

6442

6482

6443

#: bzrlib/errors.py:2763

6483

#: bzrlib/errors.py:2772

6444

6484

msgid "No message supplied."

6445

6485

msgstr ""

6446

6486

6447

#: bzrlib/errors.py:2768

6487

#: bzrlib/errors.py:2777

6448

6488

msgid "No mail-to address (--mail-to) or output (-o) specified."

6449

6489

msgstr ""

6450

6490

6451

#: bzrlib/errors.py:2773

6452

msgid "Unknown mail client: %(mail_client)s"

6453

msgstr ""

6454

6455

#: bzrlib/errors.py:2781

6491

#: bzrlib/errors.py:2782

6456

6492

msgid ""

6457

6493

"Unable to find mail client with the following names: "

6458

6494

"%(mail_command_list_string)s"

6459

6495

msgstr ""

6460

6496

6461

#: bzrlib/errors.py:2791

6497

#: bzrlib/errors.py:2792

6462

6498

msgid "SMTP connection to %(host)s refused"

6463

6499

msgstr ""

6464

6500

6465

#: bzrlib/errors.py:2800

6501

#: bzrlib/errors.py:2801

6466

6502

msgid "Please specify smtp_server. No server at default %(host)s."

6467

6503

msgstr ""

6468

6504

6469

#: bzrlib/errors.py:2814

6505

#: bzrlib/errors.py:2815

6470

6506

msgid ""

6471

6507

"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"

6472

6508

"reconfigure."

6473

6509

msgstr ""

6474

6510

6475

#: bzrlib/errors.py:2826

6511

#: bzrlib/errors.py:2827

6476

6512

msgid "'%(display_url)s' is already a branch."

6477

6513

msgstr ""

6478

6514

6479

#: bzrlib/errors.py:2831

6515

#: bzrlib/errors.py:2832

6480

6516

msgid "'%(display_url)s' is already a tree."

6481

6517

msgstr ""

6482

6518

6483

#: bzrlib/errors.py:2836

6519

#: bzrlib/errors.py:2837

6484

6520

msgid "'%(display_url)s' is already a checkout."

6485

6521

msgstr ""

6486

6522

6487

#: bzrlib/errors.py:2841

6523

#: bzrlib/errors.py:2842

6488

6524

msgid "'%(display_url)s' is already a lightweight checkout."

6489

6525

msgstr ""

6490

6526

6491

#: bzrlib/errors.py:2846

6527

#: bzrlib/errors.py:2847

6492

6528

msgid "'%(display_url)s' is already using a shared repository."

6493

6529

msgstr ""

6494

6530

6495

#: bzrlib/errors.py:2851

6531

#: bzrlib/errors.py:2852

6496

6532

msgid "'%(display_url)s' is already standalone."

6497

6533

msgstr ""

6498

6534

6499

#: bzrlib/errors.py:2856

6535

#: bzrlib/errors.py:2857

6500

6536

msgid "Shared repository '%(display_url)s' already creates working trees."

6501

6537

msgstr ""

6502

6538

6503

#: bzrlib/errors.py:2862

6539

#: bzrlib/errors.py:2863

6504

6540

msgid ""

6505

6541

"Shared repository '%(display_url)s' already doesn't create working trees."

6506

6542

msgstr ""

6507

6543

6508

#: bzrlib/errors.py:2868

6544

#: bzrlib/errors.py:2869

6509

6545

msgid "Requested reconfiguration of '%(display_url)s' is not supported."

6510

6546

msgstr ""

6511

6547

6512

#: bzrlib/errors.py:2873

6548

#: bzrlib/errors.py:2874

6513

6549

msgid "No location could be found to bind to at %(display_url)s."

6514

6550

msgstr ""

6515

6551

6516

#: bzrlib/errors.py:2878

6552

#: bzrlib/errors.py:2879

6517

6553

msgid ""

6518

6554

"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "

6519

6555

"status).%(more)s"

6520

6556

msgstr ""

6521

6557

6522

#: bzrlib/errors.py:2897

6558

#: bzrlib/errors.py:2898

6523

6559

msgid ""

6524

6560

"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"

6525

6561

"list).%(more)s"

6526

6562

msgstr ""

6527

6563

6528

#: bzrlib/errors.py:2903

6564

#: bzrlib/errors.py:2904

6529

6565

msgid "Variable {%(name)s} is not available."

6530

6566

msgstr ""

6531

6567

6532

#: bzrlib/errors.py:2911

6568

#: bzrlib/errors.py:2912

6533

6569

msgid "No template specified."

6534

6570

msgstr ""

6535

6571

6536

#: bzrlib/errors.py:2916

6572

#: bzrlib/errors.py:2917

6537

6573

msgid "Unable to create symlink %(path_str)son this platform"

6538

6574

msgstr ""

6539

6575

6540

#: bzrlib/errors.py:2931

6576

#: bzrlib/errors.py:2932

6541

6577

msgid ""

6542

6578

"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "

6543

6579

"\"original\", \"local\"."

6544

6580

msgstr ""

6545

6581

6546

#: bzrlib/errors.py:2965

6582

#: bzrlib/errors.py:2966

6547

6583

msgid ""

6548

6584

"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"

6549

6585

msgstr ""

6550

6586

6551

#: bzrlib/errors.py:2977

6587

#: bzrlib/errors.py:2978

6552

6588

msgid "The \"%(config_id)s\" configuration does not exist."

6553

6589

msgstr ""

6554

6590

6555

#: bzrlib/errors.py:2985

6591

#: bzrlib/errors.py:2986

6556

6592

msgid "The \"%(option_name)s\" configuration option does not exist."

6557

6593

msgstr ""

6558

6594

6559

#: bzrlib/errors.py:2993

6595

#: bzrlib/errors.py:2994

6560

6596

msgid "The alias \"%(alias_name)s\" does not exist."

6561

6597

msgstr ""

6562

6598

6563

#: bzrlib/errors.py:3007

6599

#: bzrlib/errors.py:3008

6564

6600

msgid "\"%(alias_name)s\" is not a valid location alias."

6565

6601

msgstr ""

6566

6602

6567

#: bzrlib/errors.py:3015

6603

#: bzrlib/errors.py:3016

6568

6604

msgid "No %(alias_name)s location assigned."

6569

6605

msgstr ""

6570

6606

6571

#: bzrlib/errors.py:3023

6607

#: bzrlib/errors.py:3024

6572

6608

msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."

6573

6609

msgstr ""

6574

6610

6575

#: bzrlib/errors.py:3033

6611

#: bzrlib/errors.py:3034

6576

6612

msgid "Unknown rules detected: %(unknowns_str)s."

6577

6613

msgstr ""

6578

6614

6579

#: bzrlib/errors.py:3044

6615

#: bzrlib/errors.py:3045

6580

6616

msgid "Tip change rejected: %(msg)s"

6581

6617

msgstr ""

6582

6618

6583

#: bzrlib/errors.py:3052

6619

#: bzrlib/errors.py:3053

6584

6620

msgid "Shelf corrupt."

6585

6621

msgstr ""

6586

6622

6587

#: bzrlib/errors.py:3057

6623

#: bzrlib/errors.py:3058

6588

6624

msgid "Corruption while decompressing repository file%(orig_error)s"

6589

6625

msgstr ""

6590

6626

6591

#: bzrlib/errors.py:3069

6627

#: bzrlib/errors.py:3070

6592

6628

msgid "No changes are shelved with id \"%(shelf_id)d\"."

6593

6629

msgstr ""

6594

6630

6595

#: bzrlib/errors.py:3077

6631

#: bzrlib/errors.py:3078

6596

6632

msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."

6597

6633

msgstr ""

6598

6634

6599

#: bzrlib/errors.py:3085

6635

#: bzrlib/errors.py:3086

6600

6636

msgid ""

6601

6637

"An attempt to access a url outside the server jail was made: '%(url)s'."

6602

6638

msgstr ""

6603

6639

6604

#: bzrlib/errors.py:3093

6640

#: bzrlib/errors.py:3094

6605

6641

msgid "The user aborted the operation."

6606

6642

msgstr ""

6607

6643

6608

#: bzrlib/errors.py:3098

6644

#: bzrlib/errors.py:3099

6609

6645

msgid "Branching '%(url)s'(%(format)s) must create a working tree."

6610

6646

msgstr ""

6611

6647

6612

#: bzrlib/errors.py:3108

6648

#: bzrlib/errors.py:3109

6613

6649

msgid "No such view: %(view_name)s."

6614

6650

msgstr ""

6615

6651

6616

#: bzrlib/errors.py:3118

6652

#: bzrlib/errors.py:3119

6617

6653

msgid ""

6618

6654

"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "

6619

6655

"to a later format."

6620

6656

msgstr ""

6621

6657

6622

#: bzrlib/errors.py:3127

6658

#: bzrlib/errors.py:3128

6623

6659

msgid ""

6624

6660

"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"

6625

6661

msgstr ""

6626

6662

6627

#: bzrlib/errors.py:3194

6663

#: bzrlib/errors.py:3195

6628

6664

msgid "%(bzrdir)r does not support co-located branches."

6629

6665

msgstr ""

6630

6666

6631

#: bzrlib/errors.py:3200

6667

#: bzrlib/errors.py:3201

6632

6668

msgid ""

6633

6669

"Unable to determine your name.\n"

6634

6670

"Please, set your name with the 'whoami' command.\n"

6635

6671

"E.g. bzr whoami \"Your Name <name@example.com>\""

6636

6672

msgstr ""

6637

6673

6638

#: bzrlib/errors.py:3209

6674

#: bzrlib/errors.py:3210

6639

6675

msgid "Invalid pattern(s) found. %(msg)s"

6640

6676

msgstr ""

6641

6677

6642

#: bzrlib/errors.py:3217

6678

#: bzrlib/errors.py:3218

6643

6679

msgid ""

6644

6680

"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "

6645

6681

"unbind` to fix."

6646

6682

msgstr ""

6647

6683

6648

#: bzrlib/errors.py:3228

6684

#: bzrlib/errors.py:3229

6649

6685

msgid "Loop involving %(refs)r while expanding \"%(string)s\"."

6650

6686

msgstr ""

6651

6687

6652

#: bzrlib/errors.py:3237

6688

#: bzrlib/errors.py:3238

6653

6689

msgid "Option %(name)s is not defined while expanding \"%(string)s\"."

6654

6690

msgstr ""

6655

6691

6656

#: bzrlib/errors.py:3246

6692

#: bzrlib/errors.py:3247

6657

6693

msgid ""

6658

6694

"No compatible object available for operations from %(source)r to %(target)r."

6659

6695

msgstr ""

6660

6696

6661

#: bzrlib/errors.py:3256

6697

#: bzrlib/errors.py:3257

6662

6698

msgid ""

6663

6699

"VFS requests over the smart server are not allowed. Encountered: %(method)s, "

6664

6700

"%(arguments)s."

6665

6701

msgstr ""

6666

6702

6667

#: bzrlib/errors.py:3266

6703

#: bzrlib/errors.py:3267

6668

6704

msgid ""

6669

6705

"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "

6670

6706

"format %(format)r"

6671

6707

msgstr ""

6672

6708

6673

#: bzrlib/errors.py:3278

6709

#: bzrlib/errors.py:3279

6674

6710

msgid ""

6675

6711

"Missing feature %(feature)s not provided by this version of Bazaar or any "

6676

6712

"plugin."

6677

6713

msgstr ""

6678

6714

6679

#: bzrlib/errors.py:3291

6715

#: bzrlib/errors.py:3292

6680

6716

msgid "Binary files section encountered."

6681

6717

msgstr ""

6682

6718

6683

#: bzrlib/errors.py:3299

6719

#: bzrlib/errors.py:3300

6684

6720

msgid ""

6685

6721

"Malformed patch header. %(desc)s\n"

6686

6722

"%(line)r"

6687

6723

msgstr ""

6688

6724

6689

#: bzrlib/errors.py:3308

6725

#: bzrlib/errors.py:3309

6690

6726

msgid ""

6691

6727

"Malformed hunk header. %(desc)s\n"

6692

6728

"%(line)r"

6693

6729

msgstr ""

6694

6730

6695

#: bzrlib/errors.py:3317

6731

#: bzrlib/errors.py:3318

6696

6732

msgid ""

6697

6733

"Malformed line. %(desc)s\n"

6698

6734

"%(line)r"

6699

6735

msgstr ""

6700

6736

6701

#: bzrlib/errors.py:3327

6737

#: bzrlib/errors.py:3328

6702

6738

msgid ""

6703

6739

"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "

6704

6740

"but patch says it should be \"%(patch_line)s\""

6705

6741

msgstr ""

6706

6742

6707

#: bzrlib/errors.py:3338

6743

#: bzrlib/errors.py:3339

6708

6744

msgid "The feature %(feature)s has already been registered."

6709

6745

msgstr ""

6710

6746

6756

6792

"regular push."

6757

6793

msgstr ""

6758

6794

6759

#: bzrlib/gpg.py:119 bzrlib/gpg.py:460

6795

#: bzrlib/gpg.py:366

6796

msgid "No GnuPG key results for pattern: {0}"

6797

msgstr ""

6798

6799

#: bzrlib/gpg.py:439

6760

6800

msgid "{0} commits with valid signatures"

6761

6801

msgstr ""

6762

6802

6763

#: bzrlib/gpg.py:123 bzrlib/gpg.py:465

6803

#: bzrlib/gpg.py:445

6764

6804

msgid "{0} commit with unknown key"

6765

6805

msgid_plural "{0} commits with unknown keys"

6766

6806

msgstr[0] "{0} закрепление с неизвестным ключом"

6767

6807

msgstr[1] "{0} закрепления с неизвестным ключом"

6768

6808

msgstr[2] "{0} закреплений с неизвестным ключом"

6769

6809

6770

#: bzrlib/gpg.py:129 bzrlib/gpg.py:472

6810

#: bzrlib/gpg.py:453

6771

6811

msgid "{0} commit not valid"

6772

6812

msgid_plural "{0} commits not valid"

6773

6813

msgstr[0] ""

6774

6814

msgstr[1] ""

6775

6815

6776

#: bzrlib/gpg.py:135 bzrlib/gpg.py:479

6816

#: bzrlib/gpg.py:461

6777

6817

msgid "{0} commit not signed"

6778

6818

msgid_plural "{0} commits not signed"

6779

6819

msgstr[0] ""

6780

6820

msgstr[1] ""

6781

6821

6782

#: bzrlib/gpg.py:141 bzrlib/gpg.py:486

6822

#: bzrlib/gpg.py:469

6783

6823

msgid "{0} commit with key now expired"

6784

6824

msgid_plural "{0} commits with key now expired"

6785

6825

msgstr[0] ""

6786

6826

msgstr[1] ""

6787

6827

6788

#: bzrlib/gpg.py:343

6789

msgid "No GnuPG key results for pattern: {0}"

6790

msgstr ""

6828

#: bzrlib/gpg.py:489

6829

msgid "{0} commit by author {1} with key {2} now expired"

6830

msgid_plural "{0} commits by author {1} with key {2} now expired"

6831

msgstr[0] ""

6832

msgstr[1] ""

6791

6833

6792

#: bzrlib/gpg.py:386

6834

#: bzrlib/gpg.py:505

6793

6835

msgid "{0} signed {1} commit"

6794

6836

msgid_plural "{0} signed {1} commits"

6795

6837

msgstr[0] ""

6796

6838

msgstr[1] ""

6797

6839

6798

#: bzrlib/gpg.py:403 bzrlib/gpg.py:419

6840

#: bzrlib/gpg.py:522 bzrlib/gpg.py:539

6799

6841

msgid "{0} commit by author {1}"

6800

6842

msgid_plural "{0} commits by author {1}"

6801

6843

msgstr[0] ""

6802

6844

msgstr[1] ""

6803

6845

6804

#: bzrlib/gpg.py:433

6846

#: bzrlib/gpg.py:554

6805

6847

msgid "Unknown key {0} signed {1} commit"

6806

6848

msgid_plural "Unknown key {0} signed {1} commits"

6807

6849

msgstr[0] "Неизвестным ключом {0} подписано {1} закрепление"

6808

6850

msgstr[1] "Неизвестным ключом {0} подписаны {1} закрепления"

6809

6851

msgstr[2] "Неизвестным ключом {0} подписаны {1} закреплений"

6810

6852

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

6853

#: bzrlib/groupcompress.py:1739

6818

6854

#, python-format

6819

6855

msgid "Insert claimed random_id=True, but then inserted %r two times"

6820

6856

msgstr ""

6821

6857

6822

#: bzrlib/hooks.py:331

6858

#: bzrlib/hooks.py:313

6823

6859

#, python-format

6824

6860

msgid "Introduced in: %s"

6825

6861

msgstr ""

6826

6862

6827

#: bzrlib/hooks.py:334

6863

#: bzrlib/hooks.py:316

6828

6864

#, python-format

6829

6865

msgid "Deprecated in: %s"

6830

6866

msgstr ""

6873

6909

"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"

6874

6910

msgstr ""

6875

6911

6876

#: bzrlib/log.py:572

6912

#: bzrlib/log.py:563

6877

6913

msgid "--exclude-common-ancestry requires two different revisions"

6878

6914

msgstr ""

6879

6915

6880

#: bzrlib/log.py:574

6916

#: bzrlib/log.py:565

6881

6917

#, python-format

6882

6918

msgid "invalid direction %r"

6883

6919

msgstr ""

6884

6920

6885

#: bzrlib/log.py:662

6921

#: bzrlib/log.py:653

6886

6922

msgid "Start revision not found in history of end revision."

6887

6923

msgstr ""

6888

6924

6889

#: bzrlib/log.py:1080 bzrlib/log.py:1138

6925

#: bzrlib/log.py:1071 bzrlib/log.py:1129

6890

6926

msgid "Logging revision 0 is invalid."

6891

6927

msgstr ""

6892

6928

6893

#: bzrlib/log.py:1082 bzrlib/log.py:1140

6929

#: bzrlib/log.py:1073 bzrlib/log.py:1131

6894

6930

msgid "Start revision must be older than the end revision."

6895

6931

msgstr ""

6896

6932

6897

#: bzrlib/log.py:1827

6933

#: bzrlib/log.py:1818

6898

6934

#, python-format

6899

6935

msgid "unknown log formatter: %r"

6900

6936

msgstr ""

6901

6937

6902

#: bzrlib/log.py:2123

6938

#: bzrlib/log.py:2114

6903

6939

msgid "fixes bug"

6904

6940

msgid_plural "fixes bugs"

6905

6941

msgstr[0] ""

6914

6950

msgid "%d conflicts encountered."

6915

6951

msgstr ""

6916

6952

6917

#: bzrlib/merge.py:845 bzrlib/merge.py:1933

6953

#: bzrlib/merge.py:845 bzrlib/merge.py:1868

6918

6954

msgid "Preparing file merge"

6919

6955

msgstr ""

6920

6956

7036

7072

msgid "lstat/stat of ({0!r}): {1!r}"

7037

7073

msgstr ""

7038

7074

7039

#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019

7075

#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041

7040

7076

#, python-format

7041

7077

msgid "sorry, %r not allowed in path"

7042

7078

msgstr ""

7043

7079

7044

#: bzrlib/osutils.py:1237

7080

#: bzrlib/osutils.py:1259

7045

7081

#, python-format

7046

7082

msgid "%r is too short to calculate a relative path"

7047

7083

msgstr ""

7080

7116

msgid "Generate only the shell function, don't enable it"

7081

7117

msgstr ""

7082

7118

7083

#: bzrlib/plugins/launchpad/__init__.py:81

7119

#: bzrlib/plugins/launchpad/account.py:66

7120

msgid "Setting ssh/sftp usernames for launchpad.net."

7121

msgstr ""

7122

7123

#: bzrlib/plugins/launchpad/cmds.py:44

7084

7124

msgid "Register a branch with launchpad.net."

7085

7125

msgstr ""

7086

7126

7087

#: bzrlib/plugins/launchpad/__init__.py:83

7127

#: bzrlib/plugins/launchpad/cmds.py:46

7088

7128

msgid ""

7089

7129

"This command lists a bzr branch in the directory of branches on\n"

7090

7130

"launchpad.net. Registration allows the branch to be associated with\n"

7091

7131

"bugs or specifications."

7092

7132

msgstr ""

7093

7133

7094

#: bzrlib/plugins/launchpad/__init__.py:87

7134

#: bzrlib/plugins/launchpad/cmds.py:50

7095

7135

msgid ""

7096

7136

"Before using this command you must register the project to which the\n"

7097

7137

"branch belongs, and create an account for yourself on launchpad.net."

7098

7138

msgstr ""

7099

7139

7100

#: bzrlib/plugins/launchpad/__init__.py:90

7140

#: bzrlib/plugins/launchpad/cmds.py:53

7101

7141

msgid ""

7102

7142

"arguments:\n"

7103

7143

" public_url: The publicly visible url for the branch to register.\n"

7109

7149

" otherwise error."

7110

7150

msgstr ""

7111

7151

7112

#: bzrlib/plugins/launchpad/__init__.py:99

7152

#: bzrlib/plugins/launchpad/cmds.py:62

7113

7153

msgid ""

7114

7154

"example:\n"

7115

7155

" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"

7116

7156

" --project fooproject"

7117

7157

msgstr ""

7118

7158

7119

#: bzrlib/plugins/launchpad/__init__.py:106

7159

#: bzrlib/plugins/launchpad/cmds.py:69

7120

7160

msgid "Launchpad project short name to associate with the branch."

7121

7161

msgstr ""

7122

7162

7123

#: bzrlib/plugins/launchpad/__init__.py:113

7163

#: bzrlib/plugins/launchpad/cmds.py:76

7124

7164

msgid ""

7125

7165

"Short name for the branch; by default taken from the last component of the "

7126

7166

"url."

7127

7167

msgstr ""

7128

7168

7129

#: bzrlib/plugins/launchpad/__init__.py:117

7169

#: bzrlib/plugins/launchpad/cmds.py:80

7130

7170

msgid "One-sentence description of the branch."

7131

7171

msgstr ""

7132

7172

7133

#: bzrlib/plugins/launchpad/__init__.py:120

7173

#: bzrlib/plugins/launchpad/cmds.py:83

7134

7174

msgid "Longer description of the purpose or contents of the branch."

7135

7175

msgstr ""

7136

7176

7137

#: bzrlib/plugins/launchpad/__init__.py:123

7177

#: bzrlib/plugins/launchpad/cmds.py:86

7138

7178

msgid "Branch author's email address, if not yourself."

7139

7179

msgstr ""

7140

7180

7141

#: bzrlib/plugins/launchpad/__init__.py:126

7181

#: bzrlib/plugins/launchpad/cmds.py:89

7142

7182

msgid "The bug this branch fixes."

7143

7183

msgstr ""

7144

7184

7145

#: bzrlib/plugins/launchpad/__init__.py:129

7185

#: bzrlib/plugins/launchpad/cmds.py:92

7146

7186

msgid "Prepare the request but don't actually send it."

7147

7187

msgstr ""

7148

7188

7149

#: bzrlib/plugins/launchpad/__init__.py:151

7189

#: bzrlib/plugins/launchpad/cmds.py:114

7150

7190

msgid ""

7151

7191

"register-branch requires a public branch url - see bzr help register-branch."

7152

7192

msgstr ""

7153

7193

7154

#: bzrlib/plugins/launchpad/__init__.py:159

7194

#: bzrlib/plugins/launchpad/cmds.py:122

7155

7195

msgid "--product is deprecated; please use --project."

7156

7196

msgstr ""

7157

7197

7158

#: bzrlib/plugins/launchpad/__init__.py:191

7198

#: bzrlib/plugins/launchpad/cmds.py:152

7159

7199

msgid "Open a Launchpad branch page in your web browser."

7160

7200

msgstr ""

7161

7201

7162

#: bzrlib/plugins/launchpad/__init__.py:196

7202

#: bzrlib/plugins/launchpad/cmds.py:157

7163

7203

msgid "Do not actually open the browser. Just say the URL we would use."

7164

7204

msgstr ""

7165

7205

7166

#: bzrlib/plugins/launchpad/__init__.py:231

7206

#: bzrlib/plugins/launchpad/cmds.py:192

7167

7207

#, python-format

7168

7208

msgid "Opening %s in web browser"

7169

7209

msgstr ""

7170

7210

7171

#: bzrlib/plugins/launchpad/__init__.py:241

7211

#: bzrlib/plugins/launchpad/cmds.py:200

7172

7212

msgid "Show or set the Launchpad user ID."

7173

7213

msgstr ""

7174

7214

7175

#: bzrlib/plugins/launchpad/__init__.py:243

7215

#: bzrlib/plugins/launchpad/cmds.py:202

7176

7216

msgid ""

7177

7217

"When communicating with Launchpad, some commands need to know your\n"

7178

7218

"Launchpad user ID. This command can be used to set or show the\n"

7179

7219

"user ID that Bazaar will use for such communication."

7180

7220

msgstr ""

7181

7221

7182

#: bzrlib/plugins/launchpad/__init__.py:247

7222

#: bzrlib/plugins/launchpad/cmds.py:206

7183

7223

msgid ""

7184

7224

":Examples:\n"

7185

7225

" Show the Launchpad ID of the current user::"

7186

7226

msgstr ""

7187

7227

7188

#: bzrlib/plugins/launchpad/__init__.py:250

7228

#: bzrlib/plugins/launchpad/cmds.py:209

7189

7229

msgid " bzr launchpad-login"

7190

7230

msgstr ""

7191

7231

7192

#: bzrlib/plugins/launchpad/__init__.py:252

7232

#: bzrlib/plugins/launchpad/cmds.py:211

7193

7233

msgid " Set the Launchpad ID of the current user to 'bob'::"

7194

7234

msgstr ""

7195

7235

7196

#: bzrlib/plugins/launchpad/__init__.py:254

7236

#: bzrlib/plugins/launchpad/cmds.py:213

7197

7237

msgid " bzr launchpad-login bob"

7198

7238

msgstr ""

7199

7239

7200

#: bzrlib/plugins/launchpad/__init__.py:261

7240

#: bzrlib/plugins/launchpad/cmds.py:220

7201

7241

msgid "Don't check that the user name is valid."

7202

7242

msgstr ""

7203

7243

7204

#: bzrlib/plugins/launchpad/__init__.py:276

7205

#: bzrlib/plugins/launchpad/__init__.py:287

7244

#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246

7206

7245

msgid "Launchpad user ID exists and has SSH keys.\n"

7207

7246

msgstr ""

7208

7247

7209

#: bzrlib/plugins/launchpad/__init__.py:279

7248

#: bzrlib/plugins/launchpad/cmds.py:238

7210

7249

msgid "No Launchpad user ID configured.\n"

7211

7250

msgstr ""

7212

7251

7213

#: bzrlib/plugins/launchpad/__init__.py:290

7252

#: bzrlib/plugins/launchpad/cmds.py:249

7214

7253

#, python-format

7215

7254

msgid "Launchpad user ID set to '%s'.\n"

7216

7255

msgstr ""

7217

7256

7218

#: bzrlib/plugins/launchpad/__init__.py:298

7257

#: bzrlib/plugins/launchpad/cmds.py:255

7219

7258

msgid "Ask Launchpad to mirror a branch now."

7220

7259

msgstr ""

7221

7260

7222

#: bzrlib/plugins/launchpad/__init__.py:318

7261

#: bzrlib/plugins/launchpad/cmds.py:272

7223

7262

msgid "Propose merging a branch on Launchpad."

7224

7263

msgstr ""

7225

7264

7226

#: bzrlib/plugins/launchpad/__init__.py:320

7265

#: bzrlib/plugins/launchpad/cmds.py:274

7227

7266

msgid ""

7228

7267

"This will open your usual editor to provide the initial comment. When it\n"

7229

7268

"has created the proposal, it will open it in your default web browser."

7230

7269

msgstr ""

7231

7270

7232

#: bzrlib/plugins/launchpad/__init__.py:323

7271

#: bzrlib/plugins/launchpad/cmds.py:277

7233

7272

msgid ""

7234

7273

"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"

7235

7274

"is not supplied, the remembered submit branch will be used. If no submit\n"

7236

7275

"branch is remembered, the development focus will be used."

7237

7276

msgstr ""

7238

7277

7239

#: bzrlib/plugins/launchpad/__init__.py:327

7278

#: bzrlib/plugins/launchpad/cmds.py:281

7240

7279

msgid ""

7241

7280

"By default, the SUBMIT_BRANCH's review team will be requested to review\n"

7242

7281

"the merge proposal. This can be overriden by specifying --review (-R).\n"

7244

7283

"may optionally be followed by '=' and the review type. For example:"

7245

7284

msgstr ""

7246

7285

7247

#: bzrlib/plugins/launchpad/__init__.py:332

7286

#: bzrlib/plugins/launchpad/cmds.py:286

7248

7287

msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"

7249

7288

msgstr ""

7250

7289

7251

#: bzrlib/plugins/launchpad/__init__.py:334

7290

#: bzrlib/plugins/launchpad/cmds.py:288

7252

7291

msgid ""

7253

7292

"This will propose a merge, request \"jrandom\" to perform a review of\n"

7254

7293

"unspecified type, and request \"review-team\" to perform a \"qa\" review."

7255

7294

msgstr ""

7256

7295

7257

#: bzrlib/plugins/launchpad/__init__.py:339

7296

#: bzrlib/plugins/launchpad/cmds.py:293

7258

7297

msgid "Propose the merge on staging."

7259

7298

msgstr ""

7260

7299

7261

#: bzrlib/plugins/launchpad/__init__.py:341

7300

#: bzrlib/plugins/launchpad/cmds.py:295

7262

7301

msgid "Commit message."

7263

7302

msgstr ""

7264

7303

7265

#: bzrlib/plugins/launchpad/__init__.py:343

7304

#: bzrlib/plugins/launchpad/cmds.py:297

7266

7305

msgid "Mark the proposal as approved immediately."

7267

7306

msgstr ""

7268

7307

7269

#: bzrlib/plugins/launchpad/__init__.py:345

7308

#: bzrlib/plugins/launchpad/cmds.py:298

7309

msgid "The bug this proposal fixes."

7310

msgstr ""

7311

7312

#: bzrlib/plugins/launchpad/cmds.py:300

7270

7313

msgid "Requested reviewer and optional type."

7271

7314

msgstr ""

7272

7315

7273

#: bzrlib/plugins/launchpad/__init__.py:382

7316

#: bzrlib/plugins/launchpad/cmds.py:335

7274

7317

msgid "Find the proposal to merge this revision."

7275

7318

msgstr ""

7276

7319

7277

#: bzrlib/plugins/launchpad/__init__.py:384

7320

#: bzrlib/plugins/launchpad/cmds.py:337

7278

7321

msgid ""

7279

7322

"Finds the merge proposal(s) that discussed landing the specified revision.\n"

7280

7323

"This works only if the selected branch was the merge proposal target, and\n"

7282

7325

"are opened in a web browser."

7283

7326

msgstr ""

7284

7327

7285

#: bzrlib/plugins/launchpad/__init__.py:389

7328

#: bzrlib/plugins/launchpad/cmds.py:342

7286

7329

msgid ""

7287

7330

"Any revision involved in the merge may be specified-- the revision in\n"

7288

7331

"which the merge was performed, or one of the revisions that was merged."

7289

7332

msgstr ""

7290

7333

7291

#: bzrlib/plugins/launchpad/__init__.py:392

7334

#: bzrlib/plugins/launchpad/cmds.py:345

7292

7335

msgid "So, to find the merge proposal that reviewed line 1 of README::"

7293

7336

msgstr ""

7294

7337

7295

#: bzrlib/plugins/launchpad/__init__.py:394

7338

#: bzrlib/plugins/launchpad/cmds.py:347

7296

7339

msgid " bzr lp-find-proposal -r annotate:README:1"

7297

7340

msgstr ""

7298

7341

7299

#: bzrlib/plugins/launchpad/__init__.py:409

7342

#: bzrlib/plugins/launchpad/cmds.py:363

7300

7343

msgid "No review found."

7301

7344

msgstr ""

7302

7345

7303

#: bzrlib/plugins/launchpad/__init__.py:410

7346

#: bzrlib/plugins/launchpad/cmds.py:364

7304

7347

#, python-format

7305

7348

msgid "%d proposals(s) found."

7306

7349

msgstr ""

7307

7350

7308

#: bzrlib/plugins/launchpad/__init__.py:420

7351

#: bzrlib/plugins/launchpad/cmds.py:374

7309

7352

msgid "Finding revision-id"

7310

7353

msgstr ""

7311

7354

7312

#: bzrlib/plugins/launchpad/__init__.py:427

7355

#: bzrlib/plugins/launchpad/cmds.py:381

7313

7356

msgid "Finding merge"

7314

7357

msgstr ""

7315

7358

7316

#: bzrlib/plugins/launchpad/__init__.py:432

7359

#: bzrlib/plugins/launchpad/cmds.py:386

7317

7360

msgid "Finding revno"

7318

7361

msgstr ""

7319

7362

7320

#: bzrlib/plugins/launchpad/__init__.py:437

7363

#: bzrlib/plugins/launchpad/cmds.py:392

7321

7364

msgid "Finding Launchpad branch"

7322

7365

msgstr ""

7323

7366

7324

#: bzrlib/plugins/launchpad/__init__.py:440

7367

#: bzrlib/plugins/launchpad/cmds.py:395

7325

7368

msgid "Finding proposals"

7326

7369

msgstr ""

7327

7370

7328

#: bzrlib/plugins/launchpad/account.py:66

7329

msgid "Setting ssh/sftp usernames for launchpad.net."

7330

msgstr ""

7331

7332

7371

#: bzrlib/plugins/launchpad/lp_api.py:241

7333

7372

#: bzrlib/plugins/launchpad/lp_api.py:246

7334

7373

#, python-format

7372

7411

" remote: {2}"

7373

7412

msgstr ""

7374

7413

7375

#: bzrlib/plugins/launchpad/lp_propose.py:149

7414

#: bzrlib/plugins/launchpad/lp_propose.py:150

7376

7415

#, python-format

7377

7416

msgid "There is already a branch merge proposal: %s"

7378

7417

msgstr ""

7379

7418

7380

#: bzrlib/plugins/weave_fmt/bzrdir.py:236

7419

#: bzrlib/plugins/weave_fmt/bzrdir.py:237

7381

7420

msgid "pb parameter to convert() is deprecated"

7382

7421

msgstr ""

7383

7422

7384

#: bzrlib/plugins/weave_fmt/bzrdir.py:239

7423

#: bzrlib/plugins/weave_fmt/bzrdir.py:240

7385

7424

msgid "starting upgrade from format 4 to 5"

7386

7425

msgstr ""

7387

7426

7388

#: bzrlib/plugins/weave_fmt/bzrdir.py:249

7427

#: bzrlib/plugins/weave_fmt/bzrdir.py:250

7389

7428

msgid "note: upgrade may be faster if all store files are ungzipped first"

7390

7429

msgstr ""

7391

7430

7392

#: bzrlib/plugins/weave_fmt/bzrdir.py:278

7431

#: bzrlib/plugins/weave_fmt/bzrdir.py:279

7393

7432

msgid "converting revision"

7394

7433

msgstr ""

7395

7434

7396

#: bzrlib/plugins/weave_fmt/bzrdir.py:283

7435

#: bzrlib/plugins/weave_fmt/bzrdir.py:284

7397

7436

msgid "upgraded to weaves:"

7398

7437

msgstr ""

7399

7438

7400

#: bzrlib/plugins/weave_fmt/bzrdir.py:284

7439

#: bzrlib/plugins/weave_fmt/bzrdir.py:285

7401

7440

#, python-format

7402

7441

msgid "%6d revisions and inventories"

7403

7442

msgstr ""

7404

7443

7405

#: bzrlib/plugins/weave_fmt/bzrdir.py:286

7444

#: bzrlib/plugins/weave_fmt/bzrdir.py:287

7406

7445

#, python-format

7407

7446

msgid "%6d revisions not present"

7408

7447

msgstr ""

7409

7448

7410

#: bzrlib/plugins/weave_fmt/bzrdir.py:288

7449

#: bzrlib/plugins/weave_fmt/bzrdir.py:289

7411

7450

#, python-format

7412

7451

msgid "%6d texts"

7413

7452

msgstr ""

7414

7453

7415

#: bzrlib/plugins/weave_fmt/bzrdir.py:324

7454

#: bzrlib/plugins/weave_fmt/bzrdir.py:325

7416

7455

msgid "writing weave"

7417

7456

msgstr ""

7418

7457

7419

#: bzrlib/plugins/weave_fmt/bzrdir.py:328

7420

#: bzrlib/plugins/weave_fmt/bzrdir.py:330

7458

#: bzrlib/plugins/weave_fmt/bzrdir.py:329

7459

#: bzrlib/plugins/weave_fmt/bzrdir.py:331

7421

7460

msgid "inventory"

7422

7461

msgstr ""

7423

7462

7424

#: bzrlib/plugins/weave_fmt/bzrdir.py:347

7463

#: bzrlib/plugins/weave_fmt/bzrdir.py:348

7425

7464

msgid "write revision"

7426

7465

msgstr ""

7427

7466

7428

#: bzrlib/plugins/weave_fmt/bzrdir.py:361

7467

#: bzrlib/plugins/weave_fmt/bzrdir.py:362

7429

7468

msgid "loading revision"

7430

7469

msgstr ""

7431

7470

7432

#: bzrlib/plugins/weave_fmt/bzrdir.py:366

7471

#: bzrlib/plugins/weave_fmt/bzrdir.py:367

7433

7472

#, python-format

7434

7473

msgid "revision {%s} not present in branch; will be converted as a ghost"

7435

7474

msgstr ""

7436

7475

7437

#: bzrlib/plugins/weave_fmt/bzrdir.py:506

7476

#: bzrlib/plugins/weave_fmt/bzrdir.py:507

7438

7477

msgid "starting upgrade from format 5 to 6"

7439

7478

msgstr ""

7440

7479

7441

#: bzrlib/plugins/weave_fmt/bzrdir.py:516

7480

#: bzrlib/plugins/weave_fmt/bzrdir.py:517

7442

7481

#, python-format

7443

7482

msgid "adding prefixes to %s"

7444

7483

msgstr ""

7445

7484

7446

#: bzrlib/plugins/weave_fmt/bzrdir.py:556

7485

#: bzrlib/plugins/weave_fmt/bzrdir.py:557

7447

7486

msgid "starting upgrade from format 6 to metadir"

7448

7487

msgstr ""

7449

7488

7450

#: bzrlib/plugins/weave_fmt/bzrdir.py:564

7489

#: bzrlib/plugins/weave_fmt/bzrdir.py:565

7451

7490

msgid "Removing ancestry.weave"

7452

7491

msgstr ""

7453

7492

7454

#: bzrlib/plugins/weave_fmt/bzrdir.py:569

7493

#: bzrlib/plugins/weave_fmt/bzrdir.py:570

7455

7494

msgid "Finding branch files"

7456

7495

msgstr ""

7457

7496

7458

#: bzrlib/plugins/weave_fmt/bzrdir.py:579

7497

#: bzrlib/plugins/weave_fmt/bzrdir.py:580

7459

7498

msgid "Upgrading repository"

7460

7499

msgstr ""

7461

7500

7462

#: bzrlib/plugins/weave_fmt/bzrdir.py:589

7501

#: bzrlib/plugins/weave_fmt/bzrdir.py:590

7463

7502

msgid "Upgrading branch"

7464

7503

msgstr ""

7465

7504

7466

#: bzrlib/plugins/weave_fmt/bzrdir.py:612

7505

#: bzrlib/plugins/weave_fmt/bzrdir.py:613

7467

7506

msgid "No working tree."

7468

7507

msgstr ""

7469

7508

7470

#: bzrlib/plugins/weave_fmt/bzrdir.py:619

7509

#: bzrlib/plugins/weave_fmt/bzrdir.py:620

7471

7510

msgid "Upgrading working tree"

7472

7511

msgstr ""

7473

7512

7474

#: bzrlib/plugins/weave_fmt/bzrdir.py:640

7513

#: bzrlib/plugins/weave_fmt/bzrdir.py:641

7475

7514

#, python-format

7476

7515

msgid "Make %s lock"

7477

7516

msgstr ""

7478

7517

7479

#: bzrlib/plugins/weave_fmt/bzrdir.py:651

7518

#: bzrlib/plugins/weave_fmt/bzrdir.py:652

7480

7519

#, python-format

7481

7520

msgid "Moving %s"

7482

7521

msgstr ""

7503

7542

msgid "Too many redirections trying to make %s."

7504

7543

msgstr ""

7505

7544

7506

#: bzrlib/push.py:147

7545

#: bzrlib/push.py:148

7507

7546

msgid ""

7508

7547

"These branches have diverged. See \"bzr help diverged-branches\" for more "

7509

7548

"information."

7510

7549

msgstr ""

7511

7550

7512

#: bzrlib/push.py:151

7551

#: bzrlib/push.py:152

7513

7552

#, python-format

7514

7553

msgid ""

7515

7554

"It is not possible to losslessly push to %s. You may want to use dpush "

7516

7555

"instead."

7517

7556

msgstr ""

7518

7557

7519

#: bzrlib/push.py:157

7558

#: bzrlib/push.py:158

7520

7559

#, python-format

7521

7560

msgid ""

7522

7561

"At %s you have a valid .bzr control directory, but not a branch or "

7617

7656

msgid "bzr: ERROR (ignored): %s"

7618

7657

msgstr "bzr: ОШИБКА (игнорирована): %s"

7619

7658

7620

#: bzrlib/remote.py:2541

7659

#: bzrlib/remote.py:2534

7621

7660

msgid "Copying repository content as tarball..."

7622

7661

msgstr "Копирование содержимого репозитория в тарбол..."

7623

7662

7633

7672

msgid "{0} => {1}"

7634

7673

msgstr "{0} => {1}"

7635

7674

7636

#: bzrlib/repository.py:1787

7675

#: bzrlib/repository.py:1738

7637

7676

msgid "Moving repository to repository.backup"

7638

7677

msgstr "Перемещение репозитория в repository.backup"

7639

7678

7640

#: bzrlib/repository.py:1794

7679

#: bzrlib/repository.py:1745

7641

7680

msgid "Creating new repository"

7642

7681

msgstr "Создание нового репозитория"

7643

7682

7644

#: bzrlib/repository.py:1799

7683

#: bzrlib/repository.py:1750

7645

7684

msgid "Copying content"

7646

7685

msgstr "Копирование содержимого"

7647

7686

7648

#: bzrlib/repository.py:1803

7687

#: bzrlib/repository.py:1754

7649

7688

msgid "Deleting old repository content"

7650

7689

msgstr "Удаление старого содержимого репозитория"

7651

7690

7652

#: bzrlib/repository.py:1805

7691

#: bzrlib/repository.py:1756

7653

7692

msgid "repository converted"

7654

7693

msgstr "репозиторий преобразован"

7655

7694

7657

7696

msgid "Using {0} {1}"

7658

7697

msgstr "Используется {0} {1}"

7659

7698

7660

#: bzrlib/send.py:58

7699

#: bzrlib/send.py:59

7661

7700

#, python-format

7662

7701

msgid "Mail client \"%s\" does not support specifying body"

7663

7702

msgstr "Почтовый клиент «%s» не поддерживает определение тела"

7664

7703

7665

#: bzrlib/send.py:62

7704

#: bzrlib/send.py:63

7666

7705

msgid "--remember requires a branch to be specified."

7667

7706

msgstr "--remember требует указания ветви."

7668

7707

7669

#: bzrlib/send.py:77

7708

#: bzrlib/send.py:78

7670

7709

msgid "No submit branch known or specified"

7671

7710

msgstr "Ветвь для отсылки неизвестна и не задана"

7672

7711

7673

#: bzrlib/send.py:80

7712

#: bzrlib/send.py:81

7674

7713

msgid "Using saved {0} location \"{1}\" to determine what changes to submit."

7675

7714

msgstr ""

7676

7715

"Используется сохранённое {0} местоположение «{1}» для определения изменений, "

7677

7716

"которые необходимо отправить."

7678

7717

7679

#: bzrlib/send.py:98

7718

#: bzrlib/send.py:99

7680

7719

#, python-format

7681

7720

msgid "No such send format '%s'."

7682

7721

msgstr "Нет такого формата отправки '%s'."

7683

7722

7684

#: bzrlib/send.py:114

7723

#: bzrlib/send.py:115

7685

7724

msgid "bzr send takes at most two one revision identifiers"

7686

7725

msgstr "bzr send принимает не более двух идентификаторов ревизии"

7687

7726

7688

#: bzrlib/send.py:127

7727

#: bzrlib/send.py:128

7689

7728

msgid "No revisions to submit."

7690

7729

msgstr "Нет ревизий для отправки."

7691

7730

7692

#: bzrlib/send.py:139

7731

#: bzrlib/send.py:140

7693

7732

msgid ""

7694

7733

"- not supported for merge directives that use more than one output file."

7695

7734

msgstr ""

7696

7735

"- не поддерживается для директив merge, которые используют более, чем один "

7697

7736

"файл вывода."

7698

7737

7699

#: bzrlib/send.py:185

7738

#: bzrlib/send.py:186

7700

7739

msgid "Format 0.9 does not permit bundle with no patch"

7701

7740

msgstr "Формат 0.9 не разрешает пакеты без патчей"

7702

7741

7855

7894

"Не удалось соединиться с текущей основной ветвью %(target)s: %(error)s Для "

7856

7895

"принудительного переключения используйте --force."

7857

7896

7858

#: bzrlib/switch.py:125

7897

#: bzrlib/switch.py:129

7859

7898

msgid "Cannot switch a branch, only a checkout."

7860

7899

msgstr ""

7861

7900

7862

#: bzrlib/switch.py:163

7901

#: bzrlib/switch.py:167

7863

7902

#, python-format

7864

7903

msgid "Tree is up to date at revision %d."

7865

7904

msgstr "Дерево в актуальной ревизии %d."

7866

7905

7867

#: bzrlib/switch.py:169

7906

#: bzrlib/switch.py:173

7868

7907

#, python-format

7869

7908

msgid "Updated to revision %d."

7870

7909

msgstr "Обновлено до ревизии %d."

7871

7910

7872

#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747

7911

#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736

7873

7912

msgid "Apply phase"

7874

7913

msgstr "Применить фазу"

7875

7914

7876

#: bzrlib/transform.py:1773 bzrlib/transform.py:1841

7915

#: bzrlib/transform.py:1762 bzrlib/transform.py:1830

7877

7916

msgid "removing file"

7878

7917

msgstr "удаление файла"

7879

7918

7880

#: bzrlib/transform.py:1791 bzrlib/transform.py:1876

7919

#: bzrlib/transform.py:1780 bzrlib/transform.py:1865

7881

7920

msgid "adding file"

7882

7921

msgstr "добавление файла"

7883

7922

7884

#: bzrlib/transform.py:2591

7923

#: bzrlib/transform.py:2598

7885

7924

msgid "Building tree"

7886

7925

msgstr "Построение дерева"

7887

7926

7888

#: bzrlib/transform.py:2681 bzrlib/transform.py:2708

7927

#: bzrlib/transform.py:2688 bzrlib/transform.py:2715

7889

7928

msgid "Adding file contents"

7890

7929

msgstr "Добавление содержимого файлй"

7891

7930

7892

#: bzrlib/transform.py:3028

7931

#: bzrlib/transform.py:3017

7893

7932

msgid "Resolution pass"

7894

7933

msgstr ""

7895

7934

7898

7937

msgid "Authenticated as %s"

7899

7938

msgstr ""

7900

7939

7901

#: bzrlib/tree.py:634

7940

#: bzrlib/tree.py:647

7902

7941

msgid "*** {0} content-filter: {1} => {2!r}"

7903

7942

msgstr "*** {0} content-filter: {1} => {2!r}"

7904

7943

7959

7998

msgid "failed to clean-up {0}: {1}"

7960

7999

msgstr "не удалось очистить {0}: {1}"

7961

8000

7962

#: bzrlib/vf_repository.py:1090

8001

#: bzrlib/vf_repository.py:1091

7963

8002

msgid "inventories"

7964

8003

msgstr ""

7965

8004

7966

#: bzrlib/vf_repository.py:1116

8005

#: bzrlib/vf_repository.py:1117

7967

8006

msgid "texts"

7968

8007

msgstr ""

7969

8008

7970

#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630

8009

#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631

7971

8010

msgid "Calculating text parents"

7972

8011

msgstr ""

7973

8012

7974

#: bzrlib/vf_repository.py:1706

8013

#: bzrlib/vf_repository.py:1707

7975

8014

msgid "Fetch texts"

7976

8015

msgstr ""

7977

8016

7978

#: bzrlib/vf_repository.py:2535

8017

#: bzrlib/vf_repository.py:2536

7979

8018

msgid "loading text store"

7980

8019

msgstr ""

7981

8020

7982

#: bzrlib/vf_repository.py:2541

8021

#: bzrlib/vf_repository.py:2542

7983

8022

msgid "checking text graph"

7984

8023

msgstr ""

7985

8024

7986

#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009

7987

#: bzrlib/vf_repository.py:3124

8025

#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012

8026

#: bzrlib/vf_repository.py:3127

7988

8027

msgid "Transferring revisions"

7989

8028

msgstr ""

7990

8029

8031

8070

msgid "PageFaultCount %8d"

8032

8071

msgstr "PageFaultCount %8d"

8033

8072

8034

#: bzrlib/workingtree.py:1478

8073

#: bzrlib/workingtree.py:1482

8035

8074

msgid "Rerun update after fixing the conflicts."

8036

8075

msgstr "Снова запустите обновление после исправления конфликтов."

8037

8076

8041

8080

8042

8081

#: dummy/help_topics/basic/detail.txt:1

8043

8082

msgid ""

8044

"Bazaar 2.5b6 -- a free distributed version-control tool\n"

8083

"Bazaar 2.6b2 -- a free distributed version-control tool\n"

8045

8084

"http://bazaar.canonical.com/"

8046

8085

msgstr ""

8047

8086

8377

8416

msgid "How to fix diverged branches"

8378

8417

msgstr "Как исправлять отклонения ветвей"

8379

8418

8380

#: dummy/help_topics/env-variables/detail.txt:1

8381

msgid "Environment Variables"

8382

msgstr "Переменные окружения"

8383

8384

#: dummy/help_topics/env-variables/detail.txt:3

8385

msgid ""

8386

"=================== "

8387

"===========================================================\n"

8388

"BZRPATH Path where bzr is to look for shell plugin external\n"

8389

" commands.\n"

8390

"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"

8391

"EMAIL E-Mail address of the user.\n"

8392

"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"

8393

"EDITOR Editor for editing commit messages.\n"

8394

"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"

8395

"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"

8396

"BZR_PLUGINS_AT Plugins to load from a directory not in "

8397

"BZR_PLUGIN_PATH.\n"

8398

"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"

8399

"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "

8400

"and\n"

8401

" HOME.\n"

8402

"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "

8403

"URLs).\n"

8404

"BZR_SSH Path to SSH client, or one of paramiko, openssh, "

8405

"sshcorp,\n"

8406

" plink or lsh.\n"

8407

"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"

8408

"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"

8409

"BZR_COLUMNS Override implicit terminal width.\n"

8410

"BZR_CONCURRENCY Number of processes that can be run concurrently "

8411

"(selftest)\n"

8412

"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "

8413

"'text'.\n"

8414

"BZR_PDB Control whether to launch a debugger on error.\n"

8415

"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"

8416

" breakin debugger.\n"

8417

"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "

8418

"(instead\n"

8419

" of char-based).\n"

8420

"=================== "

8421

"===========================================================\n"

8422

msgstr ""

8423

8424

8419

#: dummy/help_topics/env-variables/summary.txt:1

8425

8420

msgid "Environment variable names and values"

8426

8421

msgstr "Имена и значения переменных окружения"

9441

9436

msgid " bzr commit --fixes <tracker>:<id>"

9442

9437

msgstr ""

9443

9438

9444

#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398

9439

#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410

9445

9440

msgid "or::"

9446

9441

msgstr ""

9447

9442

9676

9671

"remove-tree Remove the working tree from a given branch/checkout.\n"

9677

9672

"renames Show list of renamed files.\n"

9678

9673

"resolve Mark a conflict as resolved.\n"

9679

"revert Revert files to a previous revision.\n"

9674

"revert Set files in the working tree back to the contents of a\n"

9675

" previous revision.\n"

9680

9676

"revno Show current revision number.\n"

9681

9677

"root Show the tree root directory.\n"

9682

9678

"send Mail or create a merge-directive for submitting changes.\n"

10334

10330

10335

10331

#: en/help_topics/configuration.txt:336

10336

10332

msgid ""

10333

"Another such option is ``branchname``, which refers to the name of a "

10334

"colocated\n"

10335

"branch. For non-colocated branches, it behaves like basename. It can be "

10336

"used\n"

10337

"like this::"

10338

msgstr ""

10339

10340

#: en/help_topics/configuration.txt:340

10341

msgid ""

10342

" [/home/vila/src/bzr/bugs]\n"

10343

" mypush = lp:~vila/bzr/{branchname}"

10344

msgstr ""

10345

10346

#: en/help_topics/configuration.txt:343

10347

msgid ""

10348

"When used with a colocated branch named ``832013-expand-in-stack``, we'll "

10349

"get::"

10350

msgstr ""

10351

10352

#: en/help_topics/configuration.txt:345

10353

msgid ""

10354

" bzr config mypush\n"

10355

" lp:~vila/bzr/832013-expand-in-stack"

10356

msgstr ""

10357

10358

#: en/help_topics/configuration.txt:348

10359

msgid ""

10337

10360

"When an option is local to a Section, it cannot be referred to from option\n"

10338

10361

"values in any other section from the same ``Store`` nor from any other\n"

10339

10362

"``Store``."

10340

10363

msgstr ""

10341

10364

10342

#: en/help_topics/configuration.txt:340

10365

#: en/help_topics/configuration.txt:352

10343

10366

msgid ""

10344

10367

"\n"

10345

10368

"The main configuration file, bazaar.conf\n"

10346

10369

"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"

10347

10370

msgstr ""

10348

10371

10349

#: en/help_topics/configuration.txt:344

10372

#: en/help_topics/configuration.txt:356

10350

10373

msgid ""

10351

10374

"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"

10352

10375

"The default section contains the default\n"

10354

10377

"overriden by providing a branch-specific section in ``locations.conf``."

10355

10378

msgstr ""

10356

10379

10357

#: en/help_topics/configuration.txt:349

10380

#: en/help_topics/configuration.txt:361

10358

10381

msgid "A typical ``bazaar.conf`` section often looks like the following::"

10359

10382

msgstr ""

10360

10383

10361

#: en/help_topics/configuration.txt:351

10384

#: en/help_topics/configuration.txt:363

10362

10385

msgid ""

10363

10386

" [DEFAULT]\n"

10364

10387

" email = John Doe <jdoe@isp.com>\n"

10366

10389

" create_signatures = when-required"

10367

10390

msgstr ""

10368

10391

10369

#: en/help_topics/configuration.txt:356

10392

#: en/help_topics/configuration.txt:368

10370

10393

msgid ""

10371

10394

"\n"

10372

10395

"The branch location configuration file, locations.conf\n"

10373

10396

"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"

10374

10397

msgstr ""

10375

10398

10376

#: en/help_topics/configuration.txt:360

10399

#: en/help_topics/configuration.txt:372

10377

10400

msgid ""

10378

10401

"``locations.conf`` allows one to specify overriding settings for\n"

10379

10402

"a specific branch. The format is almost identical to the default section in\n"

10383

10406

"for. The '?' and '*' wildcards are supported::"

10384

10407

msgstr ""

10385

10408

10386

#: en/help_topics/configuration.txt:366

10409

#: en/help_topics/configuration.txt:378

10387

10410

msgid ""

10388

10411

" [/home/jdoe/branches/nethack]\n"

10389

10412

" email = Nethack Admin <nethack@nethack.com>"

10390

10413

msgstr ""

10391

10414

10392

#: en/help_topics/configuration.txt:369

10415

#: en/help_topics/configuration.txt:381

10393

10416

msgid ""

10394

10417

" [http://hypothetical.site.com/branches/devel-branch]\n"

10395

10418

" create_signatures = always"

10396

10419

msgstr ""

10397

10420

10398

#: en/help_topics/configuration.txt:372

10421

#: en/help_topics/configuration.txt:384

10399

10422

msgid ""

10400

10423

"The authentication configuration file, authentication.conf\n"

10401

10424

"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"

10402

10425

msgstr ""

10403

10426

10404

#: en/help_topics/configuration.txt:375

10427

#: en/help_topics/configuration.txt:387

10405

10428

msgid ""

10406

10429

"``authentication.conf`` allows one to specify credentials for\n"

10407

10430

"remote servers. This can be used for all the supported transports and any "

10409

10432

"of bzr that requires authentication (smtp for example)."

10410

10433

msgstr ""

10411

10434

10412

#: en/help_topics/configuration.txt:379

10435

#: en/help_topics/configuration.txt:391

10413

10436

msgid ""

10414

10437

"The syntax of the file obeys the same rules as the others except for the\n"

10415

10438

"option policies which don't apply."

10416

10439

msgstr ""

10417

10440

10418

#: en/help_topics/configuration.txt:382

10441

#: en/help_topics/configuration.txt:394

10419

10442

msgid ""

10420

10443

"For more information on the possible uses of the authentication "

10421

10444

"configuration\n"

10422

10445

"file see :doc:`authentication-help`."

10423

10446

msgstr ""

10424

10447

10425

#: en/help_topics/configuration.txt:385

10448

#: en/help_topics/configuration.txt:397

10426

10449

msgid ""

10427

10450

"\n"

10428

10451

"Common options\n"

10429

10452

"--------------"

10430

10453

msgstr ""

10431

10454

10432

#: en/help_topics/configuration.txt:389

10455

#: en/help_topics/configuration.txt:401

10433

10456

msgid ""

10434

10457

"debug_flags\n"

10435

10458

"~~~~~~~~~~~"

10436

10459

msgstr ""

10437

10460

10438

#: en/help_topics/configuration.txt:392

10461

#: en/help_topics/configuration.txt:404

10439

10462

msgid ""

10440

10463

"A comma-separated list of debugging options to turn on. The same values\n"

10441

10464

"can be used as with the -D command-line option (see `help global-options`).\n"

10442

10465

"For example::"

10443

10466

msgstr ""

10444

10467

10445

#: en/help_topics/configuration.txt:396

10468

#: en/help_topics/configuration.txt:408

10446

10469

msgid " debug_flags = hpss"

10447

10470

msgstr ""

10448

10471

10449

#: en/help_topics/configuration.txt:400

10472

#: en/help_topics/configuration.txt:412

10450

10473

msgid " debug_flags = hpss,evil"

10451

10474

msgstr ""

10452

10475

10453

#: en/help_topics/configuration.txt:402

10476

#: en/help_topics/configuration.txt:414

10454

10477

msgid ""

10455

10478

"email\n"

10456

10479

"~~~~~"

10457

10480

msgstr ""

10458

10481

10459

#: en/help_topics/configuration.txt:405

10482

#: en/help_topics/configuration.txt:417

10460

10483

msgid ""

10461

10484

"The email address to use when committing a branch. Typically takes the form\n"

10462

10485

"of::"

10463

10486

msgstr ""

10464

10487

10465

#: en/help_topics/configuration.txt:408

10488

#: en/help_topics/configuration.txt:420

10466

10489

msgid " email = Full Name <account@hostname.tld>"

10467

10490

msgstr ""

10468

10491

10469

#: en/help_topics/configuration.txt:410

10492

#: en/help_topics/configuration.txt:422

10470

10493

msgid ""

10471

10494

"editor\n"

10472

10495

"~~~~~~"

10473

10496

msgstr ""

10474

10497

10475

#: en/help_topics/configuration.txt:413

10498

#: en/help_topics/configuration.txt:425

10476

10499

msgid ""

10477

10500

"The path of the editor that you wish to use if *bzr commit* is run without\n"

10478

10501

"a commit message. This setting is trumped by the environment variable\n"

10480

10503

"variables."

10481

10504

msgstr ""

10482

10505

10483

#: en/help_topics/configuration.txt:418

10506

#: en/help_topics/configuration.txt:430

10484

10507

msgid ""

10485

10508

"log_format\n"

10486

10509

"~~~~~~~~~~"

10487

10510

msgstr ""

10488

10511

10489

#: en/help_topics/configuration.txt:421

10512

#: en/help_topics/configuration.txt:433

10490

10513

msgid ""

10491

10514

"The default log format to use. Standard log formats are ``long``, ``short``\n"

10492

10515

"and ``line``. Additional formats may be provided by plugins. The default\n"

10493

10516

"value is ``long``."

10494

10517

msgstr ""

10495

10518

10496

#: en/help_topics/configuration.txt:425

10519

#: en/help_topics/configuration.txt:437

10497

10520

msgid ""

10498

10521

"check_signatures\n"

10499

10522

"~~~~~~~~~~~~~~~~"

10500

10523

msgstr ""

10501

10524

10502

#: en/help_topics/configuration.txt:428

10525

#: en/help_topics/configuration.txt:440

10503

10526

msgid ""

10504

10527

"Reserved for future use. These options will allow a policy for branches to\n"

10505

10528

"require signatures."

10506

10529

msgstr ""

10507

10530

10508

#: en/help_topics/configuration.txt:431

10531

#: en/help_topics/configuration.txt:443

10509

10532

msgid ""

10510

10533

"require\n"

10511

10534

" The gnupg signature for revisions must be present and must be valid."

10512

10535

msgstr ""

10513

10536

10514

#: en/help_topics/configuration.txt:434

10537

#: en/help_topics/configuration.txt:446

10515

10538

msgid ""

10516

10539

"ignore\n"

10517

10540

" Do not check gnupg signatures of revisions."

10518

10541

msgstr ""

10519

10542

10520

#: en/help_topics/configuration.txt:437

10543

#: en/help_topics/configuration.txt:449

10521

10544

msgid ""

10522

10545

"check-available\n"

10523

10546

" (default) If gnupg signatures for revisions are present, check them.\n"

10525

10548

" no signature is present."

10526

10549

msgstr ""

10527

10550

10528

#: en/help_topics/configuration.txt:442

10551

#: en/help_topics/configuration.txt:454

10529

10552

msgid ""

10530

10553

"create_signatures\n"

10531

10554

"~~~~~~~~~~~~~~~~~"

10532

10555

msgstr ""

10533

10556

10534

#: en/help_topics/configuration.txt:445

10557

#: en/help_topics/configuration.txt:457

10535

10558

msgid ""

10536

10559

"Defines the behaviour of signing revisions on commits. By default bzr will "

10537

10560

"not\n"

10538

10561

"sign new commits."

10539

10562

msgstr ""

10540

10563

10541

#: en/help_topics/configuration.txt:448

10564

#: en/help_topics/configuration.txt:460

10542

10565

msgid ""

10543

10566

"always\n"

10544

10567

" Sign every new revision that is committed. If the signing fails then "

10546

10569

" commit will not be made."

10547

10570

msgstr ""

10548

10571

10549

#: en/help_topics/configuration.txt:452

10572

#: en/help_topics/configuration.txt:464

10550

10573

msgid ""

10551

10574

"when-required\n"

10552

10575

" Reserved for future use."

10553

10576

msgstr ""

10554

10577

10555

#: en/help_topics/configuration.txt:455

10578

#: en/help_topics/configuration.txt:467

10556

10579

msgid ""

10557

10580

"never\n"

10558

10581

" Reserved for future use."

10559

10582

msgstr ""

10560

10583

10561

#: en/help_topics/configuration.txt:458

10584

#: en/help_topics/configuration.txt:470

10562

10585

msgid ""

10563

10586

"In future it is planned that ``when-required`` will sign newly\n"

10564

10587

"committed revisions only when the branch requires them. ``never`` will "

10566

10589

"to sign newly committed revisions, even if the branch requires signatures."

10567

10590

msgstr ""

10568

10591

10569

#: en/help_topics/configuration.txt:462

10592

#: en/help_topics/configuration.txt:474

10570

10593

msgid ""

10571

10594

"dirstate.fdatasync\n"

10572

10595

"~~~~~~~~~~~~~~~~~~"

10573

10596

msgstr ""

10574

10597

10575

#: en/help_topics/configuration.txt:465

10598

#: en/help_topics/configuration.txt:477

10576

10599

msgid ""

10577

10600

"If true (default), working tree metadata changes are flushed through the\n"

10578

10601

"OS buffers to physical disk. This is somewhat slower, but means data\n"

10579

10602

"should not be lost if the machine crashes. See also repository.fdatasync."

10580

10603

msgstr ""

10581

10604

10582

#: en/help_topics/configuration.txt:469

10605

#: en/help_topics/configuration.txt:481

10583

10606

msgid ""

10584

10607

"gpg_signing_key\n"

10585

10608

"~~~~~~~~~~~~~~~"

10586

10609

msgstr ""

10587

10610

10588

#: en/help_topics/configuration.txt:472

10611

#: en/help_topics/configuration.txt:484

10589

10612

msgid ""

10590

10613

"The GnuPG user identity to use when signing commits. Can be an e-mail\n"

10591

10614

"address, key fingerprint or full key ID. When unset or when set to\n"

10592

10615

"\"default\" Bazaar will use the user e-mail set with ``whoami``."

10593

10616

msgstr ""

10594

10617

10595

#: en/help_topics/configuration.txt:476

10618

#: en/help_topics/configuration.txt:488

10596

10619

msgid ""

10597

10620

"recurse\n"

10598

10621

"~~~~~~~"

10599

10622

msgstr ""

10600

10623

10601

#: en/help_topics/configuration.txt:479

10624

#: en/help_topics/configuration.txt:491

10602

10625

msgid ""

10603

10626

"Only useful in ``locations.conf``. Defines whether or not the\n"

10604

10627

"configuration for this section applies to subdirectories:"

10605

10628

msgstr ""

10606

10629

10607

#: en/help_topics/configuration.txt:482

10630

#: en/help_topics/configuration.txt:494

10608

10631

msgid ""

10609

10632

"true\n"

10610

10633

" (default) This section applies to subdirectories as well."

10611

10634

msgstr ""

10612

10635

10613

#: en/help_topics/configuration.txt:485

10636

#: en/help_topics/configuration.txt:497

10614

10637

msgid ""

10615

10638

"false\n"

10616

10639

" This section only applies to the branch at this directory and not\n"

10617

10640

" branches below it."

10618

10641

msgstr ""

10619

10642

10620

#: en/help_topics/configuration.txt:489

10643

#: en/help_topics/configuration.txt:501

10621

10644

msgid ""

10622

10645

"gpg_signing_command\n"

10623

10646

"~~~~~~~~~~~~~~~~~~~"

10624

10647

msgstr ""

10625

10648

10626

#: en/help_topics/configuration.txt:492

10649

#: en/help_topics/configuration.txt:504

10627

10650

msgid ""

10628

10651

"(Default: \"gpg\"). Which program should be used to sign and check "

10629

10652

"revisions.\n"

10630

10653

"For example::"

10631

10654

msgstr ""

10632

10655

10633

#: en/help_topics/configuration.txt:495

10656

#: en/help_topics/configuration.txt:507

10634

10657

msgid " gpg_signing_command = /usr/bin/gnpg"

10635

10658

msgstr ""

10636

10659

10637

#: en/help_topics/configuration.txt:497

10660

#: en/help_topics/configuration.txt:509

10638

10661

msgid ""

10639

10662

"The specified command must accept the options \"--clearsign\" and \"-u "

10640

10663

"<email>\"."

10641

10664

msgstr ""

10642

10665

10643

#: en/help_topics/configuration.txt:499

10666

#: en/help_topics/configuration.txt:511

10644

10667

msgid ""

10645

10668

"bzr_remote_path\n"

10646

10669

"~~~~~~~~~~~~~~~"

10647

10670

msgstr ""

10648

10671

10649

#: en/help_topics/configuration.txt:502

10672

#: en/help_topics/configuration.txt:514

10650

10673

msgid ""

10651

10674

"(Default: \"bzr\"). The path to the command that should be used to run the "

10652

10675

"smart\n"

10653

10676

"server for bzr. This value may only be specified in locations.conf, because:"

10654

10677

msgstr ""

10655

10678

10656

#: en/help_topics/configuration.txt:505

10679

#: en/help_topics/configuration.txt:517

10657

10680

msgid ""

10658

10681

"- it's needed before branch.conf is accessible\n"

10659

10682

"- allowing remote branch.conf files to specify commands would be a security\n"

10660

10683

" risk"

10661

10684

msgstr ""

10662

10685

10663

#: en/help_topics/configuration.txt:509

10686

#: en/help_topics/configuration.txt:521

10664

10687

msgid "It is overridden by the BZR_REMOTE_PATH environment variable."

10665

10688

msgstr ""

10666

10689

10667

#: en/help_topics/configuration.txt:511

10690

#: en/help_topics/configuration.txt:523

10668

10691

msgid ""

10669

10692

"smtp_server\n"

10670

10693

"~~~~~~~~~~~"

10671

10694

msgstr ""

10672

10695

10673

#: en/help_topics/configuration.txt:514

10696

#: en/help_topics/configuration.txt:526

10674

10697

msgid ""

10675

10698

"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"

10676

10699

"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."

10677

10700

msgstr ""

10678

10701

10679

#: en/help_topics/configuration.txt:517

10702

#: en/help_topics/configuration.txt:529

10680

10703

msgid ""

10681

10704

"smtp_username, smtp_password\n"

10682

10705

"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"

10683

10706

msgstr ""

10684

10707

10685

#: en/help_topics/configuration.txt:520

10708

#: en/help_topics/configuration.txt:532

10686

10709

msgid ""

10687

10710

"User and password to authenticate to the SMTP server. If smtp_username\n"

10688

10711

"is set, and smtp_password is not, Bazaar will prompt for a password.\n"

10690

10713

"to send mail."

10691

10714

msgstr ""

10692

10715

10693

#: en/help_topics/configuration.txt:525

10716

#: en/help_topics/configuration.txt:537

10694

10717

msgid ""

10695

10718

"locks.steal_dead\n"

10696

10719

"~~~~~~~~~~~~~~~~"

10697

10720

msgstr ""

10698

10721

10699

#: en/help_topics/configuration.txt:528

10722

#: en/help_topics/configuration.txt:540

10700

10723

msgid ""

10701

10724

"If set to true, bzr will automatically break locks held by processes from\n"

10702

10725

"the same machine and user that are no longer alive. Otherwise, it will\n"

10704

10727

"the object is no longer in use."

10705

10728

msgstr ""

10706

10729

10707

#: en/help_topics/configuration.txt:533

10730

#: en/help_topics/configuration.txt:545

10708

10731

msgid ""

10709

10732

"mail_client\n"

10710

10733

"~~~~~~~~~~~"

10711

10734

msgstr ""

10712

10735

10713

#: en/help_topics/configuration.txt:536

10736

#: en/help_topics/configuration.txt:548

10714

10737

msgid ""

10715

10738

"A mail client to use for sending merge requests.\n"

10716

10739

"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "

10719

10742

"``editor``."

10720

10743

msgstr ""

10721

10744

10722

#: en/help_topics/configuration.txt:541

10745

#: en/help_topics/configuration.txt:553

10723

10746

msgid "Supported values for specific clients:"

10724

10747

msgstr ""

10725

10748

10726

#: en/help_topics/configuration.txt:543

10749

#: en/help_topics/configuration.txt:555

10727

10750

msgid ""

10728

10751

":claws: Use Claws. This skips a dialog for attaching files.\n"

10729

10752

":evolution: Use Evolution.\n"

10734

10757

" this works around some bugs that xdg-email doesn't handle."

10735

10758

msgstr ""

10736

10759

10737

#: en/help_topics/configuration.txt:550

10760

#: en/help_topics/configuration.txt:562

10738

10761

msgid "Supported generic values are:"

10739

10762

msgstr ""

10740

10763

10741

#: en/help_topics/configuration.txt:552

10764

#: en/help_topics/configuration.txt:564

10742

10765

msgid ""

10743

10766

":default: See above.\n"

10744

10767

":editor: Use your editor to compose the merge request. This also uses\n"

10748

10771

":xdg-email: Use xdg-email to run your preferred mail program"

10749

10772

msgstr ""

10750

10773

10751

#: en/help_topics/configuration.txt:559

10774

#: en/help_topics/configuration.txt:571

10752

10775

msgid ""

10753

10776

"repository.fdatasync\n"

10754

10777

"~~~~~~~~~~~~~~~~~~~~"

10755

10778

msgstr ""

10756

10779

10757

#: en/help_topics/configuration.txt:562

10780

#: en/help_topics/configuration.txt:574

10758

10781

msgid ""

10759

10782

"If true (default), repository changes are flushed through the OS buffers\n"

10760

10783

"to physical disk. This is somewhat slower, but means data should not be\n"

10761

10784

"lost if the machine crashes. See also dirstate.fdatasync."

10762

10785

msgstr ""

10763

10786

10764

#: en/help_topics/configuration.txt:566

10787

#: en/help_topics/configuration.txt:578

10765

10788

msgid ""

10766

10789

"submit_branch\n"

10767

10790

"~~~~~~~~~~~~~"

10768

10791

msgstr ""

10769

10792

10770

#: en/help_topics/configuration.txt:569

10793

#: en/help_topics/configuration.txt:581

10771

10794

msgid ""

10772

10795

"The branch you intend to submit your current work to. This is "

10773

10796

"automatically\n"

10776

10799

"should usually be set on a per-branch or per-location basis."

10777

10800

msgstr ""

10778

10801

10779

#: en/help_topics/configuration.txt:573

10802

#: en/help_topics/configuration.txt:585

10780

10803

msgid ""

10781

10804

"public_branch\n"

10782

10805

"~~~~~~~~~~~~~"

10783

10806

msgstr ""

10784

10807

10785

#: en/help_topics/configuration.txt:576

10808

#: en/help_topics/configuration.txt:588

10786

10809

msgid ""

10787

10810

"A publically-accessible version of this branch (implying that this version "

10788

10811

"is\n"

10789

10812

"not publically-accessible). Used (and set) by ``bzr send``."

10790

10813

msgstr ""

10791

10814

10792

#: en/help_topics/configuration.txt:579

10815

#: en/help_topics/configuration.txt:591

10793

10816

msgid ""

10794

10817

"suppress_warnings\n"

10795

10818

"~~~~~~~~~~~~~~~~~"

10796

10819

msgstr ""

10797

10820

10798

#: en/help_topics/configuration.txt:582

10821

#: en/help_topics/configuration.txt:594

10799

10822

msgid ""

10800

10823

"A list of strings, each string represent a warning that can be emitted by\n"

10801

10824

"bzr. Mentioning a warning in this list tells bzr to not emit it."

10802

10825

msgstr ""

10803

10826

10804

#: en/help_topics/configuration.txt:585

10827

#: en/help_topics/configuration.txt:597

10805

10828

msgid "Valid values:"

10806

10829

msgstr ""

10807

10830

10808

#: en/help_topics/configuration.txt:587

10831

#: en/help_topics/configuration.txt:599

10809

10832

msgid ""

10810

10833

"* ``format_deprecation``:\n"

10811

10834

" whether the format deprecation warning is shown on repositories that "

10813

10836

" using deprecated formats."

10814

10837

msgstr ""

10815

10838

10816

#: en/help_topics/configuration.txt:591

10839

#: en/help_topics/configuration.txt:603

10817

10840

msgid ""

10818

10841

"default_format\n"

10819

10842

"~~~~~~~~~~~~~~"

10820

10843

msgstr ""

10821

10844

10822

#: en/help_topics/configuration.txt:594

10845

#: en/help_topics/configuration.txt:606

10823

10846

msgid ""

10824

10847

"A format name for the default format used when creating branches. See "

10825

10848

"``bzr\n"

10826

10849

"help formats`` for possible values."

10827

10850

msgstr ""

10828

10851

10829

#: en/help_topics/configuration.txt:597

10852

#: en/help_topics/configuration.txt:609

10830

10853

msgid ""

10831

10854

"\n"

10832

10855

"Unicode options\n"

10833

10856

"---------------"

10834

10857

msgstr ""

10835

10858

10836

#: en/help_topics/configuration.txt:601

10859

#: en/help_topics/configuration.txt:613

10837

10860

msgid ""

10838

10861

"output_encoding\n"

10839

10862

"~~~~~~~~~~~~~~~"

10840

10863

msgstr ""

10841

10864

10842

#: en/help_topics/configuration.txt:604

10865

#: en/help_topics/configuration.txt:616

10843

10866

msgid ""

10844

10867

"A Python unicode encoding name for text output from bzr, such as log\n"

10845

10868

"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"

10846

10869

"is the terminal encoding prefered by the operating system."

10847

10870

msgstr ""

10848

10871

10849

#: en/help_topics/configuration.txt:608

10872

#: en/help_topics/configuration.txt:620

10850

10873

msgid ""

10851

10874

"\n"

10852

10875

"Branch type specific options\n"

10853

10876

"----------------------------"

10854

10877

msgstr ""

10855

10878

10856

#: en/help_topics/configuration.txt:612

10879

#: en/help_topics/configuration.txt:624

10857

10880

msgid ""

10858

10881

"These options apply only to branches that use the ``dirstate-tags`` or\n"

10859

10882

"later format. They\n"

10861

10884

"manually set in ``locations.conf`` or ``bazaar.conf``."

10862

10885

msgstr ""

10863

10886

10864

#: en/help_topics/configuration.txt:617

10887

#: en/help_topics/configuration.txt:629

10865

10888

msgid ""

10866

10889

"append_revisions_only\n"

10867

10890

"~~~~~~~~~~~~~~~~~~~~~"

10868

10891

msgstr ""

10869

10892

10870

#: en/help_topics/configuration.txt:620

10893

#: en/help_topics/configuration.txt:632

10871

10894

msgid ""

10872

10895

"If set to \"True\" then revisions can only be appended to the log, not\n"

10873

10896

"removed. A branch with this setting enabled can only pull from another\n"

10877

10900

"compatibility with previous bzr versions (older than 2.2)."

10878

10901

msgstr ""

10879

10902

10880

#: en/help_topics/configuration.txt:627

10903

#: en/help_topics/configuration.txt:639

10881

10904

msgid ""

10882

10905

"parent_location\n"

10883

10906

"~~~~~~~~~~~~~~~"

10884

10907

msgstr ""

10885

10908

10886

#: en/help_topics/configuration.txt:630

10909

#: en/help_topics/configuration.txt:642

10887

10910

msgid ""

10888

10911

"If present, the location of the default branch for pull or merge. This "

10889

10912

"option\n"

10891

10914

"--remember``."

10892

10915

msgstr ""

10893

10916

10894

#: en/help_topics/configuration.txt:634

10917

#: en/help_topics/configuration.txt:646

10895

10918

msgid ""

10896

10919

"push_location\n"

10897

10920

"~~~~~~~~~~~~~"

10898

10921

msgstr ""

10899

10922

10900

#: en/help_topics/configuration.txt:637

10923

#: en/help_topics/configuration.txt:649

10901

10924

msgid ""

10902

10925

"If present, the location of the default branch for push. This option\n"

10903

10926

"is normally set by the first ``push`` or ``push --remember``."

10904

10927

msgstr ""

10905

10928

10906

#: en/help_topics/configuration.txt:640

10929

#: en/help_topics/configuration.txt:652

10907

10930

msgid ""

10908

10931

"push_strict\n"

10909

10932

"~~~~~~~~~~~"

10910

10933

msgstr ""

10911

10934

10912

#: en/help_topics/configuration.txt:643

10935

#: en/help_topics/configuration.txt:655

10913

10936

msgid ""

10914

10937

"If present, defines the ``--strict`` option default value for checking\n"

10915

10938

"uncommitted changes before pushing."

10916

10939

msgstr ""

10917

10940

10918

#: en/help_topics/configuration.txt:646

10941

#: en/help_topics/configuration.txt:658

10919

10942

msgid ""

10920

10943

"dpush_strict\n"

10921

10944

"~~~~~~~~~~~~"

10922

10945

msgstr ""

10923

10946

10924

#: en/help_topics/configuration.txt:649

10947

#: en/help_topics/configuration.txt:661

10925

10948

msgid ""

10926

10949

"If present, defines the ``--strict`` option default value for checking\n"

10927

10950

"uncommitted changes before pushing into a different VCS without any\n"

10928

10951

"custom bzr metadata."

10929

10952

msgstr ""

10930

10953

10931

#: en/help_topics/configuration.txt:653

10954

#: en/help_topics/configuration.txt:665

10932

10955

msgid ""

10933

10956

"bound_location\n"

10934

10957

"~~~~~~~~~~~~~~"

10935

10958

msgstr ""

10936

10959

10937

#: en/help_topics/configuration.txt:656

10960

#: en/help_topics/configuration.txt:668

10938

10961

msgid ""

10939

10962

"The location that commits should go to when acting as a checkout.\n"

10940

10963

"This option is normally set by ``bind``."

10941

10964

msgstr ""

10942

10965

10943

#: en/help_topics/configuration.txt:659

10966

#: en/help_topics/configuration.txt:671

10944

10967

msgid ""

10945

10968

"bound\n"

10946

10969

"~~~~~"

10947

10970

msgstr ""

10948

10971

10949

#: en/help_topics/configuration.txt:662

10972

#: en/help_topics/configuration.txt:674

10950

10973

msgid ""

10951

10974

"If set to \"True\", the branch should act as a checkout, and push each "

10952

10975

"commit to\n"

10953

10976

"the bound_location. This option is normally set by ``bind``/``unbind``."

10954

10977

msgstr ""

10955

10978

10956

#: en/help_topics/configuration.txt:665

10979

#: en/help_topics/configuration.txt:677

10957

10980

msgid ""

10958

10981

"send_strict\n"

10959

10982

"~~~~~~~~~~~"

10960

10983

msgstr ""

10961

10984

10962

#: en/help_topics/configuration.txt:668

10985

#: en/help_topics/configuration.txt:680

10963

10986

msgid ""

10964

10987

"If present, defines the ``--strict`` option default value for checking\n"

10965

10988

"uncommitted changes before sending a merge directive."

10966

10989

msgstr ""

10967

10990

10968

#: en/help_topics/configuration.txt:671

10991

#: en/help_topics/configuration.txt:683

10969

10992

msgid ""

10970

10993

"add.maximum_file_size\n"

10971

10994

"~~~~~~~~~~~~~~~~~~~~~"

10972

10995

msgstr ""

10973

10996

10974

#: en/help_topics/configuration.txt:674

10997

#: en/help_topics/configuration.txt:686

10975

10998

msgid ""

10976

10999

"Defines the maximum file size the command line \"add\" operation will allow\n"

10977

11000

"in recursive mode, with files larger than this value being skipped. You may "

10983

11006

"will disable skipping."

10984

11007

msgstr ""

10985

11008

10986

#: en/help_topics/configuration.txt:680

11009

#: en/help_topics/configuration.txt:692

10987

11010

msgid ""

10988

11011

"External Merge Tools\n"

10989

11012

"--------------------"

10990

11013

msgstr ""

10991

11014

10992

#: en/help_topics/configuration.txt:683

11015

#: en/help_topics/configuration.txt:695

10993

11016

msgid ""

10994

11017

"bzr.mergetool.<name>\n"

10995

11018

"~~~~~~~~~~~~~~~~~~~~"

10996

11019

msgstr ""

10997

11020

10998

#: en/help_topics/configuration.txt:686

11021

#: en/help_topics/configuration.txt:698

10999

11022

msgid ""

11000

11023

"Defines an external merge tool called <name> with the given command-line.\n"

11001

11024

"Arguments containing spaces should be quoted using single or double quotes. "

11003

11026

"executable may omit its path if it can be found on the PATH."

11004

11027

msgstr ""

11005

11028

11006

#: en/help_topics/configuration.txt:690

11029

#: en/help_topics/configuration.txt:702

11007

11030

msgid ""

11008

11031

"The following markers can be used in the command-line to substitute "

11009

11032

"filenames\n"

11010

11033

"involved in the merge conflict::"

11011

11034

msgstr ""

11012

11035

11013

#: en/help_topics/configuration.txt:693

11036

#: en/help_topics/configuration.txt:705

11014

11037

msgid ""

11015

11038

" {base} file.BASE\n"

11016

11039

" {this} file.THIS\n"

11021

11044

" succeeds."

11022

11045

msgstr ""

11023

11046

11024

#: en/help_topics/configuration.txt:702

11047

#: en/help_topics/configuration.txt:714

11025

11048

msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"

11026

11049

msgstr ""

11027

11050

11028

#: en/help_topics/configuration.txt:704

11051

#: en/help_topics/configuration.txt:716

11029

11052

msgid ""

11030

11053

"bzr.default_mergetool\n"

11031

11054

"~~~~~~~~~~~~~~~~~~~~~"

11032

11055

msgstr ""

11033

11056

11034

#: en/help_topics/configuration.txt:707

11057

#: en/help_topics/configuration.txt:719

11035

11058

msgid ""

11036

11059

"Specifies which external merge tool (as defined above) should be selected "

11037

11060

"by\n"

11038

11061

"default in tools such as ``bzr qconflicts``."

11039

11062

msgstr ""

11040

11063

11041

#: en/help_topics/configuration.txt:712

11064

#: en/help_topics/configuration.txt:724

11042

11065

msgid " bzr.default_mergetool = kdiff3\n"

11043

11066

msgstr ""

11044

11067

11989

12012

"branch can now be pushed to the mainline.\n"

11990

12013

msgstr ""

11991

12014

12015

#: en/help_topics/env-variables.txt:1

12016

msgid "Environment Variables"

12017

msgstr "Переменные окружения"

12018

12019

#: en/help_topics/env-variables.txt:3

12020

msgid ""

12021

"=================== "

12022

"===========================================================\n"

12023

"BZRPATH Path where bzr is to look for shell plugin external\n"

12024

" commands.\n"

12025

"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"

12026

"EMAIL E-Mail address of the user.\n"

12027

"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"

12028

"EDITOR Editor for editing commit messages.\n"

12029

"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"

12030

"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"

12031

"BZR_PLUGINS_AT Plugins to load from a directory not in "

12032

"BZR_PLUGIN_PATH.\n"

12033

"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"

12034

"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "

12035

"and\n"

12036

" HOME.\n"

12037

"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "

12038

"URLs).\n"

12039

"BZR_SSH Path to SSH client, or one of paramiko, openssh, "

12040

"sshcorp,\n"

12041

" plink or lsh.\n"

12042

"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"

12043

"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"

12044

"BZR_COLUMNS Override implicit terminal width.\n"

12045

"BZR_CONCURRENCY Number of processes that can be run concurrently "

12046

"(selftest)\n"

12047

"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "

12048

"'text'.\n"

12049

"BZR_PDB Control whether to launch a debugger on error.\n"

12050

"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"

12051

" breakin debugger.\n"

12052

"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "

12053

"(instead\n"

12054

" of char-based).\n"

12055

"=================== "

12056

"===========================================================\n"

12057

msgstr ""

12058

11992

12059

#: en/help_topics/eol.txt:1

11993

12060

msgid ""

11994

12061

"End of Line Conversion\n"

12296

12363

msgstr ""

12297

12364

12298

12365

#: 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

12366

#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262

12300

12367

msgid "Introduced in: 2.2"

12301

12368

msgstr ""

12302

12369

12314

12381

"~~~~"

12315

12382

msgstr ""

12316

12383

12317

#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290

12318

#: en/help_topics/hooks.txt:304

12384

#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293

12385

#: en/help_topics/hooks.txt:307

12319

12386

msgid "Introduced in: 1.8"

12320

12387

msgstr ""

12321

12388

12345

12412

"~~~~~~~~~~~~~~~~~~~~~~"

12346

12413

msgstr ""

12347

12414

12348

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418

12415

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421

12349

12416

msgid "Introduced in: 1.4"

12350

12417

msgstr ""

12351

12418

12357

12424

"uncommit will all trigger this hook."

12358

12425

msgstr ""

12359

12426

12360

#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389

12427

#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392

12361

12428

msgid ""

12362

12429

"post_commit\n"

12363

12430

"~~~~~~~~~~~"

12365

12432

12366

12433

#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86

12367

12434

#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110

12368

#: en/help_topics/hooks.txt:145

12369

12435

msgid "Introduced in: 0.15"

12370

12436

msgstr ""

12371

12437

12470

12536

12471

12537

#: en/help_topics/hooks.txt:142

12472

12538

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

12539

"transform_fallback_location\n"

12489

12540

"~~~~~~~~~~~~~~~~~~~~~~~~~~~"

12490

12541

msgstr ""

12491

12542

12492

#: en/help_topics/hooks.txt:156

12543

#: en/help_topics/hooks.txt:145

12493

12544

msgid "Introduced in: 1.9"

12494

12545

msgstr ""

12495

12546

12496

#: en/help_topics/hooks.txt:158

12547

#: en/help_topics/hooks.txt:147

12497

12548

msgid ""

12498

12549

"Called when a stacked branch is activating its fallback locations.\n"

12499

12550

"transform_fallback_location is called with (branch, url), and should\n"

12507

12558

"however undefined."

12508

12559

msgstr ""

12509

12560

12510

#: en/help_topics/hooks.txt:169

12561

#: en/help_topics/hooks.txt:158

12511

12562

msgid ""

12512

12563

"CommandHooks\n"

12513

12564

"------------"

12514

12565

msgstr ""

12515

12566

12516

#: en/help_topics/hooks.txt:172

12567

#: en/help_topics/hooks.txt:161

12517

12568

msgid ""

12518

12569

"extend_command\n"

12519

12570

"~~~~~~~~~~~~~~"

12520

12571

msgstr ""

12521

12572

12522

#: en/help_topics/hooks.txt:175

12573

#: en/help_topics/hooks.txt:164

12523

12574

msgid "Introduced in: 1.13"

12524

12575

msgstr ""

12525

12576

12526

#: en/help_topics/hooks.txt:177

12577

#: en/help_topics/hooks.txt:166

12527

12578

msgid ""

12528

12579

"Called after creating a command object to allow modifications such as\n"

12529

12580

"adding or removing options, docs etc. Called with the new\n"

12530

12581

"bzrlib.commands.Command object."

12531

12582

msgstr ""

12532

12583

12533

#: en/help_topics/hooks.txt:181

12584

#: en/help_topics/hooks.txt:170

12534

12585

msgid ""

12535

12586

"get_command\n"

12536

12587

"~~~~~~~~~~~"

12537

12588

msgstr ""

12538

12589

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

12590

#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185

12591

#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467

12541

12592

msgid "Introduced in: 1.17"

12542

12593

msgstr ""

12543

12594

12544

#: en/help_topics/hooks.txt:186

12595

#: en/help_topics/hooks.txt:175

12545

12596

msgid ""

12546

12597

"Called when creating a single command. Called with (cmd_or_None,\n"

12547

12598

"command_name). get_command should either return the cmd_or_None\n"

12551

12602

"plugin_cmds.register_lazy."

12552

12603

msgstr ""

12553

12604

12554

#: en/help_topics/hooks.txt:193

12605

#: en/help_topics/hooks.txt:182

12555

12606

msgid ""

12556

12607

"get_missing_command\n"

12557

12608

"~~~~~~~~~~~~~~~~~~~"

12558

12609

msgstr ""

12559

12610

12560

#: en/help_topics/hooks.txt:198

12611

#: en/help_topics/hooks.txt:187

12561

12612

msgid ""

12562

12613

"Called when creating a single command if no command could be found.\n"

12563

12614

"Called with (command_name). get_missing_command should either return\n"

12564

12615

"None, or a Command object to be used for the command."

12565

12616

msgstr ""

12566

12617

12567

#: en/help_topics/hooks.txt:202

12618

#: en/help_topics/hooks.txt:191

12568

12619

msgid ""

12569

12620

"list_commands\n"

12570

12621

"~~~~~~~~~~~~~"

12571

12622

msgstr ""

12572

12623

12573

#: en/help_topics/hooks.txt:207

12624

#: en/help_topics/hooks.txt:196

12574

12625

msgid ""

12575

12626

"Called when enumerating commands. Called with a set of cmd_name\n"

12576

12627

"strings for all the commands found so far. This set is safe to mutate\n"

12578

12629

"set of command names."

12579

12630

msgstr ""

12580

12631

12581

#: en/help_topics/hooks.txt:212

12632

#: en/help_topics/hooks.txt:201

12633

msgid ""

12634

"post_command\n"

12635

"~~~~~~~~~~~~"

12636

msgstr ""

12637

12638

#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211

12639

msgid "Introduced in: 2.6"

12640

msgstr ""

12641

12642

#: en/help_topics/hooks.txt:206

12643

msgid "Called after executing a command. Called with the command object."

12644

msgstr ""

12645

12646

#: en/help_topics/hooks.txt:208

12647

msgid ""

12648

"pre_command\n"

12649

"~~~~~~~~~~~"

12650

msgstr ""

12651

12652

#: en/help_topics/hooks.txt:213

12653

msgid "Called prior to executing a command. Called with the command object."

12654

msgstr ""

12655

12656

#: en/help_topics/hooks.txt:215

12582

12657

msgid ""

12583

12658

"_ConfigHooks\n"

12584

12659

"------------"

12585

12660

msgstr ""

12586

12661

12587

#: en/help_topics/hooks.txt:215

12662

#: en/help_topics/hooks.txt:218

12588

12663

msgid ""

12589

12664

"get\n"

12590

12665

"~~~"

12591

12666

msgstr ""

12592

12667

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

12668

#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229

12669

#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244

12670

#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373

12671

#: en/help_topics/hooks.txt:446

12597

12672

msgid "Introduced in: 2.4"

12598

12673

msgstr ""

12599

12674

12600

#: en/help_topics/hooks.txt:220

12675

#: en/help_topics/hooks.txt:223

12601

12676

msgid ""

12602

12677

"Invoked when a config option is read. The signature is (stack, name,\n"

12603

12678

"value)."

12604

12679

msgstr ""

12605

12680

12606

#: en/help_topics/hooks.txt:223

12681

#: en/help_topics/hooks.txt:226

12607

12682

msgid ""

12608

12683

"load\n"

12609

12684

"~~~~"

12610

12685

msgstr ""

12611

12686

12612

#: en/help_topics/hooks.txt:228

12687

#: en/help_topics/hooks.txt:231

12613

12688

msgid "Invoked when a config store is loaded. The signature is (store)."

12614

12689

msgstr ""

12615

12690

12616

#: en/help_topics/hooks.txt:230

12691

#: en/help_topics/hooks.txt:233

12617

12692

msgid ""

12618

12693

"remove\n"

12619

12694

"~~~~~~"

12620

12695

msgstr ""

12621

12696

12622

#: en/help_topics/hooks.txt:235

12697

#: en/help_topics/hooks.txt:238

12623

12698

msgid ""

12624

12699

"Invoked when a config option is removed. The signature is (stack,\n"

12625

12700

"name)."

12626

12701

msgstr ""

12627

12702

12628

#: en/help_topics/hooks.txt:238

12703

#: en/help_topics/hooks.txt:241

12629

12704

msgid ""

12630

12705

"save\n"

12631

12706

"~~~~"

12632

12707

msgstr ""

12633

12708

12634

#: en/help_topics/hooks.txt:243

12709

#: en/help_topics/hooks.txt:246

12635

12710

msgid "Invoked when a config store is saved. The signature is (store)."

12636

12711

msgstr ""

12637

12712

12638

#: en/help_topics/hooks.txt:245

12713

#: en/help_topics/hooks.txt:248

12639

12714

msgid ""

12640

12715

"set\n"

12641

12716

"~~~"

12642

12717

msgstr ""

12643

12718

12644

#: en/help_topics/hooks.txt:250

12719

#: en/help_topics/hooks.txt:253

12645

12720

msgid ""

12646

12721

"Invoked when a config option is set. The signature is (stack, name,\n"

12647

12722

"value)."

12648

12723

msgstr ""

12649

12724

12650

#: en/help_topics/hooks.txt:253

12725

#: en/help_topics/hooks.txt:256

12651

12726

msgid ""

12652

12727

"ControlDirHooks\n"

12653

12728

"---------------"

12654

12729

msgstr ""

12655

12730

12656

#: en/help_topics/hooks.txt:256

12731

#: en/help_topics/hooks.txt:259

12657

12732

msgid ""

12658

12733

"post_repo_init\n"

12659

12734

"~~~~~~~~~~~~~~"

12660

12735

msgstr ""

12661

12736

12662

#: en/help_topics/hooks.txt:261

12737

#: en/help_topics/hooks.txt:264

12663

12738

msgid ""

12664

12739

"Invoked after a repository has been initialized. post_repo_init is\n"

12665

12740

"called with a bzrlib.controldir.RepoInitHookParams."

12666

12741

msgstr ""

12667

12742

12668

#: en/help_topics/hooks.txt:264

12743

#: en/help_topics/hooks.txt:267

12669

12744

msgid ""

12670

12745

"pre_open\n"

12671

12746

"~~~~~~~~"

12672

12747

msgstr ""

12673

12748

12674

#: en/help_topics/hooks.txt:267

12749

#: en/help_topics/hooks.txt:270

12675

12750

msgid "Introduced in: 1.14"

12676

12751

msgstr ""

12677

12752

12678

#: en/help_topics/hooks.txt:269

12753

#: en/help_topics/hooks.txt:272

12679

12754

msgid ""

12680

12755

"Invoked before attempting to open a ControlDir with the transport that\n"

12681

12756

"the open will use."

12682

12757

msgstr ""

12683

12758

12684

#: en/help_topics/hooks.txt:272

12759

#: en/help_topics/hooks.txt:275

12685

12760

msgid ""

12686

12761

"InfoHooks\n"

12687

12762

"---------"

12688

12763

msgstr ""

12689

12764

12690

#: en/help_topics/hooks.txt:275

12765

#: en/help_topics/hooks.txt:278

12691

12766

msgid ""

12692

12767

"repository\n"

12693

12768

"~~~~~~~~~~"

12694

12769

msgstr ""

12695

12770

12696

#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297

12697

#: en/help_topics/hooks.txt:521

12771

#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300

12772

#: en/help_topics/hooks.txt:524

12698

12773

msgid "Introduced in: 1.15"

12699

12774

msgstr ""

12700

12775

12701

#: en/help_topics/hooks.txt:280

12776

#: en/help_topics/hooks.txt:283

12702

12777

msgid ""

12703

12778

"Invoked when displaying the statistics for a repository. repository is\n"

12704

12779

"called with a statistics dictionary as returned by the repository and\n"

12705

12780

"a file-like object to write to."

12706

12781

msgstr ""

12707

12782

12708

#: en/help_topics/hooks.txt:284

12783

#: en/help_topics/hooks.txt:287

12709

12784

msgid ""

12710

12785

"LockHooks\n"

12711

12786

"---------"

12712

12787

msgstr ""

12713

12788

12714

#: en/help_topics/hooks.txt:287

12789

#: en/help_topics/hooks.txt:290

12715

12790

msgid ""

12716

12791

"lock_acquired\n"

12717

12792

"~~~~~~~~~~~~~"

12718

12793

msgstr ""

12719

12794

12720

#: en/help_topics/hooks.txt:292

12795

#: en/help_topics/hooks.txt:295

12721

12796

msgid ""

12722

12797

"Called with a bzrlib.lock.LockResult when a physical lock is acquired."

12723

12798

msgstr ""

12724

12799

12725

#: en/help_topics/hooks.txt:294

12800

#: en/help_topics/hooks.txt:297

12726

12801

msgid ""

12727

12802

"lock_broken\n"

12728

12803

"~~~~~~~~~~~"

12729

12804

msgstr ""

12730

12805

12731

#: en/help_topics/hooks.txt:299

12806

#: en/help_topics/hooks.txt:302

12732

12807

msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."

12733

12808

msgstr ""

12734

12809

12735

#: en/help_topics/hooks.txt:301

12810

#: en/help_topics/hooks.txt:304

12736

12811

msgid ""

12737

12812

"lock_released\n"

12738

12813

"~~~~~~~~~~~~~"

12739

12814

msgstr ""

12740

12815

12741

#: en/help_topics/hooks.txt:306

12816

#: en/help_topics/hooks.txt:309

12742

12817

msgid ""

12743

12818

"Called with a bzrlib.lock.LockResult when a physical lock is released."

12744

12819

msgstr ""

12745

12820

12746

#: en/help_topics/hooks.txt:308

12821

#: en/help_topics/hooks.txt:311

12747

12822

msgid ""

12748

12823

"MergeHooks\n"

12749

12824

"----------"

12750

12825

msgstr ""

12751

12826

12752

#: en/help_topics/hooks.txt:311

12827

#: en/help_topics/hooks.txt:314

12753

12828

msgid ""

12754

12829

"merge_file_content\n"

12755

12830

"~~~~~~~~~~~~~~~~~~"

12756

12831

msgstr ""

12757

12832

12758

#: en/help_topics/hooks.txt:314

12833

#: en/help_topics/hooks.txt:317

12759

12834

msgid "Introduced in: 2.1"

12760

12835

msgstr ""

12761

12836

12762

#: en/help_topics/hooks.txt:316

12837

#: en/help_topics/hooks.txt:319

12763

12838

msgid ""

12764

12839

"Called with a bzrlib.merge.Merger object to create a per file merge\n"

12765

12840

"object when starting a merge. Should return either None or a subclass\n"

12769

12844

"AbstractPerFileMerger API docs for details on how it is used by merge."

12770

12845

msgstr ""

12771

12846

12772

#: en/help_topics/hooks.txt:323

12847

#: en/help_topics/hooks.txt:326

12773

12848

msgid ""

12774

12849

"post_merge\n"

12775

12850

"~~~~~~~~~~"

12776

12851

msgstr ""

12777

12852

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

12853

#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337

12854

#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405

12855

#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512

12781

12856

msgid "Introduced in: 2.5"

12782

12857

msgstr ""

12783

12858

12784

#: en/help_topics/hooks.txt:328

12859

#: en/help_topics/hooks.txt:331

12785

12860

msgid ""

12786

12861

"Called after a merge. Receives a Merger object as the single argument.\n"

12787

12862

"The return value is ignored."

12788

12863

msgstr ""

12789

12864

12790

#: en/help_topics/hooks.txt:331

12865

#: en/help_topics/hooks.txt:334

12791

12866

msgid ""

12792

12867

"pre_merge\n"

12793

12868

"~~~~~~~~~"

12794

12869

msgstr ""

12795

12870

12796

#: en/help_topics/hooks.txt:336

12871

#: en/help_topics/hooks.txt:339

12797

12872

msgid ""

12798

12873

"Called before a merge. Receives a Merger object as the single\n"

12799

12874

"argument."

12800

12875

msgstr ""

12801

12876

12802

#: en/help_topics/hooks.txt:339

12877

#: en/help_topics/hooks.txt:342

12803

12878

msgid ""

12804

12879

"MergeDirectiveHooks\n"

12805

12880

"-------------------"

12806

12881

msgstr ""

12807

12882

12808

#: en/help_topics/hooks.txt:342

12883

#: en/help_topics/hooks.txt:345

12809

12884

msgid ""

12810

12885

"merge_request_body\n"

12811

12886

"~~~~~~~~~~~~~~~~~~"

12812

12887

msgstr ""

12813

12888

12814

#: en/help_topics/hooks.txt:345

12889

#: en/help_topics/hooks.txt:348

12815

12890

msgid "Introduced in: 1.15.0"

12816

12891

msgstr ""

12817

12892

12818

#: en/help_topics/hooks.txt:347

12893

#: en/help_topics/hooks.txt:350

12819

12894

msgid ""

12820

12895

"Called with a MergeRequestBodyParams when a body is needed for a merge\n"

12821

12896

"request. Callbacks must return a body. If more than one callback is\n"

12822

12897

"registered, the output of one callback is provided to the next."

12823

12898

msgstr ""

12824

12899

12825

#: en/help_topics/hooks.txt:351

12900

#: en/help_topics/hooks.txt:354

12826

12901

msgid ""

12827

12902

"MessageEditorHooks\n"

12828

12903

"------------------"

12829

12904

msgstr ""

12830

12905

12831

#: en/help_topics/hooks.txt:354

12906

#: en/help_topics/hooks.txt:357

12832

12907

msgid ""

12833

12908

"commit_message_template\n"

12834

12909

"~~~~~~~~~~~~~~~~~~~~~~~"

12835

12910

msgstr ""

12836

12911

12837

#: en/help_topics/hooks.txt:357

12912

#: en/help_topics/hooks.txt:360

12838

12913

msgid "Introduced in: 1.10"

12839

12914

msgstr ""

12840

12915

12841

#: en/help_topics/hooks.txt:359

12916

#: en/help_topics/hooks.txt:362

12842

12917

msgid ""

12843

12918

"Called when a commit message is being generated.\n"

12844

12919

"commit_message_template is called with the bzrlib.commit.Commit object\n"

12849

12924

"second, and so on."

12850

12925

msgstr ""

12851

12926

12852

#: en/help_topics/hooks.txt:367

12927

#: en/help_topics/hooks.txt:370

12853

12928

msgid ""

12854

12929

"set_commit_message\n"

12855

12930

"~~~~~~~~~~~~~~~~~~"

12856

12931

msgstr ""

12857

12932

12858

#: en/help_topics/hooks.txt:372

12933

#: en/help_topics/hooks.txt:375

12859

12934

msgid ""

12860

12935

"Set a fixed commit message. set_commit_message is called with the\n"

12861

12936

"bzrlib.commit.Commit object (so you can also change e.g. revision\n"

12864

12939

"should use the message editor as normal."

12865

12940

msgstr ""

12866

12941

12867

#: en/help_topics/hooks.txt:378

12942

#: en/help_topics/hooks.txt:381

12868

12943

msgid ""

12869

12944

"MutableTreeHooks\n"

12870

12945

"----------------"

12871

12946

msgstr ""

12872

12947

12873

#: en/help_topics/hooks.txt:381

12948

#: en/help_topics/hooks.txt:384

12874

12949

msgid ""

12875

12950

"post_build_tree\n"

12876

12951

"~~~~~~~~~~~~~~~"

12877

12952

msgstr ""

12878

12953

12879

#: en/help_topics/hooks.txt:386

12954

#: en/help_topics/hooks.txt:389

12880

12955

msgid ""

12881

12956

"Called after a completely new tree is built. The hook is called with\n"

12882

12957

"the tree as its only argument."

12883

12958

msgstr ""

12884

12959

12885

#: en/help_topics/hooks.txt:392

12960

#: en/help_topics/hooks.txt:395

12886

12961

msgid "Introduced in: 2.0"

12887

12962

msgstr ""

12888

12963

12889

#: en/help_topics/hooks.txt:394

12964

#: en/help_topics/hooks.txt:397

12890

12965

msgid ""

12891

12966

"Called after a commit is performed on a tree. The hook is called with\n"

12892

12967

"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"

12894

12969

"that object."

12895

12970

msgstr ""

12896

12971

12897

#: en/help_topics/hooks.txt:399

12972

#: en/help_topics/hooks.txt:402

12898

12973

msgid ""

12899

12974

"post_transform\n"

12900

12975

"~~~~~~~~~~~~~~"

12901

12976

msgstr ""

12902

12977

12903

#: en/help_topics/hooks.txt:404

12978

#: en/help_topics/hooks.txt:407

12904

12979

msgid ""

12905

12980

"Called after a tree transform has been performed on a tree. The hook\n"

12906

12981

"is called with the tree that is being transformed and the transform."

12907

12982

msgstr ""

12908

12983

12909

#: en/help_topics/hooks.txt:407

12984

#: en/help_topics/hooks.txt:410

12910

12985

msgid ""

12911

12986

"pre_transform\n"

12912

12987

"~~~~~~~~~~~~~"

12913

12988

msgstr ""

12914

12989

12915

#: en/help_topics/hooks.txt:412

12990

#: en/help_topics/hooks.txt:415

12916

12991

msgid ""

12917

12992

"Called before a tree transform on this tree. The hook is called with\n"

12918

12993

"the tree that is being transformed and the transform."

12919

12994

msgstr ""

12920

12995

12921

#: en/help_topics/hooks.txt:415

12996

#: en/help_topics/hooks.txt:418

12922

12997

msgid ""

12923

12998

"start_commit\n"

12924

12999

"~~~~~~~~~~~~"

12925

13000

msgstr ""

12926

13001

12927

#: en/help_topics/hooks.txt:420

13002

#: en/help_topics/hooks.txt:423

12928

13003

msgid ""

12929

13004

"Called before a commit is performed on a tree. The start commit hook\n"

12930

13005

"is able to change the tree before the commit takes place. start_commit\n"

12932

13007

"being performed on."

12933

13008

msgstr ""

12934

13009

12935

#: en/help_topics/hooks.txt:425

13010

#: en/help_topics/hooks.txt:428

12936

13011

msgid ""

12937

13012

"SmartClientHooks\n"

12938

13013

"----------------"

12939

13014

msgstr ""

12940

13015

12941

#: en/help_topics/hooks.txt:428

13016

#: en/help_topics/hooks.txt:431

12942

13017

msgid ""

12943

13018

"call\n"

12944

13019

"~~~~"

12945

13020

msgstr ""

12946

13021

12947

#: en/help_topics/hooks.txt:431

13022

#: en/help_topics/hooks.txt:434

12948

13023

msgid "Introduced in: unknown"

12949

13024

msgstr ""

12950

13025

12951

#: en/help_topics/hooks.txt:433

13026

#: en/help_topics/hooks.txt:436

12952

13027

msgid ""

12953

13028

"Called when the smart client is submitting a request to the smart\n"

12954

13029

"server. Called with a bzrlib.smart.client.CallHookParams object.\n"

12955

13030

"Streaming request bodies, and responses, are not accessible."

12956

13031

msgstr ""

12957

13032

12958

#: en/help_topics/hooks.txt:437

13033

#: en/help_topics/hooks.txt:440

12959

13034

msgid ""

12960

13035

"SmartServerHooks\n"

12961

13036

"----------------"

12962

13037

msgstr ""

12963

13038

12964

#: en/help_topics/hooks.txt:440

13039

#: en/help_topics/hooks.txt:443

12965

13040

msgid ""

12966

13041

"server_exception\n"

12967

13042

"~~~~~~~~~~~~~~~~"

12968

13043

msgstr ""

12969

13044

12970

#: en/help_topics/hooks.txt:445

13045

#: en/help_topics/hooks.txt:448

12971

13046

msgid ""

12972

13047

"Called by the bzr server when an exception occurs. server_exception is\n"

12973

13048

"called with the sys.exc_info() tuple return true for the hook if the\n"

12975

13050

"normally."

12976

13051

msgstr ""

12977

13052

12978

#: en/help_topics/hooks.txt:450

13053

#: en/help_topics/hooks.txt:453

12979

13054

msgid ""

12980

13055

"server_started\n"

12981

13056

"~~~~~~~~~~~~~~"

12982

13057

msgstr ""

12983

13058

12984

#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472

13059

#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475

12985

13060

msgid "Introduced in: 0.16"

12986

13061

msgstr ""

12987

13062

12988

#: en/help_topics/hooks.txt:455

13063

#: en/help_topics/hooks.txt:458

12989

13064

msgid ""

12990

13065

"Called by the bzr server when it starts serving a directory.\n"

12991

13066

"server_started is called with (backing urls, public url), where\n"

12994

13069

"served."

12995

13070

msgstr ""

12996

13071

12997

#: en/help_topics/hooks.txt:461

13072

#: en/help_topics/hooks.txt:464

12998

13073

msgid ""

12999

13074

"server_started_ex\n"

13000

13075

"~~~~~~~~~~~~~~~~~"

13001

13076

msgstr ""

13002

13077

13003

#: en/help_topics/hooks.txt:466

13078

#: en/help_topics/hooks.txt:469

13004

13079

msgid ""

13005

13080

"Called by the bzr server when it starts serving a directory.\n"

13006

13081

"server_started is called with (backing_urls, server_obj)."

13007

13082

msgstr ""

13008

13083

13009

#: en/help_topics/hooks.txt:469

13084

#: en/help_topics/hooks.txt:472

13010

13085

msgid ""

13011

13086

"server_stopped\n"

13012

13087

"~~~~~~~~~~~~~~"

13013

13088

msgstr ""

13014

13089

13015

#: en/help_topics/hooks.txt:474

13090

#: en/help_topics/hooks.txt:477

13016

13091

msgid ""

13017

13092

"Called by the bzr server when it stops serving a directory.\n"

13018

13093

"server_stopped is called with the same parameters as the\n"

13019

13094

"server_started hook: (backing_urls, public_url)."

13020

13095

msgstr ""

13021

13096

13022

#: en/help_topics/hooks.txt:478

13097

#: en/help_topics/hooks.txt:481

13023

13098

msgid ""

13024

13099

"StatusHooks\n"

13025

13100

"-----------"

13026

13101

msgstr ""

13027

13102

13028

#: en/help_topics/hooks.txt:481

13103

#: en/help_topics/hooks.txt:484

13029

13104

msgid ""

13030

13105

"post_status\n"

13031

13106

"~~~~~~~~~~~"

13032

13107

msgstr ""

13033

13108

13034

#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495

13109

#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498

13035

13110

msgid "Introduced in: 2.3"

13036

13111

msgstr ""

13037

13112

13038

#: en/help_topics/hooks.txt:486

13113

#: en/help_topics/hooks.txt:489

13039

13114

msgid ""

13040

13115

"Called with argument StatusHookParams after Bazaar has displayed the\n"

13041

13116

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

13044

13119

"status command. to_file is the output stream for writing."

13045

13120

msgstr ""

13046

13121

13047

#: en/help_topics/hooks.txt:492

13122

#: en/help_topics/hooks.txt:495

13048

13123

msgid ""

13049

13124

"pre_status\n"

13050

13125

"~~~~~~~~~~"

13051

13126

msgstr ""

13052

13127

13053

#: en/help_topics/hooks.txt:497

13128

#: en/help_topics/hooks.txt:500

13054

13129

msgid ""

13055

13130

"Called with argument StatusHookParams before Bazaar displays the\n"

13056

13131

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

13059

13134

"status command. to_file is the output stream for writing."

13060

13135

msgstr ""

13061

13136

13062

#: en/help_topics/hooks.txt:503

13137

#: en/help_topics/hooks.txt:506

13063

13138

msgid ""

13064

13139

"TransportHooks\n"

13065

13140

"--------------"

13066

13141

msgstr ""

13067

13142

13068

#: en/help_topics/hooks.txt:506

13143

#: en/help_topics/hooks.txt:509

13069

13144

msgid ""

13070

13145

"post_connect\n"

13071

13146

"~~~~~~~~~~~~"

13072

13147

msgstr ""

13073

13148

13074

#: en/help_topics/hooks.txt:511

13149

#: en/help_topics/hooks.txt:514

13075

13150

msgid ""

13076

13151

"Called after a new connection is established or a reconnect occurs.\n"

13077

13152

"The sole argument passed is either the connected transport or smart\n"

13078

13153

"medium instance."

13079

13154

msgstr ""

13080

13155

13081

#: en/help_topics/hooks.txt:515

13156

#: en/help_topics/hooks.txt:518

13082

13157

msgid ""

13083

13158

"RioVersionInfoBuilderHooks\n"

13084

13159

"--------------------------"

13085

13160

msgstr ""

13086

13161

13087

#: en/help_topics/hooks.txt:518

13162

#: en/help_topics/hooks.txt:521

13088

13163

msgid ""

13089

13164

"revision\n"

13090

13165

"~~~~~~~~"

13091

13166

msgstr ""

13092

13167

13093

#: en/help_topics/hooks.txt:523

13168

#: en/help_topics/hooks.txt:526

13094

13169

msgid ""

13095

13170

"Invoked when adding information about a revision to the RIO stanza\n"

13096

13171

"that is printed. revision is called with a revision object and a RIO\n"

13862

13937

"Many commands that accept URLs also accept location aliases too.\n"

13863

13938

"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"

13864

13939

msgstr ""

13940

13941

#~ msgid ""

13942

#~ "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"

13943

#~ "delete them if they can easily be recovered using revert otherwise they\n"

13944

#~ "will be backed up (adding an extention of the form .~#~). If no options or\n"

13945

#~ "parameters are given Bazaar will scan for files that are being tracked by\n"

13946

#~ "Bazaar but missing in your tree and stop tracking them for you."

13947

#~ msgstr ""

13948

#~ "Прекращает отслеживание изменений в указанных файлах. Bazaar удалит их,\n"

13949

#~ "если их можно легко восстановить с помощью revert, иначе будут созданы\n"

13950

#~ "их резервные копии (с расширением вида .~#~). Если не указано ни опций,\n"

13951

#~ "ни параметров, Bazaar найдёт файлы, которые отслеживаются, но отсутствуют\n"

13952

#~ "в рабочем дереве и прекратит их отслеживать."