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

7

msgstr ""

8

"Project-Id-Version: bzr\n"

9

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

10

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

10

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

11

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

12

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

13

"Language-Team: Russian <ru@li.org>\n"

16

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

17

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

18

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

19

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

20

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

19

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

20

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

21

22

#: bzrlib/add.py:95

23

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

27

msgid "Unstacking"

28

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

29

30

#: bzrlib/branch.py:3183

30

#: bzrlib/branch.py:3205

31

#, python-format

32

msgid "Pushed up to revision %d."

33

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

34

35

#: bzrlib/branch.py:3185

35

#: bzrlib/branch.py:3207

36

#, python-format

37

msgid "%d tag updated."

38

msgid_plural "%d tags updated."

40

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

41

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

42

43

#: bzrlib/branch.py:3188

43

#: bzrlib/branch.py:3210

44

msgid "No new revisions or tags to push."

45

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

46

47

#: bzrlib/branch.py:3190

47

#: bzrlib/branch.py:3212

48

msgid "No new revisions to push."

49

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

50

51

#: bzrlib/branch.py:3210

51

#: bzrlib/branch.py:3232

52

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

53

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

54

55

#: bzrlib/branch.py:3213

55

#: bzrlib/branch.py:3235

56

#, python-format

57

msgid "found error:%s"

58

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

59

60

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

60

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

61

#, python-format

62

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

63

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

64

65

#: bzrlib/builtins.py:130

65

#: bzrlib/builtins.py:218

66

#, python-format

67

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

68

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

69

70

#: bzrlib/builtins.py:215

70

#: bzrlib/builtins.py:303

71

msgid "Display status summary."

72

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

73

74

#: bzrlib/builtins.py:217

74

#: bzrlib/builtins.py:305

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

82

#: bzrlib/builtins.py:308

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

91

#: bzrlib/builtins.py:311

92

msgid ""

93

"removed\n"

94

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

98

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

99

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

100

101

#: bzrlib/builtins.py:227

101

#: bzrlib/builtins.py:315

102

msgid ""

103

"renamed\n"

104

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

110

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

111

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

112

113

#: bzrlib/builtins.py:232

113

#: bzrlib/builtins.py:320

114

msgid ""

115

"modified\n"

116

" Text has changed since the previous revision."

118

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

119

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

120

121

#: bzrlib/builtins.py:235

121

#: bzrlib/builtins.py:323

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

129

#: bzrlib/builtins.py:326

130

msgid ""

131

"unknown\n"

132

" Not versioned and not matching an ignore pattern."

134

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

135

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

136

137

#: bzrlib/builtins.py:241

137

#: bzrlib/builtins.py:329

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

149

#: bzrlib/builtins.py:334

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

157

#: bzrlib/builtins.py:337

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

167

#: bzrlib/builtins.py:341

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

179

#: bzrlib/builtins.py:346

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

191

#: bzrlib/builtins.py:351

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

199

#: bzrlib/builtins.py:354

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

209

#: bzrlib/builtins.py:363

210

msgid "Use short status indicators."

211

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

212

213

#: bzrlib/builtins.py:277

213

#: bzrlib/builtins.py:365

214

msgid "Only show versioned files."

215

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

216

217

#: bzrlib/builtins.py:279

217

#: bzrlib/builtins.py:367

218

msgid "Don't show pending merges."

219

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

220

221

#: bzrlib/builtins.py:282

221

#: bzrlib/builtins.py:370

222

msgid "Do not mark object type using indicator."

223

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

224

225

#: bzrlib/builtins.py:297

225

#: bzrlib/builtins.py:385

226

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

227

msgstr ""

228

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

229

230

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

230

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

231

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

232

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

233

234

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

234

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

235

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

236

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

237

238

#: bzrlib/builtins.py:351

238

#: bzrlib/builtins.py:439

239

#, python-format

240

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

241

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

242

243

#: bzrlib/builtins.py:362

243

#: bzrlib/builtins.py:450

244

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

245

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

246

247

#: bzrlib/builtins.py:369

247

#: bzrlib/builtins.py:457

248

msgid "You cannot specify a NULL revision."

249

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

250

251

#: bzrlib/builtins.py:461

251

#: bzrlib/builtins.py:549

252

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

253

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

254

255

#: bzrlib/builtins.py:463

255

#: bzrlib/builtins.py:551

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

263

#: bzrlib/builtins.py:554

264

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

265

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

266

267

#: bzrlib/builtins.py:472

267

#: bzrlib/builtins.py:560

268

msgid ""

269

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

270

msgstr ""

271

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

272

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

273

274

#: bzrlib/builtins.py:486

274

#: bzrlib/builtins.py:574

275

msgid "No working tree to remove"

276

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

277

278

#: bzrlib/builtins.py:488

278

#: bzrlib/builtins.py:576

279

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

280

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

281

282

#: bzrlib/builtins.py:497

282

#: bzrlib/builtins.py:585

283

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

284

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

285

286

#: bzrlib/builtins.py:537

286

#: bzrlib/builtins.py:625

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

294

#: bzrlib/builtins.py:636

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

302

#: bzrlib/builtins.py:640

303

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

304

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

305

306

#: bzrlib/builtins.py:556

306

#: bzrlib/builtins.py:644

307

msgid "Show current revision number."

308

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

309

310

#: bzrlib/builtins.py:558

310

#: bzrlib/builtins.py:646

311

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

312

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

313

314

#: bzrlib/builtins.py:571

314

#: bzrlib/builtins.py:659

315

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

316

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

317

318

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

318

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

319

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

320

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

321

322

#: bzrlib/builtins.py:612

322

#: bzrlib/builtins.py:700

323

msgid "Show revno of working tree."

324

msgstr ""

324

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

325

326

#: bzrlib/builtins.py:660

326

#: bzrlib/builtins.py:748

327

msgid "Add specified files or directories."

328

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

329

330

#: bzrlib/builtins.py:662

330

#: bzrlib/builtins.py:750

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

341

#: bzrlib/builtins.py:754

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

360

#: bzrlib/builtins.py:762

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

368

#: bzrlib/builtins.py:765

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

376

#: bzrlib/builtins.py:768

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

388

#: bzrlib/builtins.py:773

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

396

#: bzrlib/builtins.py:776

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

416

#: bzrlib/builtins.py:784

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

424

#: bzrlib/builtins.py:787

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

434

#: bzrlib/builtins.py:794

435

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

436

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

437

438

#: bzrlib/builtins.py:712

438

#: bzrlib/builtins.py:800

439

msgid "Lookup file ids from this tree."

440

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

441

442

#: bzrlib/builtins.py:748

442

#: bzrlib/builtins.py:836

443

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

444

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

445

446

#: bzrlib/builtins.py:753

446

#: bzrlib/builtins.py:841

447

msgid "Create a new versioned directory."

448

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

449

450

#: bzrlib/builtins.py:755

450

#: bzrlib/builtins.py:843

451

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

452

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

453

454

#: bzrlib/builtins.py:762

454

#: bzrlib/builtins.py:850

455

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

456

msgstr ""

457

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

458

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

457

459

458

#: bzrlib/builtins.py:796

460

#: bzrlib/builtins.py:884

459

461

#, python-format

460

462

msgid "added %s\n"

461

463

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

462

464

463

#: bzrlib/builtins.py:838

465

#: bzrlib/builtins.py:926

464

466

#, python-format

465

467

msgid "invalid kind %r specified"

466

468

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

467

469

468

#: bzrlib/builtins.py:875

470

#: bzrlib/builtins.py:963

469

471

msgid "Move or rename a file."

470

472

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

471

473

472

#: bzrlib/builtins.py:877

474

#: bzrlib/builtins.py:965

473

475

msgid " bzr mv SOURCE... DESTINATION"

474

476

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

475

477

476

#: bzrlib/builtins.py:879

478

#: bzrlib/builtins.py:967

477

479

msgid ""

478

480

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

479

481

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

483

485

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

484

486

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

485

487

486

#: bzrlib/builtins.py:883

488

#: bzrlib/builtins.py:971

487

489

msgid ""

488

490

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

489

491

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

497

499

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

498

500

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

499

501

500

#: bzrlib/builtins.py:889

502

#: bzrlib/builtins.py:977

501

503

msgid "Files cannot be moved between branches."

502

504

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

503

505

504

#: bzrlib/builtins.py:896

506

#: bzrlib/builtins.py:984

505

507

msgid ""

506

508

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

507

509

"moved."

509

511

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

510

512

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

511

513

512

#: bzrlib/builtins.py:898

514

#: bzrlib/builtins.py:986

513

515

msgid "Automatically guess renames."

514

516

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

515

517

516

#: bzrlib/builtins.py:899

518

#: bzrlib/builtins.py:987

517

519

msgid "Avoid making changes when guessing renames."

518

520

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

519

521

520

#: bzrlib/builtins.py:908

522

#: bzrlib/builtins.py:996

521

523

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

522

524

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

523

525

524

#: bzrlib/builtins.py:912

526

#: bzrlib/builtins.py:1000

525

527

msgid "missing file argument"

526

528

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

527

529

528

#: bzrlib/builtins.py:916

530

#: bzrlib/builtins.py:1004

529

531

msgid "can not move root of branch"

530

532

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

531

533

532

#: bzrlib/builtins.py:922

534

#: bzrlib/builtins.py:1010

533

535

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

534

536

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

535

537

536

#: bzrlib/builtins.py:925

538

#: bzrlib/builtins.py:1013

537

539

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

538

540

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

539

541

540

#: bzrlib/builtins.py:962

542

#: bzrlib/builtins.py:1050

541

543

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

542

544

msgstr ""

543

545

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

544

546

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

545

547

546

#: bzrlib/builtins.py:1014

548

#: bzrlib/builtins.py:1102

547

549

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

548

550

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

549

551

550

#: bzrlib/builtins.py:1016

552

#: bzrlib/builtins.py:1104

551

553

msgid ""

552

554

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

553

555

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

558

560

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

559

561

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

560

562

561

#: bzrlib/builtins.py:1021

563

#: bzrlib/builtins.py:1109

562

564

msgid ""

563

565

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

564

566

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

568

570

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

569

571

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

570

572

571

#: bzrlib/builtins.py:1025

573

#: bzrlib/builtins.py:1113

572

574

msgid ""

573

575

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

574

576

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

578

580

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

579

581

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

580

582

581

#: bzrlib/builtins.py:1029

583

#: bzrlib/builtins.py:1117

582

584

msgid ""

583

585

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

584

586

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

592

594

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

593

595

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

594

596

595

#: bzrlib/builtins.py:1034

597

#: bzrlib/builtins.py:1122

596

598

msgid ""

597

599

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

598

600

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

602

604

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

603

605

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

604

606

605

#: bzrlib/builtins.py:1038

607

#: bzrlib/builtins.py:1126

606

608

msgid ""

607

609

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

608

610

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

611

613

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

612

614

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

613

615

614

#: bzrlib/builtins.py:1046

616

#: bzrlib/builtins.py:1134

615

617

msgid "Show logs of pulled revisions."

616

618

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

617

619

618

#: bzrlib/builtins.py:1048

620

#: bzrlib/builtins.py:1136

619

621

msgid ""

620

622

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

621

623

msgstr ""

622

624

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

623

625

624

#: bzrlib/builtins.py:1051

626

#: bzrlib/builtins.py:1139

625

627

msgid ""

626

628

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

627

629

"master branch."

629

631

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

630

632

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

631

633

632

#: bzrlib/builtins.py:1080

634

#: bzrlib/builtins.py:1168

633

635

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

634

636

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

635

637

636

#: bzrlib/builtins.py:1096

638

#: bzrlib/builtins.py:1184

637

639

msgid "No pull location known or specified."

638

640

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

639

641

640

#: bzrlib/builtins.py:1102

642

#: bzrlib/builtins.py:1190

641

643

#, python-format

642

644

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

643

645

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

644

646

645

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

647

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

646

648

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

647

649

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

648

650

649

#: bzrlib/builtins.py:1150

651

#: bzrlib/builtins.py:1238

650

652

msgid "Update a mirror of this branch."

651

653

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

652

654

653

#: bzrlib/builtins.py:1152

655

#: bzrlib/builtins.py:1240

654

656

msgid ""

655

657

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

656

658

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

658

660

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

659

661

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

660

662

661

#: bzrlib/builtins.py:1155

663

#: bzrlib/builtins.py:1243

662

664

msgid ""

663

665

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

664

666

"the future."

666

668

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

667

669

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

668

670

669

#: bzrlib/builtins.py:1158

671

#: bzrlib/builtins.py:1246

670

672

msgid ""

671

673

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

672

674

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

677

679

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

678

680

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

679

681

680

#: bzrlib/builtins.py:1162

682

#: bzrlib/builtins.py:1250

681

683

msgid ""

682

684

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

683

685

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

686

688

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

687

689

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

688

690

689

#: bzrlib/builtins.py:1165

691

#: bzrlib/builtins.py:1253

690

692

msgid ""

691

693

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

692

694

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

697

699

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

698

700

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

699

701

700

#: bzrlib/builtins.py:1169

702

#: bzrlib/builtins.py:1257

701

703

msgid ""

702

704

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

703

705

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

711

713

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

712

714

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

713

715

714

#: bzrlib/builtins.py:1174

716

#: bzrlib/builtins.py:1262

715

717

msgid ""

716

718

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

717

719

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

721

723

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

722

724

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

723

725

724

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

726

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

725

727

msgid ""

726

728

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

727

729

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

728

730

729

#: bzrlib/builtins.py:1188

731

#: bzrlib/builtins.py:1276

730

732

msgid ""

731

733

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

732

734

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

735

737

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

736

738

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

737

739

738

#: bzrlib/builtins.py:1193

740

#: bzrlib/builtins.py:1281

739

741

msgid ""

740

742

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

741

743

"branch."

743

745

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

744

746

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

745

747

746

#: bzrlib/builtins.py:1196

748

#: bzrlib/builtins.py:1284

747

749

msgid ""

748

750

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

749

751

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

753

755

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

754

756

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

755

757

756

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

758

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

757

759

msgid ""

758

760

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

759

761

"strict disables the check."

761

763

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

762

764

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

763

765

764

#: bzrlib/builtins.py:1204

766

#: bzrlib/builtins.py:1292

765

767

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

766

768

msgstr ""

767

769

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

768

770

769

#: bzrlib/builtins.py:1248

771

#: bzrlib/builtins.py:1336

770

772

msgid "Could not determine branch to refer to."

771

773

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

772

774

773

#: bzrlib/builtins.py:1257

775

#: bzrlib/builtins.py:1345

774

776

#, python-format

775

777

msgid ""

776

778

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

777

779

"use 'bzr push :parent'."

778

780

msgstr ""

779

781

780

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

782

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

781

783

msgid "No push location known or specified."

782

784

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

783

785

784

#: bzrlib/builtins.py:1267

786

#: bzrlib/builtins.py:1355

785

787

#, python-format

786

788

msgid "Using saved push location: %s"

787

789

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

788

790

789

#: bzrlib/builtins.py:1277

791

#: bzrlib/builtins.py:1365

790

792

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

791

793

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

792

794

793

#: bzrlib/builtins.py:1279

795

#: bzrlib/builtins.py:1367

794

796

msgid ""

795

797

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

796

798

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

806

808

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

807

809

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

808

810

809

#: bzrlib/builtins.py:1286

811

#: bzrlib/builtins.py:1374

810

812

msgid ""

811

813

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

812

814

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

814

816

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

815

817

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

816

818

817

#: bzrlib/builtins.py:1289

819

#: bzrlib/builtins.py:1377

818

820

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

819

821

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

820

822

821

#: bzrlib/builtins.py:1299

823

#: bzrlib/builtins.py:1387

822

824

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

823

825

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

824

826

825

#: bzrlib/builtins.py:1301

827

#: bzrlib/builtins.py:1389

826

828

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

827

829

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

828

830

829

#: bzrlib/builtins.py:1304

831

#: bzrlib/builtins.py:1392

830

832

msgid ""

831

833

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

832

834

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

834

836

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

835

837

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

836

838

837

#: bzrlib/builtins.py:1308

839

#: bzrlib/builtins.py:1396

838

840

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

839

841

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

840

842

841

#: bzrlib/builtins.py:1310

843

#: bzrlib/builtins.py:1398

842

844

msgid ""

843

845

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

844

846

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

847

849

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

848

850

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

849

851

850

#: bzrlib/builtins.py:1315

852

#: bzrlib/builtins.py:1403

851

853

msgid "Bind new branch to from location."

852

854

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

853

855

854

#: bzrlib/builtins.py:1362

856

#: bzrlib/builtins.py:1450

855

857

#, python-format

856

858

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

857

859

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

858

860

859

#: bzrlib/builtins.py:1374

861

#: bzrlib/builtins.py:1462

860

862

#, python-format

861

863

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

862

864

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

863

865

864

#: bzrlib/builtins.py:1393

866

#: bzrlib/builtins.py:1481

865

867

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

866

868

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

867

869

868

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

870

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

869

871

#, python-format

870

872

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

871

873

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

872

874

873

#: bzrlib/builtins.py:1407

875

#: bzrlib/builtins.py:1500

874

876

#, python-format

875

877

msgid "Branched %d revision."

876

878

msgid_plural "Branched %d revisions."

878

880

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

879

881

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

880

882

881

#: bzrlib/builtins.py:1412

883

#: bzrlib/builtins.py:1505

882

884

#, python-format

883

885

msgid "New branch bound to %s"

884

886

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

885

887

886

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

888

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

887

889

#, python-format

888

890

msgid "Switched to branch: %s"

889

891

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

890

892

891

#: bzrlib/builtins.py:1422

893

#: bzrlib/builtins.py:1515

892

894

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

893

895

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

894

896

895

#: bzrlib/builtins.py:1424

897

#: bzrlib/builtins.py:1517

896

898

msgid ""

897

899

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

898

900

"location."

899

901

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

900

902

901

#: bzrlib/builtins.py:1431

903

#: bzrlib/builtins.py:1524

902

904

msgid ""

903

905

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

904

906

"location."

905

907

msgstr ""

906

908

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

907

909

908

#: bzrlib/builtins.py:1461

910

#: bzrlib/builtins.py:1554

909

911

msgid "(default)"

910

msgstr ""

912

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

911

913

912

#: bzrlib/builtins.py:1473

914

#: bzrlib/builtins.py:1566

913

915

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

914

916

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

915

917

916

#: bzrlib/builtins.py:1475

918

#: bzrlib/builtins.py:1568

917

919

msgid ""

918

920

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

919

921

"for\n"

926

928

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

927

929

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

928

930

929

#: bzrlib/builtins.py:1480

931

#: bzrlib/builtins.py:1573

930

932

msgid ""

931

933

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

932

934

"will\n"

943

945

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

944

946

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

945

947

946

#: bzrlib/builtins.py:1487

948

#: bzrlib/builtins.py:1580

947

949

msgid ""

948

950

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

949

951

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

957

959

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

958

960

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

959

961

960

#: bzrlib/builtins.py:1497

962

#: bzrlib/builtins.py:1590

961

963

msgid ""

962

964

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

963

965

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

969

971

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

970

972

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

971

973

972

#: bzrlib/builtins.py:1504

974

#: bzrlib/builtins.py:1597

973

975

msgid "Get file contents from this tree."

974

976

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

975

977

976

#: bzrlib/builtins.py:1506

978

#: bzrlib/builtins.py:1599

977

979

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

978

980

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

979

981

980

#: bzrlib/builtins.py:1547

982

#: bzrlib/builtins.py:1640

981

983

msgid ""

982

984

"Show list of renamed files.\n"

983

985

" "

985

987

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

986

988

" "

987

989

988

#: bzrlib/builtins.py:1577

990

#: bzrlib/builtins.py:1670

989

991

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

990

992

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

991

993

992

#: bzrlib/builtins.py:1579

994

#: bzrlib/builtins.py:1672

993

995

msgid ""

994

996

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

995

997

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

996

998

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

997

999

msgstr ""

998

1000

999

#: bzrlib/builtins.py:1583

1001

#: bzrlib/builtins.py:1676

1000

1002

msgid ""

1001

1003

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

1002

1004

"that is out of date from its branch."

1003

1005

msgstr ""

1004

1006

1005

#: bzrlib/builtins.py:1586

1007

#: bzrlib/builtins.py:1679

1006

1008

msgid ""

1007

1009

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

1008

1010

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

1010

1012

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

1011

1013

msgstr ""

1012

1014

1013

#: bzrlib/builtins.py:1591

1015

#: bzrlib/builtins.py:1684

1014

1016

msgid ""

1015

1017

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

1016

1018

"the branch from the master."

1017

1019

msgstr ""

1018

1020

1019

#: bzrlib/builtins.py:1594

1021

#: bzrlib/builtins.py:1687

1020

1022

msgid ""

1021

1023

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

1022

1024

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

1033

1035

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

1034

1036

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

1035

1037

1036

#: bzrlib/builtins.py:1601

1038

#: bzrlib/builtins.py:1694

1037

1039

msgid ""

1038

1040

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

1039

1041

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

1040

1042

"current working directory is used."

1041

1043

msgstr ""

1042

1044

1043

#: bzrlib/builtins.py:1617

1045

#: bzrlib/builtins.py:1710

1044

1046

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

1045

1047

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

1046

1048

1047

#: bzrlib/builtins.py:1625

1049

#: bzrlib/builtins.py:1718

1048

1050

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

1049

1051

msgstr ""

1050

1052

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

1051

1053

1052

#: bzrlib/builtins.py:1656

1054

#: bzrlib/builtins.py:1749

1053

1055

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

1054

1056

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

1055

1057

1056

#: bzrlib/builtins.py:1672

1058

#: bzrlib/builtins.py:1765

1057

1059

#, python-format

1058

1060

msgid ""

1059

1061

"branch has no revision %s\n"

1062

1064

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

1063

1065

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

1064

1066

1065

#: bzrlib/builtins.py:1678

1067

#: bzrlib/builtins.py:1771

1066

1068

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

1067

1069

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

1068

1070

1069

#: bzrlib/builtins.py:1682

1071

#: bzrlib/builtins.py:1775

1070

1072

msgid ""

1071

1073

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

1072

1074

"can be committed with 'bzr commit'."

1074

1076

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

1075

1077

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

1076

1078

1077

#: bzrlib/builtins.py:1691

1079

#: bzrlib/builtins.py:1784

1078

1080

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

1079

1081

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

1080

1082

1081

#: bzrlib/builtins.py:1693

1083

#: bzrlib/builtins.py:1786

1082

1084

msgid ""

1083

1085

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

1084

1086

"tree, branch or repository."

1086

1088

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

1087

1089

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

1088

1090

1089

#: bzrlib/builtins.py:1696

1091

#: bzrlib/builtins.py:1789

1090

1092

msgid ""

1091

1093

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

1092

1094

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

1096

1098

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

1097

1099

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

1098

1100

1099

#: bzrlib/builtins.py:1700

1101

#: bzrlib/builtins.py:1793

1100

1102

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

1101

1103

msgstr ""

1102

1104

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

1103

1105

1104

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

1105

#: bzrlib/builtins.py:6389

1106

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

1107

#: bzrlib/builtins.py:6442

1106

1108

msgid ":Examples:"

1107

msgstr ""

1109

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

1108

1110

1109

#: bzrlib/builtins.py:1704

1111

#: bzrlib/builtins.py:1797

1110

1112

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

1111

1113

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

1112

1114

1113

#: bzrlib/builtins.py:1706

1115

#: bzrlib/builtins.py:1799

1114

1116

msgid " bzr info"

1115

1117

msgstr " bzr info"

1116

1118

1117

#: bzrlib/builtins.py:1708

1119

#: bzrlib/builtins.py:1801

1118

1120

msgid ""

1119

1121

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

1120

1122

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

1124

1126

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

1125

1127

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

1126

1128

1127

#: bzrlib/builtins.py:1712

1129

#: bzrlib/builtins.py:1805

1128

1130

msgid " bzr info -v"

1129

1131

msgstr " bzr info -v"

1130

1132

1131

#: bzrlib/builtins.py:1714

1133

#: bzrlib/builtins.py:1807

1132

1134

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

1133

1135

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

1134

1136

1135

#: bzrlib/builtins.py:1716

1137

#: bzrlib/builtins.py:1809

1136

1138

msgid " bzr info -vv"

1137

1139

msgstr " bzr info -vv"

1138

1140

1139

#: bzrlib/builtins.py:1735

1141

#: bzrlib/builtins.py:1828

1140

1142

msgid "Remove files or directories."

1141

1143

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

1142

1144

1143

#: bzrlib/builtins.py:1737

1145

#: bzrlib/builtins.py:1830

1144

1146

msgid ""

1145

1147

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

1146

1148

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

1154

1156

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

1155

1157

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

1156

1158

1157

#: bzrlib/builtins.py:1745

1159

#: bzrlib/builtins.py:1838

1158

1160

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

1159

1161

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

1160

1162

1161

#: bzrlib/builtins.py:1747

1163

#: bzrlib/builtins.py:1840

1162

1164

msgid "The file deletion mode to be used."

1163

1165

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

1164

1166

1165

#: bzrlib/builtins.py:1748

1167

#: bzrlib/builtins.py:1841

1166

1168

msgid "Deletion Strategy"

1167

1169

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

1168

1170

1169

#: bzrlib/builtins.py:1749

1171

#: bzrlib/builtins.py:1842

1170

1172

msgid "Backup changed files (default)."

1171

1173

msgstr ""

1172

1174

1173

#: bzrlib/builtins.py:1750

1175

#: bzrlib/builtins.py:1843

1174

1176

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

1175

msgstr ""

1177

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

1176

1178

1177

#: bzrlib/builtins.py:1751

1179

#: bzrlib/builtins.py:1844

1178

1180

msgid "Don't backup changed files."

1179

msgstr ""

1181

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

1180

1182

1181

#: bzrlib/builtins.py:1752

1183

#: bzrlib/builtins.py:1845

1182

1184

msgid ""

1183

1185

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

1184

1186

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

1185

1187

msgstr ""

1188

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

1189

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

1186

1190

1187

#: bzrlib/builtins.py:1761

1191

#: bzrlib/builtins.py:1854

1188

1192

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

1189

1193

msgstr ""

1190

1194

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

1191

1195

1192

#: bzrlib/builtins.py:1778

1196

#: bzrlib/builtins.py:1871

1193

1197

msgid "No matching files."

1194

1198

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

1195

1199

1196

#: bzrlib/builtins.py:1839

1200

#: bzrlib/builtins.py:1932

1197

1201

msgid "Reconcile bzr metadata in a branch."

1198

1202

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

1199

1203

1200

#: bzrlib/builtins.py:1841

1204

#: bzrlib/builtins.py:1934

1201

1205

msgid ""

1202

1206

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

1203

1207

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

1208

1212

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

1209

1213

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

1210

1214

1211

#: bzrlib/builtins.py:1846

1215

#: bzrlib/builtins.py:1939

1212

1216

msgid ""

1213

1217

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

1214

1218

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

1220

1224

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

1221

1225

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

1222

1226

1223

#: bzrlib/builtins.py:1851

1227

#: bzrlib/builtins.py:1944

1224

1228

msgid ""

1225

1229

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

1226

1230

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

1229

1233

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

1230

1234

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

1231

1235

1232

#: bzrlib/builtins.py:1854

1236

#: bzrlib/builtins.py:1947

1233

1237

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

1234

1238

msgstr ""

1235

1239

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

1236

1240

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

1237

1241

1238

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

1242

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

1239

1243

msgid ""

1240

1244

"Format for the bzr 2.0 series.\n"

1241

1245

"Uses group-compress storage.\n"

1242

1246

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

1243

1247

msgstr ""

1244

1248

1245

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

1249

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

1246

1250

msgid ""

1247

1251

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

1248

1252

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

1249

1253

msgstr ""

1250

1254

1251

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

1255

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

1252

1256

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

1253

1257

msgstr ""

1254

1258

1255

#: bzrlib/builtins.py:1922

1259

#: bzrlib/builtins.py:2015

1256

1260

msgid "Make a directory into a versioned branch."

1257

1261

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

1258

1262

1259

#: bzrlib/builtins.py:1924

1263

#: bzrlib/builtins.py:2017

1260

1264

msgid ""

1261

1265

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

1262

1266

"existing project."

1264

1268

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

1265

1269

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

1266

1270

1267

#: bzrlib/builtins.py:1927

1271

#: bzrlib/builtins.py:2020

1268

1272

msgid ""

1269

1273

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

1270

1274

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

1275

1279

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

1276

1280

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

1277

1281

1278

#: bzrlib/builtins.py:1932

1282

#: bzrlib/builtins.py:2025

1279

1283

msgid ""

1280

1284

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

1281

1285

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

1283

1287

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

1284

1288

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

1285

1289

1286

#: bzrlib/builtins.py:1935

1290

#: bzrlib/builtins.py:2028

1287

1291

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

1288

1292

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

1289

1293

1290

#: bzrlib/builtins.py:1937

1294

#: bzrlib/builtins.py:2030

1291

1295

msgid ""

1292

1296

" cd ~/project\n"

1293

1297

" bzr init\n"

1301

1305

" bzr status\n"

1302

1306

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

1303

1307

1304

#: bzrlib/builtins.py:1948

1308

#: bzrlib/builtins.py:2041

1305

1309

msgid ""

1306

1310

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

1307

1311

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

1308

1312

1309

#: bzrlib/builtins.py:1951

1313

#: bzrlib/builtins.py:2044

1310

1314

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

1311

1315

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

1312

1316

1313

#: bzrlib/builtins.py:1959

1317

#: bzrlib/builtins.py:2052

1314

1318

msgid ""

1315

1319

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

1316

1320

msgstr ""

1317

1321

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

1318

1322

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

1319

1323

1320

#: bzrlib/builtins.py:1962

1324

#: bzrlib/builtins.py:2055

1321

1325

msgid "Create a branch without a working tree."

1322

1326

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

1323

1327

1324

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

1328

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

1325

1329

#, python-format

1326

1330

msgid ""

1327

1331

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

1331

1335

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

1332

1336

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

1333

1337

1334

#: bzrlib/builtins.py:2016

1338

#: bzrlib/builtins.py:2109

1335

1339

msgid ""

1336

1340

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

1337

1341

msgstr ""

1338

1342

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

1339

1343

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

1340

1344

1341

#: bzrlib/builtins.py:2027

1345

#: bzrlib/builtins.py:2120

1342

1346

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

1343

1347

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

1344

1348

1345

#: bzrlib/builtins.py:2036

1349

#: bzrlib/builtins.py:2129

1346

1350

#, python-format

1347

1351

msgid "Using shared repository: %s\n"

1348

1352

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

1349

1353

1350

#: bzrlib/builtins.py:2040

1354

#: bzrlib/builtins.py:2133

1351

1355

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

1352

1356

msgstr ""

1353

1357

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

1354

1358

1355

#: bzrlib/builtins.py:2042

1359

#: bzrlib/builtins.py:2135

1356

1360

msgid ""

1357

1361

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

1358

1362

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

1364

1368

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

1365

1369

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

1366

1370

1367

#: bzrlib/builtins.py:2047

1371

#: bzrlib/builtins.py:2140

1368

1372

msgid ""

1369

1373

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

1370

1374

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

1380

1384

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

1381

1385

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

1382

1386

1383

#: bzrlib/builtins.py:2054

1387

#: bzrlib/builtins.py:2147

1384

1388

msgid ""

1385

1389

":Examples:\n"

1386

1390

" Create a shared repository holding just branches::"

1388

1392

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

1389

1393

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

1390

1394

1391

#: bzrlib/builtins.py:2057

1395

#: bzrlib/builtins.py:2150

1392

1396

msgid ""

1393

1397

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

1394

1398

" bzr init repo/trunk"

1396

1400

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

1397

1401

" bzr init repo/trunk"

1398

1402

1399

#: bzrlib/builtins.py:2060

1403

#: bzrlib/builtins.py:2153

1400

1404

msgid " Make a lightweight checkout elsewhere::"

1401

1405

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

1402

1406

1403

#: bzrlib/builtins.py:2062

1407

#: bzrlib/builtins.py:2155

1404

1408

msgid ""

1405

1409

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

1406

1410

" cd trunk-checkout\n"

1410

1414

" cd trunk-checkout\n"

1411

1415

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

1412

1416

1413

#: bzrlib/builtins.py:2070

1417

#: bzrlib/builtins.py:2163

1414

1418

msgid ""

1415

1419

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

1416

1420

msgstr ""

1417

1421

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

1418

1422

"formats»."

1419

1423

1420

#: bzrlib/builtins.py:2074

1424

#: bzrlib/builtins.py:2167

1421

1425

msgid "Repository format"

1422

1426

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

1423

1427

1424

#: bzrlib/builtins.py:2076

1428

#: bzrlib/builtins.py:2169

1425

1429

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

1426

1430

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

1427

1431

1428

#: bzrlib/builtins.py:2102

1432

#: bzrlib/builtins.py:2195

1429

1433

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

1430

1434

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

1431

1435

1432

#: bzrlib/builtins.py:2104

1436

#: bzrlib/builtins.py:2197

1433

1437

msgid ""

1434

1438

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

1435

1439

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

1444

1448

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

1445

1449

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

1446

1450

1447

#: bzrlib/builtins.py:2111

1451

#: bzrlib/builtins.py:2204

1448

1452

msgid ""

1449

1453

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

1450

1454

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

1452

1456

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

1453

1457

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

1454

1458

1455

#: bzrlib/builtins.py:2114

1459

#: bzrlib/builtins.py:2207

1456

1460

msgid ""

1457

1461

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

1458

1462

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

1467

1471

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

1468

1472

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

1469

1473

1470

#: bzrlib/builtins.py:2121

1474

#: bzrlib/builtins.py:2214

1471

1475

msgid ""

1472

1476

":Exit values:\n"

1473

1477

" 1 - changed\n"

1481

1485

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

1482

1486

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

1483

1487

1484

#: bzrlib/builtins.py:2127

1488

#: bzrlib/builtins.py:2220

1485

1489

msgid ""

1486

1490

":Examples:\n"

1487

1491

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

1489

1493

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

1490

1494

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

1491

1495

1492

#: bzrlib/builtins.py:2130

1496

#: bzrlib/builtins.py:2223

1493

1497

msgid " bzr diff"

1494

1498

msgstr " bzr diff"

1495

1499

1496

#: bzrlib/builtins.py:2132

1500

#: bzrlib/builtins.py:2225

1497

1501

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

1498

1502

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

1499

1503

1500

#: bzrlib/builtins.py:2134

1504

#: bzrlib/builtins.py:2227

1501

1505

msgid " bzr diff -r1"

1502

1506

msgstr " bzr diff -r1"

1503

1507

1504

#: bzrlib/builtins.py:2136

1508

#: bzrlib/builtins.py:2229

1505

1509

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

1506

1510

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

1507

1511

1508

#: bzrlib/builtins.py:2138

1512

#: bzrlib/builtins.py:2231

1509

1513

msgid " bzr diff -r1..3"

1510

1514

msgstr " bzr diff -r1..3"

1511

1515

1512

#: bzrlib/builtins.py:2140

1516

#: bzrlib/builtins.py:2233

1513

1517

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

1514

1518

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

1515

1519

1516

#: bzrlib/builtins.py:2142

1520

#: bzrlib/builtins.py:2235

1517

1521

msgid " bzr diff -r1..3 xxx"

1518

1522

msgstr " bzr diff -r1..3 xxx"

1519

1523

1520

#: bzrlib/builtins.py:2144

1524

#: bzrlib/builtins.py:2237

1521

1525

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

1522

1526

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

1523

1527

1524

#: bzrlib/builtins.py:2146

1528

#: bzrlib/builtins.py:2239

1525

1529

msgid " bzr diff -c2"

1526

1530

msgstr " bzr diff -c2"

1527

1531

1528

#: bzrlib/builtins.py:2148

1532

#: bzrlib/builtins.py:2241

1529

1533

msgid ""

1530

1534

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

1531

1535

" \n"

1535

1539

" \n"

1536

1540

" bzr diff -cX"

1537

1541

1538

#: bzrlib/builtins.py:2152

1542

#: bzrlib/builtins.py:2245

1539

1543

msgid ""

1540

1544

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

1541

1545

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

1545

1549

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

1546

1550

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

1547

1551

1548

#: bzrlib/builtins.py:2156

1552

#: bzrlib/builtins.py:2249

1549

1553

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

1550

1554

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

1551

1555

1552

#: bzrlib/builtins.py:2158

1556

#: bzrlib/builtins.py:2251

1553

1557

msgid ""

1554

1558

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

1555

1559

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

1557

1561

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

1558

1562

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

1559

1563

1560

#: bzrlib/builtins.py:2161

1564

#: bzrlib/builtins.py:2254

1561

1565

msgid " bzr diff -r-2.."

1562

1566

msgstr " bzr diff -r-2.."

1563

1567

1564

#: bzrlib/builtins.py:2163

1568

#: bzrlib/builtins.py:2256

1565

1569

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

1566

1570

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

1567

1571

1568

#: bzrlib/builtins.py:2165

1572

#: bzrlib/builtins.py:2258

1569

1573

msgid " bzr diff NEWS"

1570

1574

msgstr " bzr diff NEWS"

1571

1575

1572

#: bzrlib/builtins.py:2167

1576

#: bzrlib/builtins.py:2260

1573

1577

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

1574

1578

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

1575

1579

1576

#: bzrlib/builtins.py:2169

1580

#: bzrlib/builtins.py:2262

1577

1581

msgid " bzr diff xxx/NEWS"

1578

1582

msgstr " bzr diff xxx/NEWS"

1579

1583

1580

#: bzrlib/builtins.py:2171

1584

#: bzrlib/builtins.py:2264

1581

1585

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

1582

1586

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

1583

1587

1584

#: bzrlib/builtins.py:2173

1588

#: bzrlib/builtins.py:2266

1585

1589

msgid " bzr diff --old xxx"

1586

1590

msgstr " bzr diff --old xxx"

1587

1591

1588

#: bzrlib/builtins.py:2175

1592

#: bzrlib/builtins.py:2268

1589

1593

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

1590

1594

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

1591

1595

1592

#: bzrlib/builtins.py:2177

1596

#: bzrlib/builtins.py:2270

1593

1597

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

1594

1598

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

1595

1599

1596

#: bzrlib/builtins.py:2179

1600

#: bzrlib/builtins.py:2272

1597

1601

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

1598

1602

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

1599

1603

1600

#: bzrlib/builtins.py:2181

1604

#: bzrlib/builtins.py:2274

1601

1605

msgid ""

1602

1606

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

1603

1607

" \n"

1612

1616

" \n"

1613

1617

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

1614

1618

1615

#: bzrlib/builtins.py:2191

1619

#: bzrlib/builtins.py:2284

1616

1620

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

1617

1621

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

1618

1622

1619

#: bzrlib/builtins.py:2194

1623

#: bzrlib/builtins.py:2287

1620

1624

msgid ""

1621

1625

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

1622

1626

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

1624

1628

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

1625

1629

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

1626

1630

1627

#: bzrlib/builtins.py:2197

1631

#: bzrlib/builtins.py:2290

1628

1632

msgid "Branch/tree to compare from."

1629

1633

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

1630

1634

1631

#: bzrlib/builtins.py:2201

1635

#: bzrlib/builtins.py:2294

1632

1636

msgid "Branch/tree to compare to."

1633

1637

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

1634

1638

1635

#: bzrlib/builtins.py:2207

1639

#: bzrlib/builtins.py:2300

1636

1640

msgid "Use this command to compare files."

1637

1641

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

1638

1642

1639

#: bzrlib/builtins.py:2212

1643

#: bzrlib/builtins.py:2305

1640

1644

msgid "Diff format to use."

1641

1645

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

1642

1646

1643

#: bzrlib/builtins.py:2214

1647

#: bzrlib/builtins.py:2307

1644

1648

msgid "Diff format"

1645

1649

msgstr "Формат diff"

1646

1650

1647

#: bzrlib/builtins.py:2236

1651

#: bzrlib/builtins.py:2329

1648

1652

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

1649

1653

msgstr ""

1650

1654

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

1651

1655

1652

#: bzrlib/builtins.py:2240

1656

#: bzrlib/builtins.py:2333

1653

1657

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

1654

1658

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

1655

1659

1656

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

1657

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

1660

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

1661

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

1658

1662

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

1659

1663

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

1660

1664

1661

#: bzrlib/builtins.py:2265

1665

#: bzrlib/builtins.py:2358

1662

1666

msgid ""

1663

1667

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

1664

1668

" "

1666

1670

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

1667

1671

" "

1668

1672

1669

#: bzrlib/builtins.py:2343

1673

#: bzrlib/builtins.py:2436

1670

1674

msgid "Show the tree root directory."

1671

1675

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

1672

1676

1673

#: bzrlib/builtins.py:2345

1677

#: bzrlib/builtins.py:2438

1674

1678

msgid ""

1675

1679

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

1676

1680

"directory."

1678

1682

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

1679

1683

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

1680

1684

1681

#: bzrlib/builtins.py:2360

1685

#: bzrlib/builtins.py:2453

1682

1686

msgid "The limit argument must be an integer."

1683

1687

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

1684

1688

1685

#: bzrlib/builtins.py:2368

1689

#: bzrlib/builtins.py:2461

1686

1690

msgid "The levels argument must be an integer."

1687

1691

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

1688

1692

1689

#: bzrlib/builtins.py:2373

1693

#: bzrlib/builtins.py:2466

1690

1694

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

1691

1695

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

1692

1696

1693

#: bzrlib/builtins.py:2375

1697

#: bzrlib/builtins.py:2468

1694

1698

msgid ""

1695

1699

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

1696

1700

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

1702

1706

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

1703

1707

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

1704

1708

1705

#: bzrlib/builtins.py:2380

1709

#: bzrlib/builtins.py:2473

1706

1710

msgid ""

1707

1711

" bzr log log the current branch\n"

1708

1712

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

1712

1716

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

1713

1717

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

1714

1718

1715

#: bzrlib/builtins.py:2384

1719

#: bzrlib/builtins.py:2477

1716

1720

msgid ""

1717

1721

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

1718

1722

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

1728

1732

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

1729

1733

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

1730

1734

1731

#: bzrlib/builtins.py:2391

1735

#: bzrlib/builtins.py:2484

1732

1736

msgid ":Output control:"

1733

1737

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

1734

1738

1735

#: bzrlib/builtins.py:2393

1739

#: bzrlib/builtins.py:2486

1736

1740

msgid ""

1737

1741

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

1738

1742

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

1744

1748

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

1745

1749

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

1746

1750

1747

#: bzrlib/builtins.py:2398

1751

#: bzrlib/builtins.py:2491

1748

1752

msgid ""

1749

1753

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

1750

1754

" displayed::"

1752

1756

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

1753

1757

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

1754

1758

1755

#: bzrlib/builtins.py:2401

1759

#: bzrlib/builtins.py:2494

1756

1760

msgid ""

1757

1761

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

1758

1762

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

1766

1770

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

1767

1771

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

1768

1772

1769

#: bzrlib/builtins.py:2407

1773

#: bzrlib/builtins.py:2500

1770

1774

msgid ""

1771

1775

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

1772

1776

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

1776

1780

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

1777

1781

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

1778

1782

1779

#: bzrlib/builtins.py:2411

1783

#: bzrlib/builtins.py:2504

1780

1784

msgid ""

1781

1785

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

1782

1786

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

1786

1790

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

1787

1791

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

1788

1792

1789

#: bzrlib/builtins.py:2415

1793

#: bzrlib/builtins.py:2508

1790

1794

msgid ":Ordering control:"

1791

1795

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

1792

1796

1793

#: bzrlib/builtins.py:2417

1797

#: bzrlib/builtins.py:2510

1794

1798

msgid ""

1795

1799

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

1796

1800

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

1802

1806

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

1803

1807

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

1804

1808

1805

#: bzrlib/builtins.py:2422

1809

#: bzrlib/builtins.py:2515

1806

1810

msgid ":Revision filtering:"

1807

1811

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

1808

1812

1809

#: bzrlib/builtins.py:2424

1813

#: bzrlib/builtins.py:2517

1810

1814

msgid ""

1811

1815

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

1812

1816

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

1814

1818

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

1815

1819

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

1816

1820

1817

#: bzrlib/builtins.py:2427

1821

#: bzrlib/builtins.py:2520

1818

1822

msgid ""

1819

1823

" -rX display revision X\n"

1820

1824

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

1826

1830

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

1827

1831

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

1828

1832

1829

#: bzrlib/builtins.py:2432

1833

#: bzrlib/builtins.py:2525

1830

1834

msgid ""

1831

1835

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

1832

1836

" Some common examples are given below::"

1834

1838

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

1835

1839

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

1836

1840

1837

#: bzrlib/builtins.py:2435

1841

#: bzrlib/builtins.py:2528

1838

1842

msgid ""

1839

1843

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

1840

1844

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

1850

1854

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

1851

1855

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

1852

1856

1853

#: bzrlib/builtins.py:2442

1857

#: bzrlib/builtins.py:2535

1854

1858

msgid ""

1855

1859

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

1856

1860

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

1860

1864

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

1861

1865

msgstr ""

1862

1866

1863

#: bzrlib/builtins.py:2449

1867

#: bzrlib/builtins.py:2542

1864

1868

msgid ":Path filtering:"

1865

1869

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

1866

1870

1867

#: bzrlib/builtins.py:2451

1871

#: bzrlib/builtins.py:2544

1868

1872

msgid ""

1869

1873

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

1870

1874

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

1873

1877

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

1874

1878

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

1875

1879

1876

#: bzrlib/builtins.py:2455

1880

#: bzrlib/builtins.py:2548

1877

1881

msgid ""

1878

1882

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

1879

1883

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

1883

1887

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

1884

1888

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

1885

1889

1886

#: bzrlib/builtins.py:2459

1890

#: bzrlib/builtins.py:2552

1887

1891

msgid ""

1888

1892

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

1889

1893

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

1891

1895

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

1892

1896

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

1893

1897

1894

#: bzrlib/builtins.py:2462

1898

#: bzrlib/builtins.py:2555

1895

1899

msgid ""

1896

1900

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

1897

1901

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

1901

1905

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

1902

1906

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

1903

1907

1904

#: bzrlib/builtins.py:2466

1908

#: bzrlib/builtins.py:2559

1905

1909

msgid " In this case:"

1906

1910

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

1907

1911

1908

#: bzrlib/builtins.py:2468

1912

#: bzrlib/builtins.py:2561

1909

1913

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

1910

1914

msgstr ""

1911

1915

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

1912

1916

1913

#: bzrlib/builtins.py:2470

1917

#: bzrlib/builtins.py:2563

1914

1918

msgid ""

1915

1919

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

1916

1920

msgstr ""

1917

1921

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

1918

1922

" в ревизии 3"

1919

1923

1920

#: bzrlib/builtins.py:2472

1924

#: bzrlib/builtins.py:2565

1921

1925

msgid ""

1922

1926

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

1923

1927

" the original file in revision 2."

1925

1929

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

1926

1930

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

1927

1931

1928

#: bzrlib/builtins.py:2475

1932

#: bzrlib/builtins.py:2568

1929

1933

msgid ""

1930

1934

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

1931

1935

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

1933

1937

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

1934

1938

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

1935

1939

1936

#: bzrlib/builtins.py:2478

1940

#: bzrlib/builtins.py:2571

1937

1941

msgid ""

1938

1942

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

1939

1943

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

1940

1944

" until it was last renamed)."

1941

1945

msgstr ""

1942

1946

1943

#: bzrlib/builtins.py:2482

1947

#: bzrlib/builtins.py:2575

1944

1948

msgid ":Other filtering:"

1945

1949

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

1946

1950

1947

#: bzrlib/builtins.py:2484

1951

#: bzrlib/builtins.py:2577

1948

1952

msgid ""

1949

1953

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

1950

1954

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

1959

1963

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

1960

1964

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

1961

1965

1962

#: bzrlib/builtins.py:2490

1966

#: bzrlib/builtins.py:2583

1963

1967

msgid ":Tips & tricks:"

1964

1968

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

1965

1969

1966

#: bzrlib/builtins.py:2492

1970

#: bzrlib/builtins.py:2585

1967

1971

msgid ""

1968

1972

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

1969

1973

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

1977

1981

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

1978

1982

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

1979

1983

1980

#: bzrlib/builtins.py:2498

1984

#: bzrlib/builtins.py:2591

1981

1985

msgid ""

1982

1986

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

1983

1987

msgstr ""

1984

1988

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

1985

1989

1986

#: bzrlib/builtins.py:2500

1990

#: bzrlib/builtins.py:2593

1987

1991

msgid ""

1988

1992

" [ALIASES]\n"

1989

1993

" tip = log -r-1\n"

1995

1999

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

1996

2000

" show = log -v -p"

1997

2001

1998

#: bzrlib/builtins.py:2505

2002

#: bzrlib/builtins.py:2598

1999

2003

msgid ""

2000

2004

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

2001

2005

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

2005

2009

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

2006

2010

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

2007

2011

2008

#: bzrlib/builtins.py:2509

2012

#: bzrlib/builtins.py:2602

2009

2013

msgid ""

2010

2014

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

2011

2015

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

2013

2017

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

2014

2018

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

2015

2019

2016

#: bzrlib/builtins.py:2512

2020

#: bzrlib/builtins.py:2605

2017

2021

msgid ""

2018

2022

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

2019

2023

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

2025

2029

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

2026

2030

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

2027

2031

2028

#: bzrlib/builtins.py:2517

2032

#: bzrlib/builtins.py:2610

2029

2033

msgid ""

2030

2034

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

2031

2035

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

2033

2037

" a list of words but not others."

2034

2038

msgstr ""

2035

2039

2036

#: bzrlib/builtins.py:2522

2040

#: bzrlib/builtins.py:2615

2037

2041

msgid ""

2038

2042

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

2039

2043

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

2041

2045

" trading disk space for faster speed."

2042

2046

msgstr ""

2043

2047

2044

#: bzrlib/builtins.py:2531

2048

#: bzrlib/builtins.py:2624

2045

2049

msgid "Show from oldest to newest."

2046

2050

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

2047

2051

2048

#: bzrlib/builtins.py:2534

2052

#: bzrlib/builtins.py:2627

2049

2053

msgid "Show files changed in each revision."

2050

2054

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

2051

2055

2052

#: bzrlib/builtins.py:2540

2056

#: bzrlib/builtins.py:2633

2053

2057

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

2054

2058

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

2055

2059

2056

#: bzrlib/builtins.py:2544

2060

#: bzrlib/builtins.py:2637

2057

2061

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

2058

2062

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

2059

2063

2060

#: bzrlib/builtins.py:2545

2064

#: bzrlib/builtins.py:2638

2061

2065

msgid "Authors"

2062

2066

msgstr "Авторы"

2063

2067

2064

#: bzrlib/builtins.py:2550

2068

#: bzrlib/builtins.py:2643

2065

2069

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

2066

2070

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

2067

2071

2068

#: bzrlib/builtins.py:2560

2072

#: bzrlib/builtins.py:2653

2069

2073

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

2070

2074

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

2071

2075

2072

#: bzrlib/builtins.py:2565

2076

#: bzrlib/builtins.py:2658

2073

2077

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

2074

2078

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

2075

2079

2076

#: bzrlib/builtins.py:2567

2080

#: bzrlib/builtins.py:2660

2077

2081

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

2078

2082

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

2079

2083

2080

#: bzrlib/builtins.py:2571

2084

#: bzrlib/builtins.py:2664

2081

2085

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

2082

2086

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

2083

2087

2084

#: bzrlib/builtins.py:2573

2088

#: bzrlib/builtins.py:2666

2085

2089

msgid ""

2086

2090

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

2087

2091

"rX..Y)."

2088

2092

msgstr ""

2093

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

2094

"rX..Y)."

2089

2095

2090

#: bzrlib/builtins.py:2577

2096

#: bzrlib/builtins.py:2670

2091

2097

msgid "Show digital signature validity."

2092

2098

msgstr ""

2093

2099

2094

#: bzrlib/builtins.py:2580

2100

#: bzrlib/builtins.py:2673

2095

2101

msgid "Show revisions whose properties match this expression."

2096

2102

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

2097

2103

2098

#: bzrlib/builtins.py:2584

2104

#: bzrlib/builtins.py:2677

2099

2105

msgid "Show revisions whose message matches this expression."

2100

2106

msgstr ""

2101

2107

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

2102

2108

2103

#: bzrlib/builtins.py:2588

2109

#: bzrlib/builtins.py:2681

2104

2110

msgid "Show revisions whose committer matches this expression."

2105

2111

msgstr ""

2106

2112

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

2107

2113

2108

#: bzrlib/builtins.py:2592

2114

#: bzrlib/builtins.py:2685

2109

2115

msgid "Show revisions whose authors match this expression."

2110

2116

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

2111

2117

2112

#: bzrlib/builtins.py:2596

2118

#: bzrlib/builtins.py:2689

2113

2119

msgid "Show revisions whose bugs match this expression."

2114

2120

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

2115

2121

2116

#: bzrlib/builtins.py:2650

2122

#: bzrlib/builtins.py:2743

2117

2123

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

2118

2124

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

2119

2125

2120

#: bzrlib/builtins.py:2678

2126

#: bzrlib/builtins.py:2771

2121

2127

#, python-format

2122

2128

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

2123

2129

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

2124

2130

2125

#: bzrlib/builtins.py:2795

2131

#: bzrlib/builtins.py:2888

2126

2132

#, python-format

2127

2133

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

2128

2134

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

2129

2135

2130

#: bzrlib/builtins.py:2811

2136

#: bzrlib/builtins.py:2904

2131

2137

#, python-format

2132

2138

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

2133

2139

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

2134

2140

2135

#: bzrlib/builtins.py:2856

2141

#: bzrlib/builtins.py:2949

2136

2142

msgid ""

2137

2143

"List files in a tree.\n"

2138

2144

" "

2140

2146

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

2141

2147

" "

2142

2148

2143

#: bzrlib/builtins.py:2865

2149

#: bzrlib/builtins.py:2958

2144

2150

msgid "Recurse into subdirectories."

2145

2151

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

2146

2152

2147

#: bzrlib/builtins.py:2867

2153

#: bzrlib/builtins.py:2960

2148

2154

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

2149

2155

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

2150

2156

2151

#: bzrlib/builtins.py:2869

2157

#: bzrlib/builtins.py:2962

2152

2158

msgid "Print unknown files."

2153

2159

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

2154

2160

2155

#: bzrlib/builtins.py:2870

2161

#: bzrlib/builtins.py:2963

2156

2162

msgid "Print versioned files."

2157

2163

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

2158

2164

2159

#: bzrlib/builtins.py:2873

2165

#: bzrlib/builtins.py:2966

2160

2166

msgid "Print ignored files."

2161

2167

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

2162

2168

2163

#: bzrlib/builtins.py:2875

2169

#: bzrlib/builtins.py:2968

2164

2170

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

2165

2171

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

2166

2172

2167

#: bzrlib/builtins.py:2888

2173

#: bzrlib/builtins.py:2981

2168

2174

msgid "invalid kind specified"

2169

2175

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

2170

2176

2171

#: bzrlib/builtins.py:2891

2177

#: bzrlib/builtins.py:2984

2172

2178

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

2173

2179

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

2174

2180

2175

#: bzrlib/builtins.py:2900

2181

#: bzrlib/builtins.py:2993

2176

2182

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

2177

2183

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

2178

2184

2179

#: bzrlib/builtins.py:2987

2185

#: bzrlib/builtins.py:3080

2180

2186

msgid "Ignore specified files or patterns."

2181

2187

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

2182

2188

2183

#: bzrlib/builtins.py:2989

2189

#: bzrlib/builtins.py:3082

2184

2190

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

2185

2191

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

2186

2192

2187

#: bzrlib/builtins.py:2991

2193

#: bzrlib/builtins.py:3084

2188

2194

msgid ""

2189

2195

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

2190

2196

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

2198

2204

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

2199

2205

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

2200

2206

2201

#: bzrlib/builtins.py:2997

2207

#: bzrlib/builtins.py:3090

2202

2208

msgid ""

2203

2209

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

2204

2210

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

2210

2216

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

2211

2217

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

2212

2218

2213

#: bzrlib/builtins.py:3002

2219

#: bzrlib/builtins.py:3095

2214

2220

msgid ""

2215

2221

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

2216

2222

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

2226

2232

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

2227

2233

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

2228

2234

2229

#: bzrlib/builtins.py:3008

2235

#: bzrlib/builtins.py:3101

2230

2236

msgid ""

2231

2237

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

2232

2238

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

2237

2243

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

2238

2244

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

2239

2245

2240

#: bzrlib/builtins.py:3012

2246

#: bzrlib/builtins.py:3105

2241

2247

msgid ""

2242

2248

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

2243

2249

"precedence over the '!' exception patterns."

2245

2251

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

2246

2252

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

2247

2253

2248

#: bzrlib/builtins.py:3015

2254

#: bzrlib/builtins.py:3108

2249

2255

msgid ""

2250

2256

":Notes: \n"

2251

2257

" \n"

2257

2263

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

2258

2264

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

2259

2265

2260

#: bzrlib/builtins.py:3020

2266

#: bzrlib/builtins.py:3113

2261

2267

msgid ""

2262

2268

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

2263

2269

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

2266

2272

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

2267

2273

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

2268

2274

2269

#: bzrlib/builtins.py:3023

2275

#: bzrlib/builtins.py:3116

2270

2276

msgid ""

2271

2277

":Examples:\n"

2272

2278

" Ignore the top level Makefile::"

2274

2280

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

2275

2281

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

2276

2282

2277

#: bzrlib/builtins.py:3026

2283

#: bzrlib/builtins.py:3119

2278

2284

msgid " bzr ignore ./Makefile"

2279

2285

msgstr " bzr ignore ./Makefile"

2280

2286

2281

#: bzrlib/builtins.py:3028

2287

#: bzrlib/builtins.py:3121

2282

2288

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

2283

2289

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

2284

2290

2285

#: bzrlib/builtins.py:3030

2291

#: bzrlib/builtins.py:3123

2286

2292

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

2287

2293

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

2288

2294

2289

#: bzrlib/builtins.py:3032

2295

#: bzrlib/builtins.py:3125

2290

2296

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

2291

2297

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

2292

2298

2293

#: bzrlib/builtins.py:3034

2299

#: bzrlib/builtins.py:3127

2294

2300

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

2295

2301

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

2296

2302

2297

#: bzrlib/builtins.py:3036

2303

#: bzrlib/builtins.py:3129

2298

2304

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

2299

2305

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

2300

2306

2301

#: bzrlib/builtins.py:3038

2307

#: bzrlib/builtins.py:3131

2302

2308

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

2303

2309

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

2304

2310

2305

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

2311

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

2306

2312

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

2307

2313

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

2308

2314

2309

#: bzrlib/builtins.py:3042

2315

#: bzrlib/builtins.py:3135

2310

2316

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

2311

2317

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

2312

2318

2313

#: bzrlib/builtins.py:3046

2319

#: bzrlib/builtins.py:3139

2314

2320

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

2315

2321

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

2316

2322

2317

#: bzrlib/builtins.py:3048

2323

#: bzrlib/builtins.py:3141

2318

2324

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

2319

2325

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

2320

2326

2321

#: bzrlib/builtins.py:3050

2327

#: bzrlib/builtins.py:3143

2322

2328

msgid ""

2323

2329

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

2324

2330

" \n"

2338

2344

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

2339

2345

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

2340

2346

2341

#: bzrlib/builtins.py:3064

2347

#: bzrlib/builtins.py:3157

2342

2348

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

2343

2349

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

2344

2350

2345

#: bzrlib/builtins.py:3076

2351

#: bzrlib/builtins.py:3169

2346

2352

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

2347

2353

msgstr ""

2348

2354

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

2349

2355

2350

#: bzrlib/builtins.py:3087

2356

#: bzrlib/builtins.py:3180

2351

2357

#, python-format

2352

2358

msgid "Invalid ignore pattern found. %s"

2353

2359

msgid_plural "Invalid ignore patterns found. %s"

2355

2361

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

2356

2362

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

2357

2363

2358

#: bzrlib/builtins.py:3096

2364

#: bzrlib/builtins.py:3189

2359

2365

msgid "NAME_PATTERN should not be an absolute path"

2360

2366

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

2361

2367

2362

#: bzrlib/builtins.py:3109

2368

#: bzrlib/builtins.py:3202

2363

2369

#, python-format

2364

2370

msgid ""

2365

2371

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

2374

2380

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

2375

2381

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

2376

2382

2377

#: bzrlib/builtins.py:3116

2383

#: bzrlib/builtins.py:3209

2378

2384

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

2379

2385

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

2380

2386

2381

#: bzrlib/builtins.py:3118

2387

#: bzrlib/builtins.py:3211

2382

2388

msgid ""

2383

2389

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

2384

2390

"be ignored."

2386

2392

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

2387

2393

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

2388

2394

2389

#: bzrlib/builtins.py:3121

2395

#: bzrlib/builtins.py:3214

2390

2396

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

2391

2397

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

2392

2398

2393

#: bzrlib/builtins.py:3123

2399

#: bzrlib/builtins.py:3216

2394

2400

msgid " bzr ls --ignored"

2395

2401

msgstr " bzr ls --ignored"

2396

2402

2397

#: bzrlib/builtins.py:3157

2403

#: bzrlib/builtins.py:3250

2398

2404

#, python-format

2399

2405

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

2400

2406

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

2401

2407

2402

#: bzrlib/builtins.py:3164

2408

#: bzrlib/builtins.py:3257

2403

2409

msgid ""

2404

2410

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

2405

2411

msgstr ""

2406

2412

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

2407

2413

"или архив."

2408

2414

2409

#: bzrlib/builtins.py:3166

2415

#: bzrlib/builtins.py:3259

2410

2416

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

2411

2417

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

2412

2418

2413

#: bzrlib/builtins.py:3168

2419

#: bzrlib/builtins.py:3261

2414

2420

msgid ""

2415

2421

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

2416

2422

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

2420

2426

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

2421

2427

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

2422

2428

2423

#: bzrlib/builtins.py:3172

2429

#: bzrlib/builtins.py:3265

2424

2430

msgid ""

2425

2431

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

2426

2432

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

2431

2437

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

2432

2438

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

2433

2439

2434

#: bzrlib/builtins.py:3176

2440

#: bzrlib/builtins.py:3269

2435

2441

msgid ""

2436

2442

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

2437

2443

"directory will be used."

2439

2445

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

2440

2446

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

2441

2447

2442

#: bzrlib/builtins.py:3179

2448

#: bzrlib/builtins.py:3272

2443

2449

msgid ""

2444

2450

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

2445

2451

msgstr ""

2446

2452

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

2447

2453

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

2448

2454

2449

#: bzrlib/builtins.py:3181

2455

#: bzrlib/builtins.py:3274

2450

2456

msgid ""

2451

2457

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

2452

2458

" Supported formats Autodetected by extension\n"

2468

2474

" zip .zip\n"

2469

2475

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

2470

2476

2471

#: bzrlib/builtins.py:3195

2477

#: bzrlib/builtins.py:3288

2472

2478

msgid "Type of file to export to."

2473

2479

msgstr "Тип файла для экспорта."

2474

2480

2475

#: bzrlib/builtins.py:3198

2481

#: bzrlib/builtins.py:3291

2476

2482

msgid "Apply content filters to export the convenient form."

2477

2483

msgstr ""

2478

2484

2479

#: bzrlib/builtins.py:3202

2485

#: bzrlib/builtins.py:3295

2480

2486

msgid "Name of the root directory inside the exported file."

2481

2487

msgstr "Имя корневой директории внутри экспортируемого файла."

2482

2488

2483

#: bzrlib/builtins.py:3204

2489

#: bzrlib/builtins.py:3297

2484

2490

msgid ""

2485

2491

"Set modification time of files to that of the last revision in which it was "

2486

2492

"changed."

2488

2494

"Установить время изменения файлов на время последней ревизии, в которой они "

2489

2495

"были изменены."

2490

2496

2491

#: bzrlib/builtins.py:3207

2497

#: bzrlib/builtins.py:3300

2492

2498

msgid ""

2493

2499

"Export the working tree contents rather than that of the last revision."

2494

2500

msgstr ""

2495

2501

2496

#: bzrlib/builtins.py:3226

2502

#: bzrlib/builtins.py:3319

2497

2503

msgid "--uncommitted requires a working tree"

2498

msgstr ""

2504

msgstr "--uncommitted требует рабочее дерево"

2499

2505

2500

#: bzrlib/builtins.py:3235

2506

#: bzrlib/builtins.py:3328

2501

2507

#, python-format

2502

2508

msgid "Unsupported export format: %s"

2503

2509

msgstr "Неподдерживаемый формат экспорта: %s"

2504

2510

2505

#: bzrlib/builtins.py:3239

2511

#: bzrlib/builtins.py:3332

2506

2512

msgid ""

2507

2513

"Write the contents of a file as of a given revision to standard output."

2508

2514

msgstr ""

2509

2515

"Вывести содержимое файла из определённой ревизии на стандартный вывод."

2510

2516

2511

#: bzrlib/builtins.py:3241

2517

#: bzrlib/builtins.py:3334

2512

2518

msgid "If no revision is nominated, the last revision is used."

2513

2519

msgstr "Если ревизия не указана, используется последняя."

2514

2520

2515

#: bzrlib/builtins.py:3243

2521

#: bzrlib/builtins.py:3336

2516

2522

msgid ""

2517

2523

"Note: Take care to redirect standard output when using this command on a\n"

2518

2524

"binary file."

2520

2526

"Замечание: Не забывайте перенаправлять стандартный вывод при использовании\n"

2521

2527

"этой команды на двоичном файле."

2522

2528

2523

#: bzrlib/builtins.py:3249

2529

#: bzrlib/builtins.py:3342

2524

2530

msgid "The path name in the old tree."

2525

msgstr ""

2531

msgstr "Имя пути в старом дереве."

2526

2532

2527

#: bzrlib/builtins.py:3250

2533

#: bzrlib/builtins.py:3343

2528

2534

msgid "Apply content filters to display the convenience form."

2529

msgstr ""

2535

msgstr "Применить фильтры содержимого для отображения в удобной форме."

2530

2536

2531

#: bzrlib/builtins.py:3261

2537

#: bzrlib/builtins.py:3354

2532

2538

msgid "bzr cat --revision takes exactly one revision specifier"

2533

2539

msgstr "bzr cat --revision принимает ровно один спецификатор ревизии"

2534

2540

2535

#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298

2541

#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391

2536

2542

msgid "{0!r} is not present in revision {1}"

2537

2543

msgstr "{0!r} не представлен в ревизии {1}"

2538

2544

2539

#: bzrlib/builtins.py:3321

2545

#: bzrlib/builtins.py:3414

2540

2546

msgid "Commit changes into a new revision."

2541

2547

msgstr "Закрепить изменения в новой ревизии."

2542

2548

2543

#: bzrlib/builtins.py:3323

2549

#: bzrlib/builtins.py:3416

2544

2550

msgid ""

2545

2551

"An explanatory message needs to be given for each commit. This is\n"

2546

2552

"often done by using the --message option (getting the message from the\n"

2550

2556

"boilerplate text loaded into the editor, use the --show-diff option."

2551

2557

msgstr ""

2552

2558

2553

#: bzrlib/builtins.py:3330

2559

#: bzrlib/builtins.py:3423

2554

2560

msgid ""

2555

2561

"By default, the entire tree is committed and the person doing the\n"

2556

2562

"commit is assumed to be the author. These defaults can be overridden\n"

2559

2565

"По умолчанию, закрепляется всё дерево и закрепляющий считается автором.\n"

2560

2566

"Эти умолчания могут быть перезаписаны, как объяснено ниже."

2561

2567

2562

#: bzrlib/builtins.py:3334

2568

#: bzrlib/builtins.py:3427

2563

2569

msgid ":Selective commits:"

2564

2570

msgstr ":Выборочные закрепления:"

2565

2571

2566

#: bzrlib/builtins.py:3336

2572

#: bzrlib/builtins.py:3429

2567

2573

msgid ""

2568

2574

" If selected files are specified, only changes to those files are\n"

2569

2575

" committed. If a directory is specified then the directory and\n"

2573

2579

" Если указана директория, то закрепляется директория и всё её\n"

2574

2580

" содержимое."

2575

2581

2576

#: bzrlib/builtins.py:3340

2582

#: bzrlib/builtins.py:3433

2577

2583

msgid ""

2578

2584

" When excludes are given, they take precedence over selected files.\n"

2579

2585

" For example, to commit only changes within foo, but not changes\n"

2583

2589

" Например, чтобы закрепить изменения внутри foo, но не изменения\n"

2584

2590

" в foo/bar::"

2585

2591

2586

#: bzrlib/builtins.py:3344

2592

#: bzrlib/builtins.py:3437

2587

2593

msgid " bzr commit foo -x foo/bar"

2588

2594

msgstr " bzr commit foo -x foo/bar"

2589

2595

2590

#: bzrlib/builtins.py:3346

2596

#: bzrlib/builtins.py:3439

2591

2597

msgid " A selective commit after a merge is not yet supported."

2592

2598

msgstr " Выборочные закрепления после слияния пока не поддерживаются."

2593

2599

2594

#: bzrlib/builtins.py:3348

2600

#: bzrlib/builtins.py:3441

2595

2601

msgid ":Custom authors:"

2596

2602

msgstr ":Выбор автора:"

2597

2603

2598

#: bzrlib/builtins.py:3350

2604

#: bzrlib/builtins.py:3443

2599

2605

msgid ""

2600

2606

" If the author of the change is not the same person as the committer,\n"

2601

2607

" you can specify the author's name using the --author option. The\n"

2610

2616

" \"John Doe <jdoe@example.com>\". Если в изменении участвовал более,\n"

2611

2617

" чем один автор, вы можете указать эту опцию несколько раз."

2612

2618

2613

#: bzrlib/builtins.py:3357

2619

#: bzrlib/builtins.py:3450

2614

2620

msgid ":Checks:"

2615

2621

msgstr ":Проверки:"

2616

2622

2617

#: bzrlib/builtins.py:3359

2623

#: bzrlib/builtins.py:3452

2618

2624

msgid ""

2619

2625

" A common mistake is to forget to add a new file or directory before\n"

2620

2626

" running the commit command. The --strict option checks for unknown\n"

2628

2634

" быть реализованы определением обработчиков. Подробности можно найти,\n"

2629

2635

" выполнив команду ``bzr help hooks''."

2630

2636

2631

#: bzrlib/builtins.py:3365

2637

#: bzrlib/builtins.py:3458

2632

2638

msgid ":Things to note:"

2633

2639

msgstr ":На заметку:"

2634

2640

2635

#: bzrlib/builtins.py:3367

2641

#: bzrlib/builtins.py:3460

2636

2642

msgid ""

2637

2643

" If you accidentially commit the wrong changes or make a spelling\n"

2638

2644

" mistake in the commit message say, you can use the uncommit command\n"

2643

2649

" uncommit, чтобы отменить последнее закрепление. Подробности смотрите\n"

2644

2650

" в «bzr help uncommit»."

2645

2651

2646

#: bzrlib/builtins.py:3371

2652

#: bzrlib/builtins.py:3464

2647

2653

msgid ""

2648

2654

" Hooks can also be configured to run after a commit. This allows you\n"

2649

2655

" to trigger updates to external systems like bug trackers. The --fixes\n"

2651

2657

" one or more bugs. See ``bzr help bugs`` for details."

2652

2658

msgstr ""

2653

2659

2654

#: bzrlib/builtins.py:3381

2660

#: bzrlib/builtins.py:3474

2655

2661

msgid "Do not consider changes made to a given path."

2656

2662

msgstr "Не рассматривать изменения, сделанные в заданном пути."

2657

2663

2658

#: bzrlib/builtins.py:3384

2664

#: bzrlib/builtins.py:3477

2659

2665

msgid "Description of the new revision."

2660

2666

msgstr "Описание новой ревизии."

2661

2667

2662

#: bzrlib/builtins.py:3387

2668

#: bzrlib/builtins.py:3480

2663

2669

msgid "Commit even if nothing has changed."

2664

2670

msgstr "Закрепить, даже если ничего не изменилось."

2665

2671

2666

#: bzrlib/builtins.py:3391

2672

#: bzrlib/builtins.py:3484

2667

2673

msgid "Take commit message from this file."

2668

2674

msgstr "Взять сообщение о закреплении из этого файла."

2669

2675

2670

#: bzrlib/builtins.py:3393

2676

#: bzrlib/builtins.py:3486

2671

2677

msgid "Refuse to commit if there are unknown files in the working tree."

2672

2678

msgstr ""

2673

2679

"Отказываться закреплять, если в рабочем дереве есть неизвестные файлы."

2674

2680

2675

#: bzrlib/builtins.py:3396

2681

#: bzrlib/builtins.py:3489

2676

2682

msgid ""

2677

2683

"Manually set a commit time using commit date format, e.g. '2009-10-10 "

2678

2684

"08:00:00 +0100'."

2680

2686

"Вручную установить время закрепления, используя формат даты закрепления, "

2681

2687

"напр. '2009-10-10 08:00:00 +0100'."

2682

2688

2683

#: bzrlib/builtins.py:3399

2689

#: bzrlib/builtins.py:3492

2684

2690

msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."

2685

2691

msgstr ""

2686

2692

"Отметить ошибку, как исправленную в этой ревизии (см. «bzr help bugs»)."

2687

2693

2688

#: bzrlib/builtins.py:3402

2694

#: bzrlib/builtins.py:3495

2689

2695

msgid "Set the author's name, if it's different from the committer."

2690

2696

msgstr "Установить имя автора, если оно отличается от имени закрепляющего."

2691

2697

2692

#: bzrlib/builtins.py:3405

2698

#: bzrlib/builtins.py:3498

2693

2699

msgid ""

2694

2700

"Perform a local commit in a bound branch. Local commits are not pushed to "

2695

2701

"the master branch until a normal commit is performed."

2698

2704

"выгружаются в основную ветвь до тех пор, пока не совершено нормальное "

2699

2705

"закрепление."

2700

2706

2701

#: bzrlib/builtins.py:3411

2707

#: bzrlib/builtins.py:3504

2702

2708

msgid ""

2703

2709

"When no message is supplied, show the diff along with the status summary in "

2704

2710

"the message editor."

2706

2712

"Если не указано сообщение, показывать изменения формате diff вместе с "

2707

2713

"обзором состояния в редакторе сообщения."

2708

2714

2709

#: bzrlib/builtins.py:3414

2715

#: bzrlib/builtins.py:3507

2710

2716

msgid ""

2711

2717

"When committing to a foreign version control system do not push data that "

2712

2718

"can not be natively represented."

2714

2720

"При закреплении в иной системе контроля версий, не выгружать данные, которые "

2715

2721

"нельзя в ней представить."

2716

2722

2717

#: bzrlib/builtins.py:3432

2723

#: bzrlib/builtins.py:3525

2718

2724

#, python-format

2719

2725

msgid ""

2720

2726

"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "

2726

2732

"Больше информации об этом можно узнать, выполнив «bzr help bugs». "

2727

2733

"Закрепление отклонено."

2728

2734

2729

#: bzrlib/builtins.py:3441

2735

#: bzrlib/builtins.py:3534

2730

2736

#, python-format

2731

2737

msgid ""

2732

2738

"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "

2737

2743

"информации об этом можно узнать, выполнив «bzr help bugs».\n"

2738

2744

"Закрепление отклонено."

2739

2745

2740

#: bzrlib/builtins.py:3450

2746

#: bzrlib/builtins.py:3543

2741

2747

#, python-format

2742

2748

msgid "Unrecognized bug %s. Commit refused."

2743

2749

msgstr "Ошибка %s не распознана. Закрепление отклонено."

2744

2750

2745

#: bzrlib/builtins.py:3453

2751

#: bzrlib/builtins.py:3546

2746

2752

#, python-format

2747

2753

msgid ""

2748

2754

"%s\n"

2751

2757

"%s\n"

2752

2758

"Закрепление отклонено."

2753

2759

2754

#: bzrlib/builtins.py:3477

2760

#: bzrlib/builtins.py:3570

2755

2761

msgid "Could not parse --commit-time: "

2756

2762

msgstr "Не удалось разобрать --commit-time: "

2757

2763

2758

#: bzrlib/builtins.py:3517

2764

#: bzrlib/builtins.py:3610

2759

2765

msgid "please specify either --message or --file"

2760

2766

msgstr "укажите либо --message, либо --file"

2761

2767

2762

#: bzrlib/builtins.py:3546

2768

#: bzrlib/builtins.py:3639

2763

2769

msgid "please specify a commit message with either --message or --file"

2764

2770

msgstr "укажите сообщение о закреплении, используя --message либо --file"

2765

2771

2766

#: bzrlib/builtins.py:3549

2772

#: bzrlib/builtins.py:3642

2767

2773

msgid ""

2768

2774

"Empty commit message specified. Please specify a commit message with either -"

2769

2775

"-message or --file or leave a blank message with --message \"\"."

2771

2777

"Указано пустое сообщение о закреплении. Пожалуйста, укажите сообщение опцией "

2772

2778

"--message либо --file или оставьте пустым, указав --message \"\"."

2773

2779

2774

#: bzrlib/builtins.py:3569

2780

#: bzrlib/builtins.py:3662

2775

2781

msgid ""

2776

2782

"No changes to commit. Please 'bzr add' the files you want to commit, or use -"

2777

2783

"-unchanged to force an empty commit."

2780

2786

"командой 'bzr add', или используйте --unchanged, чтобы принудительно сделать "

2781

2787

"пустое закрепление."

2782

2788

2783

#: bzrlib/builtins.py:3573

2789

#: bzrlib/builtins.py:3666

2784

2790

msgid ""

2785

2791

"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "

2786

2792

"resolve FILE\" to resolve."

2788

2794

"В рабочем дереве обнаружены конфликты. Выполните «bzr conflicts», чтобы "

2789

2795

"вывести список конфликтов и «bzr resolve ФАЙЛ» для исправления."

2790

2796

2791

#: bzrlib/builtins.py:3577

2797

#: bzrlib/builtins.py:3670

2792

2798

msgid "Commit refused because there are unknown files in the working tree."

2793

2799

msgstr "Закрепление отклонено, поскольку в рабочем дереве неизвестные файлы."

2794

2800

2795

#: bzrlib/builtins.py:3580

2801

#: bzrlib/builtins.py:3673

2796

2802

msgid ""

2797

2803

"\n"

2798

2804

"To commit to master branch, run update and then commit.\n"

2799

2805

"You can also pass --local to commit to continue working disconnected."

2800

2806

msgstr ""

2801

2807

2802

#: bzrlib/builtins.py:3588

2808

#: bzrlib/builtins.py:3681

2803

2809

msgid ""

2804

2810

"Validate working tree structure, branch consistency and repository history."

2805

2811

msgstr ""

2806

2812

2807

#: bzrlib/builtins.py:3590

2813

#: bzrlib/builtins.py:3683

2808

2814

msgid ""

2809

2815

"This command checks various invariants about branch and repository storage\n"

2810

2816

"to detect data corruption or bzr bugs."

2811

2817

msgstr ""

2812

2818

2813

#: bzrlib/builtins.py:3593

2819

#: bzrlib/builtins.py:3686

2814

2820

msgid ""

2815

2821

"The working tree and branch checks will only give output if a problem is\n"

2816

2822

"detected. The output fields of the repository check are:"

2817

2823

msgstr ""

2824

"Проверки рабочего дерева и ветви выведут что-либо только в случае\n"

2825

"обнаружения проблемы. Поля вывода проверки репозитория следующие:"

2818

2826

2819

#: bzrlib/builtins.py:3596

2827

#: bzrlib/builtins.py:3689

2820

2828

msgid ""

2821

2829

"revisions\n"

2822

2830

" This is just the number of revisions checked. It doesn't\n"

2823

2831

" indicate a problem."

2824

2832

msgstr ""

2833

"ревизии\n"

2834

" Это просто число проверенных ревизий. Оно не указывает\n"

2835

" на проблему."

2825

2836

2826

#: bzrlib/builtins.py:3600

2837

#: bzrlib/builtins.py:3693

2827

2838

msgid ""

2828

2839

"versionedfiles\n"

2829

2840

" This is just the number of versionedfiles checked. It\n"

2830

2841

" doesn't indicate a problem."

2831

2842

msgstr ""

2843

"версифицированные файлы\n"

2844

" Это просто число проверенных файлов под контролем системы\n"

2845

" версий. Оно не указывает на проблему."

2832

2846

2833

#: bzrlib/builtins.py:3604

2847

#: bzrlib/builtins.py:3697

2834

2848

msgid ""

2835

2849

"unreferenced ancestors\n"

2836

2850

" Texts that are ancestors of other texts, but\n"

2837

2851

" are not properly referenced by the revision ancestry. This is a\n"

2838

2852

" subtle problem that Bazaar can work around."

2839

2853

msgstr ""

2854

"предки без ссылок\n"

2855

" Тексты, являющиеся предками других текстов, но не имеющие\n"

2856

" корректных ссылок в истории ревизии. Это небольшая\n"

2857

" проблема, с которой Bazaar может разобраться."

2840

2858

2841

#: bzrlib/builtins.py:3609

2859

#: bzrlib/builtins.py:3702

2842

2860

msgid ""

2843

2861

"unique file texts\n"

2844

2862

" This is the total number of unique file contents\n"

2845

2863

" seen in the checked revisions. It does not indicate a problem."

2846

2864

msgstr ""

2865

"уникальные тексты файлов\n"

2866

" Это общее число уникального содержимого файлов, встреченного\n"

2867

" в проверенных ревизиях. Оно не указывает на проблему."

2847

2868

2848

#: bzrlib/builtins.py:3613

2869

#: bzrlib/builtins.py:3706

2849

2870

msgid ""

2850

2871

"repeated file texts\n"

2851

2872

" This is the total number of repeated texts seen\n"

2853

2874

" entries are modified, but the file contents are not. It does not\n"

2854

2875

" indicate a problem."

2855

2876

msgstr ""

2877

"повторяемые тексты файлов\n"

2878

" Это общее число повторяемых текстов, встреченных\n"

2879

" в проверенных ревизиях. Тексты могут повторяться, если записи\n"

2880

" файлов изменились, но их содержимое осталось прежним. Оно не\n"

2881

" указывает на проблему."

2856

2882

2857

#: bzrlib/builtins.py:3619

2883

#: bzrlib/builtins.py:3712

2858

2884

msgid ""

2859

2885

"If no restrictions are specified, all Bazaar data that is found at the "

2860

2886

"given\n"

2861

2887

"location will be checked."

2862

2888

msgstr ""

2863

2889

2864

#: bzrlib/builtins.py:3624

2890

#: bzrlib/builtins.py:3717

2865

2891

msgid " Check the tree and branch at 'foo'::"

2866

msgstr ""

2892

msgstr " Проверить рабочее дерево и ветвь в 'foo'::"

2867

2893

2868

#: bzrlib/builtins.py:3626

2894

#: bzrlib/builtins.py:3719

2869

2895

msgid " bzr check --tree --branch foo"

2870

msgstr ""

2896

msgstr " bzr check --tree --branch foo"

2871

2897

2872

#: bzrlib/builtins.py:3628

2898

#: bzrlib/builtins.py:3721

2873

2899

msgid " Check only the repository at 'bar'::"

2874

msgstr ""

2900

msgstr " Проверить только репозиторий в 'bar'::"

2875

2901

2876

#: bzrlib/builtins.py:3630

2902

#: bzrlib/builtins.py:3723

2877

2903

msgid " bzr check --repo bar"

2878

msgstr ""

2904

msgstr " bzr check --repo bar"

2879

2905

2880

#: bzrlib/builtins.py:3632

2906

#: bzrlib/builtins.py:3725

2881

2907

msgid " Check everything at 'baz'::"

2882

msgstr ""

2908

msgstr " Проверить всё в 'baz'::"

2883

2909

2884

#: bzrlib/builtins.py:3634

2910

#: bzrlib/builtins.py:3727

2885

2911

msgid " bzr check baz"

2886

msgstr ""

2912

msgstr " bzr check baz"

2887

2913

2888

#: bzrlib/builtins.py:3640

2914

#: bzrlib/builtins.py:3733

2889

2915

msgid "Check the branch related to the current directory."

2890

msgstr ""

2916

msgstr "Проверить ветвь, относящуюся к текущей директории."

2891

2917

2892

#: bzrlib/builtins.py:3642

2918

#: bzrlib/builtins.py:3735

2893

2919

msgid "Check the repository related to the current directory."

2894

msgstr ""

2920

msgstr "Проверить репозиторий, относящийся к текущей директории."

2895

2921

2896

#: bzrlib/builtins.py:3644

2922

#: bzrlib/builtins.py:3737

2897

2923

msgid "Check the working tree related to the current directory."

2898

msgstr ""

2924

msgstr "Проверить рабочее дерево, относящееся к текущей директории."

2899

2925

2900

#: bzrlib/builtins.py:3658

2926

#: bzrlib/builtins.py:3751

2901

2927

msgid "Upgrade a repository, branch or working tree to a newer format."

2902

msgstr ""

2928

msgstr "Обновить репозиторий, ветвь или рабочее дерево до нового формата."

2903

2929

2904

#: bzrlib/builtins.py:3660

2930

#: bzrlib/builtins.py:3753

2905

2931

msgid ""

2906

2932

"When the default format has changed after a major new release of\n"

2907

2933

"Bazaar, you may be informed during certain operations that you\n"

2910

2936

"with older repositories or with older versions of Bazaar."

2911

2937

msgstr ""

2912

2938

2913

#: bzrlib/builtins.py:3666

2939

#: bzrlib/builtins.py:3759

2914

2940

msgid ""

2915

2941

"If you wish to upgrade to a particular format rather than the\n"

2916

2942

"current default, that can be specified using the --format option.\n"

2920

2946

"2.x default) so downgrading is not always possible."

2921

2947

msgstr ""

2922

2948

2923

#: bzrlib/builtins.py:3673

2949

#: bzrlib/builtins.py:3766

2924

2950

msgid ""

2925

2951

"A backup.bzr.~#~ directory is created at the start of the conversion\n"

2926

2952

"process (where # is a number). By default, this is left there on\n"

2931

2957

"afterwards."

2932

2958

msgstr ""

2933

2959

2934

#: bzrlib/builtins.py:3681

2960

#: bzrlib/builtins.py:3774

2935

2961

msgid ""

2936

2962

"If the location given is a shared repository, dependent branches\n"

2937

2963

"are also converted provided the repository converts successfully.\n"

2939

2965

"tried."

2940

2966

msgstr ""

2941

2967

2942

#: bzrlib/builtins.py:3686

2968

#: bzrlib/builtins.py:3779

2943

2969

msgid ""

2944

2970

"For more information on upgrades, see the Bazaar Upgrade Guide,\n"

2945

2971

"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."

2946

2972

msgstr ""

2947

2973

2948

#: bzrlib/builtins.py:3694

2974

#: bzrlib/builtins.py:3787

2949

2975

msgid "Upgrade to a specific format. See \"bzr help formats\" for details."

2950

2976

msgstr ""

2977

"Обновить до определённого формата. Подробности см. в «bzr help formats»."

2951

2978

2952

#: bzrlib/builtins.py:3698

2979

#: bzrlib/builtins.py:3791

2953

2980

msgid "Branch format"

2954

2981

msgstr "Формат ветви"

2955

2982

2956

#: bzrlib/builtins.py:3700

2983

#: bzrlib/builtins.py:3793

2957

2984

msgid "Remove the backup.bzr directory if successful."

2958

msgstr ""

2985

msgstr "Удалить директорию backup.bzr при успешном завершении."

2959

2986

2960

#: bzrlib/builtins.py:3702

2987

#: bzrlib/builtins.py:3795

2961

2988

msgid "Show what would be done, but don't actually do anything."

2962

2989

msgstr ""

2963

2990

2964

#: bzrlib/builtins.py:3717

2991

#: bzrlib/builtins.py:3810

2965

2992

msgid "Show or set bzr user id."

2966

2993

msgstr ""

2967

2994

2968

#: bzrlib/builtins.py:3719

2995

#: bzrlib/builtins.py:3812

2969

2996

msgid ""

2970

2997

":Examples:\n"

2971

2998

" Show the email of the current user::"

2972

2999

msgstr ""

3000

":Примеры:\n"

3001

" Показать email текущего пользователя::"

2973

3002

2974

#: bzrlib/builtins.py:3722

3003

#: bzrlib/builtins.py:3815

2975

3004

msgid " bzr whoami --email"

2976

msgstr ""

3005

msgstr " bzr whoami --email"

2977

3006

2978

#: bzrlib/builtins.py:3724

3007

#: bzrlib/builtins.py:3817

2979

3008

msgid " Set the current user::"

2980

msgstr ""

3009

msgstr " Установить текущего пользователя::"

2981

3010

2982

#: bzrlib/builtins.py:3726

3011

#: bzrlib/builtins.py:3819

2983

3012

msgid " bzr whoami \"Frank Chu <fchu@example.com>\""

2984

msgstr ""

3013

msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""

2985

3014

2986

#: bzrlib/builtins.py:3730

3015

#: bzrlib/builtins.py:3823

2987

3016

msgid "Display email address only."

2988

msgstr ""

3017

msgstr "Показать только адрес email."

2989

3018

2990

#: bzrlib/builtins.py:3732

3019

#: bzrlib/builtins.py:3825

2991

3020

msgid "Set identity for the current branch instead of globally."

2992

3021

msgstr ""

2993

3022

2994

#: bzrlib/builtins.py:3758

3023

#: bzrlib/builtins.py:3851

2995

3024

msgid "--email can only be used to display existing identity"

2996

3025

msgstr ""

2997

3026

2998

#: bzrlib/builtins.py:3780

3027

#: bzrlib/builtins.py:3873

2999

3028

msgid "Print or set the branch nickname."

3000

msgstr ""

3029

msgstr "Вывести или установить имя ветви."

3001

3030

3002

#: bzrlib/builtins.py:3782

3031

#: bzrlib/builtins.py:3875

3003

3032

msgid ""

3004

3033

"If unset, the tree root directory name is used as the nickname.\n"

3005

3034

"To print the current nickname, execute with no argument."

3006

3035

msgstr ""

3007

3036

3008

#: bzrlib/builtins.py:3785

3037

#: bzrlib/builtins.py:3878

3009

3038

msgid ""

3010

3039

"Bound branches use the nickname of its master branch unless it is set\n"

3011

3040

"locally."

3012

3041

msgstr ""

3013

3042

3014

#: bzrlib/builtins.py:3805

3043

#: bzrlib/builtins.py:3898

3015

3044

msgid "Set/unset and display aliases."

3016

msgstr ""

3045

msgstr "Установить, удалить или отобразить псевдонимы."

3017

3046

3018

#: bzrlib/builtins.py:3807

3047

#: bzrlib/builtins.py:3900

3019

3048

msgid ""

3020

3049

":Examples:\n"

3021

3050

" Show the current aliases::"

3022

3051

msgstr ""

3052

":Примеры:\n"

3053

" Показать текущие псевдонимы::"

3023

3054

3024

#: bzrlib/builtins.py:3810

3055

#: bzrlib/builtins.py:3903

3025

3056

msgid " bzr alias"

3026

msgstr ""

3057

msgstr " bzr alias"

3027

3058

3028

#: bzrlib/builtins.py:3812

3059

#: bzrlib/builtins.py:3905

3029

3060

msgid " Show the alias specified for 'll'::"

3030

msgstr ""

3061

msgstr " Показать псевдоним для 'll'::"

3031

3062

3032

#: bzrlib/builtins.py:3814

3063

#: bzrlib/builtins.py:3907

3033

3064

msgid " bzr alias ll"

3034

msgstr ""

3065

msgstr " bzr alias ll"

3035

3066

3036

#: bzrlib/builtins.py:3816

3067

#: bzrlib/builtins.py:3909

3037

3068

msgid " Set an alias for 'll'::"

3038

msgstr ""

3069

msgstr " Установить псевдоним для 'll'::"

3039

3070

3040

#: bzrlib/builtins.py:3818

3071

#: bzrlib/builtins.py:3911

3041

3072

msgid " bzr alias ll=\"log --line -r-10..-1\""

3042

msgstr ""

3073

msgstr " bzr alias ll=\"log --line -r-10..-1\""

3043

3074

3044

#: bzrlib/builtins.py:3820

3075

#: bzrlib/builtins.py:3913

3045

3076

msgid " To remove an alias for 'll'::"

3046

msgstr ""

3077

msgstr " Удалить псевдоним для 'll'::"

3047

3078

3048

#: bzrlib/builtins.py:3822

3079

#: bzrlib/builtins.py:3915

3049

3080

msgid " bzr alias --remove ll"

3050

msgstr ""

3081

msgstr " bzr alias --remove ll"

3051

3082

3052

#: bzrlib/builtins.py:3827

3083

#: bzrlib/builtins.py:3920

3053

3084

msgid "Remove the alias."

3054

msgstr ""

3085

msgstr "Удалить псевдоним."

3055

3086

3056

#: bzrlib/builtins.py:3845

3087

#: bzrlib/builtins.py:3938

3057

3088

msgid "bzr alias --remove expects an alias to remove."

3058

msgstr ""

3089

msgstr "bzr alias --remove требуется псевдоним для удаления."

3059

3090

3060

#: bzrlib/builtins.py:4026

3091

#: bzrlib/builtins.py:4119

3061

3092

msgid ""

3062

3093

"subunit not available. subunit needs to be installed to use --subunit."

3063

3094

msgstr ""

3095

"subunit не доступен. Нужно установить subunit, чтобы использовать --subunit."

3064

3096

3065

#: bzrlib/builtins.py:4043

3097

#: bzrlib/builtins.py:4136

3066

3098

msgid ""

3067

3099

"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"

3068

3100

msgstr ""

3101

"--benchmark не поддерживается начиная с версии bzr 2.2; вместо этого "

3102

"используйте bzr-usertest"

3069

3103

3070

#: bzrlib/builtins.py:4090

3104

#: bzrlib/builtins.py:4183

3071

3105

msgid "Show version of bzr."

3072

msgstr ""

3106

msgstr "Вывести версию bzr."

3073

3107

3074

#: bzrlib/builtins.py:4094

3108

#: bzrlib/builtins.py:4187

3075

3109

msgid "Print just the version number."

3076

msgstr ""

3110

msgstr "Вывести только номер версии."

3077

3111

3078

#: bzrlib/builtins.py:4113

3112

#: bzrlib/builtins.py:4206

3079

3113

msgid "It sure does!\n"

3080

msgstr ""

3114

msgstr "Да, он крут!\n"

3081

3115

3082

#: bzrlib/builtins.py:4137

3116

#: bzrlib/builtins.py:4230

3083

3117

#, python-format

3084

3118

msgid "merge base is revision %s\n"

3085

3119

msgstr ""

3086

3120

3087

#: bzrlib/builtins.py:4141

3121

#: bzrlib/builtins.py:4234

3088

3122

msgid "Perform a three-way merge."

3089

3123

msgstr ""

3090

3124

3091

#: bzrlib/builtins.py:4143

3125

#: bzrlib/builtins.py:4236

3092

3126

msgid ""

3093

3127

"The source of the merge can be specified either in the form of a branch,\n"

3094

3128

"or in the form of a path to a file containing a merge directive generated\n"

3099

3133

"the current working tree."

3100

3134

msgstr ""

3101

3135

3102

#: bzrlib/builtins.py:4151

3136

#: bzrlib/builtins.py:4244

3103

3137

msgid ""

3104

3138

"When merging from a branch, by default bzr will try to merge in all new\n"

3105

3139

"work from the other branch, automatically determining an appropriate base\n"

3106

3140

"revision. If this fails, you may need to give an explicit base."

3107

3141

msgstr ""

3108

3142

3109

#: bzrlib/builtins.py:4155

3143

#: bzrlib/builtins.py:4248

3110

3144

msgid ""

3111

3145

"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"

3112

3146

"try to merge in all new work up to and including revision OTHER."

3113

3147

msgstr ""

3114

3148

3115

#: bzrlib/builtins.py:4158

3149

#: bzrlib/builtins.py:4251

3116

3150

msgid ""

3117

3151

"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"

3118

3152

"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"

3123

3157

"changes from the other branch is not stored in the commit."

3124

3158

msgstr ""

3125

3159

3126

#: bzrlib/builtins.py:4166

3160

#: bzrlib/builtins.py:4259

3127

3161

msgid "Revision numbers are always relative to the source branch."

3128

3162

msgstr ""

3129

3163

3130

#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106

3164

#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106

3131

3165

msgid ""

3132

3166

"Merge will do its best to combine the changes in two branches, but there\n"

3133

3167

"are some kinds of problems only a human can fix. When it encounters those,\n"

3134

3168

"it will mark a conflict. A conflict means that you need to fix something,\n"

3135

"before you should commit."

3169

"before you can commit."

3136

3170

msgstr ""

3137

3171

3138

#: bzrlib/builtins.py:4173

3172

#: bzrlib/builtins.py:4266

3139

3173

msgid ""

3140

3174

"Use bzr resolve when you have fixed a problem. See also bzr conflicts."

3141

3175

msgstr ""

3142

3176

3143

#: bzrlib/builtins.py:4175

3177

#: bzrlib/builtins.py:4268

3144

3178

msgid ""

3145

3179

"If there is no default branch set, the first merge will set it (use\n"

3146

3180

"--no-remember to avoid setting it). After that, you can omit the branch\n"

3148

3182

"only be saved if the remote location can be accessed."

3149

3183

msgstr ""

3150

3184

3151

#: bzrlib/builtins.py:4180

3185

#: bzrlib/builtins.py:4273

3152

3186

msgid ""

3153

3187

"The results of the merge are placed into the destination working\n"

3154

3188

"directory, where they can be reviewed (with bzr diff), tested, and then\n"

3155

3189

"committed to record the result of the merge."

3156

3190

msgstr ""

3157

3191

3158

#: bzrlib/builtins.py:4184

3192

#: bzrlib/builtins.py:4277

3159

3193

msgid ""

3160

3194

"merge refuses to run if there are any uncommitted changes, unless\n"

3161

3195

"--force is given. If --force is given, then the changes from the source \n"

3164

3198

"merge revision which has more than two parents."

3165

3199

msgstr ""

3166

3200

3167

#: bzrlib/builtins.py:4190

3201

#: bzrlib/builtins.py:4283

3168

3202

msgid ""

3169

3203

"If one would like to merge changes from the working tree of the other\n"

3170

3204

"branch without merging any committed revisions, the --uncommitted option\n"

3171

3205

"can be given."

3172

3206

msgstr ""

3173

3207

3174

#: bzrlib/builtins.py:4194

3208

#: bzrlib/builtins.py:4287

3175

3209

msgid ""

3176

3210

"To select only some changes to merge, use \"merge -i\", which will prompt\n"

3177

3211

"you to apply each diff hunk and file change, similar to \"shelve\"."

3178

3212

msgstr ""

3179

3213

3180

#: bzrlib/builtins.py:4197

3214

#: bzrlib/builtins.py:4290

3181

3215

msgid ""

3182

3216

":Examples:\n"

3183

3217

" To merge all new revisions from bzr.dev::"

3184

3218

msgstr ""

3185

3219

3186

#: bzrlib/builtins.py:4200

3220

#: bzrlib/builtins.py:4293

3187

3221

msgid " bzr merge ../bzr.dev"

3188

3222

msgstr ""

3189

3223

3190

#: bzrlib/builtins.py:4202

3224

#: bzrlib/builtins.py:4295

3191

3225

msgid " To merge changes up to and including revision 82 from bzr.dev::"

3192

3226

msgstr ""

3193

3227

3194

#: bzrlib/builtins.py:4204

3228

#: bzrlib/builtins.py:4297

3195

3229

msgid " bzr merge -r 82 ../bzr.dev"

3196

3230

msgstr ""

3197

3231

3198

#: bzrlib/builtins.py:4206

3232

#: bzrlib/builtins.py:4299

3199

3233

msgid " To merge the changes introduced by 82, without previous changes::"

3200

3234

msgstr ""

3201

3235

3202

#: bzrlib/builtins.py:4208

3236

#: bzrlib/builtins.py:4301

3203

3237

msgid " bzr merge -r 81..82 ../bzr.dev"

3204

3238

msgstr ""

3205

3239

3206

#: bzrlib/builtins.py:4210

3240

#: bzrlib/builtins.py:4303

3207

3241

msgid " To apply a merge directive contained in /tmp/merge::"

3208

3242

msgstr ""

3209

3243

3210

#: bzrlib/builtins.py:4212

3244

#: bzrlib/builtins.py:4305

3211

3245

msgid " bzr merge /tmp/merge"

3212

3246

msgstr ""

3213

3247

3214

#: bzrlib/builtins.py:4214

3248

#: bzrlib/builtins.py:4307

3215

3249

msgid ""

3216

3250

" To create a merge revision with three parents from two branches\n"

3217

3251

" feature1a and feature1b:"

3218

3252

msgstr ""

3219

3253

3220

#: bzrlib/builtins.py:4217

3254

#: bzrlib/builtins.py:4310

3221

3255

msgid ""

3222

3256

" bzr merge ../feature1a\n"

3223

3257

" bzr merge ../feature1b --force\n"

3224

3258

" bzr commit -m 'revision with three parents'"

3225

3259

msgstr ""

3226

3260

3227

#: bzrlib/builtins.py:4229

3261

#: bzrlib/builtins.py:4322

3228

3262

msgid "Merge even if the destination tree has uncommitted changes."

3229

3263

msgstr ""

3230

3264

3231

#: bzrlib/builtins.py:4235

3265

#: bzrlib/builtins.py:4328

3232

3266

msgid ""

3233

3267

"Apply uncommitted changes from a working copy, instead of branch changes."

3234

3268

msgstr ""

3235

3269

3236

#: bzrlib/builtins.py:4237

3270

#: bzrlib/builtins.py:4330

3237

3271

msgid ""

3238

3272

"If the destination is already completely merged into the source, pull from "

3239

3273

"the source rather than merging. When this happens, you do not need to "

3240

3274

"commit the result."

3241

3275

msgstr ""

3242

3276

3243

#: bzrlib/builtins.py:4242

3277

#: bzrlib/builtins.py:4335

3244

3278

msgid ""

3245

3279

"Branch to merge into, rather than the one containing the working directory."

3246

3280

msgstr ""

3247

3281

3248

#: bzrlib/builtins.py:4244

3282

#: bzrlib/builtins.py:4337

3249

3283

msgid "Instead of merging, show a diff of the merge."

3250

3284

msgstr ""

3251

3285

3252

#: bzrlib/builtins.py:4246

3286

#: bzrlib/builtins.py:4339

3253

3287

msgid "Select changes interactively."

3254

3288

msgstr ""

3255

3289

3256

#: bzrlib/builtins.py:4268

3290

#: bzrlib/builtins.py:4361

3257

3291

msgid ""

3258

3292

"Merging into empty branches not currently supported, "

3259

3293

"https://bugs.launchpad.net/bzr/+bug/308562"

3260

3294

msgstr ""

3261

3295

3262

#: bzrlib/builtins.py:4295

3296

#: bzrlib/builtins.py:4388

3263

3297

msgid "Cannot use --uncommitted with bundles or merge directives."

3264

3298

msgstr ""

3265

3299

3266

#: bzrlib/builtins.py:4306

3300

#: bzrlib/builtins.py:4399

3267

3301

msgid "Cannot use --uncommitted and --revision at the same time."

3268

3302

msgstr ""

3269

3303

3270

#: bzrlib/builtins.py:4326

3304

#: bzrlib/builtins.py:4419

3271

3305

msgid "merger: "

3272

3306

msgstr ""

3273

3307

3274

#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71

3308

#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71

3275

3309

msgid "Nothing to do."

3276

3310

msgstr ""

3277

3311

3278

#: bzrlib/builtins.py:4332

3312

#: bzrlib/builtins.py:4425

3279

3313

msgid "Cannot pull individual files"

3280

3314

msgstr ""

3281

3315

3282

#: bzrlib/builtins.py:4340

3316

#: bzrlib/builtins.py:4433

3283

3317

msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"

3284

3318

msgstr ""

3285

3319

3286

#: bzrlib/builtins.py:4398

3320

#: bzrlib/builtins.py:4491

3287

3321

#, python-format

3288

3322

msgid "Show-base is not supported for this merge type. %s"

3289

3323

msgstr ""

3290

3324

3291

#: bzrlib/builtins.py:4407

3325

#: bzrlib/builtins.py:4500

3292

3326

#, python-format

3293

3327

msgid "Conflict reduction is not supported for merge type %s."

3294

3328

msgstr ""

3295

3329

3296

#: bzrlib/builtins.py:4411

3330

#: bzrlib/builtins.py:4504

3297

3331

msgid "Cannot do conflict reduction and show base."

3298

3332

msgstr ""

3299

3333

3300

#: bzrlib/builtins.py:4522

3334

#: bzrlib/builtins.py:4615

3301

3335

msgid "No location specified or remembered"

3302

3336

msgstr ""

3303

3337

3304

#: bzrlib/builtins.py:4524

3338

#: bzrlib/builtins.py:4617

3305

3339

msgid "{0} remembered {1} location {2}"

3306

3340

msgstr ""

3307

3341

3308

#: bzrlib/builtins.py:4530

3342

#: bzrlib/builtins.py:4623

3309

3343

msgid "Redo a merge."

3310

3344

msgstr ""

3311

3345

3312

#: bzrlib/builtins.py:4532

3346

#: bzrlib/builtins.py:4625

3313

3347

msgid ""

3314

3348

"Use this if you want to try a different merge technique while resolving\n"

3315

3349

"conflicts. Some merge techniques are better than others, and remerge\n"

3316

3350

"lets you try different ones on different files."

3317

3351

msgstr ""

3318

3352

3319

#: bzrlib/builtins.py:4536

3353

#: bzrlib/builtins.py:4629

3320

3354

msgid ""

3321

3355

"The options for remerge have the same meaning and defaults as the ones for\n"

3322

3356

"merge. The difference is that remerge can (only) be run when there is a\n"

3323

3357

"pending merge, and it lets you specify particular files."

3324

3358

msgstr ""

3325

3359

3326

#: bzrlib/builtins.py:4540

3360

#: bzrlib/builtins.py:4633

3327

3361

msgid ""

3328

3362

":Examples:\n"

3329

3363

" Re-do the merge of all conflicted files, and show the base text in\n"

3330

3364

" conflict regions, in addition to the usual THIS and OTHER texts::"

3331

3365

msgstr ""

3332

3366

3333

#: bzrlib/builtins.py:4544

3367

#: bzrlib/builtins.py:4637

3334

3368

msgid " bzr remerge --show-base"

3335

3369

msgstr ""

3336

3370

3337

#: bzrlib/builtins.py:4546

3371

#: bzrlib/builtins.py:4639

3338

3372

msgid ""

3339

3373

" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"

3340

3374

" additional processing to reduce the size of conflict regions::"

3341

3375

msgstr ""

3342

3376

3343

#: bzrlib/builtins.py:4549

3377

#: bzrlib/builtins.py:4642

3344

3378

msgid " bzr remerge --merge-type weave --reprocess foobar"

3345

3379

msgstr ""

3346

3380

3347

#: bzrlib/builtins.py:4556

3381

#: bzrlib/builtins.py:4649

3348

3382

msgid "Show base revision text in conflicts."

3349

3383

msgstr ""

3350

3384

3351

#: bzrlib/builtins.py:4568

3385

#: bzrlib/builtins.py:4661

3352

3386

msgid ""

3353

3387

"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"

3354

3388

"merges."

3355

3389

msgstr ""

3356

3390

3357

#: bzrlib/builtins.py:4624

3391

#: bzrlib/builtins.py:4717

3358

3392

msgid "Revert files to a previous revision."

3359

3393

msgstr ""

3360

3394

3361

#: bzrlib/builtins.py:4626

3395

#: bzrlib/builtins.py:4719

3362

3396

msgid ""

3363

3397

"Giving a list of files will revert only those files. Otherwise, all files\n"

3364

3398

"will be reverted. If the revision is not specified with '--revision', the\n"

3365

3399

"last committed revision is used."

3366

3400

msgstr ""

3367

3401

3368

#: bzrlib/builtins.py:4630

3402

#: bzrlib/builtins.py:4723

3369

3403

msgid ""

3370

3404

"To remove only some changes, without reverting to a prior version, use\n"

3371

3405

"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"

3374

3408

"certain changes on a hunk-by-hunk basis, see the shelve command."

3375

3409

msgstr ""

3376

3410

3377

#: bzrlib/builtins.py:4636

3411

#: bzrlib/builtins.py:4729

3378

3412

msgid ""

3379

3413

"By default, any files that have been manually changed will be backed up\n"

3380

3414

"first. (Files changed only by merge are not backed up.) Backup files have\n"

3381

3415

"'.~#~' appended to their name, where # is a number."

3382

3416

msgstr ""

3383

3417

3384

#: bzrlib/builtins.py:4640

3418

#: bzrlib/builtins.py:4733

3385

3419

msgid ""

3386

3420

"When you provide files, you can use their current pathname or the pathname\n"

3387

3421

"from the target revision. So you can use revert to \"undelete\" a file by\n"

3389

3423

"reverted."

3390

3424

msgstr ""

3391

3425

3392

#: bzrlib/builtins.py:4645

3426

#: bzrlib/builtins.py:4738

3393

3427

msgid ""

3394

3428

"If you have newly added files since the target revision, they will be\n"

3395

3429

"removed. If the files to be removed have been changed, backups will be\n"

3397

3431

"deleted."

3398

3432

msgstr ""

3399

3433

3400

#: bzrlib/builtins.py:4650

3434

#: bzrlib/builtins.py:4743

3401

3435

msgid ""

3402

3436

"The working tree contains a list of revisions that have been merged but\n"

3403

3437

"not yet committed. These revisions will be included as additional parents\n"

3409

3443

"reverting any files."

3410

3444

msgstr ""

3411

3445

3412

#: bzrlib/builtins.py:4659

3446

#: bzrlib/builtins.py:4752

3413

3447

msgid ""

3414

3448

"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"

3415

3449

"changes from a branch in a single revision. To do this, perform the merge\n"

3423

3457

"target branches."

3424

3458

msgstr ""

3425

3459

3426

#: bzrlib/builtins.py:4673

3460

#: bzrlib/builtins.py:4766

3427

3461

msgid "Do not save backups of reverted files."

3428

3462

msgstr ""

3429

3463

3430

#: bzrlib/builtins.py:4675

3464

#: bzrlib/builtins.py:4768

3431

3465

msgid "Remove pending merge marker, without changing any files."

3432

3466

msgstr ""

3433

3467

3434

#: bzrlib/builtins.py:4706

3468

#: bzrlib/builtins.py:4799

3435

3469

msgid ""

3436

3470

"Show help on a command or other topic.\n"

3437

3471

" "

3438

3472

msgstr ""

3439

3473

3440

#: bzrlib/builtins.py:4711

3474

#: bzrlib/builtins.py:4804

3441

3475

msgid "Show help on all commands."

3442

3476

msgstr ""

3443

3477

3444

#: bzrlib/builtins.py:4740

3478

#: bzrlib/builtins.py:4833

3445

3479

msgid "Show unmerged/unpulled revisions between two branches."

3446

3480

msgstr ""

3447

3481

3448

#: bzrlib/builtins.py:4742

3482

#: bzrlib/builtins.py:4835

3449

3483

msgid "OTHER_BRANCH may be local or remote."

3450

3484

msgstr ""

3451

3485

3452

#: bzrlib/builtins.py:4744

3486

#: bzrlib/builtins.py:4837

3453

3487

msgid ""

3454

3488

"To filter on a range of revisions, you can use the command -r begin..end\n"

3455

3489

"-r revision requests a specific revision, -r ..end or -r begin.. are\n"

3460

3494

" 0 - no missing revisions"

3461

3495

msgstr ""

3462

3496

3463

#: bzrlib/builtins.py:4754

3497

#: bzrlib/builtins.py:4847

3464

3498

msgid ""

3465

3499

" Determine the missing revisions between this and the branch at the\n"

3466

3500

" remembered pull location::"

3467

3501

msgstr ""

3468

3502

3469

#: bzrlib/builtins.py:4757

3503

#: bzrlib/builtins.py:4850

3470

3504

msgid " bzr missing"

3471

3505

msgstr ""

3472

3506

3473

#: bzrlib/builtins.py:4759

3507

#: bzrlib/builtins.py:4852

3474

3508

msgid " Determine the missing revisions between this and another branch::"

3475

3509

msgstr ""

3476

3510

3477

#: bzrlib/builtins.py:4761

3511

#: bzrlib/builtins.py:4854

3478

3512

msgid " bzr missing http://server/branch"

3479

3513

msgstr ""

3480

3514

3481

#: bzrlib/builtins.py:4763

3515

#: bzrlib/builtins.py:4856

3482

3516

msgid ""

3483

3517

" Determine the missing revisions up to a specific revision on the other\n"

3484

3518

" branch::"

3485

3519

msgstr ""

3486

3520

3487

#: bzrlib/builtins.py:4766

3521

#: bzrlib/builtins.py:4859

3488

3522

msgid " bzr missing -r ..-10"

3489

3523

msgstr ""

3490

3524

3491

#: bzrlib/builtins.py:4768

3525

#: bzrlib/builtins.py:4861

3492

3526

msgid ""

3493

3527

" Determine the missing revisions up to a specific revision on this\n"

3494

3528

" branch::"

3495

3529

msgstr ""

3496

3530

3497

#: bzrlib/builtins.py:4771

3531

#: bzrlib/builtins.py:4864

3498

3532

msgid " bzr missing --my-revision ..-10"

3499

3533

msgstr ""

3500

3534

3501

#: bzrlib/builtins.py:4778

3535

#: bzrlib/builtins.py:4871

3502

3536

msgid "Reverse the order of revisions."

3503

3537

msgstr ""

3504

3538

3505

#: bzrlib/builtins.py:4780

3539

#: bzrlib/builtins.py:4873

3506

3540

msgid "Display changes in the local branch only."

3507

3541

msgstr ""

3508

3542

3509

#: bzrlib/builtins.py:4781

3543

#: bzrlib/builtins.py:4874

3510

3544

msgid "Same as --mine-only."

3511

3545

msgstr ""

3512

3546

3513

#: bzrlib/builtins.py:4783

3547

#: bzrlib/builtins.py:4876

3514

3548

msgid "Display changes in the remote branch only."

3515

3549

msgstr ""

3516

3550

3517

#: bzrlib/builtins.py:4784

3551

#: bzrlib/builtins.py:4877

3518

3552

msgid "Same as --theirs-only."

3519

3553

msgstr ""

3520

3554

3521

#: bzrlib/builtins.py:4789

3555

#: bzrlib/builtins.py:4882

3522

3556

msgid ""

3523

3557

"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "

3524

3558

"details."

3525

3559

msgstr ""

3526

3560

3527

#: bzrlib/builtins.py:4793

3561

#: bzrlib/builtins.py:4886

3528

3562

msgid ""

3529

3563

"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "

3530

3564

"details."

3531

3565

msgstr ""

3532

3566

3533

#: bzrlib/builtins.py:4796

3567

#: bzrlib/builtins.py:4889

3534

3568

msgid "Show all revisions in addition to the mainline ones."

3535

3569

msgstr ""

3536

3570

3537

#: bzrlib/builtins.py:4850

3571

#: bzrlib/builtins.py:4943

3538

3572

msgid "No peer location known or specified."

3539

3573

msgstr ""

3540

3574

3541

#: bzrlib/builtins.py:4854

3575

#: bzrlib/builtins.py:4947

3542

3576

msgid "Using saved parent location: {0}\n"

3543

3577

msgstr ""

3544

3578

3545

#: bzrlib/builtins.py:4887

3579

#: bzrlib/builtins.py:4980

3546

3580

#, python-format

3547

3581

msgid "You have %d extra revision:\n"

3548

3582

msgid_plural "You have %d extra revisions:\n"

3549

3583

msgstr[0] ""

3550

3584

msgstr[1] ""

3551

3585

3552

#: bzrlib/builtins.py:4903

3586

#: bzrlib/builtins.py:4996

3553

3587

#, python-format

3554

3588

msgid "You are missing %d revision:\n"

3555

3589

msgid_plural "You are missing %d revisions:\n"

3556

3590

msgstr[0] ""

3557

3591

msgstr[1] ""

3558

3592

3559

#: bzrlib/builtins.py:4915

3593

#: bzrlib/builtins.py:5008

3560

3594

msgid "This branch has no new revisions.\n"

3561

3595

msgstr ""

3562

3596

3563

#: bzrlib/builtins.py:4918

3597

#: bzrlib/builtins.py:5011

3564

3598

msgid "Other branch has no new revisions.\n"

3565

3599

msgstr ""

3566

3600

3567

#: bzrlib/builtins.py:4923

3601

#: bzrlib/builtins.py:5016

3568

3602

msgid "Branches are up to date.\n"

3569

3603

msgstr ""

3570

3604

3571

#: bzrlib/builtins.py:4934

3605

#: bzrlib/builtins.py:5027

3572

3606

msgid "Compress the data within a repository."

3573

3607

msgstr ""

3574

3608

3575

#: bzrlib/builtins.py:4936

3609

#: bzrlib/builtins.py:5029

3576

3610

msgid ""

3577

3611

"This operation compresses the data within a bazaar repository. As\n"

3578

3612

"bazaar supports automatic packing of repository, this operation is\n"

3579

3613

"normally not required to be done manually."

3580

3614

msgstr ""

3581

3615

3582

#: bzrlib/builtins.py:4940

3616

#: bzrlib/builtins.py:5033

3583

3617

msgid ""

3584

3618

"During the pack operation, bazaar takes a backup of existing repository\n"

3585

3619

"data, i.e. pack files. This backup is eventually removed by bazaar\n"

3588

3622

"used."

3589

3623

msgstr ""

3590

3624

3591

#: bzrlib/builtins.py:4946

3625

#: bzrlib/builtins.py:5039

3592

3626

msgid ""

3593

3627

"Warning: If you use --clean-obsolete-packs and your machine crashes\n"

3594

3628

"during or immediately after repacking, you may be left with a state\n"

3596

3630

"been. In this case the repository may be unusable."

3597

3631

msgstr ""

3598

3632

3599

#: bzrlib/builtins.py:4955

3633

#: bzrlib/builtins.py:5048

3600

3634

msgid "Delete obsolete packs to save disk space."

3601

3635

msgstr ""

3602

3636

3603

#: bzrlib/builtins.py:4969

3637

#: bzrlib/builtins.py:5062

3604

3638

msgid "List the installed plugins."

3605

3639

msgstr ""

3606

3640

3607

#: bzrlib/builtins.py:4971

3641

#: bzrlib/builtins.py:5064

3608

3642

msgid ""

3609

3643

"This command displays the list of installed plugins including\n"

3610

3644

"version of plugin and a short description of each."

3611

3645

msgstr ""

3612

3646

3613

#: bzrlib/builtins.py:4974

3647

#: bzrlib/builtins.py:5067

3614

3648

msgid "--verbose shows the path where each plugin is located."

3615

3649

msgstr ""

3616

3650

3617

#: bzrlib/builtins.py:4976

3651

#: bzrlib/builtins.py:5069

3618

3652

msgid ""

3619

3653

"A plugin is an external component for Bazaar that extends the\n"

3620

3654

"revision control system, by adding or replacing code in Bazaar.\n"

3623

3657

"customizing log output."

3624

3658

msgstr ""

3625

3659

3626

#: bzrlib/builtins.py:4982

3660

#: bzrlib/builtins.py:5075

3627

3661

msgid ""

3628

3662

"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"

3629

3663

"for further information on plugins including where to find them and how to\n"

3631

3665

"plugins using the Python programming language."

3632

3666

msgstr ""

3633

3667

3634

#: bzrlib/builtins.py:4998

3668

#: bzrlib/builtins.py:5091

3635

3669

msgid "Show testament (signing-form) of a revision."

3636

3670

msgstr ""

3637

3671

3638

#: bzrlib/builtins.py:5001

3672

#: bzrlib/builtins.py:5094

3639

3673

msgid "Produce long-format testament."

3640

3674

msgstr ""

3641

3675

3642

#: bzrlib/builtins.py:5003

3676

#: bzrlib/builtins.py:5096

3643

3677

msgid "Produce a strict-format testament."

3644

3678

msgstr ""

3645

3679

3646

#: bzrlib/builtins.py:5029

3680

#: bzrlib/builtins.py:5122

3647

3681

msgid "Show the origin of each line in a file."

3648

3682

msgstr ""

3649

3683

3650

#: bzrlib/builtins.py:5031

3684

#: bzrlib/builtins.py:5124

3651

3685

msgid ""

3652

3686

"This prints out the given file with an annotation on the left side\n"

3653

3687

"indicating which revision, author and date introduced the change."

3654

3688

msgstr ""

3655

3689

3656

#: bzrlib/builtins.py:5034

3690

#: bzrlib/builtins.py:5127

3657

3691

msgid ""

3658

3692

"If the origin is the same for a run of consecutive lines, it is\n"

3659

3693

"shown only at the top, unless the --all option is given."

3660

3694

msgstr ""

3661

3695

3662

#: bzrlib/builtins.py:5042

3696

#: bzrlib/builtins.py:5135

3663

3697

msgid "Show annotations on all lines."

3664

3698

msgstr ""

3665

3699

3666

#: bzrlib/builtins.py:5043

3700

#: bzrlib/builtins.py:5136

3667

3701

msgid "Show commit date in annotations."

3668

3702

msgstr ""

3669

3703

3670

#: bzrlib/builtins.py:5130

3704

#: bzrlib/builtins.py:5223

3671

3705

msgid "Cannot sign a range of non-revision-history revisions"

3672

3706

msgstr ""

3673

3707

3674

#: bzrlib/builtins.py:5142

3708

#: bzrlib/builtins.py:5235

3675

3709

msgid "Please supply either one revision, or a range."

3676

3710

msgstr ""

3677

3711

3678

#: bzrlib/builtins.py:5146

3712

#: bzrlib/builtins.py:5239

3679

3713

msgid ""

3680

3714

"Convert the current branch into a checkout of the supplied branch.\n"

3681

3715

"If no branch is supplied, rebind to the last bound location."

3683

3717

"Преобразовать текущую ветвь в рабочую копию указанной ветви.\n"

3684

3718

"Если ветвь не указаны, перепривязать последнее расположение привязки."

3685

3719

3686

#: bzrlib/builtins.py:5149

3720

#: bzrlib/builtins.py:5242

3687

3721

msgid ""

3688

3722

"Once converted into a checkout, commits must succeed on the master branch\n"

3689

3723

"before they will be applied to the local branch."

3691

3725

"После преобразования в рабочую копию, закрепления должны производиться\n"

3692

3726

"над основной ветвью, прежде чем они могут быть применены к локальной."

3693

3727

3694

#: bzrlib/builtins.py:5152

3728

#: bzrlib/builtins.py:5245

3695

3729

msgid ""

3696

3730

"Bound branches use the nickname of its master branch unless it is set\n"

3697

3731

"locally, in which case binding will update the local nickname to be\n"

3698

3732

"that of the master."

3699

3733

msgstr ""

3700

3734

3701

#: bzrlib/builtins.py:5167

3735

#: bzrlib/builtins.py:5260

3702

3736

msgid "No location supplied. This format does not remember old locations."

3703

3737

msgstr ""

3704

3738

3705

#: bzrlib/builtins.py:5172

3739

#: bzrlib/builtins.py:5265

3706

3740

msgid "Branch is already bound"

3707

3741

msgstr ""

3708

3742

3709

#: bzrlib/builtins.py:5174

3743

#: bzrlib/builtins.py:5267

3710

3744

msgid "No location supplied and no previous location known"

3711

3745

msgstr ""

3712

3746

3713

#: bzrlib/builtins.py:5180

3747

#: bzrlib/builtins.py:5273

3714

3748

msgid "These branches have diverged. Try merging, and then bind again."

3715

3749

msgstr ""

3716

3750

3717

#: bzrlib/builtins.py:5187

3751

#: bzrlib/builtins.py:5280

3718

3752

msgid "Convert the current checkout into a regular branch."

3719

3753

msgstr "Преобразовать текущую рабочую копию в обычную ветвь."

3720

3754

3721

#: bzrlib/builtins.py:5189

3755

#: bzrlib/builtins.py:5282

3722

3756

msgid ""

3723

3757

"After unbinding, the local branch is considered independent and subsequent\n"

3724

3758

"commits will be local only."

3725

3759

msgstr ""

3726

3760

3727

#: bzrlib/builtins.py:5200

3761

#: bzrlib/builtins.py:5293

3728

3762

msgid "Local branch is not bound"

3729

3763

msgstr ""

3730

3764

3731

#: bzrlib/builtins.py:5204

3765

#: bzrlib/builtins.py:5297

3732

3766

msgid "Remove the last committed revision."

3733

3767

msgstr ""

3734

3768

3735

#: bzrlib/builtins.py:5206

3769

#: bzrlib/builtins.py:5299

3736

3770

msgid ""

3737

3771

"--verbose will print out what is being removed.\n"

3738

3772

"--dry-run will go through all the motions, but not actually\n"

3739

3773

"remove anything."

3740

3774

msgstr ""

3741

3775

3742

#: bzrlib/builtins.py:5210

3776

#: bzrlib/builtins.py:5303

3743

3777

msgid ""

3744

3778

"If --revision is specified, uncommit revisions to leave the branch at the\n"

3745

3779

"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"

3746

3780

"branch at revision 15."

3747

3781

msgstr ""

3748

3782

3749

#: bzrlib/builtins.py:5214

3783

#: bzrlib/builtins.py:5307

3750

3784

msgid ""

3751

3785

"Uncommit leaves the working tree ready for a new commit. The only change\n"

3752

3786

"it may make is to restore any pending merges that were present before\n"

3753

3787

"the commit."

3754

3788

msgstr ""

3755

3789

3756

#: bzrlib/builtins.py:5225

3790

#: bzrlib/builtins.py:5318

3757

3791

msgid "Don't actually make changes."

3758

3792

msgstr ""

3759

3793

3760

#: bzrlib/builtins.py:5226

3794

#: bzrlib/builtins.py:5319

3761

3795

msgid "Say yes to all questions."

3762

3796

msgstr ""

3763

3797

3764

#: bzrlib/builtins.py:5228

3798

#: bzrlib/builtins.py:5321

3765

3799

msgid "Keep tags that point to removed revisions."

3766

3800

msgstr ""

3767

3801

3768

#: bzrlib/builtins.py:5230

3802

#: bzrlib/builtins.py:5323

3769

3803

msgid "Only remove the commits from the local branch when in a checkout."

3770

3804

msgstr "Удалить закрепления из локальной ветви только в рабочей копии."

3771

3805

3772

#: bzrlib/builtins.py:5279

3806

#: bzrlib/builtins.py:5372

3773

3807

msgid "No revisions to uncommit.\n"

3774

3808

msgstr ""

3775

3809

3776

#: bzrlib/builtins.py:5294

3810

#: bzrlib/builtins.py:5387

3777

3811

msgid "Dry-run, pretending to remove the above revisions.\n"

3778

3812

msgstr ""

3779

3813

3780

#: bzrlib/builtins.py:5297

3814

#: bzrlib/builtins.py:5390

3781

3815

msgid "The above revision(s) will be removed.\n"

3782

3816

msgstr ""

3783

3817

3784

#: bzrlib/builtins.py:5301

3818

#: bzrlib/builtins.py:5394

3785

3819

msgid "Uncommit these revisions"

3786

3820

msgstr ""

3787

3821

3788

#: bzrlib/builtins.py:5304

3822

#: bzrlib/builtins.py:5397

3789

3823

msgid "Canceled\n"

3790

3824

msgstr ""

3791

3825

3792

#: bzrlib/builtins.py:5311

3826

#: bzrlib/builtins.py:5404

3793

3827

#, python-format

3794

3828

msgid ""

3795

3829

"You can restore the old tip by running:\n"

3796

3830

" bzr pull . -r revid:%s\n"

3797

3831

msgstr ""

3798

3832

3799

#: bzrlib/builtins.py:5316

3833

#: bzrlib/builtins.py:5409

3800

3834

msgid "Break a dead lock."

3801

3835

msgstr ""

3802

3836

3803

#: bzrlib/builtins.py:5318

3837

#: bzrlib/builtins.py:5411

3804

3838

msgid ""

3805

3839

"This command breaks a lock on a repository, branch, working directory or\n"

3806

3840

"config file."

3807

3841

msgstr ""

3808

3842

3809

#: bzrlib/builtins.py:5321

3843

#: bzrlib/builtins.py:5414

3810

3844

msgid ""

3811

3845

"CAUTION: Locks should only be broken when you are sure that the process\n"

3812

3846

"holding the lock has been stopped."

3813

3847

msgstr ""

3814

3848

3815

#: bzrlib/builtins.py:5324

3849

#: bzrlib/builtins.py:5417

3816

3850

msgid ""

3817

3851

"You can get information on what locks are open via the 'bzr info\n"

3818

3852

"[location]' command."

3819

3853

msgstr ""

3820

3854

3821

#: bzrlib/builtins.py:5327

3855

#: bzrlib/builtins.py:5420

3822

3856

msgid ""

3823

3857

":Examples:\n"

3824

3858

" bzr break-lock\n"

3826

3860

" bzr break-lock --conf ~/.bazaar"

3827

3861

msgstr ""

3828

3862

3829

#: bzrlib/builtins.py:5336

3863

#: bzrlib/builtins.py:5429

3830

3864

msgid "LOCATION is the directory where the config lock is."

3831

3865

msgstr ""

3832

3866

3833

#: bzrlib/builtins.py:5338

3867

#: bzrlib/builtins.py:5431

3834

3868

msgid "Do not ask for confirmation before breaking the lock."

3835

3869

msgstr ""

3836

3870

3837

#: bzrlib/builtins.py:5373

3871

#: bzrlib/builtins.py:5466

3838

3872

msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"

3839

3873

msgstr ""

3840

3874

3841

#: bzrlib/builtins.py:5374

3875

#: bzrlib/builtins.py:5467

3842

3876

msgid "Run the bzr server."

3843

3877

msgstr ""

3844

3878

3845

#: bzrlib/builtins.py:5380

3879

#: bzrlib/builtins.py:5473

3846

3880

msgid "Serve on stdin/out for use from inetd or sshd."

3847

3881

msgstr ""

3848

3882

3849

#: bzrlib/builtins.py:5381

3883

#: bzrlib/builtins.py:5474

3850

3884

msgid "protocol"

3851

3885

msgstr ""

3852

3886

3853

#: bzrlib/builtins.py:5382

3887

#: bzrlib/builtins.py:5475

3854

3888

msgid "Protocol to serve."

3855

3889

msgstr ""

3856

3890

3857

#: bzrlib/builtins.py:5386

3891

#: bzrlib/builtins.py:5479

3858

3892

msgid ""

3859

3893

"Listen for connections on nominated port of the form [hostname:]portnumber. "

3860

3894

"Passing 0 as the port number will result in a dynamically allocated port. "

3861

3895

"The default port depends on the protocol."

3862

3896

msgstr ""

3863

3897

3864

#: bzrlib/builtins.py:5392

3898

#: bzrlib/builtins.py:5485

3865

3899

msgid "Serve contents of this directory."

3866

3900

msgstr ""

3867

3901

3868

#: bzrlib/builtins.py:5394

3902

#: bzrlib/builtins.py:5487

3869

3903

msgid ""

3870

3904

"By default the server is a readonly server. Supplying --allow-writes "

3871

3905

"enables write access to the contents of the served directory and below. "

3874

3908

"uncontrolled write access to your file system."

3875

3909

msgstr ""

3876

3910

3877

#: bzrlib/builtins.py:5403

3911

#: bzrlib/builtins.py:5496

3878

3912

msgid "Override the default idle client timeout (5min)."

3879

3913

msgstr ""

3880

3914

3881

#: bzrlib/builtins.py:5453

3915

#: bzrlib/builtins.py:5546

3882

3916

msgid "Combine a tree into its containing tree."

3883

3917

msgstr ""

3884

3918

3885

#: bzrlib/builtins.py:5455

3919

#: bzrlib/builtins.py:5548

3886

3920

msgid "This command requires the target tree to be in a rich-root format."

3887

3921

msgstr ""

3888

3922

3889

#: bzrlib/builtins.py:5457

3923

#: bzrlib/builtins.py:5550

3890

3924

msgid ""

3891

3925

"The TREE argument should be an independent tree, inside another tree, but\n"

3892

3926

"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"

3893

3927

"running \"bzr branch\" with the target inside a tree.)"

3894

3928

msgstr ""

3895

3929

3896

#: bzrlib/builtins.py:5461

3930

#: bzrlib/builtins.py:5554

3897

3931

msgid ""

3898

3932

"The result is a combined tree, with the subtree no longer an independent\n"

3899

3933

"part. This is marked as a merge of the subtree into the containing tree,\n"

3900

3934

"and all history is preserved."

3901

3935

msgstr ""

3902

3936

3903

#: bzrlib/builtins.py:5479

3937

#: bzrlib/builtins.py:5572

3904

3938

#, python-format

3905

3939

msgid ""

3906

3940

"Can't join trees because %s doesn't support rich root data.\n"

3907

3941

"You can use bzr upgrade on the repository."

3908

3942

msgstr ""

3909

3943

3910

#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495

3944

#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588

3911

3945

msgid "Cannot join {0}. {1}"

3912

3946

msgstr ""

3913

3947

3914

#: bzrlib/builtins.py:5499

3948

#: bzrlib/builtins.py:5592

3915

3949

msgid "Split a subdirectory of a tree into a separate tree."

3916

3950

msgstr ""

3917

3951

3918

#: bzrlib/builtins.py:5501

3952

#: bzrlib/builtins.py:5594

3919

3953

msgid ""

3920

3954

"This command will produce a target tree in a format that supports\n"

3921

3955

"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"

3922

3956

"converted into earlier formats like 'dirstate-tags'."

3923

3957

msgstr ""

3924

3958

3925

#: bzrlib/builtins.py:5505

3959

#: bzrlib/builtins.py:5598

3926

3960

msgid ""

3927

3961

"The TREE argument should be a subdirectory of a working tree. That\n"

3928

3962

"subdirectory will be converted into an independent tree, with its own\n"

3929

3963

"branch. Commits in the top-level tree will not apply to the new subtree."

3930

3964

msgstr ""

3931

3965

3932

#: bzrlib/builtins.py:5585

3966

#: bzrlib/builtins.py:5678

3933

3967

msgid "No submit branch specified or known"

3934

3968

msgstr ""

3935

3969

3936

#: bzrlib/builtins.py:5593 bzrlib/send.py:108

3970

#: bzrlib/builtins.py:5686 bzrlib/send.py:108

3937

3971

msgid "No public branch specified or known"

3938

3972

msgstr ""

3939

3973

3940

#: bzrlib/builtins.py:5598

3974

#: bzrlib/builtins.py:5691

3941

3975

msgid "bzr merge-directive takes at most two one revision identifiers"

3942

3976

msgstr ""

3943

3977

3944

#: bzrlib/builtins.py:5607

3978

#: bzrlib/builtins.py:5700

3945

3979

msgid "No revisions to bundle."

3946

3980

msgstr ""

3947

3981

3948

#: bzrlib/builtins.py:5626

3982

#: bzrlib/builtins.py:5719

3949

3983

msgid "Mail or create a merge-directive for submitting changes."

3950

3984

msgstr ""

3951

3985

3952

#: bzrlib/builtins.py:5628

3986

#: bzrlib/builtins.py:5721

3953

3987

msgid "A merge directive provides many things needed for requesting merges:"

3954

3988

msgstr ""

3955

3989

3956

#: bzrlib/builtins.py:5630

3990

#: bzrlib/builtins.py:5723

3957

3991

msgid "* A machine-readable description of the merge to perform"

3958

3992

msgstr ""

3959

3993

3960

#: bzrlib/builtins.py:5632

3994

#: bzrlib/builtins.py:5725

3961

3995

msgid "* An optional patch that is a preview of the changes requested"

3962

3996

msgstr ""

3963

3997

3964

#: bzrlib/builtins.py:5634

3998

#: bzrlib/builtins.py:5727

3965

3999

msgid ""

3966

4000

"* An optional bundle of revision data, so that the changes can be applied\n"

3967

4001

" directly from the merge directive, without retrieving data from a\n"

3968

4002

" branch."

3969

4003

msgstr ""

3970

4004

3971

#: bzrlib/builtins.py:5638

4005

#: bzrlib/builtins.py:5731

3972

4006

msgid ""

3973

4007

"`bzr send` creates a compact data set that, when applied using bzr\n"

3974

4008

"merge, has the same effect as merging from the source branch. "

3975

4009

msgstr ""

3976

4010

3977

#: bzrlib/builtins.py:5641

4011

#: bzrlib/builtins.py:5734

3978

4012

msgid ""

3979

4013

"By default the merge directive is self-contained and can be applied to any\n"

3980

4014

"branch containing submit_branch in its ancestory without needing access to\n"

3981

4015

"the source branch."

3982

4016

msgstr ""

3983

4017

3984

#: bzrlib/builtins.py:5645

4018

#: bzrlib/builtins.py:5738

3985

4019

msgid ""

3986

4020

"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"

3987

4021

"revisions, but only a structured request to merge from the\n"

3990

4024

"included if known, so that people can check it later."

3991

4025

msgstr ""

3992

4026

3993

#: bzrlib/builtins.py:5651

4027

#: bzrlib/builtins.py:5744

3994

4028

msgid ""

3995

4029

"The submit branch defaults to the parent of the source branch, but can be\n"

3996

4030

"overridden. Both submit branch and public branch will be remembered in\n"

3999

4033

"be changed using --from."

4000

4034

msgstr ""

4001

4035

4002

#: bzrlib/builtins.py:5657

4036

#: bzrlib/builtins.py:5750

4003

4037

msgid ""

4004

4038

"Both the submit branch and the public branch follow the usual behavior with\n"

4005

4039

"respect to --remember: If there is no default location set, the first send\n"

4008

4042

"--remember. The value will only be saved if the location can be accessed."

4009

4043

msgstr ""

4010

4044

4011

#: bzrlib/builtins.py:5663

4045

#: bzrlib/builtins.py:5756

4012

4046

msgid ""

4013

4047

"In order to calculate those changes, bzr must analyse the submit branch.\n"

4014

4048

"Therefore it is most efficient for the submit branch to be a local mirror.\n"

4016

4050

"in the merge directive."

4017

4051

msgstr ""

4018

4052

4019

#: bzrlib/builtins.py:5668

4053

#: bzrlib/builtins.py:5761

4020

4054

msgid ""

4021

4055

"The default behaviour is to send the merge directive by mail, unless -o is\n"

4022

4056

"given, in which case it is sent to a file."

4023

4057

msgstr ""

4024

4058

4025

#: bzrlib/builtins.py:5671

4059

#: bzrlib/builtins.py:5764

4026

4060

msgid ""

4027

4061

"Mail is sent using your preferred mail program. This should be transparent\n"

4028

4062

"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"

4029

4063

"If the preferred client can't be found (or used), your editor will be used."

4030

4064

msgstr ""

4031

4065

4032

#: bzrlib/builtins.py:5675

4066

#: bzrlib/builtins.py:5768

4033

4067

msgid ""

4034

4068

"To use a specific mail program, set the mail_client configuration option.\n"

4035

4069

"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"

4041

4075

"supported clients."

4042

4076

msgstr ""

4043

4077

4044

#: bzrlib/builtins.py:5682

4078

#: bzrlib/builtins.py:5775

4045

4079

msgid ""

4046

4080

"If mail is being sent, a to address is required. This can be supplied\n"

4047

4081

"either on the commandline, by setting the submit_to configuration\n"

4049

4083

"in the submit branch."

4050

4084

msgstr ""

4051

4085

4052

#: bzrlib/builtins.py:5687

4086

#: bzrlib/builtins.py:5780

4053

4087

msgid ""

4054

4088

"Two formats are currently supported: \"4\" uses revision bundle format 4 "

4055

4089

"and\n"

4059

4093

"format 1. It is compatible with Bazaar 0.12 - 0.18."

4060

4094

msgstr ""

4061

4095

4062

#: bzrlib/builtins.py:5693

4096

#: bzrlib/builtins.py:5786

4063

4097

msgid ""

4064

4098

"The merge directives created by bzr send may be applied using bzr merge or\n"

4065

4099

"bzr pull by specifying a file containing a merge directive as the location."

4066

4100

msgstr ""

4067

4101

4068

#: bzrlib/builtins.py:5696

4102

#: bzrlib/builtins.py:5789

4069

4103

msgid ""

4070

4104

"bzr send makes extensive use of public locations to map local locations "

4071

4105

"into\n"

4073

4107

"set them, and use `bzr info` to display them."

4074

4108

msgstr ""

4075

4109

4076

#: bzrlib/builtins.py:5720

4110

#: bzrlib/builtins.py:5813

4077

4111

msgid "Write merge directive to this file or directory; use - for stdout."

4078

4112

msgstr ""

4079

4113

4080

#: bzrlib/builtins.py:5724

4114

#: bzrlib/builtins.py:5817

4081

4115

msgid ""

4082

4116

"Refuse to send if there are uncommitted changes in the working tree, --no-"

4083

4117

"strict disables the check."

4084

4118

msgstr ""

4085

4119

4086

#: bzrlib/builtins.py:5726

4120

#: bzrlib/builtins.py:5819

4087

4121

msgid "Mail the request to this address."

4088

4122

msgstr ""

4089

4123

4090

#: bzrlib/builtins.py:5730

4124

#: bzrlib/builtins.py:5823

4091

4125

msgid "Body for the email."

4092

4126

msgstr ""

4093

4127

4094

#: bzrlib/builtins.py:5783

4128

#: bzrlib/builtins.py:5876

4095

4129

msgid "Do not include a bundle in the merge directive."

4096

4130

msgstr ""

4097

4131

4098

#: bzrlib/builtins.py:5784

4132

#: bzrlib/builtins.py:5877

4099

4133

msgid "Do not include a preview patch in the merge directive."

4100

4134

msgstr ""

4101

4135

4102

#: bzrlib/builtins.py:5787

4136

#: bzrlib/builtins.py:5880

4103

4137

msgid "Remember submit and public branch."

4104

4138

msgstr ""

4105

4139

4106

#: bzrlib/builtins.py:5789

4140

#: bzrlib/builtins.py:5882

4107

4141

msgid ""

4108

4142

"Branch to generate the submission from, rather than the one containing the "

4109

4143

"working directory."

4110

4144

msgstr ""

4111

4145

4112

#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76

4146

#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76

4113

4147

msgid "format"

4114

4148

msgstr ""

4115

4149

4116

#: bzrlib/builtins.py:5800

4150

#: bzrlib/builtins.py:5893

4117

4151

msgid "Use the specified output format."

4118

4152

msgstr ""

4119

4153

4120

#: bzrlib/builtins.py:5822

4154

#: bzrlib/builtins.py:5915

4121

4155

msgid "Create, remove or modify a tag naming a revision."

4122

4156

msgstr ""

4123

4157

4124

#: bzrlib/builtins.py:5824

4158

#: bzrlib/builtins.py:5917

4125

4159

msgid ""

4126

4160

"Tags give human-meaningful names to revisions. Commands that take a -r\n"

4127

4161

"(--revision) option can be given -rtag:X, where X is any previously\n"

4128

4162

"created tag."

4129

4163

msgstr ""

4130

4164

4131

#: bzrlib/builtins.py:5828

4165

#: bzrlib/builtins.py:5921

4132

4166

msgid ""

4133

4167

"Tags are stored in the branch. Tags are copied from one branch to another\n"

4134

4168

"along when you branch, push, pull or merge."

4135

4169

msgstr ""

4136

4170

4137

#: bzrlib/builtins.py:5831

4171

#: bzrlib/builtins.py:5924

4138

4172

msgid ""

4139

4173

"It is an error to give a tag name that already exists unless you pass\n"

4140

4174

"--force, in which case the tag is moved to point to the new revision."

4141

4175

msgstr ""

4142

4176

4143

#: bzrlib/builtins.py:5834

4177

#: bzrlib/builtins.py:5927

4144

4178

msgid ""

4145

4179

"To rename a tag (change the name but keep it on the same revsion), run "

4146

4180

"``bzr\n"

4147

4181

"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."

4148

4182

msgstr ""

4149

4183

4150

#: bzrlib/builtins.py:5837

4184

#: bzrlib/builtins.py:5930

4151

4185

msgid ""

4152

4186

"If no tag name is specified it will be determined through the \n"

4153

4187

"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"

4155

4189

"details."

4156

4190

msgstr ""

4157

4191

4158

#: bzrlib/builtins.py:5847

4192

#: bzrlib/builtins.py:5940

4159

4193

msgid "Delete this tag rather than placing it."

4160

4194

msgstr ""

4161

4195

4162

#: bzrlib/builtins.py:5850

4196

#: bzrlib/builtins.py:5943

4163

4197

msgid "Branch in which to place the tag."

4164

4198

msgstr ""

4165

4199

4166

#: bzrlib/builtins.py:5852

4200

#: bzrlib/builtins.py:5945

4167

4201

msgid "Replace existing tags."

4168

4202

msgstr ""

4169

4203

4170

#: bzrlib/builtins.py:5867

4204

#: bzrlib/builtins.py:5960

4171

4205

msgid "No tag specified to delete."

4172

4206

msgstr ""

4173

4207

4174

#: bzrlib/builtins.py:5869

4208

#: bzrlib/builtins.py:5962

4175

4209

#, python-format

4176

4210

msgid "Deleted tag %s."

4177

4211

msgstr ""

4178

4212

4179

#: bzrlib/builtins.py:5883

4213

#: bzrlib/builtins.py:5976

4180

4214

msgid "Please specify a tag name."

4181

4215

msgstr ""

4182

4216

4183

#: bzrlib/builtins.py:5891

4217

#: bzrlib/builtins.py:5984

4184

4218

#, python-format

4185

4219

msgid "Tag %s already exists for that revision."

4186

4220

msgstr ""

4187

4221

4188

#: bzrlib/builtins.py:5895

4222

#: bzrlib/builtins.py:5988

4189

4223

#, python-format

4190

4224

msgid "Created tag %s."

4191

4225

msgstr ""

4192

4226

4193

#: bzrlib/builtins.py:5897

4227

#: bzrlib/builtins.py:5990

4194

4228

#, python-format

4195

4229

msgid "Updated tag %s."

4196

4230

msgstr ""

4197

4231

4198

#: bzrlib/builtins.py:5901

4232

#: bzrlib/builtins.py:5994

4199

4233

msgid "List tags."

4200

4234

msgstr ""

4201

4235

4202

#: bzrlib/builtins.py:5903

4236

#: bzrlib/builtins.py:5996

4203

4237

msgid ""

4204

4238

"This command shows a table of tag names and the revisions they reference."

4205

4239

msgstr ""

4206

4240

4207

#: bzrlib/builtins.py:5909

4241

#: bzrlib/builtins.py:6002

4208

4242

msgid "Branch whose tags should be displayed."

4209

4243

msgstr ""

4210

4244

4211

#: bzrlib/builtins.py:5911

4245

#: bzrlib/builtins.py:6004

4212

4246

msgid "Sort tags by different criteria."

4213

4247

msgstr ""

4214

4248

4215

#: bzrlib/builtins.py:5911

4249

#: bzrlib/builtins.py:6004

4216

4250

msgid "Sorting"

4217

4251

msgstr ""

4218

4252

4219

#: bzrlib/builtins.py:5980

4253

#: bzrlib/builtins.py:6073

4220

4254

msgid "Reconfigure the type of a bzr directory."

4221

4255

msgstr ""

4222

4256

4223

#: bzrlib/builtins.py:5982

4257

#: bzrlib/builtins.py:6075

4224

4258

msgid "A target configuration must be specified."

4225

4259

msgstr ""

4226

4260

4227

#: bzrlib/builtins.py:5984

4261

#: bzrlib/builtins.py:6077

4228

4262

msgid ""

4229

4263

"For checkouts, the bind-to location will be auto-detected if not specified.\n"

4230

4264

"The order of preference is\n"

4235

4269

"If none of these is available, --bind-to must be specified."

4236

4270

msgstr ""

4237

4271

4238

#: bzrlib/builtins.py:5998

4272

#: bzrlib/builtins.py:6091

4239

4273

msgid "Tree type"

4240

4274

msgstr ""

4241

4275

4242

#: bzrlib/builtins.py:5999

4276

#: bzrlib/builtins.py:6092

4243

4277

msgid "The relation between branch and tree."

4244

4278

msgstr ""

4245

4279

4246

#: bzrlib/builtins.py:6001

4280

#: bzrlib/builtins.py:6094

4247

4281

msgid "Reconfigure to be an unbound branch with no working tree."

4248

4282

msgstr ""

4249

4283

4250

#: bzrlib/builtins.py:6002

4284

#: bzrlib/builtins.py:6095

4251

4285

msgid "Reconfigure to be an unbound branch with a working tree."

4252

4286

msgstr ""

4253

4287

4254

#: bzrlib/builtins.py:6003

4288

#: bzrlib/builtins.py:6096

4255

4289

msgid "Reconfigure to be a bound branch with a working tree."

4256

4290

msgstr ""

4257

4291

4258

#: bzrlib/builtins.py:6004

4292

#: bzrlib/builtins.py:6097

4259

4293

msgid "Reconfigure to be a lightweight checkout (with no local history)."

4260

4294

msgstr ""

4261

4295

4262

#: bzrlib/builtins.py:6009

4296

#: bzrlib/builtins.py:6102

4263

4297

msgid "Repository type"

4264

4298

msgstr ""

4265

4299

4266

#: bzrlib/builtins.py:6010

4300

#: bzrlib/builtins.py:6103

4267

4301

msgid "Location fo the repository."

4268

4302

msgstr ""

4269

4303

4270

#: bzrlib/builtins.py:6012

4304

#: bzrlib/builtins.py:6105

4271

4305

msgid ""

4272

4306

"Reconfigure to be a standalone branch (i.e. stop using shared repository)."

4273

4307

msgstr ""

4274

4308

4275

#: bzrlib/builtins.py:6014

4309

#: bzrlib/builtins.py:6107

4276

4310

msgid "Reconfigure to use a shared repository."

4277

4311

msgstr ""

4278

4312

4279

#: bzrlib/builtins.py:6018

4313

#: bzrlib/builtins.py:6111

4280

4314

msgid "Trees in Repository"

4281

4315

msgstr ""

4282

4316

4283

#: bzrlib/builtins.py:6019

4317

#: bzrlib/builtins.py:6112

4284

4318

msgid "Whether new branches in the repository have trees."

4285

4319

msgstr ""

4286

4320

4287

#: bzrlib/builtins.py:6021

4321

#: bzrlib/builtins.py:6114

4288

4322

msgid ""

4289

4323

"Reconfigure repository to create working trees on branches by default."

4290

4324

msgstr ""

4291

4325

4292

#: bzrlib/builtins.py:6023

4326

#: bzrlib/builtins.py:6116

4293

4327

msgid ""

4294

4328

"Reconfigure repository to not create working trees on branches by default."

4295

4329

msgstr ""

4296

4330

4297

#: bzrlib/builtins.py:6026

4331

#: bzrlib/builtins.py:6119

4298

4332

msgid "Branch to bind checkout to."

4299

4333

msgstr "Ветвь, с которой связать рабочую копию."

4300

4334

4301

#: bzrlib/builtins.py:6028

4335

#: bzrlib/builtins.py:6121

4302

4336

msgid "Perform reconfiguration even if local changes will be lost."

4303

4337

msgstr ""

4304

4338

4305

#: bzrlib/builtins.py:6031

4339

#: bzrlib/builtins.py:6124

4306

4340

msgid "Reconfigure a branch to be stacked on another branch."

4307

4341

msgstr ""

4308

4342

4309

#: bzrlib/builtins.py:6035

4343

#: bzrlib/builtins.py:6128

4310

4344

msgid ""

4311

4345

"Reconfigure a branch to be unstacked. This may require copying substantial "

4312

4346

"data into it."

4313

4347

msgstr ""

4314

4348

4315

#: bzrlib/builtins.py:6045

4349

#: bzrlib/builtins.py:6138

4316

4350

msgid "Can't use both --stacked-on and --unstacked"

4317

4351

msgstr ""

4318

4352

4319

#: bzrlib/builtins.py:6059

4353

#: bzrlib/builtins.py:6152

4320

4354

msgid "No target configuration specified"

4321

4355

msgstr ""

4322

4356

4323

#: bzrlib/builtins.py:6094

4357

#: bzrlib/builtins.py:6187

4324

4358

msgid "Set the branch of a checkout and update."

4325

4359

msgstr "Выбрать ветвь рабочей копии и обновить."

4326

4360

4327

#: bzrlib/builtins.py:6096

4361

#: bzrlib/builtins.py:6189

4328

4362

msgid ""

4329

4363

"For lightweight checkouts, this changes the branch being referenced.\n"

4330

4364

"For heavyweight checkouts, this checks that there are no local commits\n"

4332

4366

"of the new location and binds to it."

4333

4367

msgstr ""

4334

4368

4335

#: bzrlib/builtins.py:6101

4369

#: bzrlib/builtins.py:6194

4336

4370

msgid ""

4337

4371

"In both cases, the working tree is updated and uncommitted changes\n"

4338

4372

"are merged. The user can commit or revert these as they desire."

4339

4373

msgstr ""

4340

4374

4341

#: bzrlib/builtins.py:6104

4375

#: bzrlib/builtins.py:6197

4342

4376

msgid "Pending merges need to be committed or reverted before using switch."

4343

4377

msgstr ""

4344

4378

4345

#: bzrlib/builtins.py:6106

4379

#: bzrlib/builtins.py:6199

4346

4380

msgid ""

4347

4381

"The path to the branch to switch to can be specified relative to the parent\n"

4348

4382

"directory of the current branch. For example, if you are currently in a\n"

4350

4384

"/path/to/newbranch."

4351

4385

msgstr ""

4352

4386

4353

#: bzrlib/builtins.py:6111

4387

#: bzrlib/builtins.py:6204

4354

4388

msgid ""

4355

4389

"Bound branches use the nickname of its master branch unless it is set\n"

4356

4390

"locally, in which case switching will update the local nickname to be\n"

4357

4391

"that of the master."

4358

4392

msgstr ""

4359

4393

4360

#: bzrlib/builtins.py:6119

4394

#: bzrlib/builtins.py:6212

4361

4395

msgid "Switch even if local commits will be lost."

4362

4396

msgstr ""

4363

4397

4364

#: bzrlib/builtins.py:6122

4398

#: bzrlib/builtins.py:6215

4365

4399

msgid "Create the target branch from this one before switching to it."

4366

4400

msgstr ""

4367

4401

4368

#: bzrlib/builtins.py:6134

4402

#: bzrlib/builtins.py:6229

4369

4403

msgid "You must supply either a revision or a location"

4370

4404

msgstr ""

4371

4405

4372

#: bzrlib/builtins.py:6145

4406

#: bzrlib/builtins.py:6242

4373

4407

msgid "cannot create branch without source branch"

4374

4408

msgstr ""

4375

4409

4376

#: bzrlib/builtins.py:6209

4410

#: bzrlib/builtins.py:6262

4377

4411

msgid "Manage filtered views."

4378

4412

msgstr ""

4379

4413

4380

#: bzrlib/builtins.py:6211

4414

#: bzrlib/builtins.py:6264

4381

4415

msgid ""

4382

4416

"Views provide a mask over the tree so that users can focus on\n"

4383

4417

"a subset of a tree when doing their work. After creating a view,\n"

4387

4421

"must be within the current view."

4388

4422

msgstr ""

4389

4423

4390

#: bzrlib/builtins.py:6218

4424

#: bzrlib/builtins.py:6271

4391

4425

msgid ""

4392

4426

"In most cases, a view has a short life-span: it is created to make\n"

4393

4427

"a selected change and is deleted once that change is committed.\n"

4395

4429

"and switch between them."

4396

4430

msgstr ""

4397

4431

4398

#: bzrlib/builtins.py:6223

4432

#: bzrlib/builtins.py:6276

4399

4433

msgid ""

4400

4434

"To disable the current view without deleting it, you can switch to\n"

4401

4435

"the pseudo view called ``off``. This can be useful when you need\n"

4403

4437

"want to switch back to your view after that."

4404

4438

msgstr ""

4405

4439

4406

#: bzrlib/builtins.py:6228

4440

#: bzrlib/builtins.py:6281

4407

4441

msgid ""

4408

4442

":Examples:\n"

4409

4443

" To define the current view::"

4410

4444

msgstr ""

4411

4445

4412

#: bzrlib/builtins.py:6231

4446

#: bzrlib/builtins.py:6284

4413

4447

msgid " bzr view file1 dir1 ..."

4414

4448

msgstr ""

4415

4449

4416

#: bzrlib/builtins.py:6233

4450

#: bzrlib/builtins.py:6286

4417

4451

msgid " To list the current view::"

4418

4452

msgstr ""

4419

4453

4420

#: bzrlib/builtins.py:6235

4454

#: bzrlib/builtins.py:6288

4421

4455

msgid " bzr view"

4422

4456

msgstr ""

4423

4457

4424

#: bzrlib/builtins.py:6237

4458

#: bzrlib/builtins.py:6290

4425

4459

msgid " To delete the current view::"

4426

4460

msgstr ""

4427

4461

4428

#: bzrlib/builtins.py:6239

4462

#: bzrlib/builtins.py:6292

4429

4463

msgid " bzr view --delete"

4430

4464

msgstr ""

4431

4465

4432

#: bzrlib/builtins.py:6241

4466

#: bzrlib/builtins.py:6294

4433

4467

msgid " To disable the current view without deleting it::"

4434

4468

msgstr ""

4435

4469

4436

#: bzrlib/builtins.py:6243

4470

#: bzrlib/builtins.py:6296

4437

4471

msgid " bzr view --switch off"

4438

4472

msgstr ""

4439

4473

4440

#: bzrlib/builtins.py:6245

4474

#: bzrlib/builtins.py:6298

4441

4475

msgid " To define a named view and switch to it::"

4442

4476

msgstr ""

4443

4477

4444

#: bzrlib/builtins.py:6247

4478

#: bzrlib/builtins.py:6300

4445

4479

msgid " bzr view --name view-name file1 dir1 ..."

4446

4480

msgstr ""

4447

4481

4448

#: bzrlib/builtins.py:6249

4482

#: bzrlib/builtins.py:6302

4449

4483

msgid " To list a named view::"

4450

4484

msgstr ""

4451

4485

4452

#: bzrlib/builtins.py:6251

4486

#: bzrlib/builtins.py:6304

4453

4487

msgid " bzr view --name view-name"

4454

4488

msgstr ""

4455

4489

4456

#: bzrlib/builtins.py:6253

4490

#: bzrlib/builtins.py:6306

4457

4491

msgid " To delete a named view::"

4458

4492

msgstr ""

4459

4493

4460

#: bzrlib/builtins.py:6255

4494

#: bzrlib/builtins.py:6308

4461

4495

msgid " bzr view --name view-name --delete"

4462

4496

msgstr ""

4463

4497

4464

#: bzrlib/builtins.py:6257

4498

#: bzrlib/builtins.py:6310

4465

4499

msgid " To switch to a named view::"

4466

4500

msgstr ""

4467

4501

4468

#: bzrlib/builtins.py:6259

4502

#: bzrlib/builtins.py:6312

4469

4503

msgid " bzr view --switch view-name"

4470

4504

msgstr ""

4471

4505

4472

#: bzrlib/builtins.py:6261

4506

#: bzrlib/builtins.py:6314

4473

4507

msgid " To list all views defined::"

4474

4508

msgstr ""

4475

4509

4476

#: bzrlib/builtins.py:6263

4510

#: bzrlib/builtins.py:6316

4477

4511

msgid " bzr view --all"

4478

4512

msgstr ""

4479

4513

4480

#: bzrlib/builtins.py:6265

4514

#: bzrlib/builtins.py:6318

4481

4515

msgid " To delete all views::"

4482

4516

msgstr ""

4483

4517

4484

#: bzrlib/builtins.py:6267

4518

#: bzrlib/builtins.py:6320

4485

4519

msgid " bzr view --delete --all"

4486

4520

msgstr ""

4487

4521

4488

#: bzrlib/builtins.py:6274

4522

#: bzrlib/builtins.py:6327

4489

4523

msgid "Apply list or delete action to all views."

4490

4524

msgstr ""

4491

4525

4492

#: bzrlib/builtins.py:6277

4526

#: bzrlib/builtins.py:6330

4493

4527

msgid "Delete the view."

4494

4528

msgstr ""

4495

4529

4496

#: bzrlib/builtins.py:6280

4530

#: bzrlib/builtins.py:6333

4497

4531

msgid "Name of the view to define, list or delete."

4498

4532

msgstr ""

4499

4533

4500

#: bzrlib/builtins.py:6284

4534

#: bzrlib/builtins.py:6337

4501

4535

msgid "Name of the view to switch to."

4502

4536

msgstr ""

4503

4537

4504

#: bzrlib/builtins.py:6303

4538

#: bzrlib/builtins.py:6356

4505

4539

msgid "Both --delete and a file list specified"

4506

4540

msgstr ""

4507

4541

4508

#: bzrlib/builtins.py:6306

4542

#: bzrlib/builtins.py:6359

4509

4543

msgid "Both --delete and --switch specified"

4510

4544

msgstr ""

4511

4545

4512

#: bzrlib/builtins.py:6309

4546

#: bzrlib/builtins.py:6362

4513

4547

msgid "Deleted all views.\n"

4514

4548

msgstr ""

4515

4549

4516

#: bzrlib/builtins.py:6311

4550

#: bzrlib/builtins.py:6364

4517

4551

msgid "No current view to delete"

4518

4552

msgstr ""

4519

4553

4520

#: bzrlib/builtins.py:6314

4554

#: bzrlib/builtins.py:6367

4521

4555

#, python-format

4522

4556

msgid "Deleted '%s' view.\n"

4523

4557

msgstr ""

4524

4558

4525

#: bzrlib/builtins.py:6318

4559

#: bzrlib/builtins.py:6371

4526

4560

msgid "Both --switch and a file list specified"

4527

4561

msgstr ""

4528

4562

4529

#: bzrlib/builtins.py:6321

4563

#: bzrlib/builtins.py:6374

4530

4564

msgid "Both --switch and --all specified"

4531

4565

msgstr ""

4532

4566

4533

#: bzrlib/builtins.py:6324

4567

#: bzrlib/builtins.py:6377

4534

4568

msgid "No current view to disable"

4535

4569

msgstr ""

4536

4570

4537

#: bzrlib/builtins.py:6326

4571

#: bzrlib/builtins.py:6379

4538

4572

#, python-format

4539

4573

msgid "Disabled '%s' view.\n"

4540

4574

msgstr ""

4541

4575

4542

#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352

4576

#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405

4543

4577

msgid "Using '{0}' view: {1}\n"

4544

4578

msgstr ""

4545

4579

4546

#: bzrlib/builtins.py:6333

4580

#: bzrlib/builtins.py:6386

4547

4581

msgid "Views defined:\n"

4548

4582

msgstr ""

4549

4583

4550

#: bzrlib/builtins.py:6342

4584

#: bzrlib/builtins.py:6395

4551

4585

msgid "No views defined.\n"

4552

4586

msgstr ""

4553

4587

4554

#: bzrlib/builtins.py:6349

4588

#: bzrlib/builtins.py:6402

4555

4589

msgid "Cannot change the 'off' pseudo view"

4556

4590

msgstr ""

4557

4591

4558

#: bzrlib/builtins.py:6357

4592

#: bzrlib/builtins.py:6410

4559

4593

msgid "No current view.\n"

4560

4594

msgstr ""

4561

4595

4562

#: bzrlib/builtins.py:6360

4596

#: bzrlib/builtins.py:6413

4563

4597

msgid "'{0}' view is: {1}\n"

4564

4598

msgstr ""

4565

4599

4566

#: bzrlib/builtins.py:6380

4600

#: bzrlib/builtins.py:6433

4567

4601

msgid " <no hooks installed>\n"

4568

4602

msgstr ""

4569

4603

4570

#: bzrlib/builtins.py:6384

4604

#: bzrlib/builtins.py:6437

4571

4605

msgid "Remove a branch."

4572

4606

msgstr ""

4573

4607

4574

#: bzrlib/builtins.py:6386

4608

#: bzrlib/builtins.py:6439

4575

4609

msgid ""

4576

4610

"This will remove the branch from the specified location but \n"

4577

4611

"will keep any working tree or repository in place."

4578

4612

msgstr ""

4579

4613

4580

#: bzrlib/builtins.py:6391

4614

#: bzrlib/builtins.py:6444

4581

4615

msgid " Remove the branch at repo/trunk::"

4582

4616

msgstr ""

4583

4617

4584

#: bzrlib/builtins.py:6393

4618

#: bzrlib/builtins.py:6446

4585

4619

msgid " bzr remove-branch repo/trunk"

4586

4620

msgstr ""

4587

4621

4588

#: bzrlib/builtins.py:6408

4622

#: bzrlib/builtins.py:6461

4589

4623

msgid "Plaintext diff output."

4590

4624

msgstr ""

4591

4625

4592

#: bzrlib/builtins.py:6409

4626

#: bzrlib/builtins.py:6462

4593

4627

msgid "Temporarily set aside some changes from the current tree."

4594

4628

msgstr ""

4595

4629

4596

#: bzrlib/builtins.py:6411

4630

#: bzrlib/builtins.py:6464

4597

4631

msgid ""

4598

4632

"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"

4599

4633

"ie. out of the way, until a later time when you can bring them back from\n"

4602

4636

"will they survive its deletion."

4603

4637

msgstr ""

4604

4638

4605

#: bzrlib/builtins.py:6417

4639

#: bzrlib/builtins.py:6470

4606

4640

msgid "If shelve --list is specified, previously-shelved changes are listed."

4607

4641

msgstr ""

4608

4642

4609

#: bzrlib/builtins.py:6419

4643

#: bzrlib/builtins.py:6472

4610

4644

msgid ""

4611

4645

"Shelve is intended to help separate several sets of changes that have\n"

4612

4646

"been inappropriately mingled. If you just want to get rid of all changes\n"

4614

4648

"shelve all text changes at once, use shelve --all."

4615

4649

msgstr ""

4616

4650

4617

#: bzrlib/builtins.py:6424

4651

#: bzrlib/builtins.py:6477

4618

4652

msgid ""

4619

4653

"If filenames are specified, only the changes to those files will be\n"

4620

4654

"shelved. Other files will be left untouched."

4621

4655

msgstr ""

4622

4656

4623

#: bzrlib/builtins.py:6427

4657

#: bzrlib/builtins.py:6480

4624

4658

msgid ""

4625

4659

"If a revision is specified, changes since that revision will be shelved."

4626

4660

msgstr ""

4627

4661

4628

#: bzrlib/builtins.py:6429

4662

#: bzrlib/builtins.py:6482

4629

4663

msgid ""

4630

4664

"You can put multiple items on the shelf, and by default, 'unshelve' will\n"

4631

4665

"restore the most recently shelved changes."

4632

4666

msgstr ""

4633

4667

4634

#: bzrlib/builtins.py:6432

4668

#: bzrlib/builtins.py:6485

4635

4669

msgid ""

4636

4670

"For complicated changes, it is possible to edit the changes in a separate\n"

4637

4671

"editor program to decide what the file remaining in the working copy\n"

4638

4672

"should look like. To do this, add the configuration option"

4639

4673

msgstr ""

4640

4674

4641

#: bzrlib/builtins.py:6436

4675

#: bzrlib/builtins.py:6489

4642

4676

msgid " change_editor = PROGRAM @new_path @old_path"

4643

4677

msgstr ""

4644

4678

4645

#: bzrlib/builtins.py:6438

4679

#: bzrlib/builtins.py:6491

4646

4680

msgid ""

4647

4681

"where @new_path is replaced with the path of the new version of the \n"

4648

4682

"file and @old_path is replaced with the path of the old version of \n"

4651

4685

" "

4652

4686

msgstr ""

4653

4687

4654

#: bzrlib/builtins.py:6450

4688

#: bzrlib/builtins.py:6503

4655

4689

msgid "Shelve all changes."

4656

4690

msgstr ""

4657

4691

4658

#: bzrlib/builtins.py:6452

4692

#: bzrlib/builtins.py:6505

4659

4693

msgid "Method to use for writing diffs."

4660

4694

msgstr ""

4661

4695

4662

#: bzrlib/builtins.py:6452

4696

#: bzrlib/builtins.py:6505

4663

4697

msgid "writer"

4664

4698

msgstr ""

4665

4699

4666

#: bzrlib/builtins.py:6456

4700

#: bzrlib/builtins.py:6509

4667

4701

msgid "List shelved changes."

4668

4702

msgstr ""

4669

4703

4670

#: bzrlib/builtins.py:6458

4704

#: bzrlib/builtins.py:6511

4671

4705

msgid "Destroy removed changes instead of shelving them."

4672

4706

msgstr ""

4673

4707

4674

#: bzrlib/builtins.py:6487

4708

#: bzrlib/builtins.py:6540

4675

4709

msgid "No shelved changes."

4676

4710

msgstr ""

4677

4711

4678

#: bzrlib/builtins.py:6498

4712

#: bzrlib/builtins.py:6551

4679

4713

msgid "Restore shelved changes."

4680

4714

msgstr ""

4681

4715

4682

#: bzrlib/builtins.py:6500

4716

#: bzrlib/builtins.py:6553

4683

4717

msgid ""

4684

4718

"By default, the most recently shelved changes are restored. However if you\n"

4685

4719

"specify a shelf by id those changes will be restored instead. This works\n"

4686

4720

"best when the changes don't depend on each other."

4687

4721

msgstr ""

4688

4722

4689

#: bzrlib/builtins.py:6509

4723

#: bzrlib/builtins.py:6562

4690

4724

msgid "The action to perform."

4691

4725

msgstr ""

4692

4726

4693

#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694

4727

#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694

4694

4728

msgid "action"

4695

4729

msgstr ""

4696

4730

4697

#: bzrlib/builtins.py:6511

4731

#: bzrlib/builtins.py:6564

4698

4732

msgid "Apply changes and remove from the shelf."

4699

4733

msgstr ""

4700

4734

4701

#: bzrlib/builtins.py:6512

4735

#: bzrlib/builtins.py:6565

4702

4736

msgid "Show changes, but do not apply or remove them."

4703

4737

msgstr ""

4704

4738

4705

#: bzrlib/builtins.py:6513

4739

#: bzrlib/builtins.py:6566

4706

4740

msgid ""

4707

4741

"Instead of unshelving the changes, show the diff that would result from "

4708

4742

"unshelving."

4709

4743

msgstr ""

4710

4744

4711

#: bzrlib/builtins.py:6515

4745

#: bzrlib/builtins.py:6568

4712

4746

msgid "Delete changes without applying them."

4713

4747

msgstr ""

4714

4748

4715

#: bzrlib/builtins.py:6516

4749

#: bzrlib/builtins.py:6569

4716

4750

msgid "Apply changes but don't delete them."

4717

4751

msgstr ""

4718

4752

4719

#: bzrlib/builtins.py:6531

4753

#: bzrlib/builtins.py:6584

4720

4754

msgid "Remove unwanted files from working tree."

4721

4755

msgstr ""

4722

4756

4723

#: bzrlib/builtins.py:6533

4757

#: bzrlib/builtins.py:6586

4724

4758

msgid ""

4725

4759

"By default, only unknown files, not ignored files, are deleted. Versioned\n"

4726

4760

"files are never deleted."

4727

4761

msgstr ""

4728

4762

4729

#: bzrlib/builtins.py:6536

4763

#: bzrlib/builtins.py:6589

4730

4764

msgid ""

4731

4765

"Another class is 'detritus', which includes files emitted by bzr during\n"

4732

4766

"normal operations and selftests. (The value of these files decreases with\n"

4733

4767

"time.)"

4734

4768

msgstr ""

4735

4769

4736

#: bzrlib/builtins.py:6540

4770

#: bzrlib/builtins.py:6593

4737

4771

msgid ""

4738

4772

"If no options are specified, unknown files are deleted. Otherwise, option\n"

4739

4773

"flags are respected, and may be combined."

4740

4774

msgstr ""

4741

4775

4742

#: bzrlib/builtins.py:6543

4776

#: bzrlib/builtins.py:6596

4743

4777

msgid "To check what clean-tree will do, use --dry-run."

4744

4778

msgstr ""

4745

4779

4746

#: bzrlib/builtins.py:6546

4780

#: bzrlib/builtins.py:6599

4747

4781

msgid "Delete all ignored files."

4748

4782

msgstr ""

4749

4783

4750

#: bzrlib/builtins.py:6547

4784

#: bzrlib/builtins.py:6600

4751

4785

msgid ""

4752

4786

"Delete conflict files, merge and revert backups, and failed selftest dirs."

4753

4787

msgstr ""

4754

4788

4755

#: bzrlib/builtins.py:6550

4789

#: bzrlib/builtins.py:6603

4756

4790

msgid "Delete files unknown to bzr (default)."

4757

4791

msgstr ""

4758

4792

4759

#: bzrlib/builtins.py:6551

4793

#: bzrlib/builtins.py:6604

4760

4794

msgid "Show files to delete instead of deleting them."

4761

4795

msgstr ""

4762

4796

4763

#: bzrlib/builtins.py:6553

4797

#: bzrlib/builtins.py:6606

4764

4798

msgid "Do not prompt before deleting."

4765

4799

msgstr ""

4766

4800

4820

4854

msgstr[0] ""

4821

4855

msgstr[1] ""

4822

4856

4823

#: bzrlib/bzrdir.py:489

4857

#: bzrlib/bzrdir.py:490

4824

4858

msgid ""

4825

4859

"making backup of {0}\n"

4826

4860

" to {1}"

4827

4861

msgstr ""

4828

4862

4829

#: bzrlib/bzrdir.py:512

4863

#: bzrlib/bzrdir.py:513

4830

4864

msgid "renamed {0} to {1}"

4831

4865

msgstr ""

4832

4866

4833

#: bzrlib/bzrdir.py:1663

4867

#: bzrlib/bzrdir.py:1652

4834

4868

#, python-format

4835

4869

msgid ""

4836

4870

"Source repository format does not support stacking, using format:\n"

4837

4871

" %s"

4838

4872

msgstr ""

4839

4873

4840

#: bzrlib/bzrdir.py:1683

4874

#: bzrlib/bzrdir.py:1672

4841

4875

#, python-format

4842

4876

msgid ""

4843

4877

"Source branch format does not support stacking, using format:\n"

4844

4878

" %s"

4845

4879

msgstr ""

4846

4880

4847

#: bzrlib/bzrdir.py:1829

4881

#: bzrlib/bzrdir.py:1818

4848

4882

msgid "starting repository conversion"

4849

4883

msgstr ""

4850

4884

4851

#: bzrlib/bzrdir.py:2058

4885

#: bzrlib/bzrdir.py:2039

4852

4886

msgid "Using default stacking branch {0} at {1}"

4853

4887

msgstr ""

4854

4888

5087

5121

msgid "bzr version-info --revision takes exactly one revision specifier"

5088

5122

msgstr ""

5089

5123

5090

#: bzrlib/commands.py:228

5124

#: bzrlib/commands.py:229

5091

5125

#, python-format

5092

5126

msgid "unknown command \"%s\""

5093

5127

msgstr "неизвестная команда «%s»"

5094

5128

5095

#: bzrlib/commands.py:475

5129

#: bzrlib/commands.py:476

5096

5130

msgid "No help for this command."

5097

5131

msgstr "Нет справки для этой команды."

5098

5132

5099

#: bzrlib/commands.py:488

5133

#: bzrlib/commands.py:489

5100

5134

#, python-format

5101

5135

msgid ":Purpose: %s\n"

5102

5136

msgstr ":Назначение: %s\n"

5103

5137

5104

#: bzrlib/commands.py:490

5138

#: bzrlib/commands.py:491

5105

5139

#, python-format

5106

5140

msgid ""

5107

5141

":Usage:\n"

5110

5144

":Синтаксис:\n"

5111

5145

"%s\n"

5112

5146

5113

#: bzrlib/commands.py:492

5147

#: bzrlib/commands.py:493

5114

5148

#, python-format

5115

5149

msgid ":Usage: %s\n"

5116

5150

msgstr ":Синтаксис: %s\n"

5117

5151

5118

#: bzrlib/commands.py:511

5152

#: bzrlib/commands.py:512

5119

5153

#, python-format

5120

5154

msgid ":Options:%s"

5121

5155

msgstr ":Опции:%s"

5122

5156

5123

#: bzrlib/commands.py:522

5157

#: bzrlib/commands.py:523

5124

5158

#, python-format

5125

5159

msgid ""

5126

5160

":Description:\n"

5131

5165

" %s\n"

5132

5166

"\n"

5133

5167

5134

#: bzrlib/commands.py:532

5168

#: bzrlib/commands.py:533

5135

5169

#, python-format

5136

5170

msgid ""

5137

5171

"See bzr help %s for more details and examples.\n"

5140

5174

"Смотрите bzr help %s, чтобы получить подробности и примеры.\n"

5141

5175

"\n"

5142

5176

5143

#: bzrlib/commands.py:537

5177

#: bzrlib/commands.py:538

5144

5178

msgid ":Aliases: "

5145

5179

msgstr ":Псевдонимы: "

5146

5180

5147

#: bzrlib/commands.py:541

5181

#: bzrlib/commands.py:542

5148

5182

#, python-format

5149

5183

msgid ":From: plugin \"%s\"\n"

5150

5184

msgstr ":Из: модуль «%s»\n"

5151

5185

5152

#: bzrlib/commands.py:553

5186

#: bzrlib/commands.py:554

5153

5187

msgid ":doc:`{0} <{1}-help>`"

5154

5188

msgstr ""

5155

5189

5156

#: bzrlib/commands.py:557

5190

#: bzrlib/commands.py:558

5157

5191

#, python-format

5158

5192

msgid ":See also: %s"

5159

5193

msgstr ":Смотрите также: %s"

5160

5194

5161

#: bzrlib/commands.py:815 bzrlib/gpg.py:324

5195

#: bzrlib/commands.py:816 bzrlib/gpg.py:324

5162

5196

msgid "Only ASCII permitted in option names"

5163

5197

msgstr "В именах опций разрешены только символы ASCII"

5164

5198

5165

#: bzrlib/commands.py:840 bzrlib/commands.py:848

5199

#: bzrlib/commands.py:841 bzrlib/commands.py:849

5166

5200

msgid "command {0!r} needs one or more {1}"

5167

5201

msgstr "команде {0!r} требуется один или больше {1}"

5168

5202

5169

#: bzrlib/commands.py:857

5203

#: bzrlib/commands.py:858

5170

5204

msgid "command {0!r} requires argument {1}"

5171

5205

msgstr "команде {0!r} требуется аргумент {1}"

5172

5206

5173

#: bzrlib/commands.py:864

5207

#: bzrlib/commands.py:865

5174

5208

msgid "extra argument to command {0}: {1}"

5175

5209

msgstr "лишний аргумент к команде {0}: {1}"

5176

5210

5177

#: bzrlib/commands.py:961

5211

#: bzrlib/commands.py:962

5178

5212

#, python-format

5179

5213

msgid "Profile data written to \"%s\"."

5180

5214

msgstr "Данные профиля записаны в «%s»."

5276

5310

msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."

5277

5311

msgstr ""

5278

5312

5279

#: bzrlib/config.py:2499

5313

#: bzrlib/config.py:2485

5280

5314

msgid "{0} is not an SI unit."

5281

5315

msgstr ""

5282

5316

5283

#: bzrlib/config.py:2956

5317

#: bzrlib/config.py:2949

5284

5318

msgid ""

5285

5319

"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "

5286

5320

"will be saved."

5287

5321

msgstr ""

5288

5322

5289

#: bzrlib/config.py:3100

5323

#: bzrlib/config.py:3093

5290

5324

#, python-format

5291

5325

msgid "Invalid '%s', should be of the form 'name=value'"

5292

5326

msgstr ""

5293

5327

5294

#: bzrlib/config.py:3969

5328

#: bzrlib/config.py:3962

5295

5329

msgid "Display, set or remove a configuration option."

5296

5330

msgstr ""

5297

5331

5298

#: bzrlib/config.py:3971

5332

#: bzrlib/config.py:3964

5299

5333

msgid "Display the active value for a given option."

5300

5334

msgstr ""

5301

5335

5302

#: bzrlib/config.py:3973

5336

#: bzrlib/config.py:3966

5303

5337

msgid ""

5304

5338

"If --all is specified, NAME is interpreted as a regular expression and all\n"

5305

5339

"matching options are displayed mentioning their scope. The active value\n"

5306

5340

"that bzr will take into account is the first one displayed for each option."

5307

5341

msgstr ""

5308

5342

5309

#: bzrlib/config.py:3977

5343

#: bzrlib/config.py:3970

5310

5344

msgid "If no NAME is given, --all .* is implied."

5311

5345

msgstr ""

5312

5346

5313

#: bzrlib/config.py:3979

5347

#: bzrlib/config.py:3972

5314

5348

msgid ""

5315

5349

"Setting a value is achieved by using name=value without spaces. The value\n"

5316

5350

"is set in the most relevant scope and can be checked by displaying the\n"

5317

5351

"option again."

5318

5352

msgstr ""

5319

5353

5320

#: bzrlib/config.py:3991

5354

#: bzrlib/config.py:3984

5321

5355

msgid "Reduce the scope to the specified configuration file."

5322

5356

msgstr ""

5323

5357

5324

#: bzrlib/config.py:3995

5358

#: bzrlib/config.py:3988

5325

5359

msgid "Display all the defined values for the matching options."

5326

5360

msgstr ""

5327

5361

5328

#: bzrlib/config.py:3997

5362

#: bzrlib/config.py:3990

5329

5363

msgid "Remove the option from the configuration file."

5330

5364

msgstr ""

5331

5365

5405

5439

msgstr[0] ""

5406

5440

msgstr[1] ""

5407

5441

5408

#: bzrlib/controldir.py:698

5442

#: bzrlib/controldir.py:710

5409

5443

msgid "{0} is{1} redirected to {2}"

5410

5444

msgstr ""

5411

5445

5511

5545

msgid "The value '%(value)s' is not a valid value."

5512

5546

msgstr ""

5513

5547

5548

#: bzrlib/errors.py:424

5549

msgid "Bad value \"%(value)s\" for option \"%(name)s\"."

5550

msgstr ""

5551

5514

5552

#: bzrlib/errors.py:443

5515

5553

msgid "Generic path error: %(path)r%(extra)s)"

5516

5554

msgstr ""

5610

5648

msgstr ""

5611

5649

5612

5650

#: bzrlib/errors.py:705

5651

msgid "A control directory already exists: \"%(path)s\"."

5652

msgstr ""

5653

5654

#: bzrlib/errors.py:710

5613

5655

msgid "Already a branch: \"%(path)s\"."

5614

5656

msgstr ""

5615

5657

5616

#: bzrlib/errors.py:711

5658

#: bzrlib/errors.py:715

5659

msgid "Parent branch already exists: \"%(path)s\"."

5660

msgstr ""

5661

5662

#: bzrlib/errors.py:721

5617

5663

msgid ""

5618

5664

"Directory contains a branch, but no working tree (use bzr checkout if you "

5619

5665

"wish to build a working tree): \"%(path)s\""

5620

5666

msgstr ""

5621

5667

5622

#: bzrlib/errors.py:716

5668

#: bzrlib/errors.py:726

5623

5669

msgid ""

5624

5670

"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""

5625

5671

msgstr ""

5626

5672

5627

#: bzrlib/errors.py:726

5673

#: bzrlib/errors.py:736

5628

5674

msgid ""

5629

5675

"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""

5630

5676

msgstr ""

5631

5677

5632

#: bzrlib/errors.py:736

5678

#: bzrlib/errors.py:746

5633

5679

msgid "No repository present: \"%(path)s\""

5634

5680

msgstr ""

5635

5681

5636

#: bzrlib/errors.py:743

5682

#: bzrlib/errors.py:753

5637

5683

msgid ""

5638

5684

"Unsupported branch format: %(format)s\n"

5639

5685

"Please run 'bzr upgrade'"

5640

5686

msgstr ""

5641

5687

5642

#: bzrlib/errors.py:749

5688

#: bzrlib/errors.py:759

5643

5689

msgid "Unknown %(kind)s format: %(format)r"

5644

5690

msgstr ""

5645

5691

5646

#: bzrlib/errors.py:758

5692

#: bzrlib/errors.py:768

5647

5693

msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."

5648

5694

msgstr ""

5649

5695

5650

#: bzrlib/errors.py:768

5696

#: bzrlib/errors.py:778

5651

5697

msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"

5652

5698

msgstr ""

5653

5699

5654

#: bzrlib/errors.py:783

5700

#: bzrlib/errors.py:793

5655

5701

msgid ""

5656

5702

"%(target)s\n"

5657

5703

"is not compatible with\n"

5659

5705

"%(details)s"

5660

5706

msgstr ""

5661

5707

5662

#: bzrlib/errors.py:799

5708

#: bzrlib/errors.py:809

5663

5709

msgid "Revision is not compatible with %(repo_format)s"

5664

5710

msgstr ""

5665

5711

5666

#: bzrlib/errors.py:809

5712

#: bzrlib/errors.py:819

5667

5713

msgid "%(context_info)s%(path)s is already versioned."

5668

5714

msgstr ""

5669

5715

5670

#: bzrlib/errors.py:830

5716

#: bzrlib/errors.py:840

5671

5717

msgid "%(context_info)s%(path)s is not versioned."

5672

5718

msgstr ""

5673

5719

5674

#: bzrlib/errors.py:851

5720

#: bzrlib/errors.py:861

5675

5721

msgid "Path(s) are not versioned: %(paths_as_string)s"

5676

5722

msgstr ""

5677

5723

5678

#: bzrlib/errors.py:862

5724

#: bzrlib/errors.py:872

5679

5725

msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"

5680

5726

msgstr ""

5681

5727

5682

#: bzrlib/errors.py:881

5728

#: bzrlib/errors.py:891

5683

5729

msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""

5684

5730

msgstr ""

5685

5731

5686

#: bzrlib/errors.py:889

5732

#: bzrlib/errors.py:899

5687

5733

msgid ""

5688

5734

"Filename %(filename)r is not valid in your current filesystem encoding "

5689

5735

"%(fs_encoding)s"

5690

5736

msgstr ""

5691

5737

5692

#: bzrlib/errors.py:900

5738

#: bzrlib/errors.py:910

5693

5739

msgid "Cannot operate on \"%(filename)s\" because it is a control file"

5694

5740

msgstr ""

5695

5741

5696

#: bzrlib/errors.py:918

5742

#: bzrlib/errors.py:928

5697

5743

msgid "The lock for '%(lock_description)s' is in use and cannot be broken."

5698

5744

msgstr ""

5699

5745

5700

#: bzrlib/errors.py:957

5746

#: bzrlib/errors.py:967

5701

5747

msgid "Cannot lock %(lock)s: %(why)s"

5702

5748

msgstr ""

5703

5749

5704

#: bzrlib/errors.py:967

5750

#: bzrlib/errors.py:977

5705

5751

msgid ""

5706

5752

"A transaction related operation was attempted after the transaction finished."

5707

5753

msgstr ""

5708

5754

5709

#: bzrlib/errors.py:994

5755

#: bzrlib/errors.py:1004

5710

5756

msgid "Cannot lock: transport is read only: %(transport)s"

5711

5757

msgstr ""

5712

5758

5713

#: bzrlib/errors.py:1002

5759

#: bzrlib/errors.py:1012

5714

5760

msgid "Could not acquire lock \"%(lock)s\": %(msg)s"

5715

5761

msgstr ""

5716

5762

5717

#: bzrlib/errors.py:1013

5763

#: bzrlib/errors.py:1023

5718

5764

msgid ""

5719

5765

"Lock was broken while still open: %(lock)s - check storage consistency!"

5720

5766

msgstr ""

5721

5767

5722

#: bzrlib/errors.py:1024

5768

#: bzrlib/errors.py:1034

5723

5769

msgid ""

5724

5770

"Lock was released and re-acquired before being broken: %(lock)s: held by "

5725

5771

"%(holder)r, wanted to break %(target)r"

5726

5772

msgstr ""

5727

5773

5728

#: bzrlib/errors.py:1036

5774

#: bzrlib/errors.py:1046

5729

5775

msgid ""

5730

5776

"Lock is apparently held, but corrupted: %(corruption_info)s\n"

5731

5777

"Use 'bzr break-lock' to clear it"

5732

5778

msgstr ""

5733

5779

5734

#: bzrlib/errors.py:1049

5780

#: bzrlib/errors.py:1059

5735

5781

msgid "Lock not held: %(lock)s"

5736

5782

msgstr ""

5737

5783

5738

#: bzrlib/errors.py:1078

5784

#: bzrlib/errors.py:1088

5739

5785

msgid "No changes to commit"

5740

5786

msgstr ""

5741

5787

5742

#: bzrlib/errors.py:1083

5788

#: bzrlib/errors.py:1093

5743

5789

msgid ""

5744

5790

"Selected-file commit of merges is not supported yet: files %(files_str)s"

5745

5791

msgstr ""

5746

5792

5747

#: bzrlib/errors.py:1093

5793

#: bzrlib/errors.py:1103

5748

5794

msgid ""

5749

5795

"Excluding paths during commit is not supported by repository at "

5750

5796

"%(repository)r."

5751

5797

msgstr ""

5752

5798

5753

#: bzrlib/errors.py:1102

5799

#: bzrlib/errors.py:1112

5754

5800

msgid ""

5755

5801

"The specified commit message contains characters unsupported by the current "

5756

5802

"encoding."

5757

5803

msgstr ""

5758

5804

5759

#: bzrlib/errors.py:1108

5805

#: bzrlib/errors.py:1118

5760

5806

msgid "Upgrade URL cannot work with readonly URLs."

5761

5807

msgstr ""

5762

5808

5763

#: bzrlib/errors.py:1113

5809

#: bzrlib/errors.py:1123

5764

5810

msgid "The branch format %(format)s is already at the most recent format."

5765

5811

msgstr ""

5766

5812

5767

#: bzrlib/errors.py:1136

5813

#: bzrlib/errors.py:1146

5768

5814

msgid "Option --change does not accept revision ranges"

5769

5815

msgstr ""

5770

5816

5771

#: bzrlib/errors.py:1141

5817

#: bzrlib/errors.py:1151

5772

5818

msgid "No namespace registered for string: %(spec)r"

5773

5819

msgstr ""

5774

5820

5775

#: bzrlib/errors.py:1160

5821

#: bzrlib/errors.py:1170

5776

5822

msgid ""

5777

5823

"Requested revision: '%(spec)s' does not exist in branch: "

5778

5824

"%(branch_url)s%(extra)s"

5779

5825

msgstr ""

5780

5826

5781

#: bzrlib/errors.py:1174

5827

#: bzrlib/errors.py:1184

5782

5828

msgid ""

5783

5829

"Operation denied because it would change the main history, which is not "

5784

5830

"permitted by the append_revisions_only setting on branch \"%(location)s\"."

5785

5831

msgstr ""

5786

5832

5787

#: bzrlib/errors.py:1185

5833

#: bzrlib/errors.py:1195

5788

5834

msgid ""

5789

5835

"These branches have diverged. Use the missing command to see how.\n"

5790

5836

"Use the merge command to reconcile them."

5791

5837

msgstr ""

5792

5838

5793

#: bzrlib/errors.py:1205

5839

#: bzrlib/errors.py:1215

5794

5840

msgid ""

5795

5841

"Branches have no common ancestor, and no merge base revision was specified."

5796

5842

msgstr ""

5797

5843

5798

#: bzrlib/errors.py:1211

5844

#: bzrlib/errors.py:1221

5799

5845

msgid ""

5800

5846

"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."

5801

5847

msgstr ""

5802

5848

5803

#: bzrlib/errors.py:1217

5849

#: bzrlib/errors.py:1227

5804

5850

msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"

5805

5851

msgstr ""

5806

5852

5807

#: bzrlib/errors.py:1226

5853

#: bzrlib/errors.py:1236

5808

5854

msgid ""

5809

5855

"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."

5810

5856

msgstr ""

5811

5857

5812

#: bzrlib/errors.py:1235

5858

#: bzrlib/errors.py:1245

5813

5859

msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"

5814

5860

msgstr ""

5815

5861

5816

#: bzrlib/errors.py:1244

5862

#: bzrlib/errors.py:1254

5817

5863

msgid "Branch %(branch)s has no commits."

5818

5864

msgstr ""

5819

5865

5820

#: bzrlib/errors.py:1262

5866

#: bzrlib/errors.py:1272

5821

5867

msgid ""

5822

5868

"Bound branch %(branch)s is out of date with master branch "

5823

5869

"%(master)s.%(extra_help)s"

5824

5870

msgstr ""

5825

5871

5826

#: bzrlib/errors.py:1274

5872

#: bzrlib/errors.py:1284

5827

5873

msgid ""

5828

5874

"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "

5829

5875

"bound to %(remote)s."

5830

5876

msgstr ""

5831

5877

5832

#: bzrlib/errors.py:1286

5878

#: bzrlib/errors.py:1296

5833

5879

msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"

5834

5880

msgstr ""

5835

5881

5836

#: bzrlib/errors.py:1295

5882

#: bzrlib/errors.py:1305

5837

5883

msgid ""

5838

5884

"Unable to connect to target of bound branch %(branch)s => %(target)s: "

5839

5885

"%(error)s"

5840

5886

msgstr ""

5841

5887

5842

#: bzrlib/errors.py:1307

5888

#: bzrlib/errors.py:1317

5843

5889

msgid "Error in processing weave: %(msg)s"

5844

5890

msgstr ""

5845

5891

5846

#: bzrlib/errors.py:1316

5892

#: bzrlib/errors.py:1326

5847

5893

msgid "Revision {%(revision_id)s} already present in %(weave)s"

5848

5894

msgstr ""

5849

5895

5850

#: bzrlib/errors.py:1327

5896

#: bzrlib/errors.py:1337

5851

5897

msgid "Revision {%(revision_id)s} not present in %(weave)s"

5852

5898

msgstr ""

5853

5899

5854

#: bzrlib/errors.py:1337

5900

#: bzrlib/errors.py:1347

5855

5901

msgid "Weave invariant violated: %(what)s"

5856

5902

msgstr ""

5857

5903

5858

#: bzrlib/errors.py:1346

5904

#: bzrlib/errors.py:1356

5859

5905

msgid "Parents are mismatched between two revisions. %(msg)s"

5860

5906

msgstr ""

5861

5907

5862

#: bzrlib/errors.py:1368

5908

#: bzrlib/errors.py:1378

5863

5909

msgid ""

5864

5910

"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "

5865

5911

"%(weave_b)s"

5866

5912

msgstr ""

5867

5913

5868

#: bzrlib/errors.py:1380

5914

#: bzrlib/errors.py:1390

5869

5915

msgid "Versioned file error"

5870

5916

msgstr ""

5871

5917

5872

#: bzrlib/errors.py:1385

5918

#: bzrlib/errors.py:1395

5873

5919

msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."

5874

5920

msgstr ""

5875

5921

5876

#: bzrlib/errors.py:1395

5922

#: bzrlib/errors.py:1405

5877

5923

msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."

5878

5924

msgstr ""

5879

5925

5880

#: bzrlib/errors.py:1405

5926

#: bzrlib/errors.py:1415

5881

5927

msgid "Text did not match its checksum: %(msg)s"

5882

5928

msgstr ""

5883

5929

5884

#: bzrlib/errors.py:1531

5930

#: bzrlib/errors.py:1541

5885

5931

msgid "Export format %(format)r not supported"

5886

5932

msgstr ""

5887

5933

5888

#: bzrlib/errors.py:1540

5934

#: bzrlib/errors.py:1550

5889

5935

msgid "Transport error: %(msg)s %(orig_error)s"

5890

5936

msgstr ""

5891

5937

5892

#: bzrlib/errors.py:1566

5938

#: bzrlib/errors.py:1576

5893

5939

msgid "Generic bzr smart protocol error: %(details)s"

5894

5940

msgstr ""

5895

5941

5896

#: bzrlib/errors.py:1574

5942

#: bzrlib/errors.py:1584

5897

5943

msgid "Received bad protocol version marker: %(marker)r"

5898

5944

msgstr ""

5899

5945

5900

#: bzrlib/errors.py:1606

5946

#: bzrlib/errors.py:1616

5901

5947

msgid "Transport operation not possible: %(msg)s %(orig_error)s"

5902

5948

msgstr ""

5903

5949

5904

#: bzrlib/errors.py:1611

5950

#: bzrlib/errors.py:1621

5905

5951

msgid "Connection error: %(msg)s %(orig_error)s"

5906

5952

msgstr ""

5907

5953

5908

#: bzrlib/errors.py:1616

5954

#: bzrlib/errors.py:1626

5909

5955

msgid "%(msg)s %(host)s%(port)s%(orig_error)s"

5910

5956

msgstr ""

5911

5957

5912

#: bzrlib/errors.py:1637

5958

#: bzrlib/errors.py:1647

5913

5959

msgid "Connection closed: %(msg)s %(orig_error)s"

5914

5960

msgstr ""

5915

5961

5916

#: bzrlib/errors.py:1642

5962

#: bzrlib/errors.py:1652

5917

5963

msgid "Connection Timeout: %(msg)s%(orig_error)s"

5918

5964

msgstr ""

5919

5965

5920

#: bzrlib/errors.py:1647

5966

#: bzrlib/errors.py:1657

5921

5967

msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"

5922

5968

msgstr ""

5923

5969

5924

#: bzrlib/errors.py:1657

5970

#: bzrlib/errors.py:1667

5925

5971

msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"

5926

5972

msgstr ""

5927

5973

5928

#: bzrlib/errors.py:1672

5974

#: bzrlib/errors.py:1682

5975

msgid "Certificate error: %(error)s"

5976

msgstr ""

5977

5978

#: bzrlib/errors.py:1690

5929

5979

msgid "Invalid http range %(range)r for %(path)s: %(msg)s"

5930

5980

msgstr ""

5931

5981

5932

#: bzrlib/errors.py:1686

5982

#: bzrlib/errors.py:1704

5933

5983

msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"

5934

5984

msgstr ""

5935

5985

5936

#: bzrlib/errors.py:1694

5986

#: bzrlib/errors.py:1712

5937

5987

msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"

5938

5988

msgstr ""

5939

5989

5940

#: bzrlib/errors.py:1703

5990

#: bzrlib/errors.py:1721

5941

5991

msgid "%(source)s is%(permanently)s redirected to %(target)s"

5942

5992

msgstr ""

5943

5993

5944

#: bzrlib/errors.py:1717

5994

#: bzrlib/errors.py:1735

5945

5995

msgid "Too many redirections"

5946

5996

msgstr ""

5947

5997

5948

#: bzrlib/errors.py:1722

5998

#: bzrlib/errors.py:1740

5949

5999

msgid "Working tree has conflicts."

5950

6000

msgstr ""

5951

6001

5952

#: bzrlib/errors.py:1726

6002

#: bzrlib/errors.py:1744

5953

6003

msgid "Config file %(filename)s is not UTF-8 encoded\n"

5954

6004

msgstr ""

5955

6005

5956

#: bzrlib/errors.py:1735

6006

#: bzrlib/errors.py:1753

5957

6007

msgid ""

5958

6008

"Error(s) parsing config file %(filename)s:\n"

5959

6009

"%(errors)s"

5960

6010

msgstr ""

5961

6011

5962

#: bzrlib/errors.py:1746

5963

msgid "Bad value \"%(value)s\" for option \"%(name)s\"."

6012

#: bzrlib/errors.py:1763

6013

msgid ""

6014

"Bad value \"%(value)s\" for option \"%(name)s\".\n"

6015

"See ``bzr help %(name)s``"

5964

6016

msgstr ""

5965

6017

5966

#: bzrlib/errors.py:1754

6018

#: bzrlib/errors.py:1773

5967

6019

msgid "%(username)r does not seem to contain a reasonable email address"

5968

6020

msgstr ""

5969

6021

5970

#: bzrlib/errors.py:1763

6022

#: bzrlib/errors.py:1782

5971

6023

msgid "Failed to GPG sign data with command \"%(command_line)s\""

5972

6024

msgstr ""

5973

6025

5974

#: bzrlib/errors.py:1771

6026

#: bzrlib/errors.py:1790

5975

6027

msgid "Failed to verify GPG signature data with error \"%(error)s\""

5976

6028

msgstr "Не удалось верифицировать подпись GPG с ошибкой «%(error)s»"

5977

6029

5978

#: bzrlib/errors.py:1779

6030

#: bzrlib/errors.py:1798

5979

6031

msgid "Unable to import library \"%(library)s\": %(error)s"

5980

6032

msgstr "Не удалось импортировать библиотеку «%(library)s»: %(error)s"

5981

6033

5982

#: bzrlib/errors.py:1787

6034

#: bzrlib/errors.py:1806

5983

6035

msgid "python-gpgme is not installed, it is needed to verify signatures"

5984

6036

msgstr "python-gpgme не устонвлен, он нужен для верификации подписей"

5985

6037

5986

#: bzrlib/errors.py:1795

6038

#: bzrlib/errors.py:1814

5987

6039

msgid ""

5988

6040

"The working tree for %(basedir)s has changed since the last commit, but "

5989

6041

"weave merge requires that it be unchanged"

5991

6043

"Рабочее дерево для %(basedir)s изменилось с последнего закрепления, но merge "

5992

6044

"требует, чтобы оно не содержало изменений"

5993

6045

5994

#: bzrlib/errors.py:1805

6046

#: bzrlib/errors.py:1824

5995

6047

msgid ""

5996

6048

"Can't reprocess and show base, because reprocessing obscures the "

5997

6049

"relationship of conflicting lines to the base"

5998

6050

msgstr ""

5999

6051

6000

#: bzrlib/errors.py:1811

6052

#: bzrlib/errors.py:1830

6001

6053

msgid "Cycle in graph %(graph)r"

6002

6054

msgstr "Цикл в графе %(graph)r"

6003

6055

6004

#: bzrlib/errors.py:1839

6056

#: bzrlib/errors.py:1858

6005

6057

msgid "File %(filename)s is not conflicted."

6006

6058

msgstr "Файл %(filename)s не содержит конфликтов."

6007

6059

6008

#: bzrlib/errors.py:1861

6060

#: bzrlib/errors.py:1880

6009

6061

msgid "No bundle was found in \"%(filename)s\"."

6010

6062

msgstr "В файле «%(filename)s» нет пакета."

6011

6063

6012

#: bzrlib/errors.py:1870

6064

#: bzrlib/errors.py:1889

6013

6065

msgid "Unable to handle bundle version %(version)s: %(msg)s"

6014

6066

msgstr "Не удалось обработать версию пакета %(version)s: %(msg)s"

6015

6067

6016

#: bzrlib/errors.py:1880

6068

#: bzrlib/errors.py:1899

6017

6069

msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"

6018

6070

msgstr ""

6019

6071

"В ветви %(base)s отсутствует ревизия %(text_revision)s файла %(file_id)s"

6020

6072

6021

#: bzrlib/errors.py:1893

6073

#: bzrlib/errors.py:1912

6022

6074

msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"

6023

6075

msgstr ""

6024

6076

"Идентификатор файла {%(file_id)s} уже присутствует в инвентаре как %(entry)s"

6025

6077

6026

#: bzrlib/errors.py:1903

6078

#: bzrlib/errors.py:1922

6027

6079

msgid "Key %(key)s is already present in map"

6028

6080

msgstr ""

6029

6081

6030

#: bzrlib/errors.py:1908

6082

#: bzrlib/errors.py:1927

6031

6083

msgid "The prefix %(prefix)s is in the help search path twice."

6032

6084

msgstr ""

6033

6085

6034

#: bzrlib/errors.py:1918

6086

#: bzrlib/errors.py:1937

6035

6087

msgid ""

6036

6088

"No final name for trans_id %(trans_id)r\n"

6037

6089

"file-id: %(file_id)r\n"

6038

6090

"root trans-id: %(root_trans_id)r\n"

6039

6091

msgstr ""

6040

6092

6041

#: bzrlib/errors.py:1950

6093

#: bzrlib/errors.py:1969

6042

6094

msgid "Attempt to reuse a transform that has already been applied."

6043

6095

msgstr ""

6044

6096

6045

#: bzrlib/errors.py:1955

6097

#: bzrlib/errors.py:1974

6046

6098

msgid "Moving the root directory is not supported at this time"

6047

6099

msgstr "Перемещение в корневую директорию пока не поддерживается"

6048

6100

6049

#: bzrlib/errors.py:1960

6101

#: bzrlib/errors.py:1979

6050

6102

msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"

6051

6103

msgstr "Не удалось переименовать %(from_path)s в %(to_path)s: %(why)s"

6052

6104

6053

#: bzrlib/errors.py:1971

6105

#: bzrlib/errors.py:1990

6054

6106

msgid ""

6055

6107

"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

6056

6108

msgstr ""

6057

6109

"Не удалось переместить %(from_path)s%(operator)s "

6058

6110

"%(to_path)s%(_has_extra)s%(extra)s"

6059

6111

6060

#: bzrlib/errors.py:2007

6112

#: bzrlib/errors.py:2026

6061

6113

msgid ""

6062

6114

"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

6063

6115

msgstr ""

6064

6116

"Не удалось переименовать %(from_path)s%(operator)s "

6065

6117

"%(to_path)s%(_has_extra)s%(extra)s"

6066

6118

6067

#: bzrlib/errors.py:2037

6119

#: bzrlib/errors.py:2056

6068

6120

msgid "Unable to import paramiko (required for sftp support): %(error)s"

6069

6121

msgstr ""

6070

6122

6071

#: bzrlib/errors.py:2045

6123

#: bzrlib/errors.py:2064

6072

6124

msgid "Nothing to merge."

6073

6125

msgstr "Нечего совмещать."

6074

6126

6075

#: bzrlib/errors.py:2050

6127

#: bzrlib/errors.py:2069

6076

6128

msgid "Format %(format)s cannot be initialised by this version of bzr."

6077

6129

msgstr ""

6078

6130

6079

#: bzrlib/errors.py:2059

6131

#: bzrlib/errors.py:2078

6080

6132

msgid ""

6081

6133

"Cannot convert from format %(from_format)s to format %(format)s. "

6082

6134

"%(problem)s"

6083

6135

msgstr ""

6084

6136

6085

#: bzrlib/errors.py:2071

6137

#: bzrlib/errors.py:2090

6086

6138

msgid "Could not find an appropriate Differ for file \"%(path)s\""

6087

6139

msgstr ""

6088

6140

6089

#: bzrlib/errors.py:2079

6141

#: bzrlib/errors.py:2098

6090

6142

msgid "%(exe_name)s could not be found on this machine"

6091

6143

msgstr ""

6092

6144

6093

#: bzrlib/errors.py:2087

6145

#: bzrlib/errors.py:2106

6094

6146

msgid "Diff is not installed on this machine: %(msg)s"

6095

6147

msgstr ""

6096

6148

6097

#: bzrlib/errors.py:2095

6149

#: bzrlib/errors.py:2114

6098

6150

msgid "Diff3 is not installed on this machine."

6099

6151

msgstr "Diff3 не установлен на этой машине."

6100

6152

6101

#: bzrlib/errors.py:2101

6153

#: bzrlib/errors.py:2120

6102

6154

msgid "The content being inserted is already present."

6103

6155

msgstr ""

6104

6156

6105

#: bzrlib/errors.py:2106

6157

#: bzrlib/errors.py:2125

6106

6158

msgid ""

6107

6159

"This tree contains left-over files from a failed operation.\n"

6108

6160

" Please examine %(limbo_dir)s to see if it contains any files you wish "

6110

6162

" keep, and delete it when you are done."

6111

6163

msgstr ""

6112

6164

6113

#: bzrlib/errors.py:2117

6165

#: bzrlib/errors.py:2136

6114

6166

msgid ""

6115

6167

"This tree contains left-over files from a failed operation.\n"

6116

6168

" Please examine %(pending_deletion)s to see if it contains any files you\n"

6117

6169

" wish to keep, and delete it when you are done."

6118

6170

msgstr ""

6119

6171

6120

#: bzrlib/errors.py:2127

6172

#: bzrlib/errors.py:2146

6121

6173

msgid ""

6122

6174

"Unable to delete transform temporary directory %(limbo_dir)s.\n"

6123

6175

" Please examine %(limbo_dir)s to see if it contains any files you wish "

6125

6177

" keep, and delete it when you are done."

6126

6178

msgstr ""

6127

6179

6128

#: bzrlib/errors.py:2138

6180

#: bzrlib/errors.py:2157

6129

6181

msgid ""

6130

6182

"Unable to delete transform temporary directory %(pending_deletion)s. Please "

6131

6183

"examine %(pending_deletion)s to see if it contains any files you wish to "

6132

6184

"keep, and delete it when you are done."

6133

6185

msgstr ""

6134

6186

6135

#: bzrlib/errors.py:2148

6187

#: bzrlib/errors.py:2167

6136

6188

msgid "Working tree is out of date, please run 'bzr update'.%(more)s"

6137

6189

msgstr ""

6138

6190

6139

#: bzrlib/errors.py:2162

6191

#: bzrlib/errors.py:2181

6140

6192

msgid ""

6141

6193

"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."

6142

6194

msgstr ""

6143

6195

6144

#: bzrlib/errors.py:2175

6196

#: bzrlib/errors.py:2194

6145

6197

msgid "Error in merge modified format"

6146

6198

msgstr ""

6147

6199

6148

#: bzrlib/errors.py:2180

6200

#: bzrlib/errors.py:2199

6149

6201

msgid "Format error in conflict listings"

6150

6202

msgstr ""

6151

6203

6152

#: bzrlib/errors.py:2184

6204

#: bzrlib/errors.py:2203

6153

6205

msgid ""

6154

6206

"Inconsistency in dirstate file %(dirstate_path)s.\n"

6155

6207

"Error: %(description)s"

6156

6208

msgstr ""

6157

6209

6158

#: bzrlib/errors.py:2195

6210

#: bzrlib/errors.py:2214

6159

6211

msgid ""

6160

6212

"An error has been detected in the repository %(repo_path)s.\n"

6161

6213

"Please run bzr reconcile on this repository."

6162

6214

msgstr ""

6163

6215

6164

#: bzrlib/errors.py:2206

6216

#: bzrlib/errors.py:2225

6165

6217

msgid ""

6166

6218

"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"

6167

6219

"reason: %(reason)s"

6168

6220

msgstr ""

6169

6221

6170

#: bzrlib/errors.py:2219

6222

#: bzrlib/errors.py:2238

6171

6223

msgid ""

6172

6224

"An inconsistent delta was supplied: %(delta)r\n"

6173

6225

"reason: %(reason)s"

6174

6226

msgstr ""

6175

6227

6176

#: bzrlib/errors.py:2231

6228

#: bzrlib/errors.py:2250

6177

6229

msgid "To use this feature you must upgrade your branch at %(path)s."

6178

6230

msgstr ""

6179

6231

6180

#: bzrlib/errors.py:2240

6232

#: bzrlib/errors.py:2259

6181

6233

msgid "To use this feature you must upgrade your repository at %(path)s."

6182

6234

msgstr ""

6183

6235

6184

#: bzrlib/errors.py:2245

6236

#: bzrlib/errors.py:2264

6185

6237

msgid ""

6186

6238

"To use this feature you must upgrade your branch at %(path)s to a format "

6187

6239

"which supports rich roots."

6188

6240

msgstr ""

6189

6241

6190

#: bzrlib/errors.py:2251

6242

#: bzrlib/errors.py:2270

6191

6243

msgid "Cannot perform local-only commits on unbound branches."

6192

6244

msgstr ""

6193

6245

6194

#: bzrlib/errors.py:2256

6246

#: bzrlib/errors.py:2275

6195

6247

msgid "The method %(mname)s is not supported on objects of type %(tname)s."

6196

6248

msgstr ""

6197

6249

6198

#: bzrlib/errors.py:2277

6250

#: bzrlib/errors.py:2296

6199

6251

msgid "Ghost tags not supported by format %(format)r."

6200

6252

msgstr ""

6201

6253

6202

#: bzrlib/errors.py:2285

6254

#: bzrlib/errors.py:2304

6203

6255

msgid "File is binary but should be text."

6204

6256

msgstr ""

6205

6257

6206

#: bzrlib/errors.py:2290

6258

#: bzrlib/errors.py:2309

6207

6259

msgid "The path %(path)s is not permitted on this platform"

6208

6260

msgstr ""

6209

6261

6210

#: bzrlib/errors.py:2299

6262

#: bzrlib/errors.py:2318

6211

6263

msgid ""

6212

6264

"Testament did not match expected value.\n"

6213

6265

" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"

6214

6266

" {%(measured)s}"

6215

6267

msgstr ""

6216

6268

6217

#: bzrlib/errors.py:2311

6269

#: bzrlib/errors.py:2330

6218

6270

msgid "Not a bzr revision-bundle: %(text)r"

6219

6271

msgstr ""

6220

6272

6221

#: bzrlib/errors.py:2320

6273

#: bzrlib/errors.py:2339

6222

6274

msgid "Bad bzr revision-bundle: %(text)r"

6223

6275

msgstr ""

6224

6276

6225

#: bzrlib/errors.py:2329

6277

#: bzrlib/errors.py:2348

6226

6278

msgid "Malformed bzr revision-bundle header: %(text)r"

6227

6279

msgstr ""

6228

6280

6229

#: bzrlib/errors.py:2334

6281

#: bzrlib/errors.py:2353

6230

6282

msgid "Malformed patches in bzr revision-bundle: %(text)r"

6231

6283

msgstr ""

6232

6284

6233

#: bzrlib/errors.py:2339

6285

#: bzrlib/errors.py:2358

6234

6286

msgid "Malformed footer in bzr revision-bundle: %(text)r"

6235

6287

msgstr ""

6236

6288

6237

#: bzrlib/errors.py:2344

6289

#: bzrlib/errors.py:2363

6238

6290

msgid "End of line marker was not \\n in bzr revision-bundle"

6239

6291

msgstr ""

6240

6292

6241

#: bzrlib/errors.py:2354

6293

#: bzrlib/errors.py:2373

6242

6294

msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"

6243

6295

msgstr ""

6244

6296

6245

#: bzrlib/errors.py:2364

6297

#: bzrlib/errors.py:2383

6246

6298

msgid "Root class for inventory serialization errors"

6247

6299

msgstr ""

6248

6300

6249

#: bzrlib/errors.py:2368

6301

#: bzrlib/errors.py:2387

6250

6302

msgid ""

6251

6303

"The inventory was not in the expected format:\n"

6252

6304

" %(msg)s"

6253

6305

msgstr ""

6254

6306

6255

#: bzrlib/errors.py:2377

6307

#: bzrlib/errors.py:2396

6256

6308

msgid "This operation requires rich root data storage"

6257

6309

msgstr ""

6258

6310

6259

#: bzrlib/errors.py:2390

6311

#: bzrlib/errors.py:2409

6260

6312

msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"

6261

6313

msgstr ""

6262

6314

6263

#: bzrlib/errors.py:2399

6315

#: bzrlib/errors.py:2418

6264

6316

msgid ""

6265

6317

"Don't know how to handle SSH connections. Please set BZR_SSH environment "

6266

6318

"variable."

6267

6319

msgstr ""

6268

6320

6269

#: bzrlib/errors.py:2406

6321

#: bzrlib/errors.py:2425

6270

6322

msgid ""

6271

6323

"Could not determine revno for {%(revision_id)s} because its ancestry shows a "

6272

6324

"ghost at {%(ghost_revision_id)s}"

6273

6325

msgstr ""

6274

6326

6275

#: bzrlib/errors.py:2416

6327

#: bzrlib/errors.py:2435

6276

6328

msgid "Ghost revision {%(revision_id)s} cannot be used here."

6277

6329

msgstr ""

6278

6330

6279

#: bzrlib/errors.py:2467

6331

#: bzrlib/errors.py:2486

6280

6332

msgid ""

6281

6333

"A merge directive must provide either a bundle or a public branch location."

6282

6334

msgstr ""

6283

6335

6284

#: bzrlib/errors.py:2474

6336

#: bzrlib/errors.py:2493

6285

6337

msgid "Bad merge directive payload %(start)r"

6286

6338

msgstr ""

6287

6339

6288

#: bzrlib/errors.py:2484

6340

#: bzrlib/errors.py:2503

6289

6341

msgid "Preview patch does not match requested changes."

6290

6342

msgstr ""

6291

6343

6292

#: bzrlib/errors.py:2490

6344

#: bzrlib/errors.py:2509

6293

6345

msgid "Patch_type was %(patch_type)s, but no patch was supplied."

6294

6346

msgstr ""

6295

6347

6296

#: bzrlib/errors.py:2500

6348

#: bzrlib/errors.py:2519

6297

6349

msgid ""

6298

6350

"Your branch does not have all of the revisions required in order to merge "

6299

6351

"this merge directive and the target location specified in the merge "

6300

6352

"directive is not a branch: %(location)s."

6301

6353

msgstr ""

6302

6354

6303

#: bzrlib/errors.py:2512

6355

#: bzrlib/errors.py:2531

6304

6356

msgid "Unsupported entry kind %(kind)s"

6305

6357

msgstr ""

6306

6358

6307

#: bzrlib/errors.py:2520

6359

#: bzrlib/errors.py:2539

6308

6360

msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"

6309

6361

msgstr ""

6310

6362

6311

#: bzrlib/errors.py:2530

6363

#: bzrlib/errors.py:2549

6312

6364

msgid "Subsume target %(other_tree)s needs to be upgraded."

6313

6365

msgstr ""

6314

6366

6315

#: bzrlib/errors.py:2549

6367

#: bzrlib/errors.py:2568

6316

6368

msgid "No such tag: %(tag_name)s"

6317

6369

msgstr ""

6318

6370

6319

#: bzrlib/errors.py:2557

6371

#: bzrlib/errors.py:2576

6320

6372

msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."

6321

6373

msgstr ""

6322

6374

6323

#: bzrlib/errors.py:2566

6375

#: bzrlib/errors.py:2585

6324

6376

msgid "Tag %(tag_name)s already exists."

6325

6377

msgstr ""

6326

6378

6327

#: bzrlib/errors.py:2574

6379

#: bzrlib/errors.py:2593

6328

6380

msgid ""

6329

6381

"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "

6330

6382

"bugs\" for more information on this feature."

6331

6383

msgstr ""

6332

6384

6333

#: bzrlib/errors.py:2584

6385

#: bzrlib/errors.py:2603

6334

6386

msgid ""

6335

6387

"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"

6336

6388

msgstr ""

6337

6389

6338

#: bzrlib/errors.py:2594

6390

#: bzrlib/errors.py:2613

6339

6391

msgid ""

6340

6392

"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"

6341

6393

msgstr ""

6342

6394

6343

#: bzrlib/errors.py:2604

6395

#: bzrlib/errors.py:2623

6344

6396

msgid "Invalid line in bugs property: '%(line)s'"

6345

6397

msgstr ""

6346

6398

6347

#: bzrlib/errors.py:2612

6399

#: bzrlib/errors.py:2631

6348

6400

msgid "Invalid bug status: '%(status)s'"

6349

6401

msgstr ""

6350

6402

6351

#: bzrlib/errors.py:2620

6403

#: bzrlib/errors.py:2639

6352

6404

msgid "Could not understand response from smart server: %(response_tuple)r"

6353

6405

msgstr ""

6354

6406

6355

#: bzrlib/errors.py:2659

6407

#: bzrlib/errors.py:2678

6356

6408

msgid "Server sent an unexpected error: %(error_tuple)r"

6357

6409

msgstr ""

6358

6410

6359

#: bzrlib/errors.py:2678

6411

#: bzrlib/errors.py:2697

6360

6412

msgid "Unrecognised container format: %(container_format)r"

6361

6413

msgstr ""

6362

6414

6363

#: bzrlib/errors.py:2686

6415

#: bzrlib/errors.py:2705

6364

6416

msgid "Unexpected end of container stream"

6365

6417

msgstr ""

6366

6418

6367

#: bzrlib/errors.py:2691

6419

#: bzrlib/errors.py:2710

6368

6420

msgid "Unknown record type: %(record_type)r"

6369

6421

msgstr ""

6370

6422

6371

#: bzrlib/errors.py:2699

6423

#: bzrlib/errors.py:2718

6372

6424

msgid "Invalid record: %(reason)s"

6373

6425

msgstr ""

6374

6426

6375

#: bzrlib/errors.py:2707

6427

#: bzrlib/errors.py:2726

6376

6428

msgid "Container has data after end marker: %(excess)r"

6377

6429

msgstr ""

6378

6430

6379

#: bzrlib/errors.py:2715

6431

#: bzrlib/errors.py:2734

6380

6432

msgid "Container has multiple records with the same name: %(name)s"

6381

6433

msgstr ""

6382

6434

6383

#: bzrlib/errors.py:2728

6435

#: bzrlib/errors.py:2747

6384

6436

msgid "Corrupt or incompatible data stream: %(reason)s"

6385

6437

msgstr ""

6386

6438

6387

#: bzrlib/errors.py:2736

6439

#: bzrlib/errors.py:2755

6388

6440

msgid "SMTP error: %(error)s"

6389

6441

msgstr ""

6390

6442

6391

#: bzrlib/errors.py:2744

6443

#: bzrlib/errors.py:2763

6392

6444

msgid "No message supplied."

6393

6445

msgstr ""

6394

6446

6395

#: bzrlib/errors.py:2749

6447

#: bzrlib/errors.py:2768

6396

6448

msgid "No mail-to address (--mail-to) or output (-o) specified."

6397

6449

msgstr ""

6398

6450

6399

#: bzrlib/errors.py:2754

6451

#: bzrlib/errors.py:2773

6400

6452

msgid "Unknown mail client: %(mail_client)s"

6401

6453

msgstr ""

6402

6454

6403

#: bzrlib/errors.py:2762

6455

#: bzrlib/errors.py:2781

6404

6456

msgid ""

6405

6457

"Unable to find mail client with the following names: "

6406

6458

"%(mail_command_list_string)s"

6407

6459

msgstr ""

6408

6460

6409

#: bzrlib/errors.py:2772

6461

#: bzrlib/errors.py:2791

6410

6462

msgid "SMTP connection to %(host)s refused"

6411

6463

msgstr ""

6412

6464

6413

#: bzrlib/errors.py:2781

6465

#: bzrlib/errors.py:2800

6414

6466

msgid "Please specify smtp_server. No server at default %(host)s."

6415

6467

msgstr ""

6416

6468

6417

#: bzrlib/errors.py:2795

6469

#: bzrlib/errors.py:2814

6418

6470

msgid ""

6419

6471

"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"

6420

6472

"reconfigure."

6421

6473

msgstr ""

6422

6474

6423

#: bzrlib/errors.py:2807

6475

#: bzrlib/errors.py:2826

6424

6476

msgid "'%(display_url)s' is already a branch."

6425

6477

msgstr ""

6426

6478

6427

#: bzrlib/errors.py:2812

6479

#: bzrlib/errors.py:2831

6428

6480

msgid "'%(display_url)s' is already a tree."

6429

6481

msgstr ""

6430

6482

6431

#: bzrlib/errors.py:2817

6483

#: bzrlib/errors.py:2836

6432

6484

msgid "'%(display_url)s' is already a checkout."

6433

6485

msgstr ""

6434

6486

6435

#: bzrlib/errors.py:2822

6487

#: bzrlib/errors.py:2841

6436

6488

msgid "'%(display_url)s' is already a lightweight checkout."

6437

6489

msgstr ""

6438

6490

6439

#: bzrlib/errors.py:2827

6491

#: bzrlib/errors.py:2846

6440

6492

msgid "'%(display_url)s' is already using a shared repository."

6441

6493

msgstr ""

6442

6494

6443

#: bzrlib/errors.py:2832

6495

#: bzrlib/errors.py:2851

6444

6496

msgid "'%(display_url)s' is already standalone."

6445

6497

msgstr ""

6446

6498

6447

#: bzrlib/errors.py:2837

6499

#: bzrlib/errors.py:2856

6448

6500

msgid "Shared repository '%(display_url)s' already creates working trees."

6449

6501

msgstr ""

6450

6502

6451

#: bzrlib/errors.py:2843

6503

#: bzrlib/errors.py:2862

6452

6504

msgid ""

6453

6505

"Shared repository '%(display_url)s' already doesn't create working trees."

6454

6506

msgstr ""

6455

6507

6456

#: bzrlib/errors.py:2849

6508

#: bzrlib/errors.py:2868

6457

6509

msgid "Requested reconfiguration of '%(display_url)s' is not supported."

6458

6510

msgstr ""

6459

6511

6460

#: bzrlib/errors.py:2854

6512

#: bzrlib/errors.py:2873

6461

6513

msgid "No location could be found to bind to at %(display_url)s."

6462

6514

msgstr ""

6463

6515

6464

#: bzrlib/errors.py:2859

6516

#: bzrlib/errors.py:2878

6465

6517

msgid ""

6466

6518

"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "

6467

6519

"status).%(more)s"

6468

6520

msgstr ""

6469

6521

6470

#: bzrlib/errors.py:2878

6522

#: bzrlib/errors.py:2897

6471

6523

msgid ""

6472

6524

"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"

6473

6525

"list).%(more)s"

6474

6526

msgstr ""

6475

6527

6476

#: bzrlib/errors.py:2884

6528

#: bzrlib/errors.py:2903

6477

6529

msgid "Variable {%(name)s} is not available."

6478

6530

msgstr ""

6479

6531

6480

#: bzrlib/errors.py:2892

6532

#: bzrlib/errors.py:2911

6481

6533

msgid "No template specified."

6482

6534

msgstr ""

6483

6535

6484

#: bzrlib/errors.py:2897

6536

#: bzrlib/errors.py:2916

6485

6537

msgid "Unable to create symlink %(path_str)son this platform"

6486

6538

msgstr ""

6487

6539

6488

#: bzrlib/errors.py:2912

6540

#: bzrlib/errors.py:2931

6489

6541

msgid ""

6490

6542

"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "

6491

6543

"\"original\", \"local\"."

6492

6544

msgstr ""

6493

6545

6494

#: bzrlib/errors.py:2946

6546

#: bzrlib/errors.py:2965

6495

6547

msgid ""

6496

6548

"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"

6497

6549

msgstr ""

6498

6550

6499

#: bzrlib/errors.py:2958

6551

#: bzrlib/errors.py:2977

6500

6552

msgid "The \"%(config_id)s\" configuration does not exist."

6501

6553

msgstr ""

6502

6554

6503

#: bzrlib/errors.py:2966

6555

#: bzrlib/errors.py:2985

6504

6556

msgid "The \"%(option_name)s\" configuration option does not exist."

6505

6557

msgstr ""

6506

6558

6507

#: bzrlib/errors.py:2974

6559

#: bzrlib/errors.py:2993

6508

6560

msgid "The alias \"%(alias_name)s\" does not exist."

6509

6561

msgstr ""

6510

6562

6511

#: bzrlib/errors.py:2988

6563

#: bzrlib/errors.py:3007

6512

6564

msgid "\"%(alias_name)s\" is not a valid location alias."

6513

6565

msgstr ""

6514

6566

6515

#: bzrlib/errors.py:2996

6567

#: bzrlib/errors.py:3015

6516

6568

msgid "No %(alias_name)s location assigned."

6517

6569

msgstr ""

6518

6570

6519

#: bzrlib/errors.py:3004

6571

#: bzrlib/errors.py:3023

6520

6572

msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."

6521

6573

msgstr ""

6522

6574

6523

#: bzrlib/errors.py:3014

6575

#: bzrlib/errors.py:3033

6524

6576

msgid "Unknown rules detected: %(unknowns_str)s."

6525

6577

msgstr ""

6526

6578

6527

#: bzrlib/errors.py:3025

6579

#: bzrlib/errors.py:3044

6528

6580

msgid "Tip change rejected: %(msg)s"

6529

6581

msgstr ""

6530

6582

6531

#: bzrlib/errors.py:3033

6583

#: bzrlib/errors.py:3052

6532

6584

msgid "Shelf corrupt."

6533

6585

msgstr ""

6534

6586

6535

#: bzrlib/errors.py:3038

6587

#: bzrlib/errors.py:3057

6536

6588

msgid "Corruption while decompressing repository file%(orig_error)s"

6537

6589

msgstr ""

6538

6590

6539

#: bzrlib/errors.py:3050

6591

#: bzrlib/errors.py:3069

6540

6592

msgid "No changes are shelved with id \"%(shelf_id)d\"."

6541

6593

msgstr ""

6542

6594

6543

#: bzrlib/errors.py:3058

6595

#: bzrlib/errors.py:3077

6544

6596

msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."

6545

6597

msgstr ""

6546

6598

6547

#: bzrlib/errors.py:3066

6599

#: bzrlib/errors.py:3085

6548

6600

msgid ""

6549

6601

"An attempt to access a url outside the server jail was made: '%(url)s'."

6550

6602

msgstr ""

6551

6603

6552

#: bzrlib/errors.py:3074

6604

#: bzrlib/errors.py:3093

6553

6605

msgid "The user aborted the operation."

6554

6606

msgstr ""

6555

6607

6556

#: bzrlib/errors.py:3079

6608

#: bzrlib/errors.py:3098

6557

6609

msgid "Branching '%(url)s'(%(format)s) must create a working tree."

6558

6610

msgstr ""

6559

6611

6560

#: bzrlib/errors.py:3089

6612

#: bzrlib/errors.py:3108

6561

6613

msgid "No such view: %(view_name)s."

6562

6614

msgstr ""

6563

6615

6564

#: bzrlib/errors.py:3099

6616

#: bzrlib/errors.py:3118

6565

6617

msgid ""

6566

6618

"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "

6567

6619

"to a later format."

6568

6620

msgstr ""

6569

6621

6570

#: bzrlib/errors.py:3108

6622

#: bzrlib/errors.py:3127

6571

6623

msgid ""

6572

6624

"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"

6573

6625

msgstr ""

6574

6626

6575

#: bzrlib/errors.py:3175

6627

#: bzrlib/errors.py:3194

6576

6628

msgid "%(bzrdir)r does not support co-located branches."

6577

6629

msgstr ""

6578

6630

6579

#: bzrlib/errors.py:3181

6631

#: bzrlib/errors.py:3200

6580

6632

msgid ""

6581

6633

"Unable to determine your name.\n"

6582

6634

"Please, set your name with the 'whoami' command.\n"

6583

6635

"E.g. bzr whoami \"Your Name <name@example.com>\""

6584

6636

msgstr ""

6585

6637

6586

#: bzrlib/errors.py:3190

6638

#: bzrlib/errors.py:3209

6587

6639

msgid "Invalid pattern(s) found. %(msg)s"

6588

6640

msgstr ""

6589

6641

6590

#: bzrlib/errors.py:3198

6642

#: bzrlib/errors.py:3217

6591

6643

msgid ""

6592

6644

"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "

6593

6645

"unbind` to fix."

6594

6646

msgstr ""

6595

6647

6596

#: bzrlib/errors.py:3209

6648

#: bzrlib/errors.py:3228

6597

6649

msgid "Loop involving %(refs)r while expanding \"%(string)s\"."

6598

6650

msgstr ""

6599

6651

6600

#: bzrlib/errors.py:3218

6652

#: bzrlib/errors.py:3237

6601

6653

msgid "Option %(name)s is not defined while expanding \"%(string)s\"."

6602

6654

msgstr ""

6603

6655

6604

#: bzrlib/errors.py:3227

6656

#: bzrlib/errors.py:3246

6605

6657

msgid ""

6606

6658

"No compatible object available for operations from %(source)r to %(target)r."

6607

6659

msgstr ""

6608

6660

6609

#: bzrlib/errors.py:3237

6661

#: bzrlib/errors.py:3256

6610

6662

msgid ""

6611

6663

"VFS requests over the smart server are not allowed. Encountered: %(method)s, "

6612

6664

"%(arguments)s."

6613

6665

msgstr ""

6614

6666

6615

#: bzrlib/errors.py:3247

6667

#: bzrlib/errors.py:3266

6616

6668

msgid ""

6617

6669

"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "

6618

6670

"format %(format)r"

6619

6671

msgstr ""

6620

6672

6621

#: bzrlib/errors.py:3259

6673

#: bzrlib/errors.py:3278

6622

6674

msgid ""

6623

6675

"Missing feature %(feature)s not provided by this version of Bazaar or any "

6624

6676

"plugin."

6625

6677

msgstr ""

6626

6678

6627

#: bzrlib/errors.py:3272

6679

#: bzrlib/errors.py:3291

6628

6680

msgid "Binary files section encountered."

6629

6681

msgstr ""

6630

6682

6631

#: bzrlib/errors.py:3280

6683

#: bzrlib/errors.py:3299

6632

6684

msgid ""

6633

6685

"Malformed patch header. %(desc)s\n"

6634

6686

"%(line)r"

6635

6687

msgstr ""

6636

6688

6637

#: bzrlib/errors.py:3289

6689

#: bzrlib/errors.py:3308

6638

6690

msgid ""

6639

6691

"Malformed hunk header. %(desc)s\n"

6640

6692

"%(line)r"

6641

6693

msgstr ""

6642

6694

6643

#: bzrlib/errors.py:3298

6695

#: bzrlib/errors.py:3317

6644

6696

msgid ""

6645

6697

"Malformed line. %(desc)s\n"

6646

6698

"%(line)r"

6647

6699

msgstr ""

6648

6700

6649

#: bzrlib/errors.py:3308

6701

#: bzrlib/errors.py:3327

6650

6702

msgid ""

6651

6703

"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "

6652

6704

"but patch says it should be \"%(patch_line)s\""

6653

6705

msgstr ""

6654

6706

6655

#: bzrlib/errors.py:3319

6707

#: bzrlib/errors.py:3338

6656

6708

msgid "The feature %(feature)s has already been registered."

6657

6709

msgstr ""

6658

6710

6984

7036

msgid "lstat/stat of ({0!r}): {1!r}"

6985

7037

msgstr ""

6986

7038

6987

#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008

7039

#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019

6988

7040

#, python-format

6989

7041

msgid "sorry, %r not allowed in path"

6990

7042

msgstr ""

6991

7043

6992

#: bzrlib/osutils.py:1226

7044

#: bzrlib/osutils.py:1237

6993

7045

#, python-format

6994

7046

msgid "%r is too short to calculate a relative path"

6995

7047

msgstr ""

7433

7485

msgid "Created new branch."

7434

7486

msgstr ""

7435

7487

7436

#: bzrlib/push.py:98

7488

#: bzrlib/push.py:97

7437

7489

#, python-format

7438

7490

msgid ""

7439

7491

"Target directory %s already contains a .bzr directory, but it is not valid."

7560

7612

msgid "%s is now not stacked\n"

7561

7613

msgstr "%s теперь не на стеке\n"

7562

7614

7563

#: bzrlib/remote.py:1180 bzrlib/repository.py:289

7615

#: bzrlib/remote.py:1228 bzrlib/repository.py:289

7564

7616

#, python-format

7565

7617

msgid "bzr: ERROR (ignored): %s"

7566

7618

msgstr "bzr: ОШИБКА (игнорирована): %s"

7567

7619

7568

#: bzrlib/remote.py:2493

7620

#: bzrlib/remote.py:2541

7569

7621

msgid "Copying repository content as tarball..."

7570

7622

msgstr "Копирование содержимого репозитория в тарбол..."

7571

7623

7784

7836

msgid "listening on port: %s"

7785

7837

msgstr "слушаю на порту: %s"

7786

7838

7787

#: bzrlib/switch.py:69

7839

#: bzrlib/switch.py:73

7788

7840

msgid "Pending merges must be committed or reverted before using switch."

7789

7841

msgstr ""

7790

7842

7791

#: bzrlib/switch.py:96

7843

#: bzrlib/switch.py:100

7792

7844

msgid ""

7793

7845

"Cannot switch as local commits found in the checkout. Commit these to the "

7794

7846

"bound branch or use --force to throw them away."

7795

7847

msgstr ""

7796

7848

7797

#: bzrlib/switch.py:101

7849

#: bzrlib/switch.py:105

7798

7850

#, python-format

7799

7851

msgid ""

7800

7852

"Unable to connect to current master branch %(target)s: %(error)s To switch "

7803

7855

"Не удалось соединиться с текущей основной ветвью %(target)s: %(error)s Для "

7804

7856

"принудительного переключения используйте --force."

7805

7857

7806

#: bzrlib/switch.py:110

7858

#: bzrlib/switch.py:125

7807

7859

msgid "Cannot switch a branch, only a checkout."

7808

7860

msgstr ""

7809

7861

7810

#: bzrlib/switch.py:146

7862

#: bzrlib/switch.py:163

7811

7863

#, python-format

7812

7864

msgid "Tree is up to date at revision %d."

7813

7865

msgstr "Дерево в актуальной ревизии %d."

7814

7866

7815

#: bzrlib/switch.py:152

7867

#: bzrlib/switch.py:169

7816

7868

#, python-format

7817

7869

msgid "Updated to revision %d."

7818

7870

msgstr "Обновлено до ревизии %d."

7819

7871

7820

#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743

7872

#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747

7821

7873

msgid "Apply phase"

7822

7874

msgstr "Применить фазу"

7823

7875

7824

#: bzrlib/transform.py:1769 bzrlib/transform.py:1837

7876

#: bzrlib/transform.py:1773 bzrlib/transform.py:1841

7825

7877

msgid "removing file"

7826

7878

msgstr "удаление файла"

7827

7879

7828

#: bzrlib/transform.py:1787 bzrlib/transform.py:1872

7880

#: bzrlib/transform.py:1791 bzrlib/transform.py:1876

7829

7881

msgid "adding file"

7830

7882

msgstr "добавление файла"

7831

7883

7832

#: bzrlib/transform.py:2587

7884

#: bzrlib/transform.py:2591

7833

7885

msgid "Building tree"

7834

7886

msgstr "Построение дерева"

7835

7887

7836

#: bzrlib/transform.py:2677 bzrlib/transform.py:2704

7888

#: bzrlib/transform.py:2681 bzrlib/transform.py:2708

7837

7889

msgid "Adding file contents"

7838

7890

msgstr "Добавление содержимого файлй"

7839

7891

7840

#: bzrlib/transform.py:3024

7892

#: bzrlib/transform.py:3028

7841

7893

msgid "Resolution pass"

7842

7894

msgstr ""

7843

7895

7989

8041

7990

8042

#: dummy/help_topics/basic/detail.txt:1

7991

8043

msgid ""

7992

"Bazaar 2.5b5 -- a free distributed version-control tool\n"

8044

"Bazaar 2.5b6 -- a free distributed version-control tool\n"

7993

8045

"http://bazaar.canonical.com/"

7994

8046

msgstr ""

7995

8047

12293

12345

"~~~~~~~~~~~~~~~~~~~~~~"

12294

12346

msgstr ""

12295

12347

12296

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402

12348

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418

12297

12349

msgid "Introduced in: 1.4"

12298

12350

msgstr ""

12299

12351

12485

12537

msgstr ""

12486

12538

12487

12539

#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196

12488

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448

12540

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464

12489

12541

msgid "Introduced in: 1.17"

12490

12542

msgstr ""

12491

12543

12541

12593

#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226

12542

12594

#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241

12543

12595

#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370

12544

#: en/help_topics/hooks.txt:427

12596

#: en/help_topics/hooks.txt:443

12545

12597

msgid "Introduced in: 2.4"

12546

12598

msgstr ""

12547

12599

12642

12694

msgstr ""

12643

12695

12644

12696

#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297

12645

#: en/help_topics/hooks.txt:505

12697

#: en/help_topics/hooks.txt:521

12646

12698

msgid "Introduced in: 1.15"

12647

12699

msgstr ""

12648

12700

12724

12776

msgstr ""

12725

12777

12726

12778

#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334

12727

#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493

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

12728

12781

msgid "Introduced in: 2.5"

12729

12782

msgstr ""

12730

12783

12843

12896

12844

12897

#: en/help_topics/hooks.txt:399

12845

12898

msgid ""

12899

"post_transform\n"

12900

"~~~~~~~~~~~~~~"

12901

msgstr ""

12902

12903

#: en/help_topics/hooks.txt:404

12904

msgid ""

12905

"Called after a tree transform has been performed on a tree. The hook\n"

12906

"is called with the tree that is being transformed and the transform."

12907

msgstr ""

12908

12909

#: en/help_topics/hooks.txt:407

12910

msgid ""

12911

"pre_transform\n"

12912

"~~~~~~~~~~~~~"

12913

msgstr ""

12914

12915

#: en/help_topics/hooks.txt:412

12916

msgid ""

12917

"Called before a tree transform on this tree. The hook is called with\n"

12918

"the tree that is being transformed and the transform."

12919

msgstr ""

12920

12921

#: en/help_topics/hooks.txt:415

12922

msgid ""

12846

12923

"start_commit\n"

12847

12924

"~~~~~~~~~~~~"

12848

12925

msgstr ""

12849

12926

12850

#: en/help_topics/hooks.txt:404

12927

#: en/help_topics/hooks.txt:420

12851

12928

msgid ""

12852

12929

"Called before a commit is performed on a tree. The start commit hook\n"

12853

12930

"is able to change the tree before the commit takes place. start_commit\n"

12855

12932

"being performed on."

12856

12933

msgstr ""

12857

12934

12858

#: en/help_topics/hooks.txt:409

12935

#: en/help_topics/hooks.txt:425

12859

12936

msgid ""

12860

12937

"SmartClientHooks\n"

12861

12938

"----------------"

12862

12939

msgstr ""

12863

12940

12864

#: en/help_topics/hooks.txt:412

12941

#: en/help_topics/hooks.txt:428

12865

12942

msgid ""

12866

12943

"call\n"

12867

12944

"~~~~"

12868

12945

msgstr ""

12869

12946

12870

#: en/help_topics/hooks.txt:415

12947

#: en/help_topics/hooks.txt:431

12871

12948

msgid "Introduced in: unknown"

12872

12949

msgstr ""

12873

12950

12874

#: en/help_topics/hooks.txt:417

12951

#: en/help_topics/hooks.txt:433

12875

12952

msgid ""

12876

12953

"Called when the smart client is submitting a request to the smart\n"

12877

12954

"server. Called with a bzrlib.smart.client.CallHookParams object.\n"

12878

12955

"Streaming request bodies, and responses, are not accessible."

12879

12956

msgstr ""

12880

12957

12881

#: en/help_topics/hooks.txt:421

12958

#: en/help_topics/hooks.txt:437

12882

12959

msgid ""

12883

12960

"SmartServerHooks\n"

12884

12961

"----------------"

12885

12962

msgstr ""

12886

12963

12887

#: en/help_topics/hooks.txt:424

12964

#: en/help_topics/hooks.txt:440

12888

12965

msgid ""

12889

12966

"server_exception\n"

12890

12967

"~~~~~~~~~~~~~~~~"

12891

12968

msgstr ""

12892

12969

12893

#: en/help_topics/hooks.txt:429

12970

#: en/help_topics/hooks.txt:445

12894

12971

msgid ""

12895

12972

"Called by the bzr server when an exception occurs. server_exception is\n"

12896

12973

"called with the sys.exc_info() tuple return true for the hook if the\n"

12898

12975

"normally."

12899

12976

msgstr ""

12900

12977

12901

#: en/help_topics/hooks.txt:434

12978

#: en/help_topics/hooks.txt:450

12902

12979

msgid ""

12903

12980

"server_started\n"

12904

12981

"~~~~~~~~~~~~~~"

12905

12982

msgstr ""

12906

12983

12907

#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456

12984

#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472

12908

12985

msgid "Introduced in: 0.16"

12909

12986

msgstr ""

12910

12987

12911

#: en/help_topics/hooks.txt:439

12988

#: en/help_topics/hooks.txt:455

12912

12989

msgid ""

12913

12990

"Called by the bzr server when it starts serving a directory.\n"

12914

12991

"server_started is called with (backing urls, public url), where\n"

12917

12994

"served."

12918

12995

msgstr ""

12919

12996

12920

#: en/help_topics/hooks.txt:445

12997

#: en/help_topics/hooks.txt:461

12921

12998

msgid ""

12922

12999

"server_started_ex\n"

12923

13000

"~~~~~~~~~~~~~~~~~"

12924

13001

msgstr ""

12925

13002

12926

#: en/help_topics/hooks.txt:450

13003

#: en/help_topics/hooks.txt:466

12927

13004

msgid ""

12928

13005

"Called by the bzr server when it starts serving a directory.\n"

12929

13006

"server_started is called with (backing_urls, server_obj)."

12930

13007

msgstr ""

12931

13008

12932

#: en/help_topics/hooks.txt:453

13009

#: en/help_topics/hooks.txt:469

12933

13010

msgid ""

12934

13011

"server_stopped\n"

12935

13012

"~~~~~~~~~~~~~~"

12936

13013

msgstr ""

12937

13014

12938

#: en/help_topics/hooks.txt:458

13015

#: en/help_topics/hooks.txt:474

12939

13016

msgid ""

12940

13017

"Called by the bzr server when it stops serving a directory.\n"

12941

13018

"server_stopped is called with the same parameters as the\n"

12942

13019

"server_started hook: (backing_urls, public_url)."

12943

13020

msgstr ""

12944

13021

12945

#: en/help_topics/hooks.txt:462

13022

#: en/help_topics/hooks.txt:478

12946

13023

msgid ""

12947

13024

"StatusHooks\n"

12948

13025

"-----------"

12949

13026

msgstr ""

12950

13027

12951

#: en/help_topics/hooks.txt:465

13028

#: en/help_topics/hooks.txt:481

12952

13029

msgid ""

12953

13030

"post_status\n"

12954

13031

"~~~~~~~~~~~"

12955

13032

msgstr ""

12956

13033

12957

#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479

13034

#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495

12958

13035

msgid "Introduced in: 2.3"

12959

13036

msgstr ""

12960

13037

12961

#: en/help_topics/hooks.txt:470

13038

#: en/help_topics/hooks.txt:486

12962

13039

msgid ""

12963

13040

"Called with argument StatusHookParams after Bazaar has displayed the\n"

12964

13041

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12967

13044

"status command. to_file is the output stream for writing."

12968

13045

msgstr ""

12969

13046

12970

#: en/help_topics/hooks.txt:476

13047

#: en/help_topics/hooks.txt:492

12971

13048

msgid ""

12972

13049

"pre_status\n"

12973

13050

"~~~~~~~~~~"

12974

13051

msgstr ""

12975

13052

12976

#: en/help_topics/hooks.txt:481

13053

#: en/help_topics/hooks.txt:497

12977

13054

msgid ""

12978

13055

"Called with argument StatusHookParams before Bazaar displays the\n"

12979

13056

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12982

13059

"status command. to_file is the output stream for writing."

12983

13060

msgstr ""

12984

13061

12985

#: en/help_topics/hooks.txt:487

13062

#: en/help_topics/hooks.txt:503

12986

13063

msgid ""

12987

13064

"TransportHooks\n"

12988

13065

"--------------"

12989

13066

msgstr ""

12990

13067

12991

#: en/help_topics/hooks.txt:490

13068

#: en/help_topics/hooks.txt:506

12992

13069

msgid ""

12993

13070

"post_connect\n"

12994

13071

"~~~~~~~~~~~~"

12995

13072

msgstr ""

12996

13073

12997

#: en/help_topics/hooks.txt:495

13074

#: en/help_topics/hooks.txt:511

12998

13075

msgid ""

12999

13076

"Called after a new connection is established or a reconnect occurs.\n"

13000

13077

"The sole argument passed is either the connected transport or smart\n"

13001

13078

"medium instance."

13002

13079

msgstr ""

13003

13080

13004

#: en/help_topics/hooks.txt:499

13081

#: en/help_topics/hooks.txt:515

13005

13082

msgid ""

13006

13083

"RioVersionInfoBuilderHooks\n"

13007

13084

"--------------------------"

13008

13085

msgstr ""

13009

13086

13010

#: en/help_topics/hooks.txt:502

13087

#: en/help_topics/hooks.txt:518

13011

13088

msgid ""

13012

13089

"revision\n"

13013

13090

"~~~~~~~~"

13014

13091

msgstr ""

13015

13092

13016

#: en/help_topics/hooks.txt:507

13093

#: en/help_topics/hooks.txt:523

13017

13094

msgid ""

13018

13095

"Invoked when adding information about a revision to the RIO stanza\n"

13019

13096

"that is printed. revision is called with a revision object and a RIO\n"